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

[Aaron Trevena]

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

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

    Add portlets callback to admin page
    
    Add portlets callback to admin page and update styling as needed

diff --git a/share/html/Admin/Elements/Portal b/share/html/Admin/Elements/Portal
index 44c1c23cdd..3b56e0412a 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>
 </&>
-</div>
diff --git a/share/html/Admin/index.html b/share/html/Admin/index.html
index 61d71c84e9..71b688dfdd 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-8">
+  <& /Elements/ListMenu, menu => Menu()->child('admin')  &>
+</div>
+<div class="boxcontainer col-md-4">
 % 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..b2462ab396 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;

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