Aklapper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113073
Change subject: Fix UI regression in side bar introduced in bug 59889
......................................................................
Fix UI regression in side bar introduced in bug 59889
Bug: 61288
Change-Id: I28b139f60ccc6e9a9e829bbe50d758b6cb45ffc1
---
M template/en/custom/global/footer.html.tmpl
A template/en/custom/global/saved-reports.html.tmpl
M template/en/custom/global/search-links.html.tmpl
3 files changed, 44 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/modifications
refs/changes/73/113073/1
diff --git a/template/en/custom/global/footer.html.tmpl
b/template/en/custom/global/footer.html.tmpl
index c058c62..2be885a 100644
--- a/template/en/custom/global/footer.html.tmpl
+++ b/template/en/custom/global/footer.html.tmpl
@@ -87,12 +87,22 @@
<div class="portal">
<h5>Saved Searches</h5>
<div class="body">
- <ul>
+ <ul id="links-saved">
[% PROCESS
"global/search-links.html.tmpl" %]
</ul>
</div>
</div>
[% END %]
+ [% IF user.reports.size %]
+ <div class="portal">
+ <h5>Saved Reports</h5>
+ <div class="body">
+ <ul id="reports-saved">
+ [% PROCESS
"global/saved-reports.html.tmpl" %]
+ </ul>
+ </div>
+ </div>
+ [% END %]
<!-- /interaction -->
<!-- toolbox -->
<div class="portal">
diff --git a/template/en/custom/global/saved-reports.html.tmpl
b/template/en/custom/global/saved-reports.html.tmpl
new file mode 100644
index 0000000..d58d3d5
--- /dev/null
+++ b/template/en/custom/global/saved-reports.html.tmpl
@@ -0,0 +1,11 @@
+[%# This file is template/en/default/global/useful-links.html.tmpl in upstream
%]
+
+ [%# Saved reports %]
+
+ [% IF user.reports.size %]
+ [% FOREACH r = user.reports %]
+ <li>
+ <a href="report.cgi?[% r.query FILTER html %]&saved_report_id=
+ [%~ r.id FILTER uri %]">[% r.name FILTER html %]</a></li>
+ [% END %]
+ [% END %]
diff --git a/template/en/custom/global/search-links.html.tmpl
b/template/en/custom/global/search-links.html.tmpl
index 2f212eb..0336e8d 100644
--- a/template/en/custom/global/search-links.html.tmpl
+++ b/template/en/custom/global/search-links.html.tmpl
@@ -5,48 +5,31 @@
[% IF user.showmybugslink OR user.queries.size
OR user.queries_subscribed.size
%]
- <li id="links-saved">
- <ul class="links">
- [% IF user.showmybugslink %]
- [% filtered_username = user.login FILTER uri %]
- <li><a href="[% Param('mybugstemplate').replace('%userid%',
filtered_username) %]">My [% terms.Bugs %]</a></li>
- [% print_pipe = 1 %]
- [% END %]
+ [% IF user.showmybugslink %]
+ [% filtered_username = user.login FILTER uri %]
+ <li><a href="[% Param('mybugstemplate').replace('%userid%',
filtered_username) %]">My [% terms.Bugs %]</a></li>
+ [% print_pipe = 1 %]
+ [% END %]
- [% FOREACH q = user.queries %]
- [% IF q.link_in_footer %]
- <li>
- <a href="buglist.cgi?cmdtype=runnamed&namedcmd=[% q.name
FILTER uri %]">[% q.name FILTER html %]</a>
- </li>
- [% END %]
- [% END %]
- [% FOREACH q = user.queries_subscribed %]
- [% IF new_line %]
- <br>
- [% new_line = 0 %]
- [% END %]
+ [% FOREACH q = user.queries %]
+ [% IF q.link_in_footer %]
<li>
- <a href="buglist.cgi?cmdtype=dorem&remaction=run&namedcmd=
- [% q.name FILTER uri %]&sharer_id=
- [% q.user.id FILTER uri %]"
- class="shared"
- title="Shared by [% q.user.identity FILTER html %]"
- >[% q.name FILTER html %]</a>
+ <a href="buglist.cgi?cmdtype=runnamed&namedcmd=[% q.name FILTER
uri %]">[% q.name FILTER html %]</a>
</li>
[% END %]
- </ul>
- </li>
- [% END %]
-
- [% IF user.reports.size %]
- <li id="reports-saved">
- <ul class="links">
- [% FOREACH r = user.reports %]
- <li>
- <a href="report.cgi?[% r.query FILTER html %]&saved_report_id=
- [%~ r.id FILTER uri %]">[% r.name FILTER html %]</a></li>
+ [% END %]
+ [% FOREACH q = user.queries_subscribed %]
+ [% IF new_line %]
+ <br>
+ [% new_line = 0 %]
[% END %]
- </ul>
- </li>
+ <li>
+ <a href="buglist.cgi?cmdtype=dorem&remaction=run&namedcmd=
+ [% q.name FILTER uri %]&sharer_id=
+ [% q.user.id FILTER uri %]"
+ class="shared"
+ title="Shared by [% q.user.identity FILTER html %]"
+ >[% q.name FILTER html %]</a>
+ </li>
+ [% END %]
[% END %]
-
--
To view, visit https://gerrit.wikimedia.org/r/113073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28b139f60ccc6e9a9e829bbe50d758b6cb45ffc1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
