[Rt-commit] rt branch, 5.0/admin-rt-portal-layout-fix, created. rt-5.0.0-3-gadb813d7bf

[Aaron Trevena]

The branch, 5.0/admin-rt-portal-layout-fix has been created
        at  adb813d7bf029f8110cc15d32b1ebeea2e9c8982 (commit)

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

    Fix styling for RT portal iframe
    
    The RT-Portal iframe in the Admin page was being squashed and not laid out
    properly due to browser style-sheets. Adding explicit style fixes the layout
    to use the space on the page consistently with other components.
    
    Added styling to allow a less squashed layout for the admin page, allowing
    more room for the portal and any other content added to the right of the menu.

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..b04cf83112 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-portal {
+    height: 300px;
     width: 100%;
     border: 0;
 }
@@ -49,6 +52,12 @@ ul.list-menu ul li {
     padding-bottom: 0;
 }
 
+iframe.rt-portlet {
+    height: 200px;
+    width: 100%;
+    border: 0;
+}
+
 .admin-hint {
     font-style: italic;
 }

commit adb813d7bf029f8110cc15d32b1ebeea2e9c8982
Author: Aaron Trevena <ast at bestpractical.com>
Date:   Wed Sep 16 19:14:30 2020 +0100

    Remove unused styles from admin.css
    
    While fixing the styling of the portal I found that the rt-portal classes in
    the elevator-light theme admin css were unused, and wouldn't effect the contents
    of the iframe due to iframe source not inheriting styles from parent document.
    
    The unused styles were pulled in with the responsive styling from the
    base-responsive branch in commit bb895ab211600e697ac8443b0a367ed0f2e75b0f but
    haven't been used.

diff --git a/share/static/css/elevator-light/admin.css b/share/static/css/elevator-light/admin.css
index b04cf83112..76bba0bac1 100644
--- a/share/static/css/elevator-light/admin.css
+++ b/share/static/css/elevator-light/admin.css
@@ -33,25 +33,6 @@ iframe.rt-portal {
     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%;

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