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 2013/05/28 21:07:26 UTC
[1/2] git commit: [#5716] add support option for contacting members
Updated Branches:
refs/heads/db/5716 [created] 2ae6de1d2
[#5716] add support option for contacting members
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7d836a6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7d836a6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7d836a6c
Branch: refs/heads/db/5716
Commit: 7d836a6c0de67939bfde2cad286367dc16de2c97
Parents: 82f675f
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue May 28 19:03:29 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue May 28 19:03:29 2013 +0000
----------------------------------------------------------------------
.../templates/admin_widgets/metadata_admin.html | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7d836a6c/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
index ff60ab3..c21bce8 100644
--- a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
@@ -41,7 +41,7 @@
{{widget.display_field(widget.fields.short_description) }}
<div style="clear:both"> </div>
- Support Page:
+ Preferred Support Page (for users of your project):
<br>
<input name="support_page" type="radio" value=""{% if value.support_page == '' %} checked{% endif %} id="support_page_none">
<label for="support_page_none">None</label><br>
@@ -52,6 +52,8 @@
<label for="support_page_{{ac.options.mount_point}}">{{ac.options.mount_label}}</label><br>
{% endif %}
{% endfor %}
+ <input name="support_page" type="radio" value="_members" {% if value.support_page == '_members' %} checked{% endif %} id="support_page_members">
+ <label for="support_page_members">Contact project admins</label><br>
<input name="support_page" type="radio" value="_url" id="support_page_url_cb"
{% if value.support_page == '_url' %} checked{% endif %}>
<label for="support_page_url_cb">URL: </label>
[2/2] git commit: [#5716] expose tool type in _nav.json
Posted by br...@apache.org.
[#5716] expose tool type in _nav.json
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2ae6de1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2ae6de1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2ae6de1d
Branch: refs/heads/db/5716
Commit: 2ae6de1d2709785164af8b5529fd30068066f1c8
Parents: 7d836a6
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue May 28 19:07:16 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue May 28 19:07:16 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/project.py | 5 +++--
Allura/allura/tests/functional/test_home.py | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2ae6de1d/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index cc80ad3..da39e5d 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -311,9 +311,10 @@ class ProjectController(FeedController):
def _nav(self):
menu = []
for s in c.project.grouped_navbar_entries():
- entry = dict(name=s.label, url=s.url, icon=s.ui_icon)
+ entry = dict(name=s.label, url=s.url, icon=s.ui_icon, tool_name=s.tool_name)
if s.children:
- entry['children'] = [dict(name=child.label, url=child.url, icon=child.ui_icon) for child in s.children]
+ entry['children'] = [dict(name=child.label, url=child.url, icon=child.ui_icon, tool_name=child.tool_name)
+ for child in s.children]
menu.append(entry)
return dict(menu=menu)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2ae6de1d/Allura/allura/tests/functional/test_home.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_home.py b/Allura/allura/tests/functional/test_home.py
index 3e11437..5e9ec2e 100644
--- a/Allura/allura/tests/functional/test_home.py
+++ b/Allura/allura/tests/functional/test_home.py
@@ -50,8 +50,8 @@ class TestProjectHome(TestController):
response = self.app.get('/p/test/_nav.json')
menu = response.json['menu']
assert_equal(len(menu[1]['children']), 2)
- assert {u'url': u'/p/test/wiki/', u'name': u'Wiki', u'icon': u'tool-wiki'} in menu[1]['children'], menu[1]['children']
- assert {u'url': u'/p/test/wiki2/', u'name': u'wiki2', u'icon': u'tool-wiki'} in menu[1]['children'], menu[1]['children']
+ assert {u'url': u'/p/test/wiki/', u'name': u'Wiki', u'icon': u'tool-wiki', 'tool_name': 'wiki'} in menu[1]['children'], menu[1]['children']
+ assert {u'url': u'/p/test/wiki2/', u'name': u'wiki2', u'icon': u'tool-wiki', 'tool_name': 'wiki'} in menu[1]['children'], menu[1]['children']
@td.with_wiki
def test_project_group_nav_more_than_ten(self):
@@ -65,7 +65,7 @@ class TestProjectHome(TestController):
response = self.app.get('/p/test/_nav.json')
menu = response.json['menu']
assert_equal(len(menu[1]['children']), 11)
- assert {u'url': u'/p/test/_list/wiki', u'name': u'More...', u'icon': u'tool-wiki'} in menu[1]['children']
+ assert {u'url': u'/p/test/_list/wiki', u'name': u'More...', u'icon': u'tool-wiki', 'tool_name': 'wiki'} in menu[1]['children']
@td.with_wiki
def test_neighborhood_home(self):