You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2014/09/18 09:30:15 UTC
[40/43] git commit: [#7656] ticket:654 Removed sidebar from search
result pages
[#7656] ticket:654 Removed sidebar from search result pages
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a449d15c
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a449d15c
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a449d15c
Branch: refs/heads/je/42cc_7656
Commit: a449d15c8d4cfce40a2ca46f54d47fbb197a9ab8
Parents: 72c54da
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Tue Sep 16 16:19:07 2014 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Thu Sep 18 09:33:58 2014 +0300
----------------------------------------------------------------------
Allura/allura/templates/site_admin.html | 2 +-
Allura/allura/templates/site_admin_search.html | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/a449d15c/Allura/allura/templates/site_admin.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin.html b/Allura/allura/templates/site_admin.html
index d83f06e..0256563 100644
--- a/Allura/allura/templates/site_admin.html
+++ b/Allura/allura/templates/site_admin.html
@@ -20,7 +20,7 @@
{% from 'allura:templates/jinja_master/sidebar_menu.html' import sidebar_item with context %}
{% set hide_left_bar=False %}
-{% if page == 'new_projects' %}
+{% if page in ['new_projects', 'search_results'] %}
{% set hide_left_bar=True %}
{% endif %}
{% extends g.theme.master %}
http://git-wip-us.apache.org/repos/asf/allura/blob/a449d15c/Allura/allura/templates/site_admin_search.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_search.html b/Allura/allura/templates/site_admin_search.html
index 685f65b..b0d86a8 100644
--- a/Allura/allura/templates/site_admin_search.html
+++ b/Allura/allura/templates/site_admin_search.html
@@ -16,12 +16,18 @@
specific language governing permissions and limitations
under the License.
-#}
+
+{% set page_num = page %}
+{% set page = 'search_results' %}
+
{% extends 'allura:templates/site_admin.html' %}
{% block title %}Search {{ type_s }}s{% endblock %}
{% block header %}Search {{ type_s }}s{% endblock %}
{% block content %}
+ <div class="grid-19"><p><a href="/nf/admin">Back to Site Admin Home</a></p></div>
+
<div class="grid-19">
{{ c.search_form.display(q=q, f=f) }}
</div>
@@ -33,8 +39,8 @@
{% endif %}
<div class="grid-19">
- {{c.page_list.display(limit=limit, page=page, count=count)}}
- {{c.page_size.display(limit=limit, page=page, count=count)}}
+ {{c.page_list.display(limit=limit, page=page_num, count=count)}}
+ {{c.page_size.display(limit=limit, page=page_num, count=count)}}
</div>
{% endblock %}