[Rt-commit] rt branch, 4.6/article-styling, repushed
Michel Rodriguez
michel at bestpractical.com
Tue Mar 3 09:38:04 EST 2020
The branch 4.6/article-styling was deleted and repushed:
was fd9c0e3bd234bf8ac56b65674233f5e8d9682bda
now c70e58e91bc4a36967320f75d152232403389ac2
1: a91d0f2a8 ! 1: 566926c3d Convert linked classes in Articles > Search to a portlet.
@@ -1,6 +1,6 @@
Author: michel <michel at bestpractical.com>
- Convert linked classes in Articles > Search to a portlet
+ Convert linked classes in Articles > Search to a portlet.
diff --git a/share/html/Articles/Article/Search.html b/share/html/Articles/Article/Search.html
--- a/share/html/Articles/Article/Search.html
@@ -25,6 +25,36 @@
--- a/t/articles/search-interface.t
+++ b/t/articles/search-interface.t
@@
+
+ # Case sensitive search on small field.
+ DoArticleSearch($m, $class->Name, 'Africa');
+-$m->text_contains('Search results'); # Did we do a search?
++$m->text_contains('Last Updated'); # Did we do a search?
+ $m->text_contains('blah blah 1');
+
+ # Case insensitive search on small field.
+ DoArticleSearch($m, $class->Name, 'africa');
+-$m->text_contains('Search results'); # Did we do a search?
++$m->text_contains('Last Updated'); # Did we do a search?
+ $m->text_contains('blah blah 1');
+
+ # Case sensitive search on large field.
+ DoArticleSearch($m, $class->Name, 'ipsum');
+-$m->text_contains('Search results'); # Did we do a search?
++$m->text_contains('Last Updated'); # Did we do a search?
+ $m->text_contains('hoi polloi 4');
+
+ # Case insensitive search on large field.
+ DoArticleSearch($m, $class->Name, 'lorem');
+-$m->text_contains('Search results'); # Did we do a search?
+ TODO:{
+ local $TODO = 'Case insensitive search on LONGBLOB not available in MySQL'
+ if RT->Config->Get('DatabaseType') eq 'mysql';
++ $m->text_contains('Last Updated'); # Did we do a search?
+ $m->text_contains('hoi polloi 4');
+ }
+
+@@
my $search_text = shift;
$m->follow_link_ok( {text => 'Articles'}, 'Articles Search');
2: 78be6309b ! 2: 4fb9578e8 Make [Update] in Articles > Overview look like Take link in ticket searches.
@@ -13,23 +13,16 @@
+<div id="article-list">
% while (my $Article = $MyArticles->Next) {
% $i++;
- <div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row">
+ <div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row article-metadata">
@@
- <span class="current-value"><%$Article->Id%></span>
- </div>
- <div class="col-md-4 value text-left">
-- <span class="current-value"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></span>
-+ <span class="current-value article-name"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></span>
- </div>
- <div class="col-md-4 value text-left">
<span class="current-value"><%$Article->CreatorObj->Name%></span>
</div>
<div class="col-md-3 value text-left">
- <span class="current-value">[<a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a>]</span>
-+ <span class="current-value article-update"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a></span>
++ <span class="current-value font-weight-bold"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a></span>
</div>
</div>
- <div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row">
+ <div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row article-summary">
@@
</div>
</div>
@@ -50,20 +43,13 @@
+<div id="article-list">
% while (my $Article = $MyArticles->Next) {
% $i++;
- <div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row">
+ <div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row article-metadata">
@@
- <span class="current-value"><%$Article->Id%></span>
- </div>
- <div class="col-md-4 value text-left">
-- <span class="current-value"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></span>
-+ <span class="current-value article-name"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></span>
- </div>
- <div class="col-md-4 value text-left">
<span class="current-value"><%$Article->CreatorObj->Name%></span>
</div>
<div class="col-md-3 value text-left">
- <span class="current-value">[<a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a>]</span>
-+ <span class="current-value article-update"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a></span>
++ <span class="current-value font-weight-bold"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a></span>
</div>
</div>
@@ -76,16 +62,3 @@
<& /Widgets/TitleBoxEnd &>
<%INIT>
-diff --git a/share/static/css/elevator-light/articles.css b/share/static/css/elevator-light/articles.css
---- a/share/static/css/elevator-light/articles.css
-+++ b/share/static/css/elevator-light/articles.css
-@@
- #articles-needs-setup a {
- text-decoration: underline;
- }
-+
-+#article-list span.article-name,
-+#article-list span.article-update {
-+ font-weight: bold;
-+}
-
3: f119723ad ! 3: 9fee12484 Make headers smaller in Article search results.
@@ -1,6 +1,6 @@
Author: michel <michel at bestpractical.com>
- Fix the heading format in the Article search results
+ Make headers smaller in Article search results.
diff --git a/share/html/Articles/Article/Elements/ShowSearchCriteria b/share/html/Articles/Article/Elements/ShowSearchCriteria
--- a/share/html/Articles/Article/Elements/ShowSearchCriteria
@@ -10,7 +10,7 @@
% }
<div class="form-row">
-<h2><&|/l&>Basics</&></h2>
-+<span class="article-advanced-search-header"><&|/l&>Basics</&></span>
++<h5><&|/l&>Basics</&></h5>
</div>
<div class="form-row">
@@ -19,7 +19,7 @@
<div class="form-row label">
- <h2><&|/l&>Content</&></h2>
-+ <span class="article-advanced-search-header"><&|/l&>Content</&></span>
++ <h5><&|/l&>Content</&></h5>
</div>
<div class="form-row">
@@ -28,7 +28,7 @@
<div class="form-row label">
- <h2><&|/l&>Dates</&></h2>
-+ <span class="article-advanced-search-header"><&|/l&>Dates</&></span>
++ <h5><&|/l&>Dates</&></h5>
</div>
<div class="form-row">
@@ -37,7 +37,7 @@
<div class="form-row label">
- <h2><&|/l&>Links</&></h2>
-+ <span class="article-advanced-search-header"><&|/l&>Links</&></span>
++ <h5><&|/l&>Links</&></h5>
</div>
<div class="form-row">
@@ -46,21 +46,8 @@
<div class="form-row label">
- <h2><&|/l&>Topics</&></h2>
-+ <span class="article-advanced-search-header"><&|/l&>Topics</&></span>
++ <h5><&|/l&>Topics</&></h5>
</div>
-diff --git a/share/static/css/elevator-light/articles.css b/share/static/css/elevator-light/articles.css
---- a/share/static/css/elevator-light/articles.css
-+++ b/share/static/css/elevator-light/articles.css
-@@
- #article-list span.article-update {
- font-weight: bold;
- }
-+
-+span.article-advanced-search-header {
-+ font-size: 1.05em ;
-+ font-weight: bold;
-+}
-
4: d913747e7 ! 4: 6e2351a5b Change "Modify this search" to the gear icon in the article search.
@@ -1,6 +1,6 @@
Author: michel <michel at bestpractical.com>
- Change "Modify this search" to the gear icon in the article search
+ Change "Modify this search" to the gear icon in the article search.
diff --git a/share/html/Articles/Article/Search.html b/share/html/Articles/Article/Search.html
--- a/share/html/Articles/Article/Search.html
@@ -10,7 +10,7 @@
<& /Elements/ListActions, actions => \@results &>
-<div style="float:right;margin-top:15px"><a href="#criteria"><&|/l&>Modify this search...</&></a></div>
-+% my $alt = loc( 'Modify this search');
++% my $alt = loc( 'Modify this search');
+<div style="float:right;margin-top:15px">
+ <a href="#criteria">
+ <span class="fas fa-cog icon-bordered fa-2x" alt="<% $alt %>" data-toggle="tooltip" data-placement="top" data-original-title="<% $alt %>"></span>
5: 2263373b4 < -: ------- Change headers in articles search results.
6: fd9c0e3bd ! 5: c70e58e91 Add formatting to the "Topics" heading in article search results.
@@ -1,6 +1,9 @@
Author: michel <michel at bestpractical.com>
- Add formating to Topics in the article search results.
+ Add formatting to the "Topics" heading in article search results.
+
+ Since you cannot sort on topics the header does not get the same
+ formatting as the other headers (blue/bold). Add blue (but not bold).
diff --git a/share/html/Articles/Article/Search.html b/share/html/Articles/Article/Search.html
--- a/share/html/Articles/Article/Search.html
@@ -9,6 +12,7 @@
</div>
% if ($articles->BuildSelectCountQuery =~ /WHERE/i) {
+-<h2><&|/l&>Search results</&></h2>
+<div id="article-search">
<& /Elements/CollectionList,
Collection => $articles,
@@ -17,9 +21,8 @@
GenericQueryArgs => { %filtered, Format => $format, },
&>
% }
--
+</div>
- <br />
+
<br />
<br />
@@ -27,9 +30,10 @@
--- a/share/static/css/elevator-light/articles.css
+++ b/share/static/css/elevator-light/articles.css
@@
- font-size: 1.05em ;
- font-weight: bold;
+ #comp-Articles .form-row.article-summary {
+ border-bottom: 1px solid #dee2e6;
}
++
+#article-search th.collection-as-table
+ {
+ color: #3858a3;
More information about the rt-commit
mailing list