Merge branch '5.0/self-service-article-search' into 5.0-trunk

bestpractical · Mar 21, 2024 · 53c71e7 · 53c71e7
2 parents 428dd7a + 660b994
commit 53c71e7
Showing 1 changed file with 30 additions and 28 deletions.
diff --git a/share/html/SelfService/Article/Search.html b/share/html/SelfService/Article/Search.html
@@ -47,51 +47,53 @@
 %# END BPS TAGGED BLOCK }}}
 <& /SelfService/Elements/Header, Title => loc('Search Articles') &>
 
+<&| /Widgets/TitleBox, title => '' &>
+<div class="container">
 <form action="<%RT->Config->Get('WebPath')%>/SelfService/Article/Search.html">
   <div class="form-row">
-    <span class="label col-auto">
-      <&|/l&>Search for Articles matching</&>
-    </span>
-    <div class="value col-auto">
-      <input class="form-control" type="text" size=20 name="Articles_Content" />
+    <div class="col-3"></div>
+    <div class="col-5">
+      <input class="form-control" type="text" name="Articles_Content" placeholder="<% loc('Type search terms here') %>" />
     </div>
-    <div class="col-auto">
+    <div class="col-1">
       <input class="form-control btn btn-primary" type="submit" value="<&|/l&>Search</&>">
     </div>
+    <div class="col-3"></div>
   </div>
 </form>
+</div>
 
-  <div class="form-row">
-    <span class="label col-auto">
+<div class="container m-3">
+  <p class="col text-center">
 % if ($Articles_Content) {
 %   if ($articles_basics->Count || $articles_content->Count) {
-<&|/l,$Articles_Content&>Articles matching [_1]</&>
+<&|/l,$Articles_Content&>Articles matching: <span class="font-weight-bold">[_1]</span></&>
 %   } else {
-<&|/l,$Articles_Content&>No Articles match [_1]</&>
+<&|/l,$Articles_Content&>No Articles match <span class="font-weight-bold">[_1]</span></&>
 %   }
 % }
-    </span>
-  </div>
+  </p>
+</div>
 
-% my %dedupe_articles;
-% while (my $article = $articles_content->Next) {
-%   $dedupe_articles{$article->Id}++;
-  <div class="form-row">
-    <span class="value col-auto">
-      <a href="Display.html?id=<%$article->Id%>"><%$article->Name || loc('(no name)')%>: <%$article->Summary%></a>
-    </span>
-  </div>
-% }
+<div class="container m-3">
+  <div class="row justify-content-center">
+    <div class="col-6">
+%   my %dedupe_articles;
+%   while (my $article = $articles_content->Next) {
+%     $dedupe_articles{$article->Id}++;
+      <dt><a href="Display.html?id=<%$article->Id%>"><%$article->Name || loc('(no name)')%></a></dt>
+      <dd class="mb-2"><%$article->Summary%></dd>
+%   }
 
-% while (my $article = $articles_basics->Next) {
-%   next if $dedupe_articles{$article->Id};
-  <div class="form-row">
-    <span class="value col-auto">
-      <a href="Display.html?id=<%$article->Id%>"><%$article->Name || loc('(no name)')%>: <%$article->Summary%></a>
-    </span>
+%   while (my $article = $articles_basics->Next) {
+%     next if $dedupe_articles{$article->Id};
+      <dt><a href="Display.html?id=<%$article->Id%>"><%$article->Name || loc('(no name)')%></a></dt>
+      <dd class="mb-2"><%$article->Summary%></dd>
+%   }
+    </div>
   </div>
-% }
 </div>
+</&>
 <%init>
 use RT::Articles;