Mercurial > kallithea
changeset 4200:102ae2d847cb kallithea-2.2.5-rebrand
Rename rhodecode_version to kallithea_version
author | Bradley M. Kuhn <bkuhn@sfconservancy.org> |
---|---|
date | Wed, 02 Jul 2014 19:05:26 -0400 |
parents | 7436b88cbd89 |
children | bb735ce0ccbb |
files | kallithea/controllers/admin/settings.py kallithea/controllers/api/api.py kallithea/lib/base.py kallithea/lib/dbmigrate/schema/db_1_8_0.py kallithea/lib/dbmigrate/schema/db_2_0_0.py kallithea/lib/dbmigrate/schema/db_2_0_1.py kallithea/lib/dbmigrate/schema/db_2_0_2.py kallithea/lib/dbmigrate/schema/db_2_1_0.py kallithea/lib/dbmigrate/schema/db_2_2_0.py kallithea/lib/dbmigrate/schema/db_2_2_3.py kallithea/model/db.py kallithea/templates/admin/settings/settings_system.html kallithea/templates/base/root.html kallithea/templates/index_base.html |
diffstat | 14 files changed, 26 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/settings.py Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/controllers/admin/settings.py Wed Jul 02 19:05:26 2014 -0400 @@ -351,7 +351,7 @@ test_email = request.POST.get('test_email') test_email_subj = 'RhodeCode test email' test_email_body = ('RhodeCode Email test, ' - 'RhodeCode version: %s' % c.rhodecode_version) + 'RhodeCode version: %s' % c.kallithea_version) if not test_email: h.flash(_('Please enter email address'), category='error') return redirect(url('admin_settings_email'))
--- a/kallithea/controllers/api/api.py Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/controllers/api/api.py Wed Jul 02 19:05:26 2014 -0400 @@ -524,7 +524,7 @@ 'modules': [<module name>,...] 'py_version': <python version>, 'platform': <platform type>, - 'rhodecode_version': <rhodecode version> + 'kallithea_version': <rhodecode version> } error : null """
--- a/kallithea/lib/base.py Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/lib/base.py Wed Jul 02 19:05:26 2014 -0400 @@ -282,7 +282,7 @@ """ __before__ is called before controller methods and after __call__ """ - c.rhodecode_version = __version__ + c.kallithea_version = __version__ rc_config = RhodeCodeSetting.get_app_settings() # Visual options
--- a/kallithea/lib/dbmigrate/schema/db_1_8_0.py Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_8_0.py Wed Jul 02 19:05:26 2014 -0400 @@ -262,7 +262,7 @@ 'modules': sorted(mods, key=lambda k: k[0].lower()), 'py_version': platform.python_version(), 'platform': platform.platform(), - 'rhodecode_version': kallithea.__version__ + 'kallithea_version': kallithea.__version__ } return info
--- a/kallithea/lib/dbmigrate/schema/db_2_0_0.py Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_0_0.py Wed Jul 02 19:05:26 2014 -0400 @@ -307,7 +307,7 @@ 'modules': sorted(mods, key=lambda k: k[0].lower()), 'py_version': platform.python_version(), 'platform': platform.platform(), - 'rhodecode_version': kallithea.__version__, + 'kallithea_version': kallithea.__version__, 'git_version': str(check_git_version()), 'git_path': kallithea.CONFIG.get('git_path') }
--- a/kallithea/lib/dbmigrate/schema/db_2_0_1.py Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_0_1.py Wed Jul 02 19:05:26 2014 -0400 @@ -310,7 +310,7 @@ 'modules': sorted(mods, key=lambda k: k[0].lower()), 'py_version': platform.python_version(), 'platform': safe_unicode(platform.platform()), - 'rhodecode_version': kallithea.__version__, + 'kallithea_version': kallithea.__version__, 'git_version': safe_unicode(check_git_version()), 'git_path': kallithea.CONFIG.get('git_path') }
--- a/kallithea/lib/dbmigrate/schema/db_2_0_2.py Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_0_2.py Wed Jul 02 19:05:26 2014 -0400 @@ -310,7 +310,7 @@ 'modules': sorted(mods, key=lambda k: k[0].lower()), 'py_version': platform.python_version(), 'platform': safe_unicode(platform.platform()), - 'rhodecode_version': kallithea.__version__, + 'kallithea_version': kallithea.__version__, 'git_version': safe_unicode(check_git_version()), 'git_path': kallithea.CONFIG.get('git_path') }
--- a/kallithea/lib/dbmigrate/schema/db_2_1_0.py Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_1_0.py Wed Jul 02 19:05:26 2014 -0400 @@ -313,7 +313,7 @@ 'modules': sorted(mods, key=lambda k: k[0].lower()), 'py_version': platform.python_version(), 'platform': safe_unicode(platform.platform()), - 'rhodecode_version': kallithea.__version__, + 'kallithea_version': kallithea.__version__, 'git_version': safe_unicode(check_git_version()), 'git_path': kallithea.CONFIG.get('git_path') }
--- a/kallithea/lib/dbmigrate/schema/db_2_2_0.py Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_2_0.py Wed Jul 02 19:05:26 2014 -0400 @@ -314,7 +314,7 @@ 'modules': sorted(mods, key=lambda k: k[0].lower()), 'py_version': platform.python_version(), 'platform': safe_unicode(platform.platform()), - 'rhodecode_version': kallithea.__version__, + 'kallithea_version': kallithea.__version__, 'git_version': safe_unicode(check_git_version()), 'git_path': kallithea.CONFIG.get('git_path') }
--- a/kallithea/lib/dbmigrate/schema/db_2_2_3.py Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_2_3.py Wed Jul 02 19:05:26 2014 -0400 @@ -314,7 +314,7 @@ 'modules': sorted(mods, key=lambda k: k[0].lower()), 'py_version': platform.python_version(), 'platform': safe_unicode(platform.platform()), - 'rhodecode_version': kallithea.__version__, + 'kallithea_version': kallithea.__version__, 'git_version': safe_unicode(check_git_version()), 'git_path': kallithea.CONFIG.get('git_path') }
--- a/kallithea/model/db.py Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/model/db.py Wed Jul 02 19:05:26 2014 -0400 @@ -314,7 +314,7 @@ 'modules': sorted(mods, key=lambda k: k[0].lower()), 'py_version': platform.python_version(), 'platform': safe_unicode(platform.platform()), - 'rhodecode_version': kallithea.__version__, + 'kallithea_version': kallithea.__version__, 'git_version': safe_unicode(check_git_version()), 'git_path': kallithea.CONFIG.get('git_path') }
--- a/kallithea/templates/admin/settings/settings_system.html Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/templates/admin/settings/settings_system.html Wed Jul 02 19:05:26 2014 -0400 @@ -1,7 +1,7 @@ <dl class="dl-horizontal"> <% elems = [ - (_('RhodeCode version'), h.literal('%s <b><span style="color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.rhodecode_version, _('check for updates'))), ''), + (_('RhodeCode version'), h.literal('%s <b><span style="color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('check for updates'))), ''), (_('Python version'), c.py_version, ''), (_('Platform'), c.platform, ''), (_('GIT version'), c.git_version, ''),
--- a/kallithea/templates/base/root.html Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/templates/base/root.html Wed Jul 02 19:05:26 2014 -0400 @@ -10,10 +10,10 @@ ## CSS ### <%def name="css()"> - <link rel="stylesheet" type="text/css" href="${h.url('/js/select2/select2.css', ver=c.rhodecode_version)}"/> - <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css', ver=c.rhodecode_version)}"/> - <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css', ver=c.rhodecode_version)}" media="screen"/> - <link rel="stylesheet" type="text/css" href="${h.url('/css/contextbar.css', ver=c.rhodecode_version)}" media="screen"/> + <link rel="stylesheet" type="text/css" href="${h.url('/js/select2/select2.css', ver=c.kallithea_version)}"/> + <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css', ver=c.kallithea_version)}"/> + <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css', ver=c.kallithea_version)}" media="screen"/> + <link rel="stylesheet" type="text/css" href="${h.url('/css/contextbar.css', ver=c.kallithea_version)}" media="screen"/> ## EXTRA FOR CSS ${self.css_extra()} </%def> @@ -81,18 +81,18 @@ var REPO_NAME = "${c.repo_name}"; %endif </script> - <script type="text/javascript" src="${h.url('/js/yui.2.9.js', ver=c.rhodecode_version)}"></script> - <script type="text/javascript" src="${h.url('/js/jquery-1.10.2.min.js', ver=c.rhodecode_version)}"></script> - <script type="text/javascript" src="${h.url('/js/bootstrap.js', ver=c.rhodecode_version)}"></script> - <script type="text/javascript" src="${h.url('/js/select2/select2.js', ver=c.rhodecode_version)}"></script> - <script type="text/javascript" src="${h.url('/js/mousetrap.js', ver=c.rhodecode_version)}"></script> + <script type="text/javascript" src="${h.url('/js/yui.2.9.js', ver=c.kallithea_version)}"></script> + <script type="text/javascript" src="${h.url('/js/jquery-1.10.2.min.js', ver=c.kallithea_version)}"></script> + <script type="text/javascript" src="${h.url('/js/bootstrap.js', ver=c.kallithea_version)}"></script> + <script type="text/javascript" src="${h.url('/js/select2/select2.js', ver=c.kallithea_version)}"></script> + <script type="text/javascript" src="${h.url('/js/mousetrap.js', ver=c.kallithea_version)}"></script> <!--[if lt IE 9]> <script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js')}"></script> <![endif]--> - <script type="text/javascript" src="${h.url('/js/yui.flot.js', ver=c.rhodecode_version)}"></script> - <script type="text/javascript" src="${h.url('/js/native.history.js', ver=c.rhodecode_version)}"></script> - <script type="text/javascript" src="${h.url('/js/pyroutes_map.js', ver=c.rhodecode_version)}"></script> - <script type="text/javascript" src="${h.url('/js/base.js', ver=c.rhodecode_version)}"></script> + <script type="text/javascript" src="${h.url('/js/yui.flot.js', ver=c.kallithea_version)}"></script> + <script type="text/javascript" src="${h.url('/js/native.history.js', ver=c.kallithea_version)}"></script> + <script type="text/javascript" src="${h.url('/js/pyroutes_map.js', ver=c.kallithea_version)}"></script> + <script type="text/javascript" src="${h.url('/js/base.js', ver=c.kallithea_version)}"></script> ## EXTRA FOR JS ${self.js_extra()} <script type="text/javascript">
--- a/kallithea/templates/index_base.html Wed Jul 02 19:05:21 2014 -0400 +++ b/kallithea/templates/index_base.html Wed Jul 02 19:05:26 2014 -0400 @@ -72,7 +72,7 @@ <div style="height: 20px"></div> % endif <div id="welcome" style="display:none;text-align:center"> - <h1><a href="${h.url('home')}">${c.site_name} ${c.rhodecode_version}</a></h1> + <h1><a href="${h.url('home')}">${c.site_name} ${c.kallithea_version}</a></h1> </div> <%cnt=0%> <%namespace name="dt" file="/data_table/_dt_elements.html"/>