[Rt-commit] rt branch, 4.6-theme/dashboards-pages, created. rt-4.4.4-202-ge7e55fc82

Craig Kaiser craig at bestpractical.com
Fri May 3 07:35:32 EDT 2019


The branch, 4.6-theme/dashboards-pages has been created
        at  e7e55fc825cfab5e9e0d9ab58e2b11cb974bbb75 (commit)

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

    Migrate dashboards pages to elevator theme

diff --git a/share/html/Dashboards/Modify.html b/share/html/Dashboards/Modify.html
index 5696dc12b..8cdef97c7 100644
--- a/share/html/Dashboards/Modify.html
+++ b/share/html/Dashboards/Modify.html
@@ -58,22 +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="col-md-12">
+  <div class="form-row">
+    <div class="label col-md-3">
+      <&|/l&>Name</&>:
+    </div>
+    <div class="col-md-9 value">
+        <span class="current-value form-control"><input class="form-control" type="text" name="Name" value="<%$Dashboard->Name%>" /></span>
+    </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>
 % }
+</div>
 </form>
 <%INIT>
 
diff --git a/share/html/Dashboards/Queries.html b/share/html/Dashboards/Queries.html
index c7c6b240d..1e50d9614 100644
--- a/share/html/Dashboards/Queries.html
+++ b/share/html/Dashboards/Queries.html
@@ -54,22 +54,23 @@
 
 <& Elements/HiddenSearches, searches => \@hidden_searches, Dashboard => $Dashboard &>
 
-<table width="100%" border="0">
+<div class="col-md-12">
 % 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%>" />
+  <div class="form-row">
+    <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%>" />
 
-<&| /Widgets/TitleBox, title => $pane->{DisplayName} &>
+      <&| /Widgets/TitleBox, title => $pane->{DisplayName} &>
 % my ( $pane_name ) = $pane->{Name} =~ /Searches-(.+)/;
-    <& /Widgets/SelectionBox:show, self => $pane, grep( {
-            $_->{pane} eq $pane_name} @deleted ) ? ( ShowUpdate => 1 ) : () &>
-</&>
-</form>
-</td></tr>
+        <& /Widgets/SelectionBox:show, self => $pane, grep( {
+          $_->{pane} eq $pane_name} @deleted ) ? ( ShowUpdate => 1 ) : ()
+        &>
+      </&>
+    </form>
+  </div>
 % }
-</table>
+</div>
 
 <%INIT>
 
diff --git a/share/html/Dashboards/Render.html b/share/html/Dashboards/Render.html
index 480bf660b..e2b643755 100644
--- a/share/html/Dashboards/Render.html
+++ b/share/html/Dashboards/Render.html
@@ -68,25 +68,25 @@
 
 % $m->callback(CallbackName => 'BeforeTable', Dashboard => $Dashboard, show_cb => $show_cb);
 
-<table class="dashboard" id="dashboard-<%$id%>">
+<div class="col-md-12 dashboard" id="dashboard-<%$id%>">
 
 % $m->callback(CallbackName => 'BeforePanes', Dashboard => $Dashboard, show_cb => $show_cb);
 
-<tr valign="top">
+  <div class="form-row">
 
-<td class="boxcontainer">
+    <div class="col-md-12">
 % $show_cb->('body');
-</td>
+    </div>
 
-<td class="boxcontainer">
+    <div class="col-md-12">
 % $show_cb->('sidebar');
-</td>
+    </div>
 
-</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/Dashboards/Subscription.html b/share/html/Dashboards/Subscription.html
index 469d3f734..6d247dbc2 100644
--- a/share/html/Dashboards/Subscription.html
+++ b/share/html/Dashboards/Subscription.html
@@ -52,99 +52,127 @@
 
 <form action="<%RT->Config->Get('WebPath')%>/Dashboards/Subscription.html" method="post" enctype="multipart/form-data" name="SubscribeDashboard">
 <input type="hidden" class="hidden" name="id" value="<% $fields{'DashboardId'} %>" />
-<table width="100%" border="0">
-<tr>
-
-<td valign="top" class="boxcontainer">
-<&| /Widgets/TitleBox, title => loc('Dashboard') &>
-
-<table>
-<tr><td class="label">
-<&|/l&>Dashboard</&>:
-</td><td class="value">
-<% $Dashboard->Name %>
-</td></tr>
-
-<tr><td class="label">
-<&|/l&>Queries</&>:
-</td><td class="value">
+<div class="col-md-12">
+
+  <div class="form-row">
+    <div class="col-md-12">
+      <&| /Widgets/TitleBox, title => loc('Dashboard') &>
+        <div class="form-row">
+          <div class="label col-md-3">
+              <&|/l&>Dashboard</&>:
+          </div>
+          <div class="value col-md-9">
+              <span class="current-value form-control"><% $Dashboard->Name %></span>
+          </div>
+        </div>
+
+        <div class="form-row">
+          <div class="label col-md-3">
+            <&|/l&>Queries</&>:
+          </div>
+          <div class="value col-md-9">
 % my @portlets = grep { defined } $Dashboard->Portlets;
 % if (!@portlets) {
-(<&|/l&>none</&>)
+      (<&|/l&>none</&>)
 % } else {
-<ol class="dashboard-queries">
+            <ol class="dashboard-queries list-group">
 %    for my $portlet (@portlets) {
-        <li class="dashboard-query">
-            <% loc( RT::SavedSearch->EscapeDescription($portlet->{description}), $fields{'Rows'}) %>
-        </li>
+              <li class="dashboard-query list-item">
+                <% loc( RT::SavedSearch->EscapeDescription($portlet->{description}), $fields{'Rows'}) %>
+              </li>
 %    }
-</ol>
+            </ol>
 % }
-</td></tr>
-
-</table>
-</&>
-
-<&| /Widgets/TitleBox, title => loc('Subscription') &>
-
-<table class="dashboard-subscription">
-<tr class="frequency"><td class="label">
-<&|/l&>Frequency</&>:
-</td><td class="value">
-
-<input type="radio" id="Frequency-daily" name="Frequency" value="daily" <% $fields{'Frequency'} eq 'daily' ? 'checked="checked"' : "" |n %>></input>
-<label for="Frequency-daily">
-<&|/l&>daily, on</&>
-</label>
-
+          </div>
+        </div>
+      </&>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-12 dashboard-subscription">
+      <&| /Widgets/TitleBox, title => loc('Subscription') &>
+        <div class="col-md-1">
+          <div class="label">
+            <&|/l&>Frequency</&>:
+          </div>
+        </div>
+        <div class="col-md-11">
+          <div class="form-row">
+            <div class="custom-control custom-radio">
+              <input class="custom-control-input" type="radio" id="Frequency-daily" name="Frequency" value="daily" <% $fields{'Frequency'} eq 'daily' ? 'checked="checked"' : "" |n %>></input>
+              <label class="custom-control-label" for="Frequency-daily">
+                <&|/l&>daily, on</&>
+              </label>
+            </div>
 % for my $day ( qw/Monday Tuesday Wednesday Thursday Friday Saturday Sunday/ ) {
-      <label><input name="<% $day %>" value=1 type="checkbox" <% $fields{$day} ? 'checked="checked"' : '' %>> <% loc($day) %></label>
-    <input type="hidden"class="hidden" name="<% $day %>-Magic" value=1 />
+            <div class="custom-control custom-radio">
+               <input class="custom-control-input" id="<%$day%>" name="<% $day %>" value=1 type="checkbox" <% $fields{$day} ? 'checked="checked"' : '' %>>
+              <label class="custom-control-label" for="<%$day%>"><% loc($day) %></label>
+              <input type="hidden"class="hidden" name="<% $day %>-Magic" value=1 />
+            </div>
 % }
-
-<br />
-
-<input type="radio" id="Frequency-weekly" name="Frequency" value="weekly"<% $fields{'Frequency'} eq 'weekly' ? 'checked="checked"' : "" |n %>></input>
-<label for="Frequency-weekly">
-<&|/l&>weekly</&>, <&|/l&>on</&>
-<select name="Dow">
-    <option value="Monday" <% $fields{'Dow'} eq 'Monday' ? 'selected="selected"' : '' |n %>><&|/l&>Monday</&></option>
-    <option value="Tuesday" <% $fields{'Dow'} eq 'Tuesday' ? 'selected="selected"' : '' |n %>><&|/l&>Tuesday</&></option>
-    <option value="Wednesday" <% $fields{'Dow'} eq 'Wednesday' ? 'selected="selected"' : '' |n %>><&|/l&>Wednesday</&></option>
-    <option value="Thursday" <% $fields{'Dow'} eq 'Thursday' ? 'selected="selected"' : '' |n %>><&|/l&>Thursday</&></option>
-    <option value="Friday" <% $fields{'Dow'} eq 'Friday' ? 'selected="selected"' : '' |n %>><&|/l&>Friday</&></option>
-    <option value="Saturday" <% $fields{'Dow'} eq 'Saturday' ? 'selected="selected"' : '' |n %>><&|/l&>Saturday</&></option>
-    <option value="Sunday" <% $fields{'Dow'} eq 'Sunday' ? 'selected="selected"' : '' |n %>><&|/l&>Sunday</&></option>
-</select>
-<&|/l&>every</&>
-<select name="Fow">
+          </div>
+
+          <div class="form-row">
+            <div class="label custom-control custom-radio">
+              <input class="custom-control-input" type="radio" id="Frequency-weekly" name="Frequency" value="weekly"<% $fields{'Frequency'} eq 'weekly' ? 'checked="checked"' : "" |n %>></input>
+              <label class="custom-control-label" for="Frequency-weekly">
+                <&|/l&>weekly</&>, <&|/l&>on</&>
+              </label>
+            </div>
+            <select class="selectpicker" name="Dow">
+              <option value="Monday" <% $fields{'Dow'} eq 'Monday' ? 'selected="selected"' : '' |n %>><&|/l&>Monday</&></option>
+              <option value="Tuesday" <% $fields{'Dow'} eq 'Tuesday' ? 'selected="selected"' : '' |n %>><&|/l&>Tuesday</&></option>
+              <option value="Wednesday" <% $fields{'Dow'} eq 'Wednesday' ? 'selected="selected"' : '' |n %>><&|/l&>Wednesday</&></option>
+              <option value="Thursday" <% $fields{'Dow'} eq 'Thursday' ? 'selected="selected"' : '' |n %>><&|/l&>Thursday</&></option>
+              <option value="Friday" <% $fields{'Dow'} eq 'Friday' ? 'selected="selected"' : '' |n %>><&|/l&>Friday</&></option>
+              <option value="Saturday" <% $fields{'Dow'} eq 'Saturday' ? 'selected="selected"' : '' |n %>><&|/l&>Saturday</&></option>
+              <option value="Sunday" <% $fields{'Dow'} eq 'Sunday' ? 'selected="selected"' : '' |n %>><&|/l&>Sunday</&></option>
+            </select>
+            <label class="label">
+              <&|/l&>every</&>
+            </label>
+            <select name="Fow" class="selectpicker">
 % for my $f ( qw/1 2 3 4/ ) {
-    <option value="<%$f%>" <% $fields{'Fow'} == $f ? 'selected="selected"' : '' |n %>><% $f %></option>
+              <option value="<%$f%>" <% $fields{'Fow'} == $f ? 'selected="selected"' : '' |n %>><% $f %></option>
 % }
-</select>
-<&|/l&>weeks</&>
-</label>
-<br />
-
-<input type="radio" id="Frequency-monthly" name="Frequency" value="monthly"<% $fields{'Frequency'} eq 'monthly' ? 'checked="checked"' : "" |n %>></input>
-<label for="Frequency-monthly">
-<&|/l&>monthly</&>, <&|/l&>on day</&>
-<select name="Dom">
+            </select>
+            <label class="label">
+              <&|/l&>weeks</&>
+            </label>
+          </div>
+
+          <div class="form-row">
+            <div class="label custom-control custom-radio">
+              <input class="custom-control-input" type="radio" id="Frequency-monthly" name="Frequency" value="monthly"<% $fields{'Frequency'} eq 'monthly' ? 'checked="checked"' : "" |n %>></input>
+              <label class="custom-control-label" for="Frequency-monthly">
+                <&|/l&>monthly</&>, <&|/l&>on day</&>
+              </label>
+              <select class="selectpicker" name="Dom">
 %   for my $dom (1..31) {
-    <option value="<% $dom %>" <% $fields{'Dom'} == $dom ? 'selected="selected"' : '' |n %>><% loc($dom) %></option>
+                <option value="<% $dom %>" <% $fields{'Dom'} == $dom ? 'selected="selected"' : '' |n %>><% loc($dom) %></option>
 %   }
-</select>
-</label>
-<br />
-
-<input type="radio" id="Frequency-never" name="Frequency" value="never" <% $fields{'Frequency'} eq 'never' ? 'checked="checked"' : "" |n %>></input>
-<label for="Frequency-never"><&|/l&>never</&></label>
-
-</td></tr>
-<tr><td class="label">
-<&|/l&>Hour</&>:
-</td><td class="value">
-<select name="Hour">
+              </select>
+            </div>
+          </div>
+
+          <div class="form-row">
+            <div class="custom-control custom-radio">
+              <input class="custom-control-input" type="radio" id="Frequency-never" name="Frequency" value="never" <% $fields{'Frequency'} eq 'never' ? 'checked="checked"' : "" |n %>></input>
+              <label class="custom-control-label" for="Frequency-never">
+                <&|/l&>never</&>
+              </label>
+            </div>
+          </div>
+        </div>
+
+        <div class="form-row">
+          <label class="label">
+            <&|/l&>Hour</&>:
+          </label>
+          <div class="value">
+            <select class="selectpicker" name="Hour">
 % my $formatter = RT::Date->new($session{CurrentUser})->LocaleObj;
 % my $dt = DateTime->now;
 % $dt->set_minute(0);
@@ -158,51 +186,61 @@
 %     my $selected = $value eq $fields{'Hour'}
 %                  ? 'selected="selected"'
 %                  : '';
-
-    <option value="<% $value %>" <%$selected|n %>><% $formatted %></option>
+              <option value="<% $value %>" <%$selected|n %>><% $formatted %></option>
 % }
-</select>
+            </select>
 (<%$timezone%>)
-</td></tr>
-<tr><td class="label">
-<&|/l&>Language</&>:
-</td><td class="value">
-<& /Elements/SelectLang,
-    Name => 'Language',
-    Default => $fields{'Language'},
-    ShowNullOption => 1,
- &>
-</td></tr>
-<tr><td class="label">
-<&|/l&>Rows</&>:
-</td><td class="value">
-<select name="Rows">
+          </div>
+        </div>
+
+        <div class="form-row">
+          <label class="label">
+            <&|/l&>Language</&>:
+          </label>
+          <label class="value">
+            <& /Elements/SelectLang,
+                Name => 'Language',
+                Default => $fields{'Language'},
+                ShowNullOption => 1,
+            &>
+          </label>
+
+          <label class="label">
+            <&|/l&>Rows</&>:
+          </label>
+          <div class="value">
+            <select name="Rows" class="form-control selectpicker">
 %   for my $rows (1, 2, 5, 10, 15, 20, 25, 50, 75, 100, 0) {
-    <option value="<% $rows %>" <% $fields{'Rows'} eq $rows ? 'selected="selected"' : '' |n %>><% loc($rows || 'Unlimited') %></option>
+              <option value="<% $rows %>" <% $fields{'Rows'} eq $rows ? 'selected="selected"' : '' |n %>><% loc($rows || 'Unlimited') %></option>
 %   }
-</select>
-</td></tr>
+            </select>
+          </div>
+        </div>
+
+        <div class="form-row">
+          <div class="custom-control custom-checkbox">
+            <input class="custom-control-input" type="checkbox" id="SuppressIfEmpty" name="SuppressIfEmpty" value="1" <% $fields{'SuppressIfEmpty'} ? 'checked="checked"' : "" |n %> />
+            <label class="custom-control-label" for="SuppressIfEmpty"><&|/l&>Suppress if empty (Check this to avoid sending mail if all searches have no results)</&></label>
+          </div>
+          <input type="hidden"class="hidden" name="SuppressIfEmpty-Magic" value=1 />
+        </div>
+      </div>
 
-<tr><td align="right"><input type="checkbox" id="SuppressIfEmpty" name="SuppressIfEmpty" value="1" <% $fields{'SuppressIfEmpty'} ? 'checked="checked"' : "" |n %> /></td>
-<td><label for="SuppressIfEmpty"><&|/l&>Suppress if empty (Check this to avoid sending mail if all searches have no results)</&></label><br />
-<input type="hidden"class="hidden" name="SuppressIfEmpty-Magic" value=1 />
-</td></tr>
 % $m->callback( %ARGS, CallbackName => 'SubscriptionFormEnd', FieldsRef => \%fields,
 %     SubscriptionObj => $SubscriptionObj, DashboardObj => $Dashboard );
-</table>
-</&>
-
-<&| /Widgets/TitleBox, title => loc('Recipients') &>
-<& Elements/SubscriptionRecipients,
-    UserField => $UserField, UserString => $UserString, UserOp => $UserOp,
-    GroupString => $GroupString, GroupOp => $GroupOp, GroupField => $GroupField,
-    Recipients => $fields{Recipients},
-    IsFirstSubscription => $SubscriptionObj ? 0 : 1 &>
-</&>
-
-</td>
-</tr>
-</table>
+    </div>
+  </&>
+</div>
+
+  <&| /Widgets/TitleBox, title => loc('Recipients') &>
+    <& Elements/SubscriptionRecipients,
+      UserField => $UserField, UserString => $UserString, UserOp => $UserOp,
+      GroupString => $GroupString, GroupOp => $GroupOp, GroupField => $GroupField,
+      Recipients => $fields{Recipients},
+      IsFirstSubscription => $SubscriptionObj ? 0 : 1 &>
+    </&>
+
+</div>
 
 % if ($SubscriptionObj) {
     <& /Elements/Submit, Name => "Save", Label => loc('Save Changes') &>
diff --git a/share/html/Dashboards/index.html b/share/html/Dashboards/index.html
index f8fc4a43a..1299d0661 100644
--- a/share/html/Dashboards/index.html
+++ b/share/html/Dashboards/index.html
@@ -48,6 +48,8 @@
 <& /Elements/Header, Title => loc("Dashboards") &>
 <& /Elements/Tabs &>
 
-<& /Elements/ListActions &>
+<div class="col-md-12">
+  <& /Elements/ListActions &>
 
-<& /Dashboards/Elements/ShowDashboards &>
+  <& /Dashboards/Elements/ShowDashboards &>
+</div>
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>
 % }

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


More information about the rt-commit mailing list