[Bps-public-commit] rt-extension-resetpassword branch, update-rt5-styling, created. 1.04-35-g0c8095a
Craig Kaiser
craig at bestpractical.com
Thu Dec 10 09:30:02 EST 2020
The branch, update-rt5-styling has been created
at 0c8095a8818f9ba8c17310a1012468182da430cc (commit)
- Log -----------------------------------------------------------------
commit da6cedc62e6ff4baf5644fbc4f7a52bee782969f
Author: craig kaiser <craig at bestpractical.com>
Date: Fri Nov 20 14:55:34 2020 -0500
Use simpler labels
diff --git a/html/Callbacks/RT-Extension-ResetPassword/Elements/Login/Default b/html/Callbacks/RT-Extension-ResetPassword/Elements/Login/Default
index 0bc8b8e..e468d65 100644
--- a/html/Callbacks/RT-Extension-ResetPassword/Elements/Login/Default
+++ b/html/Callbacks/RT-Extension-ResetPassword/Elements/Login/Default
@@ -1,8 +1,8 @@
% unless ( RT::Config->Get('DisableResetPasswordOnLogin') ) {
% if ( RT::Handle::cmp_version($RT::VERSION, '5.0.0') >= 0 ) {
<div class="form-row">
- <div class="col-12 text-right">
- <a class="btn btn-primary" href="<%$RT::WebPath%>/NoAuth/ResetPassword/Request.html"><&|/l&>Forgot your password</&></a>
+ <div class="col-12 text-center">
+ <a href="<%$RT::WebPath%>/NoAuth/ResetPassword/Request.html"><&|/l&>Forgot password</&>?</a>
% if ( RT::Config->Get('CreateNewUserAndSetPassword') ) {
<a class="btn btn-primary" href="<%$RT::WebPath%>/NoAuth/ResetPassword/Request.html?Mode=create"><&|/l&>New account</&></a>
% }
diff --git a/html/NoAuth/ResetPassword/Request.html b/html/NoAuth/ResetPassword/Request.html
index b4d86d0..604c8d7 100644
--- a/html/NoAuth/ResetPassword/Request.html
+++ b/html/NoAuth/ResetPassword/Request.html
@@ -76,7 +76,7 @@
</&>
<div class="form-row">
<div class="col-12">
- <a class="btn btn-primary float-left" href="<%$RT::WebURL|n%>"><&|/l&>Back to Login</&></a>
+ <a class="btn btn-primary float-left" href="<%$RT::WebURL|n%>"><&|/l&>Cancel</&></a>
<input class="button btn btn-primary form-control float-right" type="submit" value="<%loc('Send it!')%>" />
</div>
</div>
commit 15490cfb4c6e0d90619f891e0654818f0d2d5c3f
Author: craig kaiser <craig at bestpractical.com>
Date: Fri Nov 20 14:55:56 2020 -0500
Move reset password cancel/send buttons into titlebox
diff --git a/html/NoAuth/ResetPassword/Request.html b/html/NoAuth/ResetPassword/Request.html
index 604c8d7..cb27ca6 100644
--- a/html/NoAuth/ResetPassword/Request.html
+++ b/html/NoAuth/ResetPassword/Request.html
@@ -73,13 +73,14 @@
<input type="text" class="form-control" name="Email" value="" />
</div>
</div>
-</&>
<div class="form-row">
- <div class="col-12">
- <a class="btn btn-primary float-left" href="<%$RT::WebURL|n%>"><&|/l&>Cancel</&></a>
- <input class="button btn btn-primary form-control float-right" type="submit" value="<%loc('Send it!')%>" />
+ <div class="col-3"></div>
+ <div class="col-8 text-right">
+ <input class="button btn btn-primary form-control" type="submit" value="<%loc('Send it!')%>" />
+ <a class="btn btn-primary" href="<%$RT::WebURL|n%>"><&|/l&>Cancel</&></a>
</div>
</div>
+</&>
</form>
% }
commit 0c8095a8818f9ba8c17310a1012468182da430cc
Author: craig kaiser <craig at bestpractical.com>
Date: Thu Dec 10 09:06:18 2020 -0500
Update wording and styling of create account link
diff --git a/html/Callbacks/RT-Extension-ResetPassword/Elements/Login/Default b/html/Callbacks/RT-Extension-ResetPassword/Elements/Login/Default
index e468d65..8c34f16 100644
--- a/html/Callbacks/RT-Extension-ResetPassword/Elements/Login/Default
+++ b/html/Callbacks/RT-Extension-ResetPassword/Elements/Login/Default
@@ -4,7 +4,7 @@
<div class="col-12 text-center">
<a href="<%$RT::WebPath%>/NoAuth/ResetPassword/Request.html"><&|/l&>Forgot password</&>?</a>
% if ( RT::Config->Get('CreateNewUserAndSetPassword') ) {
- <a class="btn btn-primary" href="<%$RT::WebPath%>/NoAuth/ResetPassword/Request.html?Mode=create"><&|/l&>New account</&></a>
+ <span> • </span><a href="<%$RT::WebPath%>/NoAuth/ResetPassword/Request.html?Mode=create"><&|/l&>New account</&></a>
% }
</div>
</div>
@@ -13,7 +13,7 @@
<div id="lostpassword" class="input-row" style="text-align:center;clear:both;">
<a href="<%$RT::WebPath%>/NoAuth/ResetPassword/Request.html"><&|/l&>Forgot your password</&></a>
% if ( RT::Config->Get('CreateNewUserAndSetPassword') ) {
- | <a href="<%$RT::WebPath%>/NoAuth/ResetPassword/Request.html?Mode=create"><&|/l&>New account</&></a>
+ <span> • </span><a href="<%$RT::WebPath%>/NoAuth/ResetPassword/Request.html?Mode=create"><&|/l&>New account</&></a>
% }
</div>
% }
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list