[Rt-commit] rt branch, 4.6/simplify-footer, created. rt-4.4.4-726-g8b2d2886a0

? sunnavy sunnavy at bestpractical.com
Tue Feb 11 13:58:03 EST 2020


The branch, 4.6/simplify-footer has been created
        at  8b2d2886a0ebb05d72cd667ab352398e9a0ac0ec (commit)

- Log -----------------------------------------------------------------
commit ebb54329a7061f67055297cac4372cde840cbceb
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Tue Feb 4 19:00:22 2020 -0600

    Change layout of footer
    
    This commit updates the footer by moving the version to the left,
    removing the GPL language and logo, updating the Sales and Support
    language on the right, and updating styles.
    
    Once logged in, the version and copyright share the center middle.
    
    Additionally, this change removes styling from the layout.css in
    exchange for bootstrap defined classes.

diff --git a/share/html/Elements/Footer b/share/html/Elements/Footer
index 43c3b81916..2446ac4c66 100644
--- a/share/html/Elements/Footer
+++ b/share/html/Elements/Footer
@@ -49,18 +49,23 @@
   <hr class="clear" />
 </div>
 % $m->callback( %ARGS );
-<div id="footer" title="Best Practical Solutions, LLC, copyright and logo" class="row">
+<div id="footer" title="Best Practical Solutions, LLC, copyright" class="row">
 % if ($m->{'rt_base_time'}) {
   <p id="time"><span><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></span></p>
 %}
-    <div class="col-md-4 offset-md-4 col-sm-12">
-  <p id="bpscredits"><span><&|/l_unsafe,     '»|«', $RT::VERSION, '2019', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[_1] RT [_2] Copyright 1996-[_3] [_4].</&>
-</span></p>
-    </div>
+% # display 3 columns on login page
+% # display 1 column center aligned once logged in, without the "For support and sales..." section
+% my $cols = ( $Menu ? '12' : '4' );
+  <div class="col-md-<% $cols %>">
+    <p id="version" class="text-center <% $Menu ? 'pb-1' : 'text-md-left' %>"><span><&|/l_unsafe, $RT::VERSION, &>RT Version [_1]</&></span></p>
+  </div>
+  <div class="col-md-<% $cols %>">
+    <p id="bpscredits" class="text-center"><span><&|/l_unsafe, '2020', '»|«', '<a href="https://bestpractical.com/about">Best Practical Solutions, LLC</a>', &>Copyright 1996-[_1] [_2] [_3].</&></span></p>
+  </div>
 % if (!$Menu) {
-    <div class="col-md-4 col-sm-12">
-  <p id="legal"><&|/l_unsafe, '<a href="http://www.gnu.org/licenses/gpl-2.0.html">', '</a>' &>Distributed under [_1]version 2 of the GNU GPL[_2].</&><br /><&|/l_unsafe, '<a href="mailto:sales at bestpractical.com">sales at bestpractical.com</a>' &>To inquire about support, training, custom development or licensing, please contact [_1].</&><br /></p>
-    </div>
+  <div class="col-md-4">
+    <p id="legal" class="text-md-right text-center"><&|/l_unsafe, '<a href="mailto:sales at bestpractical.com">sales at bestpractical.com</a>' &>For support and sales inquiries, please contact [_1].</&></p>
+  </div>
 % }
 </div>
 % if ($Debug >= 2 ) {
diff --git a/share/static/css/elevator-light/layout.css b/share/static/css/elevator-light/layout.css
index 0b3c2aca91..40acb00885 100644
--- a/share/static/css/elevator-light/layout.css
+++ b/share/static/css/elevator-light/layout.css
@@ -32,12 +32,12 @@ div#body {
 
 div#footer {
     position: absolute;
-    text-align: right;
     font-size: 0.8em;
     background: #fff;
     padding-left: 15px;
     padding-right: 15px;
-    padding-top: 5px;
+    padding-top: 9px;
+    padding-bottom: 8px;
     bottom: 0;
     width: 100%;
     margin-left: 0;
@@ -54,19 +54,13 @@ div#footer #time {
     display: none
 }
 
-div#footer #bpscredits {
-    text-align: center;
-    background: url(../../../static/images/bpslogo_wt_sm.svg) no-repeat top center !important;
-    padding-top: 2.5em;
-}
-
-div#footer a {
-    color: white;
+div#footer p, div#footer a {
+    color: #ededed;
 }
 
-/* Override the default bootstrap p margin to reduce bottom spacing in footer */
+/* Override the default bootstrap p margin to reset bottom spacing in footer */
 div#footer p {
-    margin-bottom: .5rem;
+    margin-bottom: 0;
 }
 
 /* logo stuff */

commit 5f5337e48e2d2d55bb1a2c997d0172ca03ff2323
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Thu Feb 6 18:33:08 2020 -0600

    Removed bps svg logo
    
    This logo isn't used in the footer anymore.

diff --git a/share/static/images/bpslogo_wt_sm.svg b/share/static/images/bpslogo_wt_sm.svg
deleted file mode 100644
index dbe2489c93..0000000000
--- a/share/static/images/bpslogo_wt_sm.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="120px" height="25px" viewBox="0 0 340 71" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><path d="M15.18,23.905c0,0 12.322,10.139 14.909,12.267c-2.587,2.13 -14.909,12.273 -14.909,12.273l2.195,2.667l16.53,-13.606l0,-2.668l-16.53,-13.601l-2.195,2.668Z" style="fill:#0077b2;fill-rule:nonzero;"/><path d="M2.732,23.905c0,0 12.325,10.139 14.914,12.267c-2.589,2.13 -14.914,12.272 -14.914,12.272l2.195,2.668l16.535,-13.606l0,-2.668l-16.535,-13.601l-2.195,2.668Z" style="fill:#0077b2;fill-rule:nonzero;"/><path d="M68.426,22.335l-15.195,12.503l0,2.668l16.529,13.6l2.195,-2.668c0,0 -12.32,-10.137 -14.908,-12.266c2.587,-2.129 14.908,-12.267 14.908,-1
 2.267l-2.195,-2.668l-1.334,1.098Z" style="fill:#0077b2;fill-rule:nonzero;"/><path d="M80.872,22.335l-15.199,12.503l0.001,2.668l16.533,13.6l2.195,-2.668c0,0 -12.324,-10.136 -14.912,-12.266c2.588,-2.129 14.912,-12.267 14.912,-12.267l-2.195,-2.668l-1.335,1.098Z" style="fill:#0077b2;fill-rule:nonzero;"/><path d="M121.491,12.727c4.643,0 6.61,2.581 6.61,5.29c0,1.838 -1.225,3.353 -2.483,3.965c1.612,0.871 3.096,1.774 3.096,4.933c0,3.709 -2.968,5.483 -6.643,5.483l-13.736,0l0,-0.453c0.612,0 0.709,-0.193 0.709,-0.772l0,-17.219c0,-0.581 -0.097,-0.774 -0.709,-0.774l0,-0.453l13.156,0Zm-8.513,7.805l8.447,0c1.613,0 2.936,-0.516 2.936,-2.322c0,-1.806 -1.323,-2.322 -2.936,-2.322l-8.447,0l0,4.644Zm0,8.705l8.126,0c2.289,0 3.869,-0.773 3.869,-2.772c0,-1.999 -1.58,-2.774 -3.869,-2.774l-8.126,0l0,5.546Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M154.316,32.785c0,-0.29 -0.29,-0.387 -0.935,-0.387l-17.702,0l0,-0.453c0.483,0 0.58,-0.193 0.58,-0.772l0,-17.219c0,-0.581 -0.097,-0.774 -0.58,-0.774l0,-0.453l
 17.475,0c0.679,0 0.936,-0.16 0.936,-0.386l0.452,0l0,4.128l-0.452,0c0,-0.324 -0.257,-0.581 -0.936,-0.581l-12.961,0l0,4.966l8.416,0c0.645,0 0.903,-0.161 0.903,-0.451l0.451,0l0,4.063l-0.451,0c0,-0.194 -0.258,-0.453 -0.903,-0.453l-8.416,0l0,5.224l13.188,0c0.645,0 0.935,-0.16 0.935,-0.451l0.451,0l0,3.999l-0.451,0Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M177.854,18.564l-0.451,-0.289l0,-0.387c0,-0.871 -3.321,-2.322 -6.965,-2.322c-3.547,0 -5.999,0.838 -5.999,2.644c0,4.901 15.801,-1.58 15.801,8.029c0,4.256 -4.063,6.481 -10.383,6.481c-3.192,0 -5.19,-0.483 -6.545,-0.999c-1.322,-0.516 -1.935,-1 -2.322,-1c-0.129,0 -0.322,0.031 -0.484,0.128l-0.419,-0.193l2.386,-4.32l0.419,0.258c0,0.096 -0.032,0.225 -0.032,0.387c0,1.128 3.838,2.579 7.869,2.579c4.126,0 5.771,-1.386 5.771,-3.256c0,-4.579 -15.8,0.999 -15.8,-7.191c0,-3.547 2.87,-6.707 9.61,-6.707c2.837,0 4.482,0.418 6.449,1.064c1.289,0.419 2.224,1.063 2.418,1.063c0.128,0 0.257,-0.097 0.354,-0.16l0.452,0.16l-2.129,4.031Z" style="fill:#fff;fill
 -rule:nonzero;"/><path d="M197.556,32.398l-5.256,0l0,-0.453c0.547,0 0.644,-0.193 0.644,-0.772l0,-15.285l-6.385,0c-0.644,0 -0.902,0.064 -0.902,0.387l-0.452,0l0,-3.934l0.452,0c0,0.291 0.258,0.386 0.902,0.386l16.704,0c0.644,0 0.903,-0.095 0.903,-0.386l0.451,0l0,3.934l-0.451,0c0,-0.323 -0.259,-0.387 -0.903,-0.387l-6.385,0l0,15.285c0,0.579 0.129,0.772 0.678,0.772l0,0.453Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M113.043,56.388l0,7.03c0,0.579 0.096,0.773 0.612,0.773l0,0.452l-5.191,0l0,-0.452c0.548,0 0.645,-0.194 0.645,-0.773l0,-17.22c0,-0.58 -0.097,-0.774 -0.645,-0.774l0,-0.452l12.64,0c4.288,0 6.674,1.775 6.674,5.773c0,3.257 -1.742,5.643 -6.416,5.643l-8.319,0Zm0,-3.16l7.513,0c2.514,0 3.288,-0.581 3.288,-2.548c0,-1.966 -0.774,-2.547 -3.288,-2.547l-7.513,0l0,5.095Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M138.612,56.453l0,6.965c0,0.579 0.097,0.773 0.58,0.773l0,0.452l-5.191,0l0,-0.452c0.58,0 0.677,-0.194 0.677,-0.773l0,-17.22c0,-0.58 -0.097,-0.774 -0.677,-0.774l0,-0.452l10.96
 3,0c5.869,0 9.255,1.549 9.255,5.999c0,2.966 -2.225,5.159 -5.482,5.482l4.901,6.997c0.29,0.419 0.71,0.741 1.193,0.741l0,0.452l-5.868,0l0,-0.452c0.096,0 0.258,-0.032 0.258,-0.194c0,-0.354 -0.549,-1 -0.903,-1.547l-3.999,-5.997l-5.707,0Zm0,-3.16l8.093,0c2.838,0 3.58,-0.903 3.58,-2.613c0,-1.708 -1.484,-2.547 -4.192,-2.547l-7.481,0l0,5.16Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M159.088,64.643l0,-0.452c0.644,-0.032 0.709,-0.581 1.128,-1.515l7.288,-16.219c0.096,-0.227 0.225,-0.452 0.225,-0.71c0,-0.129 -0.161,-0.323 -0.354,-0.323l0,-0.452l5.642,0l0,0.452c-0.193,0 -0.387,0.13 -0.387,0.323c0,0.226 0.162,0.419 0.291,0.71l7.739,16.767c0.289,0.645 0.515,0.967 0.806,0.967l0,0.452l-5.256,0l0,-0.452c0.258,0 0.419,-0.096 0.419,-0.322c0,-0.356 -0.161,-0.516 -1.967,-4.514l-9.287,0c-1.644,3.869 -1.838,4.158 -1.838,4.385c0,0.322 0.194,0.451 0.549,0.451l0,0.452l-4.998,0Zm10.898,-15.543l-3.192,7.095l6.449,0l-3.257,-7.095Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M208.197,61.612l-0.548,0.258
 c-0.13,-0.065 -0.292,-0.098 -0.452,-0.098c-0.58,0 -2.258,3.193 -10.19,3.193c-5.739,0 -11.543,-3.224 -11.543,-9.996c0,-6.062 5.353,-10.319 12.511,-10.319c5.192,0 8.416,2.129 8.448,2.065l-0.065,0l0,0.064c0.227,0 0.355,-0.098 0.484,-0.162l0.581,0.227l-2.355,4.32l-0.579,-0.29c0.063,-0.129 0.128,-0.259 0.128,-0.419c0,-0.581 -2.773,-2.645 -7.029,-2.645c-4.256,0 -8.191,2.451 -8.191,6.998c0,5.126 4.063,6.997 7.933,6.997c4.321,0 7.836,-2.258 7.836,-3.256c0,-0.195 -0.033,-0.323 -0.066,-0.42l0.517,-0.258l2.58,3.741Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M224.899,64.643l-5.256,0l0,-0.452c0.549,0 0.647,-0.194 0.647,-0.773l0,-15.285l-6.387,0c-0.644,0 -0.903,0.064 -0.903,0.387l-0.45,0l0,-3.934l0.45,0c0,0.291 0.259,0.386 0.903,0.386l16.704,0c0.644,0 0.903,-0.095 0.903,-0.386l0.451,0l0,3.934l-0.451,0c0,-0.323 -0.259,-0.387 -0.903,-0.387l-6.384,0l0,15.285c0,0.579 0.128,0.773 0.676,0.773l0,0.452Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M242.666,63.418c0,0.579 0.13,0.773 0.806,0.773l0
 ,0.452l-5.642,0l0,-0.452c0.805,0 0.903,-0.194 0.903,-0.773l0,-17.22c0,-0.58 -0.098,-0.774 -0.903,-0.774l0,-0.452l5.642,0l0,0.452c-0.676,0 -0.806,0.194 -0.806,0.774l0,17.22Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M272.299,61.612l-0.547,0.258c-0.13,-0.065 -0.291,-0.098 -0.452,-0.098c-0.581,0 -2.259,3.193 -10.19,3.193c-5.74,0 -11.543,-3.224 -11.543,-9.996c0,-6.062 5.351,-10.319 12.511,-10.319c5.192,0 8.416,2.129 8.448,2.065l-0.064,0l0,0.064c0.225,0 0.354,-0.098 0.484,-0.162l0.579,0.227l-2.354,4.32l-0.581,-0.29c0.065,-0.129 0.13,-0.259 0.13,-0.419c0,-0.581 -2.773,-2.645 -7.029,-2.645c-4.257,0 -8.191,2.451 -8.191,6.998c0,5.126 4.064,6.997 7.932,6.997c4.32,0 7.837,-2.258 7.837,-3.256c0,-0.195 -0.033,-0.323 -0.066,-0.42l0.517,-0.258l2.579,3.741Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M276.072,64.643l0,-0.452c0.645,-0.032 0.709,-0.581 1.128,-1.515l7.288,-16.219c0.097,-0.227 0.224,-0.452 0.224,-0.71c0,-0.129 -0.16,-0.323 -0.353,-0.323l0,-0.452l5.642,0l0,0.452c-0.192,0 -0.38
 6,0.13 -0.386,0.323c0,0.226 0.161,0.419 0.289,0.71l7.739,16.767c0.292,0.645 0.517,0.967 0.806,0.967l0,0.452l-5.256,0l0,-0.452c0.26,0 0.419,-0.096 0.419,-0.322c0,-0.356 -0.159,-0.516 -1.966,-4.514l-9.287,0c-1.645,3.869 -1.837,4.158 -1.837,4.385c0,0.322 0.192,0.451 0.547,0.451l0,0.452l-4.997,0Zm10.899,-15.543l-3.192,7.095l6.449,0l-3.257,-7.095Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M303.544,64.191c0.581,0 0.71,-0.194 0.71,-0.773l0,-17.22c0,-0.58 -0.129,-0.774 -0.71,-0.774l0,-0.452l5.352,0l0,0.452c-0.612,0 -0.708,0.194 -0.708,0.774l0,15.284l12.445,0c0.645,0 0.904,-0.257 0.904,-0.676l0.452,0l0,4.288l-0.452,0c0,-0.225 -0.259,-0.451 -0.904,-0.451l-17.089,0l0,-0.452Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M45.587,68.104c0,0.71 -4.58,0.71 -4.58,0l0,-64.607c0,-0.708 4.58,-0.708 4.58,0l0,64.607Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M329.732,50.024c0,0.143 0.033,0.193 0.2,0.193l0,0.092l-1.309,0l0,-0.092c0.168,0 0.193,-0.05 0.193,-0.193l0,-3.65l-1.553,0c-0.155,0 -0
 .219,0.052 -0.219,0.161l-0.091,0l0,-1.077l0.091,0c0,0.104 0.064,0.155 0.219,0.155l4.024,0c0.155,0 0.219,-0.051 0.219,-0.155l0.091,0l0,1.077l-0.091,0c0,-0.109 -0.064,-0.161 -0.219,-0.161l-1.555,0l0,3.65Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M337.743,45.613l0,0.09c-0.149,0 -0.175,0.053 -0.175,0.194l0,4.127c0,0.143 0.026,0.193 0.175,0.193l0,0.092l-1.246,0l0,-0.092c0.13,0 0.156,-0.05 0.156,-0.193l0,-2.896l-0.013,0l-1.664,3.181l-0.091,0l-1.644,-3.212l-0.014,0l0,2.927c0,0.143 0.027,0.193 0.194,0.193l0,0.092l-1.148,0l0,-0.092c0.143,0 0.169,-0.05 0.169,-0.193l0,-4.127c0,-0.141 -0.026,-0.194 -0.169,-0.194l0,-0.09l1.433,0l0,0.09c-0.084,0 -0.169,0.045 -0.169,0.124c0,0.058 0.046,0.116 0.143,0.302l1.302,2.49l1.431,-2.657c0.033,-0.052 0.072,-0.123 0.072,-0.168c0,-0.058 -0.058,-0.084 -0.168,-0.091l0,-0.09l1.426,0Z" style="fill:#fff;fill-rule:nonzero;"/></g></svg>

commit 8b2d2886a0ebb05d72cd667ab352398e9a0ac0ec
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Fri Feb 7 13:58:44 2020 -0600

    Add TODO block for footer translation test
    
    Pending the new translation strings for the RT 5 release.

diff --git a/t/i18n/footer.t b/t/i18n/footer.t
index a616371682..c969f9f60c 100644
--- a/t/i18n/footer.t
+++ b/t/i18n/footer.t
@@ -19,7 +19,10 @@ $m->content_contains('Copyright','Has english coypright');
 $m->get_ok( "/NoAuth/Logout.html" );
 
 $m->login( chinese => "password" );
-$m->content_lacks('Copyright','Lacks english copyright');
+TODO: {
+    local $TODO = 'pending new translation for version 5 release';
+    $m->content_lacks('Copyright','Lacks english copyright');
+};
 $m->get_ok( "/NoAuth/Logout.html" ); # ->logout fails because it's translated
 
 $m->login( root => "password" );

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


More information about the rt-commit mailing list