changeset 4194:da9aca2f4aef kallithea-2.2.5-rebrand

Correct support url and naming
author Bradley M. Kuhn <bkuhn@sfconservancy.org>
date Wed, 02 Jul 2014 19:04:50 -0400
parents fe982e5c086c
children 9581233e9275
files kallithea/config/routing.py kallithea/lib/base.py kallithea/templates/base/base.html
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/config/routing.py	Wed Jul 02 19:04:45 2014 -0400
+++ b/kallithea/config/routing.py	Wed Jul 02 19:04:50 2014 -0400
@@ -109,7 +109,7 @@
                  "http://docutils.sourceforge.net/docs/user/rst/quickref.html",
                  _static=True)
     rmap.connect('kallithea_project_url', "https://kallithea-scm.org/", _static=True)
-    rmap.connect('rc_issue_tracker', 'https://bitbucket.org/conservancy/kallithea/issues', _static=True)
+    rmap.connect('issues_url', 'https://bitbucket.org/conservancy/kallithea/issues', _static=True)
 
     #ADMIN REPOSITORY ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
--- a/kallithea/lib/base.py	Wed Jul 02 19:04:45 2014 -0400
+++ b/kallithea/lib/base.py	Wed Jul 02 19:04:50 2014 -0400
@@ -308,7 +308,7 @@
         c.visual.allow_custom_hooks_settings = str2bool(config.get('allow_custom_hooks_settings', True))
 
         c.rhodecode_instanceid = config.get('instance_id')
-        c.rhodecode_bugtracker = config.get('bugtracker', url('rc_issue_tracker'))
+        c.issues_url = config.get('bugtracker', url('issues_url'))
         # END CONFIG VARS
 
         c.repo_name = get_repo_slug(request)  # can be empty
--- a/kallithea/templates/base/base.html	Wed Jul 02 19:04:45 2014 -0400
+++ b/kallithea/templates/base/base.html	Wed Jul 02 19:04:50 2014 -0400
@@ -45,8 +45,8 @@
                %endif
                which is
                <a href="${h.url('about')}#copyright">&copy; 2010&ndash;2014 by various authors &amp; licensed under GPLv3</a>.
-               %if c.rhodecode_bugtracker:
-                   &ndash; <a href="${c.rhodecode_bugtracker}" target="_blank">${_('Support')}</a>
+               %if c.issues_url:
+                   &ndash; <a href="${c.issues_url}" target="_blank">${_('Support')}</a>
                %endif
            </p>
        </div>