allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [3/5] allura git commit: [#8046] Fix duplicate titles on neighborhood pages
Date Fri, 05 Feb 2016 19:36:07 GMT
[#8046] Fix duplicate titles on neighborhood pages


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

Branch: refs/heads/master
Commit: 3e24e7d9a4a9dd47de7bcf718ac13a8a7db8055e
Parents: 7737e08
Author: Heith Seewald <heiths@gmail.com>
Authored: Fri Jan 22 19:28:25 2016 -0500
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Fri Feb 5 14:22:26 2016 -0500

----------------------------------------------------------------------
 .../allura/templates/jinja_master/nav_menu.html | 20 +++++++++-----------
 .../templates/jinja_master/theme_macros.html    |  7 ++++---
 2 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/3e24e7d9/Allura/allura/templates/jinja_master/nav_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/nav_menu.html b/Allura/allura/templates/jinja_master/nav_menu.html
index b65d80d..e100912 100644
--- a/Allura/allura/templates/jinja_master/nav_menu.html
+++ b/Allura/allura/templates/jinja_master/nav_menu.html
@@ -31,17 +31,15 @@
     {% elif c.project.icon %}
       <img src="{{c.project.url()}}icon?{{c.project.icon._id.generation_time}}" class="project_icon"
alt="Project Logo">
     {% endif %}
-    <h1 class="project_title">
-        <a href="{{c.project.url()}}" class="project_link">
-            {%- if c.project.is_user_project -%}
-                {{ c.project.user_project_of.display_name }}
-            {%- elif c.project.is_nbhd_project -%}
-                {{ c.project.neighborhood.name }}
-            {%- else -%}
-                {{ c.project.name }}
-            {%- endif -%}
-        </a>
-    </h1>
+        <h1 class="project_title">
+            <a href="{{c.project.url()}}" class="project_link">
+                {%- if c.project.is_user_project -%}
+                    {{ c.project.user_project_of.display_name }}
+                {%- elif not c.project.is_nbhd_project -%}
+                    {{ c.project.name }}
+                {%- endif -%}
+            </a>
+        </h1>
     {% set status = c.project.troves_by_type('developmentstatus')|sort(attribute='fullname')
%}
     {% set status = status[-1] %}
     {% if status and status.shortname not in ['production', 'mature'] %}

http://git-wip-us.apache.org/repos/asf/allura/blob/3e24e7d9/Allura/allura/templates/jinja_master/theme_macros.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html
index 52365df..8ff8763 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -127,22 +127,23 @@ http://stackoverflow.com/questions/26582731/redefining-imported-jinja-macros
     </nav>
 {%- endmacro %}
 {% endif %}
-
 {% if not project_header_right %}
 {%- macro project_header_right(project, app) %}
   {% if project.neighborhood.icon %}
+  <div class="neighborhood_block">
     <a href="{{project.neighborhood.url()}}"><img src="{{project.neighborhood.url()}}icon"
class="neighborhood_icon"
        alt="Return to {{project.neighborhood.name}}" title="Return to {{project.neighborhood.name}}"></a>
        <div class="neighborhood_title">
-         <h1><a href="{{project.neighborhood.url()}}">{{project.neighborhood.name}}</a></h1>
+         <h3><a href="{{project.neighborhood.url()}}">{{project.neighborhood.name}}</a></h3>
          {% if project.neighborhood.project_list_url %}
            <div class="neighborhood_title_link">
            <a href="{{project.neighborhood.project_list_url}}">
              View More Projects
            </a>
            </div>
+             </div>
          {% endif %}
-      </div>
+  </div>
   {% endif %}
 {%- endmacro %}
 {% endif %}


Mime
View raw message