[Rt-commit] rt branch, 4.2/help-info-in-login, repushed

[Alex Vandiver]

The branch 4.2/help-info-in-login was deleted and repushed:
       was d2012a30b7fb4127274480bbd8300dc876661632
       now 6babcd56c9a2934e371b009bab1415d8b297d789

1:  d2012a3 ! 1:  6babcd5 Make it clear who is the local administrator to pester, not BPS
    @@ -1,6 +1,6 @@
    -Author: sunnavy <sunnavy at bestpractical.com>
    +Author: Alex Vandiver <alexmv at bestpractical.com>
     
    -    help message in login page
    +    Make it clear who is the local administrator to pester, not BPS
     
     diff --git a/share/html/Elements/Login b/share/html/Elements/Login
     --- a/share/html/Elements/Login
    @@ -23,7 +23,7 @@
     +%#
     +%# COPYRIGHT:
     +%#
    -+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
    ++%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
     +%#                                          <sales at bestpractical.com>
     +%#
     +%# (Except where explicitly superseded by other copyright notices)
    @@ -66,7 +66,6 @@
     +%# those contributions and any derivatives thereof.
     +%#
     +%# END BPS TAGGED BLOCK }}}
    -+
     +<div class="login-help">
     +<&|/l, RT->Config->Get('OwnerEmail')&>
     +For local help, please contact [_1]
    @@ -74,20 +73,33 @@
     +</div>
     +
     
    -diff --git a/share/html/NoAuth/css/base/login.css b/share/html/NoAuth/css/base/login.css
    ---- a/share/html/NoAuth/css/base/login.css
    -+++ b/share/html/NoAuth/css/base/login.css
    +diff --git a/share/html/m/_elements/login b/share/html/m/_elements/login
    +--- a/share/html/m/_elements/login
    ++++ b/share/html/m/_elements/login
     @@
    -     padding-left: 1em;
    + </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
    +--- a/share/static/css/base/login.css
    ++++ b/share/static/css/base/login.css
    +@@
    +     text-overflow: ellipsis;
    +     width: 90%;
      }
    - 
    ++
     +#login-box div.login-help {
     +    text-align: center;
     +}
     
    -diff --git a/share/html/m/_elements/raw_style b/share/html/m/_elements/raw_style
    ---- a/share/html/m/_elements/raw_style
    -+++ b/share/html/m/_elements/raw_style
    +diff --git a/share/static/css/mobile.css b/share/static/css/mobile.css
    +--- a/share/static/css/mobile.css
    ++++ b/share/static/css/mobile.css
     @@
          width: 100%;
      }
    @@ -101,15 +113,3 @@
      #bpscredits {
          float: right;
          clear: right;
    -
    -diff --git a/share/html/m/login b/share/html/m/login
    ---- a/share/html/m/login
    -+++ b/share/html/m/login
    -@@
    - </form>
    - % }
    - </&>
    -+<& /Elements/LoginHelp &>
    - </div><!-- #login-box -->
    - </div><!-- #login-body -->
    - <& _elements/full_site_link &>