Port Assets to LabeledValue

9 files changed, 69 insertions, 191 deletions

diff --git a/share/html/Asset/Elements/AddCatalogPeople b/share/html/Asset/Elements/AddCatalogPeople
index 50d549ed04..67aa0a5a3c 100644
--- a/share/html/Asset/Elements/AddCatalogPeople
+++ b/share/html/Asset/Elements/AddCatalogPeople
@@ -50,34 +50,24 @@ $Object
 </%args>
 <div class="add-user">
   <h3><&|/l&>Add a person</&></h3>
-  <div class="form-row">
-    <div class="col-3">
-      <& SelectRoleType, Object => $Object, Name => "AddUserRoleMember-Role" &>
-    </div>
-    <div class="col-9">
+  <&| /Elemenents/LabeledValue, RawLabel =>  $m->scomp('SelectRoleType', Object => $Object, Name => "AddUserRoleMember-Role") &>
       <input type="text" name="AddUserRoleMember"
         data-autocomplete="Users"
         data-autocomplete-return="Name"
         placeholder="<% loc("Find a user...") %>"
         class="form-control"
       >
-    </div>
-  </div>
+  </&>
 </div>
 
 <div class="add-group">
   <h3><&|/l&>Add a group</&></h3>
-  <div class="form-row">
-    <div class="col-3">
-      <& SelectRoleType, Object => $Object, Name => "AddGroupRoleMember-Role" &>
-    </div>
-    <div class="col-9">
+    <&| /Elemenents/LabeledValue, RawLabel =>  $m->scomp('SelectRoleType', Object => $Object, Name => "AddGroupRoleMember-Role") &>
       <input type="text" name="AddGroupRoleMember"
         data-autocomplete="Groups"
         data-autocomplete-return="Name"
         placeholder="<% loc("Find a group...") %>"
         class="form-control"
       >
-    </div>
-  </div>
+    </&>
 </div>
diff --git a/share/html/Asset/Elements/AssetSearchBasics b/share/html/Asset/Elements/AssetSearchBasics
index 44c675eb46..c0ba9ac9c2 100644
--- a/share/html/Asset/Elements/AssetSearchBasics
+++ b/share/html/Asset/Elements/AssetSearchBasics
@@ -49,24 +49,19 @@
   <div class="form-row">
     <div class="col-6">
       <div class="form-row">
-        <div class="label col-3"><&|/l&>Catalog</&></div>
-        <div class="value col-9">
+        <&| /Elements/LabeledValue, Label => loc('Catalog') &>
           <& /Asset/Elements/SelectCatalog, Name => 'Catalog', CheckRight => "ShowCatalog",
             Default => $ARGS{'Catalog'}, OnChange => "jQuery('#AssetSearch').submit()"
           &>
-        </div>
-      </div>
+        </&>
     </div>
 
     <div class="col-6">
-      <div class="form-row">
-        <div class="label col-3"><&|/l&>Status</&></div>
-        <div class="value col-9">
-          <& /Asset/Elements/SelectStatus, Name => 'Status', Catalogs => { $CatalogObj->id => 1 }, DefaultValue => 1,
-            Default => ($ARGS{'Status'} || '')
-          &>
-        </div>
-      </div>
+      <&| /Elements/LabeledValue, Label => loc('Status') &>
+        <& /Asset/Elements/SelectStatus, Name => 'Status', Catalogs => { $CatalogObj->id => 1 }, DefaultValue => 1,
+          Default => ($ARGS{'Status'} || '')
+        &>
+      </&>
     </div>
   </div>
 
diff --git a/share/html/Asset/Elements/EditBasics b/share/html/Asset/Elements/EditBasics
index c9c693d3c6..c3c6f20254 100644
--- a/share/html/Asset/Elements/EditBasics
+++ b/share/html/Asset/Elements/EditBasics
@@ -45,40 +45,20 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-  <div class="form-row asset-catalog">
-    <div class="label col-3">
-      <&|/l&>Catalog</&>:
-    </div>
-    <div class="value col-9">
-      <& /Asset/Elements/SelectCatalog, Default => $current{Catalog}, AutoSubmit => $AutoSubmit &>
-    </div>
-  </div>
-  <div class="form-row asset-name">
-    <div class="label col-3">
-      <&|/l&>Name</&>:
-    </div>
-    <div class="value col-9">
-      <input class="form-control" type="text" name="Name" value="<% $current{Name} %>" size="40">
-    </div>
-  </div>
+ <&| /Elements/LabeledValue, Label => loc('Catalog') &>
+  <& /Asset/Elements/SelectCatalog, Default => $current{Catalog}, AutoSubmit => $AutoSubmit &>
+</&>
+<&| /Elements/LabeledValue, Label => loc('Name') &>
+  <input class="form-control" type="text" name="Name" value="<% $current{Name} %>" size="40">
+</&>
 
-  <div class="form-row asset-description">
-    <div class="label col-3">
-      <&|/l&>Description</&>:
-    </div>
-    <div class="value col-9">
-      <input class="form-control" type="text" name="Description" value="<% $current{Description} %>" size="40">
-    </div>
-  </div>
+ <&| /Elements/LabeledValue, Label => loc('Description') &>
+  <input class="form-control" type="text" name="Description" value="<% $current{Description} %>" size="40">
+</&>
 
-  <div class="form-row asset-status">
-    <div class="label col-3">
-      <&|/l&>Status</&>:
-    </div>
-    <div class="value col-9">
-      <& /Asset/Elements/SelectStatus, Name => 'Status', AssetObj => $AssetObj, CatalogObj => $CatalogObj &>
-    </div>
-  </div>
+ <&| /Elements/LabeledValue, Label => loc('Status') &>
+  <& /Asset/Elements/SelectStatus, Name => 'Status', AssetObj => $AssetObj, CatalogObj => $CatalogObj &>
+</&>
 
 % if ( $AssetObj->id ) {
   <& /Elements/EditCustomFields, Object => $AssetObj, Grouping => 'Basics', InTable => 0 &>
diff --git a/share/html/Asset/Elements/EditDates b/share/html/Asset/Elements/EditDates
index 5c662e1909..b4288c83fc 100644
--- a/share/html/Asset/Elements/EditDates
+++ b/share/html/Asset/Elements/EditDates
@@ -45,34 +45,18 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Created</&>:
-  </div>
-  <div class="value col-9">
-    <span class="current-value form-control">
-      <&|/l_unsafe,
-        $m->interp->apply_escapes($AssetObj->CreatedAsString, 'h'),
-        $m->scomp('/Elements/ShowUser', User => $AssetObj->CreatorObj)
-        &>[_1] by [_2]</&>
-    </span>
-  </div>
-</div>
-
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Last Updated</&>:
-  </div>
-  <div class="value col-9">
-    <span class="current-value form-control">
-      <&|/l_unsafe,
-        $m->interp->apply_escapes($AssetObj->LastUpdatedAsString, 'h'),
-        $m->scomp('/Elements/ShowUser', User => $AssetObj->LastUpdatedByObj)
-        &>[_1] by [_2]</&>
-    </span>
-  </div>
-</div>
-
+<&| /Elements/LabeledValue, Label => loc('Created'), ValueSpanClass => "current-value form-control" &>
+  <&|/l_unsafe,
+    $m->interp->apply_escapes($AssetObj->CreatedAsString, 'h'),
+    $m->scomp('/Elements/ShowUser', User => $AssetObj->CreatorObj)
+      &>[_1] by [_2]</&>
+</&>
+<&| /Elements/LabeledValue, Label => loc('Updated'), ValueSpanClass => "current-value form-control" &>
+  <&|/l_unsafe,
+    $m->interp->apply_escapes($AssetObj->LastUpdatedAsString, 'h'),
+    $m->scomp('/Elements/ShowUser', User => $AssetObj->LastUpdatedByObj)
+    &>[_1] by [_2]</&>
+</&>
 <& /Elements/EditCustomFields, Object => $AssetObj, Grouping => 'Dates' &>
 % $m->callback(%ARGS, CallbackName => "AfterFields");
 <%args>
diff --git a/share/html/Asset/Elements/EditPeople b/share/html/Asset/Elements/EditPeople
index 36107b2435..8db9a7f1f9 100644
--- a/share/html/Asset/Elements/EditPeople
+++ b/share/html/Asset/Elements/EditPeople
@@ -46,12 +46,9 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 % for my $role ( $AssetObj->Roles ) {
-<div class="asset-people-<% CSSClass($role) %> form-row">
-  <div class="label col-3"><% loc($role) %>:</div>
-  <div class="value col-9">
+  <&| /Elements/LabeledValue, Label => loc($role), Class => "asset-people-".CSSClass($role) &>
     <& /Elements/EmailInput, Name => $role, Size => undef, Default => $ARGS{$role}, Autocomplete => 1, ($AssetObj->Role($role)->{Single} ? () : (AutocompleteType => 'Principals', AutocompleteMultiple => 1)) &>
-  </div>
-</div>
+  </&>
 % }
 
 <%args>
diff --git a/share/html/Asset/Elements/ShowBasics b/share/html/Asset/Elements/ShowBasics
index c38064d5af..9b54178643 100644
--- a/share/html/Asset/Elements/ShowBasics
+++ b/share/html/Asset/Elements/ShowBasics
@@ -45,41 +45,15 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<div class="form-row asset-catalog">
-  <div class="label col-3">
-    <&|/l&>Catalog</&>:
-  </div>
-  <div class="value col-9">
-    <& ShowCatalog, Asset => $AssetObj &>
-  </div>
-</div>
+<&| /Elements/LabeledValue, Label => loc('Catalog'), Class => "asset-catalog" &>
+  <& ShowCatalog, Asset => $AssetObj &>
+</&>
 
-<div class="form-row asset-name">
-  <div class="col-3 label">
-    <&|/l&>Name</&>:
-  </div>
-  <div class="value col-9">
-    <span class="current-value"><% $AssetObj->Name || '' %></span>
-  </div>
-</div>
+<& /Elements/LabeledValue, Label => loc('Name'), Class => "asset-name", ValueSpanClass => 'current-value', Value => $AssetObj->Name &>
 
-<div class="form-row asset-description">
-  <div class="col-3 label">
-    <&|/l&>Description</&>:
-  </div>
-  <div class="value col-9">
-    <span class="current-value"><% $AssetObj->Description || '' %></span>
-  </div>
-</div>
+<& /Elements/LabeledValue, Label => loc('Name'), Class => "asset-description", ValueSpanClass => 'current-value', Value => $AssetObj->Description &>
 
-<div class="form-row asset-status">
-  <div class="col-3 label">
-    <&|/l&>Status</&>:
-  </div>
-  <div class="value col-9">
-    <span class="current-value"><% $AssetObj->Status || '' %></span>
-  </div>
-</div>
+<& /Elements/LabeledValue, Label => loc('Status'), Class => "asset-status", ValueSpanClass => 'current-value', Value => $AssetObj->Status &>
 
 <& /Elements/ShowCustomFields, Object => $AssetObj, Grouping => 'Basics' &>
 % $m->callback(%ARGS, CallbackName => "AfterFields");
diff --git a/share/html/Asset/Elements/ShowDates b/share/html/Asset/Elements/ShowDates
index 14a6e283c1..56fe598d25 100644
--- a/share/html/Asset/Elements/ShowDates
+++ b/share/html/Asset/Elements/ShowDates
@@ -45,33 +45,19 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Created</&>:
-  </div>
-  <div class="value col-9">
-    <span class="current-value">
+<&| /Elements/LabeledValue, Label => loc('Created'), ValueSpanClass => 'current-value' &>
       <&|/l_unsafe,
         $m->interp->apply_escapes($AssetObj->CreatedAsString, 'h'),
         $m->scomp('/Elements/ShowUser', User => $AssetObj->CreatorObj)
       &>[_1] by [_2]</&>
-    </span>
-  </div>
-</div>
+</&>
+<&| /Elements/LabeledValue, Label => loc('Last Updated'), ValueSpanClass => 'current-value' &>
 
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Last Updated</&>:
-  </div>
-  <div class="value col-9">
-    <span class="current-value">
       <&|/l_unsafe,
         $m->interp->apply_escapes($AssetObj->LastUpdatedAsString, 'h'),
         $m->scomp('/Elements/ShowUser', User => $AssetObj->LastUpdatedByObj)
       &>[_1] by [_2]</&>
-    </span>
-  </div>
-</div>
+</&>
 
 <div class="form-row">
   <& /Elements/ShowCustomFields, Object => $AssetObj, Grouping => 'Dates' &>
diff --git a/share/html/Asset/Elements/ShowPeople b/share/html/Asset/Elements/ShowPeople
index 0ecad92f38..6b35fdf2e6 100644
--- a/share/html/Asset/Elements/ShowPeople
+++ b/share/html/Asset/Elements/ShowPeople
@@ -56,27 +56,23 @@ my $CatalogObj = $AssetObj->CatalogObj;
     <div class="label col-3">
       <% loc($role) %>:
     </div>
+    <div class="value col-9">
+      <div class="user-accordion accordion">
 % if ($AssetObj->Role($role)->{Single}) {
 %      my $users = $AssetObj->RoleGroup($role)->UserMembersObj(Recursively => 0);
 %      $users->FindAllRows;
 %      my $user = $users->Next;
-    <div class="value col-9">
-      <div class="user-accordion accordion">
 %     if ( $user->id != RT->Nobody->id ) {
         <& ShowRoleMembers, Group => $AssetObj->RoleGroup($role), Role => $role &>
 %     } else {
         <& /Elements/ShowUser, User => $user, Link => 1 &>
 %     }
-      </div>
-    </div>
 % } else {
-    <div class="value col-9">
-      <div class="user-accordion accordion">
         <& ShowRoleMembers, Group => $AssetObj->RoleGroup($role), Role => $role &>
         <& ShowRoleMembers, Group => $CatalogObj->RoleGroup($role), Role => $role, Skip => $AssetObj->RoleGroup($role), Note => loc("(via this asset's catalog)") &>
+% }
       </div>
     </div>
-% }
   </div>
 % }
 
diff --git a/share/html/Asset/Search/Bulk.html b/share/html/Asset/Search/Bulk.html
index 7dc7c0b2aa..f1331b3af2 100644
--- a/share/html/Asset/Search/Bulk.html
+++ b/share/html/Asset/Search/Bulk.html
@@ -91,42 +91,29 @@
     <div class="form-row">
       <div class="col-6">
         <div class="form-row">
-          <div class="label col-3">
-            <&|/l&>Catalog</&>
-          </div>
-          <div class="value col-9">
+          <&| /Elements/LabeledValue, Label => loc('Catalog') &>
             <& /Asset/Elements/SelectCatalog, Name => 'UpdateCatalog', UpdateSession => 0, ShowNullOption => 1 &>
-          </div>
-        </div>
-      </div>
+          </&>
+
 
       <div class="col-6">
-        <div class="form-row">
-          <div class="label col-3"><&|/l&>Name</&></div>
-          <div class="value col-9">
-            <input class="form-control" type="text" name="UpdateName" value="<% $ARGS{'Name'}||'' %>" size="40">
-          </div>
-        </div>
+        <&| /Elements/LabeledValue, Label => loc('Name') &>
+          <input class="form-control" type="text" name="UpdateName" value="<% $ARGS{'Name'}||'' %>" size="40">
+        </&>
       </div>
     </div>
 
     <div class="form-row">
       <div class="col-6 asset-catalog">
-        <div class="form-row">
-          <div class="label col-3"><&|/l&>Description</&></div>
-          <div class="value col-9">
+        <&| /Elements/LabeledValue, Label => loc('Description') &>
             <input class="form-control" type="text" name="UpdateDescription" value="<% $ARGS{'Description'}||'' %>" size="40">
-          </div>
-        </div>
+        </&>
       </div>
 
       <div class="col-6 asset-status">
-        <div class="form-row">
-          <div class="label col-3"><&|/l&>Status</&></div>
-          <div class="value col-9">
-            <& /Asset/Elements/SelectStatus, Name => 'UpdateStatus', DefaultValue => 1 &>
-          </div>
-        </div>
+        <&| /Elements/LabeledValue, Label => loc('Status') &>
+          <& /Asset/Elements/SelectStatus, Name => 'UpdateStatus', DefaultValue => 1 &>
+        </&>
       </div>
     </div>
 % my $basic_cfs = $cfs->Clone;
@@ -143,41 +130,30 @@
 % my $input = "SetRoleMember-$rname";
     <div class="form-row">
       <div class="col-6">
-        <div class="form-row">
-          <div class="label col-3">
-            <% loc($rname) %>
-          </div>
-          <div class="value col-9">
-            <input class="form-control" type="text" value="<% $ARGS{ $input } || '' %>" name="<% $input %>" id="<% $input %>" data-autocomplete="Users" data-autocomplete-return="Name" />
-          </div>
-        </div>
+        <&| /Elements/LabeledValue, Label => loc($rname) &>
+          <input class="form-control" type="text" value="<% $ARGS{ $input } || '' %>" name="<% $input %>" id="<% $input %>" data-autocomplete="Users" data-autocomplete-return="Name" />
+        </&>
       </div>
     </div>
 % } else {
 % my $input = "AddRoleMember-$rname";
     <div class="form-row">
       <div class="col-6">
-        <div class="form-row">
-          <div class="label col-3"><% loc("Add [_1]", loc($rname)) %></div>
-          <div class="value col-9">
-            <input class="form-control" type="text" value="<% $ARGS{ $input } || '' %>" name="<% $input %>" id="<% $input %>" data-autocomplete="Users" data-autocomplete-return="Name" />
-          </div>
-        </div>
+        <&| /Elements/LabeledValue, Label => loc("Add [_1]", loc($rname)) &>
+          <input class="form-control" type="text" value="<% $ARGS{ $input } || '' %>" name="<% $input %>" id="<% $input %>" data-autocomplete="Users" data-autocomplete-return="Name" />
+        </&>
       </div>
 
 % $input = "RemoveRoleMember-$rname";
       <div class="col-6">
-        <div class="form-row">
-          <div class="label col-3"><% loc("Remove [_1]", loc($rname)) %></div>
-          <div class="value col-9">
+        <&| /Elements/LabeledValue, Label => loc("Remove [_1]", loc($rname)) &>
             <input class="form-control" type="text" value="<% $ARGS{ $input } || '' %>" name="<% $input %>" id="<% $input %>" data-autocomplete="Users" data-autocomplete-return="Name" />
 
             <div class="custom-control custom-checkbox">
               <input class="custom-control-input" type="checkbox" id="RemoveAllRoleMembers-<% $rname %>" name="RemoveAllRoleMembers-<% $rname %>" value="1"/>
               <label class="custom-control-label" for="RemoveAllRoleMembers-<% $rname %>"><em><&|/l&>(Check to delete all values)</&></em></label>
             </div>
-          </div>
-        </div>
+        </&>
       </div>
     </div>
 % }