You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/06/21 20:33:43 UTC
[1/3] git commit: [#6257] add with-icon class to h2.project_summary
too
Updated Branches:
refs/heads/master 1753ad197 -> 0c5787e98
[#6257] add with-icon class to h2.project_summary too
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/0c5787e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/0c5787e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/0c5787e9
Branch: refs/heads/master
Commit: 0c5787e987628c25f96109a556243e7f910ce9fb
Parents: 8479dc6
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Mon Jun 10 17:53:26 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Fri Jun 21 18:33:07 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/nav_menu.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0c5787e9/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 8aa91f1..4280881 100644
--- a/Allura/allura/templates/jinja_master/nav_menu.html
+++ b/Allura/allura/templates/jinja_master/nav_menu.html
@@ -37,7 +37,7 @@
{% if status and status.shortname not in ['production', 'mature'] %}
<span id="dev-status" class="{{ status.shortname }}">{{ status.shortname }}</span>
{% endif %}
- <h2 class="project_summary">
+ <h2 class="project_summary{% if c.project.icon %} with-icon{% endif %}">
{{c.project.summary}}
</h2>
<div class="brought-by{% if c.project.icon %} with-icon{% endif %}">
[2/3] git commit: [#6257] let project header take up the full width
Posted by tv...@apache.org.
[#6257] let project header take up the full width
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8479dc62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8479dc62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8479dc62
Branch: refs/heads/master
Commit: 8479dc628c01d983821a121406c2e10ca0bcccdc
Parents: a9b8ad9
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Jun 4 20:59:49 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Fri Jun 21 18:33:07 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/master.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8479dc62/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index 11482a7..e3afa6a 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -77,7 +77,7 @@
{{theme_macros.header(g.login_url, '/auth/logout')}}
{% set flash = tg.flash_obj.render('flash', use_js=False) %}
<section id="page-body" class="{{g.document_class(neighborhood)}}">
- <div class="grid-24" id="nav_menu_holder">
+ <div id="nav_menu_holder">
{% block nav_menu %}
{% include g.theme.nav_menu %}
{% endblock %}
[3/3] git commit: [#6257] make the right side of the project header
extensible
Posted by tv...@apache.org.
[#6257] make the right side of the project header extensible
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a9b8ad9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a9b8ad9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a9b8ad9f
Branch: refs/heads/master
Commit: a9b8ad9fd2fb3c53924ba5620391ee6c0b045262
Parents: 1753ad1
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Jun 4 19:54:57 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Fri Jun 21 18:33:07 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/nav_menu.html | 17 ++---------------
.../templates/jinja_master/theme_macros.html | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a9b8ad9f/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 a34e20a..8aa91f1 100644
--- a/Allura/allura/templates/jinja_master/nav_menu.html
+++ b/Allura/allura/templates/jinja_master/nav_menu.html
@@ -22,21 +22,8 @@
{% if not c.project or (n.neighborhood_project == c.project and not n.show_title) %}
<div id="nav_menu_missing"></div>
{% else %}
- {{ theme_macros.breadcrumbs(c.project, c.app) }}
- {% if c.project.neighborhood.icon %}
- <a href="{{c.project.neighborhood.url()}}"><img src="{{c.project.neighborhood.url()}}/icon" class="neighborhood_icon"
- alt="Return to {{c.project.neighborhood.name}}" title="Return to {{c.project.neighborhood.name}}"></a>
- <div class="neighborhood_title">
- <h1><a href="{{c.project.neighborhood.url()}}">{{c.project.neighborhood.name}}</a></h1>
- {% if c.project.neighborhood.project_list_url %}
- <div class="neighborhood_title_link">
- <a href="{{c.project.neighborhood.project_list_url}}">
- View More Projects
- </a>
- </div>
- {% endif %}
- </div>
- {% endif %}
+ {{ theme_macros.breadcrumbs(c.project, c.app) }}
+ {{ theme_macros.project_header_right(c.project, c.app) }}
{% if c.project.user_project_of %}
{{lib.gravatar(c.project.user_project_of, size=48, className='project_icon')}}
{% elif c.project.icon %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a9b8ad9f/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 a493075..61f5e2f 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -96,3 +96,20 @@
</ul>
</nav>
{%- endmacro %}
+
+{%- macro project_header_right(project, app) %}
+ {% if project.neighborhood.icon %}
+ <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>
+ {% if project.neighborhood.project_list_url %}
+ <div class="neighborhood_title_link">
+ <a href="{{project.neighborhood.project_list_url}}">
+ View More Projects
+ </a>
+ </div>
+ {% endif %}
+ </div>
+ {% endif %}
+{%- endmacro %}
\ No newline at end of file