[Rt-commit] rt branch, 4.6-theme-trunk, updated. rt-4.4.4-213-gbfa3026ab

[? sunnavy]

The branch, 4.6-theme-trunk has been updated
       via  bfa3026ab282942ac8e9c94ec345e08bfa4f9afb (commit)
       via  3633771fd48b24bb938a0a23c77bd8f058404f0d (commit)
      from  8c59a95227010ffc6fa8b247a584b442bd9bb22f (commit)

Summary of changes:
 share/html/Dashboards/Elements/SelectPrivacy |  2 +-
 share/html/Dashboards/Modify.html            | 41 ++++++++++++++++++++--------
 share/html/Dashboards/Queries.html           |  4 ---
 share/html/Dashboards/Render.html            | 16 ++++-------
 share/html/Elements/SelectLang               |  2 +-
 5 files changed, 37 insertions(+), 28 deletions(-)

- Log -----------------------------------------------------------------
commit 3633771fd48b24bb938a0a23c77bd8f058404f0d
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Mon Apr 29 15:43:20 2019 -0400

    Migrate dashboards pages to elevator theme
    
    Dashboards/Subscription.html is complicated, which we will migrate in a
    separate branch.

diff --git a/share/html/Dashboards/Elements/SelectPrivacy b/share/html/Dashboards/Elements/SelectPrivacy
index b0148a29f..d6b3112b2 100644
--- a/share/html/Dashboards/Elements/SelectPrivacy
+++ b/share/html/Dashboards/Elements/SelectPrivacy
@@ -50,7 +50,7 @@
 $Name => undef
 $Default => undef
 </%args>
-<select name="<%$Name%>">
+<select class="form-control selectpicker" name="<%$Name%>">
 <%perl>
 foreach my $object (@Objects) {
     my $privacy = ref($object) . '-' . $object->id;
diff --git a/share/html/Dashboards/Modify.html b/share/html/Dashboards/Modify.html
index 5696dc12b..c264cdf88 100644
--- a/share/html/Dashboards/Modify.html
+++ b/share/html/Dashboards/Modify.html
@@ -58,21 +58,38 @@
 % }
 
 <&|/Widgets/TitleBox, title => loc('Basics') &>
-<table>
-    <tr>
-     <td class="label"><&|/l&>Name</&>:</td>
-     <td class="value"><input type="text" name="Name" value="<%$Dashboard->Name%>" /></td>
-    </tr>
-    <tr>
-    <td class="label"><&|/l&>Privacy</&>:</td>
-    <td><& /Dashboards/Elements/SelectPrivacy, Name => "Privacy", Objects => \@privacies, Default => $Dashboard->Privacy &></td>
-</tr>
-</table>
+
+  <div class="form-row">
+    <div class="label col-md-3">
+      <&|/l&>Name</&>:
+    </div>
+    <div class="col-md-9 value">
+        <input class="form-control" type="text" name="Name" value="<%$Dashboard->Name%>" />
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="label col-md-3">
+      <&|/l&>Privacy</&>:
+    </div>
+    <div class="col-md-9 value">
+      <& /Dashboards/Elements/SelectPrivacy, Name => "Privacy", Objects => \@privacies, Default => $Dashboard->Privacy &>
+    </div>
+  </div>
 </&>
-<& /Elements/Submit, Name => 'Save', Label =>( $Create ? loc('Create') : loc('Save Changes') ) &>
+
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Name => 'Save', Label =>( $Create ? loc('Create') : loc('Save Changes') ) &>
+    </div>
+  </div>
 
 % if ($Dashboard->Id && $can_delete) {
-<& /Elements/Submit, Name => 'Delete', Label => loc('Delete') &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Name => 'Delete', Label => loc('Delete') &>
+    </div>
+  </div>
 % }
 </form>
 <%INIT>
diff --git a/share/html/Dashboards/Queries.html b/share/html/Dashboards/Queries.html
index c7c6b240d..785ea588d 100644
--- a/share/html/Dashboards/Queries.html
+++ b/share/html/Dashboards/Queries.html
@@ -54,9 +54,7 @@
 
 <& Elements/HiddenSearches, searches => \@hidden_searches, Dashboard => $Dashboard &>
 
-<table width="100%" border="0">
 % for my $pane (@panes) {
-<tr><td valign="top" class="boxcontainer">
 <form action="Queries.html" name="Dashboard-<%$pane->{Name}%>" method="post" enctype="multipart/form-data">
 <input type="hidden" class="hidden" name="id" value="<%$Dashboard->Id%>" />
 <input type="hidden" class="hidden" name="Privacy" value="<%$Dashboard->Privacy%>" />
@@ -67,9 +65,7 @@
             $_->{pane} eq $pane_name} @deleted ) ? ( ShowUpdate => 1 ) : () &>
 </&>
 </form>
-</td></tr>
 % }
-</table>
 
 <%INIT>
 
diff --git a/share/html/Dashboards/Render.html b/share/html/Dashboards/Render.html
index 480bf660b..5ea001a7b 100644
--- a/share/html/Dashboards/Render.html
+++ b/share/html/Dashboards/Render.html
@@ -68,25 +68,21 @@
 
 % $m->callback(CallbackName => 'BeforeTable', Dashboard => $Dashboard, show_cb => $show_cb);
 
-<table class="dashboard" id="dashboard-<%$id%>">
+<div class="dashboard row" id="dashboard-<%$id%>">
 
 % $m->callback(CallbackName => 'BeforePanes', Dashboard => $Dashboard, show_cb => $show_cb);
 
-<tr valign="top">
-
-<td class="boxcontainer">
+  <div class="col-md-8">
 % $show_cb->('body');
-</td>
+  </div>
 
-<td class="boxcontainer">
+    <div class="col-md-4">
 % $show_cb->('sidebar');
-</td>
-
-</tr>
+    </div>
 
 % $m->callback(CallbackName => 'AfterPanes', Dashboard => $Dashboard, show_cb => $show_cb);
 
-</table>
+</div>
 
 % $m->callback(CallbackName => 'AfterTable', Dashboard => $Dashboard, show_cb => $show_cb);
 
diff --git a/share/html/Elements/SelectLang b/share/html/Elements/SelectLang
index 7f9f48e5d..d64736e7c 100644
--- a/share/html/Elements/SelectLang
+++ b/share/html/Elements/SelectLang
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<select name="<%$Name%>">
+<select class="form-control selectpicker" name="<%$Name%>">
 % if ($ShowNullOption) {
 <option value="">- (<% I18N::LangTags::List::name($session{CurrentUser}->LanguageHandle->language_tag) %>)</option>
 % }

commit bfa3026ab282942ac8e9c94ec345e08bfa4f9afb
Merge: 8c59a9522 3633771fd
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu May 9 05:35:06 2019 +0800

    Merge branch '4.6-theme/dashboards-pages' into 4.6-theme-trunk


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