allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [21/26] git commit: [#7656] ticket:654 Removed sidebar from search result pages
Date Fri, 19 Sep 2014 20:04:35 GMT
[#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/ab4961f5
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ab4961f5
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ab4961f5

Branch: refs/heads/master
Commit: ab4961f58f943fe085980008e233689fdde485d5
Parents: 38cd390
Author: Aleksey 'LXj' Alekseyev <gotletter@gmail.com>
Authored: Tue Sep 16 16:19:07 2014 +0300
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Sep 19 19:35:41 2014 +0000

----------------------------------------------------------------------
 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/ab4961f5/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/ab4961f5/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 %}
 


Mime
View raw message