[Rt-commit] rt branch, 5.0/admin-rt-maintenance-callback, created. rt-5.0.0-3-g9b39fd42a8

[Aaron Trevena]

The branch, 5.0/admin-rt-maintenance-callback has been created
        at  9b39fd42a81eeadd3d942ae24b0d4d7ea0e947aa (commit)

- Log -----------------------------------------------------------------
commit 59118f81c902631eb882021e5dde401c902df98e
Author: Aaron Trevena <ast at bestpractical.com>
Date:   Tue Aug 4 16:23:05 2020 +0100

    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, 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
index 44c1c23cdd..3a2bd76aa6 100644
--- a/share/html/Admin/Elements/Portal
+++ b/share/html/Admin/Elements/Portal
@@ -45,8 +45,6 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<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-portal"></iframe>
 </&>
-</div>
diff --git a/share/html/Admin/index.html b/share/html/Admin/index.html
index 61d71c84e9..1b4b1672dd 100644
--- a/share/html/Admin/index.html
+++ b/share/html/Admin/index.html
@@ -47,7 +47,13 @@
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => loc('RT Administration') &>
 <& /Elements/Tabs &>
-<& /Elements/ListMenu, menu => Menu()->child('admin')  &>
+<div class="row">
+   <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 &>
 % }
+   </div>
+</div>
diff --git a/share/static/css/elevator-light/admin.css b/share/static/css/elevator-light/admin.css
index ca5a1c0093..76bba0bac1 100644
--- a/share/static/css/elevator-light/admin.css
+++ b/share/static/css/elevator-light/admin.css
@@ -5,6 +5,9 @@ ul.list-menu {
  list-style: none;
     width: 35%;
 }
+div.boxcontainer ul.list-menu {
+  width:90%;
+}
 ul.list-menu > li {
     margin-bottom: .5em;
     margin-top: .5em;
@@ -24,29 +27,16 @@ ul.list-menu ul li {
  margin-right: 0.5em;
 }
 
-#rt-portal .titlebox iframe {
-    height: 100%;
+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 {

commit 9b39fd42a81eeadd3d942ae24b0d4d7ea0e947aa
Author: Aaron Trevena <ast at bestpractical.com>
Date:   Tue Aug 4 16:24:40 2020 +0100

    Add portlets callback to Admin page
    
    Add new portlets callback to Admin index allowing additional
    content to be added to the Admin main page by plugins

diff --git a/share/html/Admin/index.html b/share/html/Admin/index.html
index 1b4b1672dd..2f6d24a44f 100644
--- a/share/html/Admin/index.html
+++ b/share/html/Admin/index.html
@@ -55,5 +55,6 @@
 % if (RT->Config->Get('ShowRTPortal')) {
       <& /Admin/Elements/Portal &>
 % }
+% $m->callback( CallbackName => 'AdminPortlets', ARGSRef => \%ARGS );
    </div>
 </div>

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