[Rt-commit] rt branch, 5.0/admin-rt-maintenance-callback, repushed

[Aaron Trevena]

The branch 5.0/admin-rt-maintenance-callback was deleted and repushed:
       was 5d4072bc58b3d0526a1653d50ab766cf92990305
       now 9b39fd42a81eeadd3d942ae24b0d4d7ea0e947aa

1: 5d4072bc58 ! 1: 59118f81c9 Update styling for iframes in Admin page
    @@ -1,12 +1,10 @@
     Author: Aaron Trevena <ast at bestpractical.com>
     
    -    Add portlets callback to admin page and update styling
    -    
    -    Add portlets callback to admin page and update styling as needed
    +    Update styling for iframes in Admin page
         
         The iframe is itself a different "document" in the DOM, so you can't target it with elements in the parent dom and it's own dom,
         also the class in admin.css wasn't matching the iframe or it's parents, as the class was used in the iframe source document
    -    rather than the page containing the iframe
    +    rather than the page containing the iframe, so we've removed the classes that would be in the document inside the iframe.
     
     diff --git a/share/html/Admin/Elements/Portal b/share/html/Admin/Elements/Portal
     --- a/share/html/Admin/Elements/Portal
    @@ -18,7 +16,7 @@
     -<div id="rt-portal">
      <&| /Widgets/TitleBox, title => loc('RT Portal') &>
     -<iframe src="https://bestpractical.com/rt/integration/news?utm_source=rt&utm_medium=iframe&utm_campaign=<%$RT::VERSION%>"></iframe>
    -+<iframe src="https://bestpractical.com/rt/integration/news?utm_source=rt&utm_medium=iframe&utm_campaign=<%$RT::VERSION%>" class="rt-portlet"></iframe>
    ++<iframe src="https://bestpractical.com/rt/integration/news?utm_source=rt&utm_medium=iframe&utm_campaign=<%$RT::VERSION%>" class="rt-portal"></iframe>
      </&>
     -</div>
     
    @@ -26,22 +24,20 @@
     --- a/share/html/Admin/index.html
     +++ b/share/html/Admin/index.html
     @@
    - %#
      %# END BPS TAGGED BLOCK }}}
      <& /Admin/Elements/Header, Title => loc('RT Administration') &>
    --<& /Elements/Tabs &>
    + <& /Elements/Tabs &>
     -<& /Elements/ListMenu, menu => Menu()->child('admin')  &>
    -+  <& /Elements/Tabs &>
     +<div class="row">
    -+<div class="boxcontainer col-md-5">
    -+  <& /Elements/ListMenu, menu => Menu()->child('admin')  &>
    -+</div>
    -+<div class="boxcontainer col-md-7">
    ++   <div class="boxcontainer col-md-5">
    ++      <& /Elements/ListMenu, menu => Menu()->child('admin')  &>
    ++   </div>
    ++   <div class="boxcontainer col-md-7">
      % if (RT->Config->Get('ShowRTPortal')) {
    - <& /Admin/Elements/Portal &>
    +-<& /Admin/Elements/Portal &>
    ++      <& /Admin/Elements/Portal &>
      % }
    -+% $m->callback( CallbackName => 'AdminPortlets', ARGSRef => \%ARGS );
    -+</div>
    ++   </div>
     +</div>
     
     diff --git a/share/static/css/elevator-light/admin.css b/share/static/css/elevator-light/admin.css
    @@ -63,8 +59,34 @@
      
     -#rt-portal .titlebox iframe {
     -    height: 100%;
    -+iframe.rt-portlet {
    -+    height: 200px;
    ++iframe.rt-portal {
    ++    height: 300px;
          width: 100%;
          border: 0;
      }
    + 
    +-#rt-portal .titlebox {
    +-    position: absolute;
    +-    top: 1em;
    +-    right: 1em;
    +-    bottom: 3em;
    +-    width: 55%;
    +-    padding-bottom: 1em;
    +-}
    +-
    +-#rt-portal .titlebox-content {
    +-    height: 100%;
    +-    padding: 0;
    +-}
    +-
    +-#rt-portal .titlebox.rolled-up {
    +-    bottom: auto;
    +-    padding-bottom: 0;
    ++iframe.rt-portlet {
    ++    height: 200px;
    ++    width: 100%;
    ++    border: 0;
    + }
    + 
    + .admin-hint {
    +
-:  ------- > 2: 9b39fd42a8 Add portlets callback to Admin page