[Rt-commit] rt branch, 5.0-trunk, updated. rt-5.0.0alpha1-23-ge1d214cef
? sunnavy
sunnavy at bestpractical.com
Fri Mar 6 10:22:18 EST 2020
The branch, 5.0-trunk has been updated
via e1d214cefcd69d358282f65ad9971f945925f5b9 (commit)
via 8c93f3021f1efb00178d038220fa8b444e6e5406 (commit)
via 83632ed4f9d049e050db9f9346fe17e356273c1d (commit)
via ba44d1d9f1393d487abd64cffeee9a28d60c2ac1 (commit)
via d76940b63bbfd90506cbaf6e878670e8a84bc8a6 (commit)
via ec85db1726aef5bfc76452fd7696435177700a27 (commit)
via 6614c842a8edc9dbf364059ffb808312d4211e59 (commit)
via 566926c3d2ded2a0ad822cba3870b81a5852a742 (commit)
from 129481bc00ccfe555aa5d2809135f16bd86c4b19 (commit)
Summary of changes:
share/html/Articles/Article/Elements/ShowSearchCriteria | 10 +++++-----
share/html/Articles/Article/Search.html | 12 +++++++++---
share/html/Articles/Elements/NewestArticles | 2 +-
share/html/Articles/Elements/UpdatedArticles | 2 +-
share/static/css/elevator-light/ticket-lists.css | 7 +++++++
t/articles/search-interface.t | 10 +++++-----
6 files changed, 28 insertions(+), 15 deletions(-)
- Log -----------------------------------------------------------------
commit 6614c842a8edc9dbf364059ffb808312d4211e59
Author: michel <michel at bestpractical.com>
Date: Mon Mar 2 23:19:08 2020 +0100
Make [Update] in Articles > Overview look like Take link in ticket searches.
diff --git a/share/html/Articles/Elements/NewestArticles b/share/html/Articles/Elements/NewestArticles
index 48b5f3493..a35ddf186 100644
--- a/share/html/Articles/Elements/NewestArticles
+++ b/share/html/Articles/Elements/NewestArticles
@@ -74,7 +74,7 @@
<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 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 article-summary">
diff --git a/share/html/Articles/Elements/UpdatedArticles b/share/html/Articles/Elements/UpdatedArticles
index 405239f86..2cac32a9a 100644
--- a/share/html/Articles/Elements/UpdatedArticles
+++ b/share/html/Articles/Elements/UpdatedArticles
@@ -75,7 +75,7 @@
<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 font-weight-bold"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a></span>
</div>
</div>
commit ec85db1726aef5bfc76452fd7696435177700a27
Author: michel <michel at bestpractical.com>
Date: Mon Mar 2 23:21:50 2020 +0100
Make headers smaller in Article search results.
diff --git a/share/html/Articles/Article/Elements/ShowSearchCriteria b/share/html/Articles/Article/Elements/ShowSearchCriteria
index 3d9a54a1e..56a8e1545 100644
--- a/share/html/Articles/Article/Elements/ShowSearchCriteria
+++ b/share/html/Articles/Article/Elements/ShowSearchCriteria
@@ -51,7 +51,7 @@
<& /Widgets/TitleBoxStart, title => loc('Advanced search') &>
% }
<div class="form-row">
-<h2><&|/l&>Basics</&></h2>
+<h5><&|/l&>Basics</&></h5>
</div>
<div class="form-row">
@@ -100,7 +100,7 @@
</div>
<div class="form-row label">
- <h2><&|/l&>Content</&></h2>
+ <h5><&|/l&>Content</&></h5>
</div>
<div class="form-row">
@@ -145,7 +145,7 @@
% }
<div class="form-row label">
- <h2><&|/l&>Dates</&></h2>
+ <h5><&|/l&>Dates</&></h5>
</div>
<div class="form-row">
@@ -181,7 +181,7 @@
</div>
<div class="form-row label">
- <h2><&|/l&>Links</&></h2>
+ <h5><&|/l&>Links</&></h5>
</div>
<div class="form-row">
@@ -209,7 +209,7 @@
</div>
<div class="form-row label">
- <h2><&|/l&>Topics</&></h2>
+ <h5><&|/l&>Topics</&></h5>
</div>
commit d76940b63bbfd90506cbaf6e878670e8a84bc8a6
Author: michel <michel at bestpractical.com>
Date: Mon Mar 2 23:43:41 2020 +0100
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
index eb8a6e1db..63d6c111a 100644
--- a/share/html/Articles/Article/Search.html
+++ b/share/html/Articles/Article/Search.html
@@ -85,7 +85,12 @@
% }
<& /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');
+<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>
+ </a>
+</div>
% if ($articles->BuildSelectCountQuery =~ /WHERE/i) {
<h2><&|/l&>Search results</&></h2>
commit ba44d1d9f1393d487abd64cffeee9a28d60c2ac1
Author: michel <michel at bestpractical.com>
Date: Tue Mar 3 12:51:58 2020 +0100
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 and bolder.
This fix also adds the same format tp other collection-as-table
headers.
diff --git a/share/static/css/elevator-light/ticket-lists.css b/share/static/css/elevator-light/ticket-lists.css
index 70609e098..5c81fd27d 100644
--- a/share/static/css/elevator-light/ticket-lists.css
+++ b/share/static/css/elevator-light/ticket-lists.css
@@ -20,6 +20,12 @@ table.queue-summary th.collection-as-table a {
color: #3858a3
}
+table.collection-as-table th.collection-as-table,
+table.queue-summary th.collection-as-table {
+ color: #3858a3;
+ font-weight: 500; /* 500 is between regular (400) and bold (700) */
+}
+
table.queue-summary th.collection-as-table {
text-align: right
}
commit 83632ed4f9d049e050db9f9346fe17e356273c1d
Author: michel <michel at bestpractical.com>
Date: Fri Mar 6 15:06:12 2020 +0100
Remove "Search results" header in the article search result page.
diff --git a/share/html/Articles/Article/Search.html b/share/html/Articles/Article/Search.html
index 63d6c111a..6e5d3892b 100644
--- a/share/html/Articles/Article/Search.html
+++ b/share/html/Articles/Article/Search.html
@@ -93,7 +93,6 @@
</div>
% if ($articles->BuildSelectCountQuery =~ /WHERE/i) {
-<h2><&|/l&>Search results</&></h2>
<& /Elements/CollectionList,
Collection => $articles,
AllowSorting => 1,
commit 8c93f3021f1efb00178d038220fa8b444e6e5406
Author: michel <michel at bestpractical.com>
Date: Fri Mar 6 15:24:57 2020 +0100
Format newest/most recently updated article headers.
Those 2 lists are created with specific elements, tagged differently than the
usual collection-as-table. This gives their headers the same format as regular
result lists.
diff --git a/share/static/css/elevator-light/ticket-lists.css b/share/static/css/elevator-light/ticket-lists.css
index 5c81fd27d..73673070e 100644
--- a/share/static/css/elevator-light/ticket-lists.css
+++ b/share/static/css/elevator-light/ticket-lists.css
@@ -21,7 +21,8 @@ table.queue-summary th.collection-as-table a {
}
table.collection-as-table th.collection-as-table,
-table.queue-summary th.collection-as-table {
+table.queue-summary th.collection-as-table,
+.article-headers .label {
color: #3858a3;
font-weight: 500; /* 500 is between regular (400) and bold (700) */
}
commit e1d214cefcd69d358282f65ad9971f945925f5b9
Merge: 129481bc0 8c93f3021
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Mar 6 23:07:10 2020 +0800
Merge branch '4.6/article-styling' into 5.0-trunk
-----------------------------------------------------------------------
More information about the rt-commit
mailing list