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

[Aaron Trevena]

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

- Log -----------------------------------------------------------------
commit 5d4072bc58b3d0526a1653d50ab766cf92990305
Author: Aaron Trevena <ast at bestpractical.com>
Date:   Wed Jul 29 13:21:42 2020 +0100

    Add portlets callback to admin page and update styling
    
    Add portlets callback to admin page and update styling as needed
    
    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

diff --git a/share/html/Admin/Elements/Portal b/share/html/Admin/Elements/Portal
index 44c1c23cdd..40289214b1 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-portlet"></iframe>
 </&>
-</div>
diff --git a/share/html/Admin/index.html b/share/html/Admin/index.html
index 61d71c84e9..1f3208016a 100644
--- a/share/html/Admin/index.html
+++ b/share/html/Admin/index.html
@@ -46,8 +46,15 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => loc('RT Administration') &>
-<& /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">
 % if (RT->Config->Get('ShowRTPortal')) {
 <& /Admin/Elements/Portal &>
 % }
+% $m->callback( CallbackName => 'AdminPortlets', ARGSRef => \%ARGS );
+</div>
+</div>
diff --git a/share/static/css/elevator-light/admin.css b/share/static/css/elevator-light/admin.css
index ca5a1c0093..e19105a6c5 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,8 +27,8 @@ ul.list-menu ul li {
  margin-right: 0.5em;
 }
 
-#rt-portal .titlebox iframe {
-    height: 100%;
+iframe.rt-portlet {
+    height: 200px;
     width: 100%;
     border: 0;
 }

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