From eb894c71d8321868b1cb32275991378b819943f3 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Mon, 8 Aug 2022 17:53:21 -0700 Subject: Port Assets to LabeledValue --- share/html/Asset/Elements/AddCatalogPeople | 18 ++------- share/html/Asset/Elements/AssetSearchBasics | 19 ++++----- share/html/Asset/Elements/EditBasics | 44 ++++++-------------- share/html/Asset/Elements/EditDates | 40 ++++++------------- share/html/Asset/Elements/EditPeople | 7 +--- share/html/Asset/Elements/ShowBasics | 38 +++--------------- share/html/Asset/Elements/ShowDates | 22 ++-------- share/html/Asset/Elements/ShowPeople | 10 ++--- share/html/Asset/Search/Bulk.html | 62 +++++++++-------------------- 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

<&|/l&>Add a person

-
-
- <& SelectRoleType, Object => $Object, Name => "AddUserRoleMember-Role" &> -
-
+ <&| /Elemenents/LabeledValue, RawLabel => $m->scomp('SelectRoleType', Object => $Object, Name => "AddUserRoleMember-Role") &> " class="form-control" > -
-
+

<&|/l&>Add a group

-
-
- <& SelectRoleType, Object => $Object, Name => "AddGroupRoleMember-Role" &> -
-
+ <&| /Elemenents/LabeledValue, RawLabel => $m->scomp('SelectRoleType', Object => $Object, Name => "AddGroupRoleMember-Role") &> " class="form-control" > -
-
+
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 @@
-
<&|/l&>Catalog
-
+ <&| /Elements/LabeledValue, Label => loc('Catalog') &> <& /Asset/Elements/SelectCatalog, Name => 'Catalog', CheckRight => "ShowCatalog", Default => $ARGS{'Catalog'}, OnChange => "jQuery('#AssetSearch').submit()" &> -
-
+
-
-
<&|/l&>Status
-
- <& /Asset/Elements/SelectStatus, Name => 'Status', Catalogs => { $CatalogObj->id => 1 }, DefaultValue => 1, - Default => ($ARGS{'Status'} || '') - &> -
-
+ <&| /Elements/LabeledValue, Label => loc('Status') &> + <& /Asset/Elements/SelectStatus, Name => 'Status', Catalogs => { $CatalogObj->id => 1 }, DefaultValue => 1, + Default => ($ARGS{'Status'} || '') + &> +
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 }}} -
-
- <&|/l&>Catalog: -
-
- <& /Asset/Elements/SelectCatalog, Default => $current{Catalog}, AutoSubmit => $AutoSubmit &> -
-
-
-
- <&|/l&>Name: -
-
- -
-
+ <&| /Elements/LabeledValue, Label => loc('Catalog') &> + <& /Asset/Elements/SelectCatalog, Default => $current{Catalog}, AutoSubmit => $AutoSubmit &> + +<&| /Elements/LabeledValue, Label => loc('Name') &> + + -
-
- <&|/l&>Description: -
-
- -
-
+ <&| /Elements/LabeledValue, Label => loc('Description') &> + + -
-
- <&|/l&>Status: -
-
- <& /Asset/Elements/SelectStatus, Name => 'Status', AssetObj => $AssetObj, CatalogObj => $CatalogObj &> -
-
+ <&| /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 }}} -
-
- <&|/l&>Created: -
-
- - <&|/l_unsafe, - $m->interp->apply_escapes($AssetObj->CreatedAsString, 'h'), - $m->scomp('/Elements/ShowUser', User => $AssetObj->CreatorObj) - &>[_1] by [_2] - -
-
- -
-
- <&|/l&>Last Updated: -
-
- - <&|/l_unsafe, - $m->interp->apply_escapes($AssetObj->LastUpdatedAsString, 'h'), - $m->scomp('/Elements/ShowUser', User => $AssetObj->LastUpdatedByObj) - &>[_1] by [_2] - -
-
- +<&| /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 ) { -
-
<% loc($role) %>:
-
+ <&| /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)) &> -
-
+ % } <%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 }}} -
-
- <&|/l&>Catalog: -
-
- <& ShowCatalog, Asset => $AssetObj &> -
-
+<&| /Elements/LabeledValue, Label => loc('Catalog'), Class => "asset-catalog" &> + <& ShowCatalog, Asset => $AssetObj &> + -
-
- <&|/l&>Name: -
-
- <% $AssetObj->Name || '' %> -
-
+<& /Elements/LabeledValue, Label => loc('Name'), Class => "asset-name", ValueSpanClass => 'current-value', Value => $AssetObj->Name &> -
-
- <&|/l&>Description: -
-
- <% $AssetObj->Description || '' %> -
-
+<& /Elements/LabeledValue, Label => loc('Name'), Class => "asset-description", ValueSpanClass => 'current-value', Value => $AssetObj->Description &> -
-
- <&|/l&>Status: -
-
- <% $AssetObj->Status || '' %> -
-
+<& /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 }}} -
-
- <&|/l&>Created: -
-
- +<&| /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] - -
-
+ +<&| /Elements/LabeledValue, Label => loc('Last Updated'), ValueSpanClass => 'current-value' &> -
-
- <&|/l&>Last Updated: -
-
- <&|/l_unsafe, $m->interp->apply_escapes($AssetObj->LastUpdatedAsString, 'h'), $m->scomp('/Elements/ShowUser', User => $AssetObj->LastUpdatedByObj) &>[_1] by [_2] - -
-
+
<& /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;
<% loc($role) %>:
+
+
% if ($AssetObj->Role($role)->{Single}) { % my $users = $AssetObj->RoleGroup($role)->UserMembersObj(Recursively => 0); % $users->FindAllRows; % my $user = $users->Next; -
-
% if ( $user->id != RT->Nobody->id ) { <& ShowRoleMembers, Group => $AssetObj->RoleGroup($role), Role => $role &> % } else { <& /Elements/ShowUser, User => $user, Link => 1 &> % } -
-
% } else { -
-
<& 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)") &> +% }
-% }
% } 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 @@
-
- <&|/l&>Catalog -
-
+ <&| /Elements/LabeledValue, Label => loc('Catalog') &> <& /Asset/Elements/SelectCatalog, Name => 'UpdateCatalog', UpdateSession => 0, ShowNullOption => 1 &> -
-
-
+ +
-
-
<&|/l&>Name
-
- -
-
+ <&| /Elements/LabeledValue, Label => loc('Name') &> + +
-
-
<&|/l&>Description
-
+ <&| /Elements/LabeledValue, Label => loc('Description') &> -
-
+
-
-
<&|/l&>Status
-
- <& /Asset/Elements/SelectStatus, Name => 'UpdateStatus', DefaultValue => 1 &> -
-
+ <&| /Elements/LabeledValue, Label => loc('Status') &> + <& /Asset/Elements/SelectStatus, Name => 'UpdateStatus', DefaultValue => 1 &> +
% my $basic_cfs = $cfs->Clone; @@ -143,41 +130,30 @@ % my $input = "SetRoleMember-$rname";
-
-
- <% loc($rname) %> -
-
- -
-
+ <&| /Elements/LabeledValue, Label => loc($rname) &> + +
% } else { % my $input = "AddRoleMember-$rname";
-
-
<% loc("Add [_1]", loc($rname)) %>
-
- -
-
+ <&| /Elements/LabeledValue, Label => loc("Add [_1]", loc($rname)) &> + +
% $input = "RemoveRoleMember-$rname";
-
-
<% loc("Remove [_1]", loc($rname)) %>
-
+ <&| /Elements/LabeledValue, Label => loc("Remove [_1]", loc($rname)) &>
-
-
+
% } -- cgit v1.2.3