Skip to content

Commit

Permalink
Port Admin to LabeledValue
Browse files Browse the repository at this point in the history
  • Loading branch information
@obra @cbrandtbuffalo
obra authored and cbrandtbuffalo committed Sep 2, 2022
1 parent 52d6658 commit 88e4b50
Show file tree
Hide file tree
Showing 23 changed files with 311 additions and 935 deletions.
40 changes: 8 additions & 32 deletions share/html/Admin/Actions/Elements/EditBasics
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,42 +45,18 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
<div class="form-row">
<div class="label col-3">
<&|/l&>Name</&>:
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => loc("Name") &>
<input type="text" class="form-control" name="Name" size="60" value="<% $ARGS{"Name"} || $Action->Name || '' %>" />
</div>
</div>

<div class="form-row">
<div class="label col-3">
<&|/l&>Description</&>:
</div>
<div class="value col-9">
</&>
<&| /Elements/LabeledValue, Label => loc("Description") &>
<input type="text" class="form-control" name="Description" size="60" value="<% $ARGS{"Description"} || $Action->Description || '' %>" />
</div>
</div>

<div class="form-row">
<div class="label col-3">
<&|/l&>Action Module</&>:
</div>
<div class="value col-9">
</&>
<&| /Elements/LabeledValue, Label => loc("Action Module") &>
<input type="text" class="form-control" name="ExecModule" size="60" value="<% $ARGS{"ExecModule"} || $Action->ExecModule || ''%>" />
</div>
</div>

<div class="form-row">
<div class="label col-3">
<&|/l&>Parameters to Pass</&>:
</div>
<div class="value col-9">
</&>
<&| /Elements/LabeledValue, Label => loc("Parameters to Pass") &>
<input type="text" class="form-control" name="Argument" size="60" value="<% $ARGS{"Argument"} || $Action->Argument || '' %>"/>
</div>
</div>

</&>
<%ARGS>
$Action
</%ARGS>
39 changes: 8 additions & 31 deletions share/html/Admin/Actions/Elements/ShowBasics
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,41 +45,18 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
<div class="form-row">
<div class="label col-3">
<&|/l&>Name</&>:
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => loc("Name") &>
<span class="current-value"><% $ARGS{"Name"} || $Action->Name || '' %></span>
</div>
</div>

<div class="form-row">
<div class="label col-3">
<&|/l&>Description</&>:
</div>
<div class="value col-9">
</&>
<&| /Elements/LabeledValue, Label => loc("Description") &>
<span class="current-value"><% $ARGS{"Description"} || $Action->Description || '' %></span>
</div>
</div>

<div class="form-row">
<div class="label col-3">
<&|/l&>Action Module</&>:
</div>
<div class="value col-9">
</&>
<&| /Elements/LabeledValue, Label => loc("Action Module") &>
<span class="current-value"><% $ARGS{"ExecModule"} || $Action->ExecModule || ''%></span>
</div>
</div>

<div class="form-row">
<div class="label col-3">
<&|/l&>Parameters to Pass</&>:
</div>
<div class="value col-9">
</&>
<&| /Elements/LabeledValue, Label => loc("Parameters to Pass") &>
<span class="current-value"><% $ARGS{"Argument"} || $Action->Argument || '' %></span>
</div>
</div>
</&>

<%ARGS>
$Action
Expand Down
83 changes: 21 additions & 62 deletions share/html/Admin/Articles/Classes/Modify.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,45 +59,28 @@

<&| /Widgets/TitleBox, class => 'article-class-info-basics', content_class => 'mx-auto width-sm' &>

<div class="form-row">
<div class="label col-3">
<&|/l&>Class Name</&>:
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => loc("Class Name") &>
<input type="text" class="form-control" name="Name" value="<% $ClassObj->Name || $Name || ''%>" />
</div>
</div>
</&>

<div class="form-row">
<div class="label col-3">
<&|/l&>Description</&>:
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => loc("Description") &>
<input type="text" class="form-control" name="Description" value="<% $ClassObj->Description || $Description || '' %>" size=60 />
</div>
</div>
</&>

<div class="form-row">
<div class="label col-3">
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => "" &>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked%>>
<label class="custom-control-label" for="Enabled"><&|/l&>Enabled (Unchecking this box disables this class)</&></label>
</div>
</div>
</div>
</&>

<div class="form-row">
<div class="col-12">
<h5 class="mt-3"><&|/l&>When inserting articles in this class into emails:</&></h5>
</div>
</div>

<div class="form-row">
<div class="label col-3">
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => "" &>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input checkbox" id="Include-LinkToTicket" name="Include-LinkToTicket" value="1" <% $include{LinkToTicket} %>
% if ( !RT->Config->Get('LinkArticlesOnInclude') ) {
Expand All @@ -106,50 +89,34 @@ <h5 class="mt-3"><&|/l&>When inserting articles in this class into emails:</&></
>
<label class="custom-control-label" for="Include-LinkToTicket"><&|/l&>Link article to ticket</&></label>
</div>
</div>
</div>
</&>

<div class="form-row">
<div class="label col-3">
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => "" &>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input checkbox" id="Include-Name" name="Include-Name" value="1" <% $include{Name} %>>
<label class="custom-control-label" for="Include-Name"><&|/l&>Include article name</&></label>
</div>
</div>
</div>
</&>

<div class="form-row">
<div class="label col-3">
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => "" &>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input checkbox" id="Include-Summary" name="Include-Summary" value="1" <% $include{Summary} %>>
<label class="custom-control-label" for="Include-Summary"><&|/l&>Include article summary</&></label>
</div>
</div>
</div>
</&>

<div class="form-row">
<div class="label col-3">
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => "" &>
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input checkbox" id="Include-EscapeHTML" name="Include-EscapeHTML" value="1" <% $include{EscapeHTML} %>>
<label class="custom-control-label" for="Include-EscapeHTML"><&|/l&>Escape HTML (Unchecking this box is potentially unsafe)</&></label>
</div>
</div>
</div>
</&>

% if ( $cfs ) {
<h5 class="mt-3"><&|/l&>Include custom field:</&></h5>
% while (my $cf = $cfs->Next) {
<div class="form-row">
<div class="label col-3 pt-0">
<% $cf->Name %>:
</div>
<div class="value col-9">

<&| /Elements/LabeledValue, Label => $cf->Name &>
<div class="form-row">
<div class="col-auto">
<div class="custom-control custom-checkbox">
Expand All @@ -164,8 +131,7 @@ <h5 class="mt-3"><&|/l&>Include custom field:</&></h5>
</div>
</div>
</div>
</div>
</div>
</&>
% } }

% if ( @$subject_cfs ) {
Expand All @@ -186,17 +152,10 @@ <h5 class="mt-3"><&|/l&>Change email subject:</&></h5>
<h5 class="mt-3"><&|/l&>Class Custom Fields:</&></h5>
% }
% while (my $CF = $CFs->Next) {
<div class="form-row">
<div class="label col-3">
<span class="<% $CF->EntryHint ? 'prev-icon-helper' : '' %>"><% $CF->Name %>:</span>\
% if ( $CF->EntryHint ) {
<span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<% $CF->EntryHint %>"></span>
% }
</div>
<div class="value col-9">
<& /Elements/EditCustomField, CustomField => $CF, Object => $ClassObj, &>
</div>
</div>
<&| /Elements/LabeledValue, Label => $CF->Name, LabelSpanClass => ($CF->EntryHint ? 'prev-icon-helper' : '' ),
LabelTooltip => $CF->EntryHint &>
<& /Elements/EditCustomField, CustomField => $CF, Object => $ClassObj, &>
</&>
% }

%$m->callback( CallbackName => 'BeforeSubmit', CustomFields => $cfs, ClassObj => $ClassObj );
Expand Down
41 changes: 12 additions & 29 deletions share/html/Admin/Articles/Elements/Topics
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,13 @@
<input type="hidden" name="id" value="<%$RootObj->Id%>" />

% if (!$Modify) {
<div class="form-row">
<div class="label col-3">
<&|/l&>Topic Name</&>
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => loc("Topic Name") &>
<input class="form-control" type="text" name="Name" size="30" />
</div>
</div>
<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="Description" size="50" />
</div>
</div>
</&>
% } else {
<a href="Topics.html">New topic</a>
% }
Expand All @@ -77,25 +68,17 @@

<%def .edit>
&nbsp;
<div class="form-row">
<div class="label col-3">
Topic Name:
</div>
<div class="value col-9 input-group">
<&| /Elements/LabeledValue, Label => loc("Topic Name"), ValueSpanClass => 'input-group' &>


<input class="form-control" type="text" name="Topic-<%$topic->Id%>-Name" size="20" value="<%$topic->Name%>" />
<input type="submit" class="btn btn-primary" name="Update" value="Update">
</div>
</div>

<div class="form-row">
<div class="label col-3">
Description:
</div>
<div class="value col-9 input-group">
</&>

<&| /Elements/LabeledValue, Label => loc("Description"), ValueSpanClass => 'input-group' &>
<input class="form-control" type="text" name="Topic-<%$topic->Id%>-Description" size="20" value="<%$topic->Description%>" />
<input type="submit" class="btn btn-primary" name="Delete-Topic-<%$topic->Id%>" value="Delete" />
</div>
</div>
</&>
<%args>
$topic
</%args>
Expand Down
36 changes: 9 additions & 27 deletions share/html/Admin/Assets/Catalogs/Elements/EditBasics
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,48 +45,30 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
<div class="form-row">
<div class="label col-3">
<&|/l&>Name</&>
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => loc("Name") &>
<input type="text" class="form-control" name="Name" value="<% $current{Name} %>" size="40">
</div>
</div>
</&>

<div class="form-row">
<div class="label col-3">
<&|/l&>Description</&>
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => loc("Description") &>
<input type="text" class="form-control" name="Description" value="<% $current{Description} %>" size="40">
</div>
</div>
</&>

<div class="form-row">
<div class="label col-3">
<&|/l&>Lifecycle</&>
</div>
<div class="value col-9">
<&| /Elements/LabeledValue, Label => loc("Lifecycle") &>
<& /Widgets/Form/Select:InputOnly,
Name => 'Lifecycle',
Values => [ sort { loc($a) cmp loc($b) } RT::Lifecycle->List( $CatalogObj->LifecycleType ) ],
CurrentValue => $current{Lifecycle},
Default => 0,
&>
</div>
</div>
</&>

<div class="form-row">
<div class="label col-3"></div>
<input name="SetDisabled" type="hidden" value="1">
<div class="value col-9">
<&| /Elements/LabeledValue, Label => '' &>
<input name="SetDisabled" type="hidden" value="1">
<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>
Expand Down
Loading

0 comments on commit 88e4b50

Please sign in to comment.