You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/04/08 23:11:15 UTC
git commit: [#3699] Removed title casing of mount_label
Updated Branches:
refs/heads/cj/3699 [created] 2adba9d29
[#3699] Removed title casing of mount_label
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2adba9d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2adba9d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2adba9d2
Branch: refs/heads/cj/3699
Commit: 2adba9d294e033b44e4851f366150429bc23d847
Parents: b08571f
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Mon Apr 8 21:10:49 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Mon Apr 8 21:10:49 2013 +0000
----------------------------------------------------------------------
Allura/allura/ext/project_home/project_main.py | 2 +-
Allura/allura/lib/repository.py | 4 ++--
.../templates/jinja_master/sidebar_menu.html | 2 +-
ForgeBlog/forgeblog/main.py | 4 ++--
ForgeChat/forgechat/main.py | 4 ++--
ForgeDiscussion/forgediscussion/forum_main.py | 4 ++--
ForgeLink/forgelink/link_main.py | 2 +-
ForgeShortUrl/forgeshorturl/main.py | 2 +-
ForgeTracker/forgetracker/tracker_main.py | 4 ++--
ForgeUserStats/forgeuserstats/main.py | 4 ++--
ForgeWiki/forgewiki/wiki_main.py | 4 ++--
11 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2adba9d2/Allura/allura/ext/project_home/project_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/project_home/project_main.py b/Allura/allura/ext/project_home/project_main.py
index 70c781d..ace0ddc 100644
--- a/Allura/allura/ext/project_home/project_main.py
+++ b/Allura/allura/ext/project_home/project_main.py
@@ -41,7 +41,7 @@ class ProjectHomeApp(Application):
:return: a list of :class:`SitemapEntries <allura.app.SitemapEntry>`
'''
return [ SitemapEntry(
- self.config.options.mount_label.title(),
+ self.config.options.mount_label,
'..')]
@property
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2adba9d2/Allura/allura/lib/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/repository.py b/Allura/allura/lib/repository.py
index 79a6b33..401c71d 100644
--- a/Allura/allura/lib/repository.py
+++ b/Allura/allura/lib/repository.py
@@ -55,13 +55,13 @@ class RepositoryApp(Application):
:return: a list of :class:`SitemapEntries <allura.app.SitemapEntry>`
'''
return [ SitemapEntry(
- self.config.options.mount_label.title(),
+ self.config.options.mount_label,
'.')]
@property
@h.exceptionless([], log)
def sitemap(self):
- menu_id = self.config.options.mount_label.title()
+ menu_id = self.config.options.mount_label
with h.push_config(c, app=self):
return [
SitemapEntry(menu_id, '.')[self.sidebar_menu()] ]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2adba9d2/Allura/allura/templates/jinja_master/sidebar_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/sidebar_menu.html b/Allura/allura/templates/jinja_master/sidebar_menu.html
index 651ed77..e7ffdd9 100644
--- a/Allura/allura/templates/jinja_master/sidebar_menu.html
+++ b/Allura/allura/templates/jinja_master/sidebar_menu.html
@@ -22,7 +22,7 @@
<div id="sidebar">
{% if c.app and c.app.searchable %}
<form id="search" method="GET" action="{{c.app.url + 'search/'}}">
- <input name="q" type="text" title="Search {{c.app.config.options.mount_point.title()}}" placeholder="Search {{c.app.config.options.mount_point.title()}}">
+ <input name="q" type="text" title="Search {{c.app.config.options.mount_label}}" placeholder="Search {{c.app.config.options.mount_label}}">
</form>
{% else %}
<div> </div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2adba9d2/ForgeBlog/forgeblog/main.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py
index 1cfd96a..14cf2c2 100644
--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -96,12 +96,12 @@ class ForgeBlogApp(Application):
session(globals).flush()
def main_menu(self):
- return [SitemapEntry(self.config.options.mount_label.title(), '.')]
+ return [SitemapEntry(self.config.options.mount_label, '.')]
@property
@h.exceptionless([], log)
def sitemap(self):
- menu_id = self.config.options.mount_label.title()
+ menu_id = self.config.options.mount_label
with h.push_config(c, app=self):
return [
SitemapEntry(menu_id, '.')[self.sidebar_menu()] ]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2adba9d2/ForgeChat/forgechat/main.py
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/main.py b/ForgeChat/forgechat/main.py
index 6d2eb9a..4b411d6 100644
--- a/ForgeChat/forgechat/main.py
+++ b/ForgeChat/forgechat/main.py
@@ -52,12 +52,12 @@ class ForgeChatApp(Application):
self.admin = AdminController(self)
def main_menu(self):
- return [SitemapEntry(self.config.options.mount_label.title(), '.')]
+ return [SitemapEntry(self.config.options.mount_label, '.')]
@property
@h.exceptionless([], log)
def sitemap(self):
- menu_id = self.config.options.mount_label.title()
+ menu_id = self.config.options.mount_label
with h.push_config(c, app=self):
return [
SitemapEntry(menu_id, '.')[self.sidebar_menu()] ]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2adba9d2/ForgeDiscussion/forgediscussion/forum_main.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/forum_main.py b/ForgeDiscussion/forgediscussion/forum_main.py
index c7f1361..85daf3c 100644
--- a/ForgeDiscussion/forgediscussion/forum_main.py
+++ b/ForgeDiscussion/forgediscussion/forum_main.py
@@ -88,13 +88,13 @@ class ForgeDiscussionApp(Application):
:return: a list of :class:`SitemapEntries <allura.app.SitemapEntry>`
'''
return [ SitemapEntry(
- self.config.options.mount_label.title(),
+ self.config.options.mount_label,
'.')]
@property
@h.exceptionless([], log)
def sitemap(self):
- menu_id = self.config.options.mount_label.title()
+ menu_id = self.config.options.mount_label
with h.push_config(c, app=self):
return [
SitemapEntry(menu_id, '.')[self.sidebar_menu()] ]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2adba9d2/ForgeLink/forgelink/link_main.py
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/link_main.py b/ForgeLink/forgelink/link_main.py
index a6128f5..1c7b7b9 100644
--- a/ForgeLink/forgelink/link_main.py
+++ b/ForgeLink/forgelink/link_main.py
@@ -47,7 +47,7 @@ class ForgeLinkApp(Application):
@property
@h.exceptionless([], log)
def sitemap(self):
- menu_id = self.config.options.mount_label.title()
+ menu_id = self.config.options.mount_label
return [SitemapEntry(menu_id, '.')[self.sidebar_menu()] ]
def sidebar_menu(self):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2adba9d2/ForgeShortUrl/forgeshorturl/main.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/main.py b/ForgeShortUrl/forgeshorturl/main.py
index 53d96c8..7cad8a7 100644
--- a/ForgeShortUrl/forgeshorturl/main.py
+++ b/ForgeShortUrl/forgeshorturl/main.py
@@ -64,7 +64,7 @@ class ForgeShortUrlApp(Application):
@property
@h.exceptionless([], log)
def sitemap(self):
- menu_id = self.config.options.mount_label.title()
+ menu_id = self.config.options.mount_label
return [SitemapEntry(menu_id, '.')[self.sidebar_menu()]]
def sidebar_menu(self):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2adba9d2/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 7cde33e..b44cff0 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -196,13 +196,13 @@ class ForgeTrackerApp(Application):
:return: a list of :class:`SitemapEntries <allura.app.SitemapEntry>`
'''
return [ SitemapEntry(
- self.config.options.mount_label.title(),
+ self.config.options.mount_label,
'.')]
@property
@h.exceptionless([], log)
def sitemap(self):
- menu_id = self.config.options.mount_label.title()
+ menu_id = self.config.options.mount_label
with h.push_config(c, app=self):
return [
SitemapEntry(menu_id, '.')[self.sidebar_menu()] ]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2adba9d2/ForgeUserStats/forgeuserstats/main.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/main.py b/ForgeUserStats/forgeuserstats/main.py
index 194c7d6..95bfbfa 100644
--- a/ForgeUserStats/forgeuserstats/main.py
+++ b/ForgeUserStats/forgeuserstats/main.py
@@ -96,12 +96,12 @@ class ForgeUserStatsApp(Application):
M.ACE.allow(role_admin, 'admin')]
def main_menu(self):
- return [SitemapEntry(self.config.options.mount_label.title(), '.')]
+ return [SitemapEntry(self.config.options.mount_label, '.')]
@property
@h.exceptionless([], log)
def sitemap(self):
- menu_id = self.config.options.mount_label.title()
+ menu_id = self.config.options.mount_label
with h.push_config(c, app=self):
return [
SitemapEntry(menu_id, '.')[self.sidebar_menu()] ]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2adba9d2/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index be11731..219fe00 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -141,13 +141,13 @@ class ForgeWikiApp(Application):
:return: a list of :class:`SitemapEntries <allura.app.SitemapEntry>`
'''
return [ SitemapEntry(
- self.config.options.mount_label.title(),
+ self.config.options.mount_label,
'.')]
@property
@h.exceptionless([], log)
def sitemap(self):
- menu_id = self.config.options.mount_label.title()
+ menu_id = self.config.options.mount_label
with h.push_config(c, app=self):
pages = [
SitemapEntry(p.title, p.url())