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

[Aaron Trevena]

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

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

    Update styling for RT portal iframe
    
    Remove unused (due to iframe source not inheriting styles from parent document) classes.
    Update css with new class for portal

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 c2221e4159351b3c5506a559b949b3fced0982cb
Author: Aaron Trevena <ast at bestpractical.com>
Date:   Tue Aug 4 16:24:40 2020 +0100

    Add callback for displaying additional content on admin home page

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>

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