[Rt-commit] rt branch, 4.6-theme/admin-assets-pages, created. rt-4.4.4-231-g4759d3c48

Blaine Motsinger blaine at bestpractical.com
Thu May 23 16:02:17 EDT 2019


The branch, 4.6-theme/admin-assets-pages has been created
        at  4759d3c488f87cc103845b4a481730809ca034a4 (commit)

- Log -----------------------------------------------------------------
commit adf04b399d363645dfe6054d027cda4bf14d7c4b
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Fri May 17 15:26:59 2019 -0500

    Migrate Admin/Assets/Catalogs/Modify to elevator themes

diff --git a/share/html/Admin/Assets/Catalogs/Create.html b/share/html/Admin/Assets/Catalogs/Create.html
index 256eda390..7b17ff8b3 100644
--- a/share/html/Admin/Assets/Catalogs/Create.html
+++ b/share/html/Admin/Assets/Catalogs/Create.html
@@ -56,7 +56,11 @@
     <& Elements/EditBasics, %ARGS, CatalogObj => $catalog &>
   </&>
 
-  <& /Elements/Submit, Label => loc('Create catalog'), Name => "Update" &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Create catalog'), Name => "Update" &>
+    </div>
+  </div>
 </form>
 <%args>
 $id => ""
diff --git a/share/html/Admin/Assets/Catalogs/Elements/EditBasics b/share/html/Admin/Assets/Catalogs/Elements/EditBasics
index a17cfc99a..4c56ae31d 100644
--- a/share/html/Admin/Assets/Catalogs/Elements/EditBasics
+++ b/share/html/Admin/Assets/Catalogs/Elements/EditBasics
@@ -45,34 +45,48 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<table>
-  <tr>
-    <td class="label"><label for="Name"><&|/l&>Name</&></label></td>
-    <td><input type="text" name="Name" value="<% $current{Name} %>" size="40"></td>
-  </tr>
-  <tr>
-    <td class="label"><label for="Description"><&|/l&>Description</&></label></td>
-    <td><input type="text" name="Description" value="<% $current{Description} %>" size="40"></td>
-  </tr>
-  <tr class="lifecycle">
-    <td class="label"><label for="Lifecycle"><&|/l&>Lifecycle</&></label></td>
-    <td>
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Name</&>
+    </div>
+    <div class="col-md-9 value">
+      <input type="text" class="form-control" name="Name" value="<% $current{Name} %>" size="40">
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Description</&>
+    </div>
+    <div class="col-md-9 value">
+      <input type="text" class="form-control" name="Description" value="<% $current{Description} %>" size="40">
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Lifecycle</&>
+    </div>
+    <div class="col-md-9 value">
       <& /Widgets/Form/Select:InputOnly,
           Name         => 'Lifecycle',
           Values       => [ sort { loc($a) cmp loc($b) } RT::Lifecycle->List( $CatalogObj->LifecycleType ) ],
           CurrentValue => $current{Lifecycle},
           Default      => 0,
       &>
-    </td>
-  </tr>
-  <tr>
-    <td class="label"><label for="Disabled"><&|/l&>Disabled?</&></label></td>
-    <td>
-      <input name="Disabled" type="checkbox" value="1" <% $current{Disabled} ? "checked" : "" %>>
-      <input name="SetDisabled" type="hidden" value="1">
-    </td>
-  </tr>
-</table>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-3 label"></div>
+    <input name="SetDisabled" type="hidden" value="1">
+    <div class="col-md-9 value">
+      <div class="custom-control custom-checkbox">
+        <input name="Disabled" type="checkbox" class="checkbox custom-control-input" id="Disabled" value="1" <% $current{Disabled} ? "checked" : "" %>>
+        <label class="custom-control-label" for="Disabled"><&|/l&>Disabled?</&></label>
+      </div>
+    </div>
+  </div>
 <%args>
 $CatalogObj
 </%args>
diff --git a/share/html/Admin/Assets/Catalogs/Modify.html b/share/html/Admin/Assets/Catalogs/Modify.html
index e0fb43b66..e27bc2fd3 100644
--- a/share/html/Admin/Assets/Catalogs/Modify.html
+++ b/share/html/Admin/Assets/Catalogs/Modify.html
@@ -56,7 +56,11 @@
     <& Elements/EditBasics, %ARGS, CatalogObj => $catalog &>
   </&>
 
-  <& /Elements/Submit, Label => loc('Save'), Name => "Update" &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Save'), Name => "Update" &>
+    </div>
+  </div>
 </form>
 <%args>
 $id     => undef

commit 747db72ec6d074ba052f0701cebb58a6de9c6208
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon May 20 15:15:30 2019 -0500

    Migrate Admin/Assets/Catalogs/CustomFields to elevator themes

diff --git a/share/html/Admin/Elements/EditCustomFields b/share/html/Admin/Elements/EditCustomFields
index af4eacbcb..567f7ca8a 100644
--- a/share/html/Admin/Elements/EditCustomFields
+++ b/share/html/Admin/Elements/EditCustomFields
@@ -85,7 +85,11 @@
     ],
 &>
 
-<& /Elements/Submit, Name => 'UpdateCFs' &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Name => 'UpdateCFs' &>
+    </div>
+  </div>
 </form>
 
 

commit 32f5757cdcb3f5ef6bd88011845a75ddab2d4ef0
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon May 20 15:45:00 2019 -0500

    Migrate Admin/Assets/Catalogs/DefaultValues to elevator themes

diff --git a/share/html/Admin/Assets/Catalogs/DefaultValues.html b/share/html/Admin/Assets/Catalogs/DefaultValues.html
index 01cd9c681..8854fb9b3 100644
--- a/share/html/Admin/Assets/Catalogs/DefaultValues.html
+++ b/share/html/Admin/Assets/Catalogs/DefaultValues.html
@@ -60,8 +60,16 @@
     Object => RT::Asset->new($session{CurrentUser})
 &>
 
-<& /Elements/Submit, Name => 'Update', Label => loc('Save Changes') &>
-<& /Elements/Submit, Name => 'Reset', Label => loc('Reset Custom Field Values to Default') &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Name => 'Update', Label => loc('Save Changes') &>
+    </div>
+  </div>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Name => 'Reset', Label => loc('Reset Custom Field Values to Default') &>
+    </div>
+  </div>
 </form>
 
 <%INIT>

commit b5d9dc0fcfe71ab88fc1dda04d262ca67096ce40
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon May 20 16:24:05 2019 -0500

    Migrate Admin/Assets/Catalogs/GroupRights to elevator themes

diff --git a/share/html/Admin/Assets/Catalogs/GroupRights.html b/share/html/Admin/Assets/Catalogs/GroupRights.html
index 09658d37d..3277df490 100644
--- a/share/html/Admin/Assets/Catalogs/GroupRights.html
+++ b/share/html/Admin/Assets/Catalogs/GroupRights.html
@@ -52,7 +52,11 @@
 <form method="post" action="GroupRights.html" id="ModifyGroupRights" name="ModifyGroupRights">
   <input type="hidden" class="hidden" name="id" value="<% $Catalog->id %>" />
   <& /Admin/Elements/EditRights, Context => $Catalog, Principals => \@principals &>
-  <& /Elements/Submit, Label => loc('Save Changes') &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Save Changes') &>
+    </div>
+  </div>
 </form>
 <%init>
 my $Catalog    = LoadCatalog($id);

commit ffb3caddcc33f50dc1eee47ac00ad8b4e2a696e5
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon May 20 18:01:19 2019 -0500

    Migrate Admin/Assets/Catalogs/Roles to elevator themes

diff --git a/share/html/Admin/Assets/Catalogs/Roles.html b/share/html/Admin/Assets/Catalogs/Roles.html
index a0a37291a..666581ef6 100644
--- a/share/html/Admin/Assets/Catalogs/Roles.html
+++ b/share/html/Admin/Assets/Catalogs/Roles.html
@@ -53,15 +53,22 @@
   <input type="hidden" name="id" value="<% $catalog->id %>">
 
   <&| /Widgets/TitleBox, title => loc("Roles"), class => "catalog-roles" &>
-    <table width="60%" class="edit">
-      <tr>
-        <td><& /Asset/Elements/EditCatalogPeople, %ARGS, Object => $catalog &></td>
-        <td><& /Asset/Elements/AddCatalogPeople, Object => $catalog &></td>
-      </tr>
-    </table>
+    <div class="form-row">
+      <div class="col-md-6">
+        <& /Asset/Elements/EditCatalogPeople, %ARGS, Object => $catalog &>
+      </div>
+
+      <div class="col-md-6">
+        <& /Asset/Elements/AddCatalogPeople, Object => $catalog &>
+      </div>
+    </div>
   </&>
 
-  <& /Elements/Submit, Label => loc('Save'), Name => "Update" &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Save'), Name => "Update" &>
+    </div>
+  </div>
 </form>
 <%args>
 $id     => undef

commit bc6c541ef96ccdb0709f210ed9e40e2e4ac3da2f
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon May 20 18:04:42 2019 -0500

    Migrate Admin/Assets/Catalogs/UserRights to elevator themes

diff --git a/share/html/Admin/Assets/Catalogs/UserRights.html b/share/html/Admin/Assets/Catalogs/UserRights.html
index 9d533ab29..b7b570d04 100644
--- a/share/html/Admin/Assets/Catalogs/UserRights.html
+++ b/share/html/Admin/Assets/Catalogs/UserRights.html
@@ -52,7 +52,11 @@
 <form method="post" action="UserRights.html" id="ModifyUserRights" name="ModifyUserRights">
   <input type="hidden" class="hidden" name="id" value="<% $Catalog->id %>" />
   <& /Admin/Elements/EditRights, Context => $Catalog, Principals => \@principals &>
-  <& /Elements/Submit, Label => loc('Save Changes') &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Save Changes') &>
+    </div>
+  </div>
 </form>
 <%init>
 my $Catalog    = LoadCatalog($id);

commit 4759d3c488f87cc103845b4a481730809ca034a4
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon May 20 19:11:58 2019 -0500

    Migrate Admin/Assets/Catalogs/index to elevator themes

diff --git a/share/html/Admin/Assets/Catalogs/index.html b/share/html/Admin/Assets/Catalogs/index.html
index d2098ce6b..6829e3db3 100644
--- a/share/html/Admin/Assets/Catalogs/index.html
+++ b/share/html/Admin/Assets/Catalogs/index.html
@@ -72,18 +72,36 @@
 <input type="hidden" name="<% $field %>" value="<% $ARGS{ $field } %>" />
 % }
 
-<select name="Field">
+  <div class="form-row">
+    <div class="col-md-auto">
+      <select class="form-control selectpicker" name="Field">
 % foreach my $col (qw(id Name Description Lifecycle)) {
-<option <% $Field eq $col ? 'selected="selected"' : '' |n %> value="<% $col %>"><% loc($col) %></option>
+        <option <% $Field eq $col ? 'selected="selected"' : '' |n %> value="<% $col %>"><% loc($col) %></option>
 % }
-</select>
-<& /Elements/SelectMatch, Name => 'Op', Default => $Op &>
-<input type="text" size="20" name="String" value="<% $String %>" />
-<br />
+      </select>
+    </div>
+    <div class="col-md-auto">
+      <& /Elements/SelectMatch, Name => 'Op', Default => $Op &>
+    </div>
+    <div class="col-md-auto">
+      <input type="text" class="form-control" size="20" name="String" value="<% $String %>" />
+    </div>
+  </div>
 
-<input type="checkbox" class="checkbox" id="FindDisabled" name="FindDisabled" value="1" <% $FindDisabled ? 'checked="checked"': '' |n%> />
-<label for="FindDisabled"><&|/l&>Include disabled catalogs in listing.</&></label>
-<div align="right"><input type="submit" class="button" value="<&|/l&>Search</&>" /></div> 
+  <div class="form-row">
+    <div class="col-md-12">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="custom-control-input checkbox" id="FindDisabled" name="FindDisabled" value="1" <% $FindDisabled ? 'checked="checked"': '' |n%> />
+        <label class="custom-control-label" for="FindDisabled"><&|/l&>Include disabled catalogs in listing.</&></label>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-12 text-right">
+      <input type="submit" class="form-control btn btn-primary button" value="<&|/l&>Search</&>" />
+    </div>
+  </div>
 </form>
 
 <%INIT>

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


More information about the rt-commit mailing list