You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/02/05 20:36:05 UTC
[1/5] allura git commit: [#8035] Remove url validation for
project_list_url to support relative paths
Repository: allura
Updated Branches:
refs/heads/master b0371e966 -> f83e73147
[#8035] Remove url validation for project_list_url to support relative paths
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/7737e085
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/7737e085
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/7737e085
Branch: refs/heads/master
Commit: 7737e0857df95316cae2f52b9786229a3012c5c9
Parents: b0371e9
Author: Heith Seewald <he...@gmail.com>
Authored: Fri Jan 22 18:47:53 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Feb 5 14:22:25 2016 -0500
----------------------------------------------------------------------
Allura/allura/lib/widgets/forms.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/7737e085/Allura/allura/lib/widgets/forms.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index 5d35788..df5ad84 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -806,7 +806,7 @@ class NeighborhoodOverviewForm(ForgeForm):
validator=V.JsonValidator(if_empty=''))
icon = ew.FileField()
tracking_id = ew.TextField()
- project_list_url = ew.TextField(validator=fev.URL())
+ project_list_url = ew.TextField()
anchored_tools = ffw.AutoResizeTextarea()
prohibited_tools = ffw.AutoResizeTextarea()
[5/5] allura git commit: Use a good default for the global_nav
Posted by br...@apache.org.
Use a good default for the global_nav
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f83e7314
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f83e7314
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f83e7314
Branch: refs/heads/master
Commit: f83e731475c8976380d6a340ebc726630717ddd2
Parents: d057e49
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Feb 5 14:35:59 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Feb 5 14:35:59 2016 -0500
----------------------------------------------------------------------
Allura/development.ini | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/f83e7314/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index e890cd7..bad2383 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -122,6 +122,12 @@ beaker.session.secure = false
; CHANGE THIS VALUE FOR YOUR SITE
beaker.session.validate_key = 714bfe3612c42390726f
+;
+; Settings for global navigation
+;
+; Override this to specify your custom navigation links
+global_nav = [{"title": "Site Home", "url": "/"}]
+
; Google Analytics account for tracking
;ga.account = UA-XXXXX-X
@@ -498,12 +504,6 @@ lcd_timeout = 60
limit_param_max = 500
-;
-; Settings for global navigation
-;
-; Override this to specify your custom navigation links
-; global_nav = [{"title": "Link 1", "url": "http://example.com"}]
-
;
; Settings for the Blog tool
[4/5] allura git commit: [#8046] Make nbhd nav_menu look cleaner and
positioned to the left
Posted by br...@apache.org.
[#8046] Make nbhd nav_menu look cleaner and positioned to the left
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d057e496
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d057e496
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d057e496
Branch: refs/heads/master
Commit: d057e4963cdc8b233d8ecc1651485ae41bf0e895
Parents: 4bad121
Author: Heith Seewald <he...@gmail.com>
Authored: Mon Jan 25 17:43:55 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Feb 5 14:22:26 2016 -0500
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 9 +--------
Allura/allura/templates/jinja_master/master.html | 9 +++++++--
Allura/allura/templates/jinja_master/theme_macros.html | 2 +-
3 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/d057e496/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index fbda348..22998cf 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2133,13 +2133,6 @@ a.sidebar-disabled:focus {
height: 48px;
vertical-align: middle;
}
-.neighborhood_icon_left {
- float: left;
- margin-right: 0.5em;
- width: 48px;
- height: 48px;
- vertical-align: middle;
-}
.neighborhood_block {
margin-bottom: 10px;
@@ -2149,7 +2142,7 @@ a.sidebar-disabled:focus {
.neighborhood_title {
float: right;
- text-align: end;
+ text-align: right;
padding-top: 0.4rem;
}
http://git-wip-us.apache.org/repos/asf/allura/blob/d057e496/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 dbb6dae..f4ec78f 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -88,11 +88,16 @@
{{ theme_macros.site_notification() }}
{% set flash = tg.flash_obj.render('flash', use_js=False) %}
<section id="page-body" class="{{ g.document_class(neighborhood) }}">
- <div id="nav_menu_holder">
+<div id="nav_menu_holder">
+ {% if c.project and c.project.is_nbhd_project %}
+ {% set neighborhood=c.project.neighborhood %}
+ {% include 'allura:templates/jinja_master/neigh_nav_menu.html' with context %}
+ {% else %}
{% block nav_menu %}
{% include g.theme.nav_menu %}
{% endblock %}
- </div>
+ {% endif %}
+</div>
<div id="top_nav" class="">
{% block top_nav %}
{% include g.theme.top_nav %}
http://git-wip-us.apache.org/repos/asf/allura/blob/d057e496/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 8ff8763..2518f58 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -141,8 +141,8 @@ http://stackoverflow.com/questions/26582731/redefining-imported-jinja-macros
View More Projects
</a>
</div>
- </div>
{% endif %}
+ </div>
</div>
{% endif %}
{%- endmacro %}
[2/5] allura git commit: [#8046] Fix style issues for nbhd logo/title
Posted by br...@apache.org.
[#8046] Fix style issues for nbhd logo/title
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/4bad1211
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/4bad1211
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/4bad1211
Branch: refs/heads/master
Commit: 4bad1211525c304b592f0ed2ef0b7fb40ec3c3b4
Parents: 3e24e7d
Author: Heith Seewald <he...@gmail.com>
Authored: Fri Jan 22 19:29:09 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Feb 5 14:22:26 2016 -0500
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 29 +++++++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/4bad1211/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 885d948..fbda348 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2133,6 +2133,35 @@ a.sidebar-disabled:focus {
height: 48px;
vertical-align: middle;
}
+.neighborhood_icon_left {
+ float: left;
+ margin-right: 0.5em;
+ width: 48px;
+ height: 48px;
+ vertical-align: middle;
+}
+
+.neighborhood_block {
+ margin-bottom: 10px;
+ float: right;
+ z-index: 0;
+}
+
+.neighborhood_title {
+ float: right;
+ text-align: end;
+ padding-top: 0.4rem;
+}
+
+.neighborhood_title h3 {
+ font-size: x-large;
+ margin-bottom: 0.4rem;
+}
+
+.neighborhood_title_link {
+ float: right;
+ font-style: italic;
+}
#top_nav {
background-color: #f8f8f8;
[3/5] allura git commit: [#8046] Fix duplicate titles on neighborhood
pages
Posted by br...@apache.org.
[#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 <he...@gmail.com>
Authored: Fri Jan 22 19:28:25 2016 -0500
Committer: Dave Brondsema <da...@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 %}