allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [26/26] git commit: [#7656] put hide_left_bar var logic in respective templates
Date Fri, 19 Sep 2014 20:04:40 GMT
[#7656] put hide_left_bar var logic in respective templates


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a9883cd2
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a9883cd2
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a9883cd2

Branch: refs/heads/master
Commit: a9883cd2345697df8acdcd6cc8c0b20ad142db64
Parents: 7cb33a4
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Fri Sep 19 19:50:42 2014 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Sep 19 19:50:42 2014 +0000

----------------------------------------------------------------------
 Allura/allura/templates/site_admin.html         |  4 ----
 .../templates/site_admin_new_projects.html      | 24 +++++++++++---------
 Allura/allura/templates/site_admin_search.html  |  1 +
 3 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/a9883cd2/Allura/allura/templates/site_admin.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin.html b/Allura/allura/templates/site_admin.html
index 0256563..3670285 100644
--- a/Allura/allura/templates/site_admin.html
+++ b/Allura/allura/templates/site_admin.html
@@ -19,10 +19,6 @@
 
 {% from 'allura:templates/jinja_master/sidebar_menu.html' import sidebar_item with context
%}
 
-{% set hide_left_bar=False %}
-{% if page in ['new_projects', 'search_results'] %}
-  {% set hide_left_bar=True %}
-{% endif %}
 {% extends g.theme.master %}
 
 {% block title %}Forge Site Admin{% endblock %}

http://git-wip-us.apache.org/repos/asf/allura/blob/a9883cd2/Allura/allura/templates/site_admin_new_projects.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_new_projects.html b/Allura/allura/templates/site_admin_new_projects.html
index 995906f..81902d6 100644
--- a/Allura/allura/templates/site_admin_new_projects.html
+++ b/Allura/allura/templates/site_admin_new_projects.html
@@ -16,7 +16,9 @@
        specific language governing permissions and limitations
        under the License.
 -#}
-{% set page="new_projects" %}
+{% set page = "new_projects" %}
+{% set hide_left_bar = True %}
+
 {% extends 'allura:templates/site_admin.html' %}
 
 {% macro _paging() %}
@@ -86,20 +88,20 @@
     }
     th.header {
         background-image: url("{{g.forge_static('images/bg.gif')}}");
-        cursor: pointer; 
-        font-weight: bold; 
-        background-repeat: no-repeat; 
-        background-position: center left; 
-        padding-left: 20px; 
+        cursor: pointer;
+        font-weight: bold;
+        background-repeat: no-repeat;
+        background-position: center left;
+        padding-left: 20px;
     }
-    th.headerSortUp { 
+    th.headerSortUp {
         background-image: url("{{g.forge_static('images/asc.gif')}}");
-        background-color: #6bb3fd; 
+        background-color: #6bb3fd;
     }
-    th.headerSortDown { 
+    th.headerSortDown {
         background-image: url("{{g.forge_static('images/desc.gif')}}");
-        background-color: #6bb3fd; 
-    }   
+        background-color: #6bb3fd;
+    }
 </style>
 {% endblock %}
 

http://git-wip-us.apache.org/repos/asf/allura/blob/a9883cd2/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 7345c4d..108b39b 100644
--- a/Allura/allura/templates/site_admin_search.html
+++ b/Allura/allura/templates/site_admin_search.html
@@ -19,6 +19,7 @@
 
 {% set page_num = page %}
 {% set page = 'search_results' %}
+{% set hide_left_bar = True %}
 
 {% extends 'allura:templates/site_admin.html' %}
 


Mime
View raw message