[Rt-commit] rt branch, 4.2/help-info-in-login, created. rt-4.1.17-140-g6babcd5

[Alex Vandiver]

The branch, 4.2/help-info-in-login has been created
        at  6babcd56c9a2934e371b009bab1415d8b297d789 (commit)

- Log -----------------------------------------------------------------
commit 6babcd56c9a2934e371b009bab1415d8b297d789
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jul 26 19:43:51 2013 -0400

    Make it clear who is the local administrator to pester, not BPS

diff --git a/share/html/Elements/Login b/share/html/Elements/Login
index 9928e34..2a59e7c 100644
--- a/share/html/Elements/Login
+++ b/share/html/Elements/Login
@@ -97,6 +97,7 @@ jQuery(function(){
 </form>
 % }
 </&>
+<& /Elements/LoginHelp &>
 </div><!-- #login-box -->
 % $m->callback( %ARGS, CallbackName => 'AfterForm' );
 </div><!-- #login-body -->
diff --git a/share/html/m/_elements/login b/share/html/Elements/LoginHelp
similarity index 54%
copy from share/html/m/_elements/login
copy to share/html/Elements/LoginHelp
index a37b223..657a7d4 100644
--- a/share/html/m/_elements/login
+++ b/share/html/Elements/LoginHelp
@@ -45,64 +45,9 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-% $m->callback( %ARGS, CallbackName => 'Header' );
-<&| /m/_elements/wrapper, title => loc('RT for [_1]', RT->Config->Get('rtname')), show_home_button => 0 &>
-<div id="body" class="login-body">
-
-<& /Elements/ListActions,
-    title       => loc('Error'),
-    titlebox    => { class => 'error', hideable => 0 },
-    actions     => $actions,
-&>
-
-% $m->callback( %ARGS, CallbackName => 'BeforeForm' );
-
-<div id="login-box">
-<&| /Widgets/TitleBox, title => loc('Login'), hideable => 0 &>
-
-<& /Elements/LoginRedirectWarning, %ARGS &>
-
-% unless (RT->Config->Get('WebRemoteUserAuth') and !RT->Config->Get('WebFallbackToRTLogin')) {
-<form id="login" name="login" method="post" action="<% RT->Config->Get("WebPath") %>/NoAuth/Login.html">
-
-<div class="entry">
-    <span class="label"><&|/l&>Username</&>:</span><span class="value"><input type="text" name="user" value="<%$user%>" id="user" /></span>
-</div>
-
-<div class="entry">
-    <span class="label"><&|/l&>Password</&>:</span><span class="value"><input type="password" name="pass"/></span>
-</div>
-
-<& /Elements/Submit, Label => loc('Login')&>
-
-<input type="hidden" name="next" value="<% $next %>" />
-<input type="hidden" name="mobile" value="1" />
-
-<script type="text/javascript">
-if (window.location.hash) {
-    var form = (document.getElementsByName("login"))[0];
-    if (form) {
-        form.action = form.action + '#' + window.location.hash.replace(/^#/, '');
-    }
-}
-</script>
-
-% $m->callback( %ARGS );
-
-</form>
-% }
+<div class="login-help">
+<&|/l, RT->Config->Get('OwnerEmail')&>
+For local help, please contact [_1]
 </&>
-</div><!-- #login-box -->
-
-% $m->callback( %ARGS, CallbackName => 'AfterForm' );
+</div>
 
-</div><!-- #login-body -->
-<& /m/_elements/full_site_link &>
-</&>
-<%ARGS>
-$user => ""
-$pass => undef
-$goto => undef
-$actions => undef
-$next => ""
-</%ARGS>
diff --git a/share/html/m/_elements/login b/share/html/m/_elements/login
index a37b223..9407c57 100644
--- a/share/html/m/_elements/login
+++ b/share/html/m/_elements/login
@@ -92,6 +92,7 @@ if (window.location.hash) {
 </form>
 % }
 </&>
+<& /Elements/LoginHelp &>
 </div><!-- #login-box -->
 
 % $m->callback( %ARGS, CallbackName => 'AfterForm' );
diff --git a/share/static/css/base/login.css b/share/static/css/base/login.css
index c240ae9..47882d9 100644
--- a/share/static/css/base/login.css
+++ b/share/static/css/base/login.css
@@ -65,3 +65,7 @@ margin-right:auto;margin-left:auto;
     text-overflow: ellipsis;
     width: 90%;
 }
+
+#login-box div.login-help {
+    text-align: center;
+}
diff --git a/share/static/css/mobile.css b/share/static/css/mobile.css
index 481ba95..8b35b19 100644
--- a/share/static/css/mobile.css
+++ b/share/static/css/mobile.css
@@ -311,6 +311,12 @@ div#login-box input[type=text], div#login-box input[type=password] {
     width: 100%;
 }
 
+div#login-box div.login-help {
+    text-align: center;
+    /* don't be too close to the following "Not using a mobile ..." link */
+    margin-bottom: 1em;
+}
+
 #bpscredits {
     float: right;
     clear: right;

-----------------------------------------------------------------------