Port Articles to LabeledValue

7 files changed, 42 insertions, 150 deletions

diff --git a/share/html/Articles/Article/Display.html b/share/html/Articles/Article/Display.html
index b79ff2699c..8b4a96d4a6 100644
--- a/share/html/Articles/Article/Display.html
+++ b/share/html/Articles/Article/Display.html
@@ -49,59 +49,13 @@
 <& /Elements/Tabs &>
 
 <&| /Widgets/TitleBox, title => loc('The Basics'), class => 'article-basics', &>
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Summary</&>:
-    </div>
-    <div class="value col-9">
-      <span class="current-value"><%$article->Summary%></span>
-    </div>
-  </div>
 
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Sort Order</&>:
-    </div>
-    <div class="value col-9">
-      <span class="current-value"><%$article->SortOrder%></span>
-    </div>
-  </div>
+<& /Elements/LabeledValue, Label => loc('Summary'), ValueSpanClass => 'current-value', Value => $article->Summary &>
+<& /Elements/LabeledValue, Label => loc('Sort Order'), ValueSpanClass => 'current-value', Value => $article->SortOrder &>
+<& /Elements/LabeledValue, Label => loc('Class'), ValueSpanClass => 'current-value', Value => $article->ClassObj->Name &>
+<& /Elements/LabeledValue, Label => loc('Creator'), ValueSpanClass => 'current-value', Value => $article->CreatedObj->AsString &>
+<& /Elements/LabeledValue, Label => loc('Updated'), ValueSpanClass => 'current-value', Value => $article->LastUpdatedObj->AsString &>
 
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Class</&>:
-    </div>
-    <div class="value col-9">
-      <span class="current-value"><%$article->ClassObj->Name%></span>
-    </div>
-  </div>
-
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Creator</&>:
-    </div>
-    <div class="value col-9">
-      <span class="current-value"><& /Elements/ShowUser, User => $article->CreatorObj &></span>
-    </div>
-  </div>
-
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Created</&>:
-    </div>
-    <div class="value col-9">
-      <span class="current-value"><%$article->CreatedObj->AsString%></span>
-    </div>
-  </div>
-
-  <div class="form-row">
-    <div class="label col-3">
-      <&|/l&>Updated</&>:
-    </div>
-    <div class="value col-9">
-      <span class="current-value"><%$article->LastUpdatedObj->AsString%></span>
-    </div>
-  </div>
 </&>
 
 % $m->callback( %ARGS, CallbackName => 'AfterBasics' );
diff --git a/share/html/Articles/Article/Elements/EditBasics b/share/html/Articles/Article/Elements/EditBasics
index 026c14f393..4f5046a092 100644
--- a/share/html/Articles/Article/Elements/EditBasics
+++ b/share/html/Articles/Article/Elements/EditBasics
@@ -45,80 +45,45 @@
 %# 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">
-    <input class="form-control" type="text" name="Name" value="<%($ARGS{'id'} eq 'new' ? '' : $ArticleObj->Name) || $ARGS{'Name'} || ''|h%>" size="50" />
-  </div>
-</div>
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Summary</&>:
-  </div>
-  <div class="value col-9">
-    <input class="form-control" type="text" name="Summary" value="<%($ARGS{'id'} eq 'new' ? '' : $ArticleObj->Summary) || $ARGS{'Summary'} ||'' |h%>" size="50" />
-  </div>
-</div>
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Sort Order</&>:
-  </div>
-  <div class="value col-9">
-    <input class="form-control" type="text" name="SortOrder" value="<%($ARGS{'id'} eq 'new' ? '0' : $ArticleObj->SortOrder) || $ARGS{'SortOrder'} || '0' %>" size="50" />
-  </div>
-</div>
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Class</&>:
-  </div>
-  <div class="value col-9">
+
+<&| /Elements/LabeledValue, Label => loc('Name') &>
+  <input class="form-control" type="text" name="Name" value="<%($ARGS{'id'} eq 'new' ? '' : $ArticleObj->Name) || $ARGS{'Name'} || ''|h%>" size="50" />
+</&>
+<&| /Elements/LabeledValue, Label => loc('Summary') &>
+  <input class="form-control" type="text" name="Summary" value="<%($ARGS{'id'} eq 'new' ? '' : $ArticleObj->Summary) || $ARGS{'Summary'} ||'' |h%>" size="50" />
+</&>
+<&| /Elements/LabeledValue, Label => loc('Sort Order') &>
+  <input class="form-control" type="text" name="SortOrder" value="<%($ARGS{'id'} eq 'new' ? '0' : $ArticleObj->SortOrder) || $ARGS{'SortOrder'} || '0' %>" size="50" />
+</&>
+<&| /Elements/LabeledValue, Label => loc('Class') &>
 % if ($EditClass) {
 <& /Articles/Elements/SelectClass, Name => 'Class', Default =>$ArticleObj->ClassObj->Id&>
 % } else {
 <span class="current-value form-control"><%$ClassObj->Name%></span>
 <input type="hidden" name="Class" value="<%$ClassObj->Id%>" />
 % }
-  </div>
-</div>
+</&>
+
 % if ($ARGS{'id'} ne 'new') {
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Creator</&>:
-  </div>
-  <div class="value col-9">
+  <&| /Elements/LabeledValue, Label => loc('Creator') &>
     <span class="current-value form-control"><& /Elements/ShowUser, User => $ArticleObj->CreatorObj &></span>
-  </div>
-</div>
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Created</&>:
-  </div>
-  <div class="value col-9">
+  </&>
+  <&| /Elements/LabeledValue, Label => loc('Created') &>
     <span class="current-value form-control"><%$ArticleObj->CreatedObj->AsString%></span>
-  </div>
-</div>
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Updated</&>:
-  </div>
-  <div class="value col-9">
+  </&>
+  <&| /Elements/LabeledValue, Label => loc('Updated') &>
     <span class="current-value form-control"><%$ArticleObj->LastUpdatedObj->AsString%></span>
-  </div>
-</div>
+  </&>
 % }
 % if ($ARGS{'id'} eq 'new' || $ArticleObj->CurrentUserHasRight('DisableArticle')) {
-<div class="form-row">
-  <div class="label col-3"></div>
-  <div class="value col-9">
+  <&| /Elements/LabeledValue, Label => '' &>
+
     <input type="hidden" class="hidden" name="SetEnabled" value="1" />
     <div class="custom-control custom-checkbox">
       <input type="checkbox" id="Enabled" name="Enabled" class="custom-control-input" value="1" <% ( $ArticleObj->id && $ArticleObj->Disabled || $ARGS{'Disabled'} ) ? '' : 'checked="checked"' |n %> />
       <label class="custom-control-label" for="Enabled"><&|/l&>Enabled (Unchecking this box disables this article)</&></label>
     </div>
-  </div>
-</div>
+  </&>
 % }
 <%INIT>
 </%INIT>
diff --git a/share/html/Articles/Article/Elements/EditCustomFields b/share/html/Articles/Article/Elements/EditCustomFields
index a2dec964da..52d177efcd 100644
--- a/share/html/Articles/Article/Elements/EditCustomFields
+++ b/share/html/Articles/Article/Elements/EditCustomFields
@@ -46,14 +46,8 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 % while (my $CustomField = $CustomFields->Next()) {
-<div class="form-row">
-  <div class="label col-3">
-    <span class="name <% $CustomField->EntryHint ? 'prev-icon-helper' : '' %>"><%$CustomField->Name%>:</span>\
-% if ( $CustomField->EntryHint ) {
-<span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<% $CustomField->EntryHint %>"></span>
-% }
-  </div>
-  <div class="value col-9 entry">
+  <&| /Elements/LabeledValue, Label => $CustomField->Name, LabelTooltip => $CustomField->EntryHint &>
+
     <& /Elements/EditCustomField, 
       Object => $ArticleObj, 
       CustomField => $CustomField, 
@@ -61,8 +55,7 @@
       Rows => 15,
       Cols => 70
     &>
-  </div>
-</div>
+  </&>
 % }
 <%INIT>
 my $CustomFields;
diff --git a/share/html/Articles/Article/Elements/EditLinks b/share/html/Articles/Article/Elements/EditLinks
index 92ef88783e..6f6470723d 100644
--- a/share/html/Articles/Article/Elements/EditLinks
+++ b/share/html/Articles/Article/Elements/EditLinks
@@ -45,12 +45,9 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<div class="form-row">
-  <div class="label col-3"></div>
-  <div class="value col-9">
+<&| /Elements/LabeledValue, Label => '' &>
     <i><&|/l&>Enter articles, tickets, or other URLs related to this article.</&></i>
-  </div>
-</div>
+</&>
 <div class="form-row">
   <div class="label col-3"></div>
   <div class="label col-9 text-left">
diff --git a/share/html/Articles/Article/Elements/EditTopics b/share/html/Articles/Article/Elements/EditTopics
index 4946f34029..63b193fee7 100644
--- a/share/html/Articles/Article/Elements/EditTopics
+++ b/share/html/Articles/Article/Elements/EditTopics
@@ -45,10 +45,8 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Topics</&>:
-  </div>
+  <&| /Elements/LabeledValue, Label => loc('Topics') &>
+
   <input type="hidden" name="EditTopics" value="1" />
   <div class="value col-9">
 <select multiple size="10" name="Topics" class="tall selection-box">
@@ -81,8 +79,7 @@
 </optgroup>
 % }
 </select>
-  </div>
-</div>
+</&>
 <%INIT>
 use Tree::Simple;
 
diff --git a/share/html/Articles/Article/Elements/ShowLinks b/share/html/Articles/Article/Elements/ShowLinks
index e17312dae6..af4b14809f 100644
--- a/share/html/Articles/Article/Elements/ShowLinks
+++ b/share/html/Articles/Article/Elements/ShowLinks
@@ -45,11 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Refers to</&>:
-  </div>
-  <div class="value col-9">
+  <&| /Elements/LabeledValue, Label => loc('Refers to') &>
 % my $refersto = $article->RefersTo;
 <ul class="list-group list-group-compact">
 % while (my $link = $refersto->Next) {
@@ -71,12 +67,10 @@
 </li>
 % }
 </ul>
-  </div>
+</&>
+
+<&| /Elements/LabeledValue, Label => loc('Referred to by') &>
 
-  <div class="label col-3">
-    <&|/l&>Referred to by</&>:
-  </div>
-  <div class="value col-9">
 <ul class="list-group list-group-compact">
 % my $referredtoby = $article->ReferredToBy;
 % while (my $link = $referredtoby->Next) {
@@ -98,8 +92,7 @@
 </li>
 % }
 </ul>
-</div>
-</div>
+</&>
 <%args>
 $article => undef
 </%args>
diff --git a/share/html/Articles/Article/Elements/ShowTopics b/share/html/Articles/Article/Elements/ShowTopics
index 1740b93107..75162533bb 100644
--- a/share/html/Articles/Article/Elements/ShowTopics
+++ b/share/html/Articles/Article/Elements/ShowTopics
@@ -45,20 +45,13 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<div class="form-row">
-  <div class="label col-3">
-    <&|/l&>Topics</&>:
-  </div>
-  <div class="value col-9">
-    <span class="current-value">
+<&| /Elements/LabeledValue, Label => loc('Topics'), ValueSpanClass => 'current-value' &>
 % my $topics = RT::ObjectTopics->new($session{'CurrentUser'});
 % $topics->LimitToObject($article);
 % while (my $t = $topics->Next) {
 <& /Articles/Elements/ShowTopic, topic => $t->TopicObj &>
 % }
-    </span>
-  </div>
-</div>
+</&>
 <%args>
 $article => undef
 </%args>