kallithea Changeset - 0e6035a85980

Changeset - 0e6035a85980

Parent rev.

Child rev.

[Not reviewed]

beta

3 5 0

Marcin Kuzminski - 15 years ago 2011-03-17 03:04:17
marcin@python-works.com

added changes made in production branch back into beta

8 files changed with 12 insertions and 849 deletions:

MANIFEST.in

init.d/celeryd

224

rhodecode/config/routing.py

rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo

bin+del

rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po

619

rhodecode/public/css/style.css

rhodecode/templates/base/base.html

setup.py

0 comments (0 inline, 0 general)

MANIFEST.in

➞

Show inline comments

 include rhodecode/config/deployment.ini_tmpl
 include rhodecode/lib/dbmigrate/migrate.cfg
 include README.rst
 recursive-include rhodecode/i18n *
 #docs
 recursive-include docs *
 #init.d
 recursive-include init.d *
 #images
 recursive-include rhodecode/public/css *
 recursive-include rhodecode/public/images *
 #js
 include rhodecode/public/js/yui2a.js
 include rhodecode/public/js/excanvas.min.js
 include rhodecode/public/js/yui.flot.js
 include rhodecode/public/js/graph.js
 #templates
 recursive-include rhodecode/templates *

init.d/celeryd

➞

Show inline comments

deleted file

rhodecode/config/routing.py

➞

Show inline comments

@@ @@ -27,27 +27,29 @@ def make_map(config): @@
         return not cr(repo_name, config['base_path'])
     # The ErrorController route (handles 404/500 error pages); it should
     # likely stay at the top, ensuring it can always be resolved
     routes_map.connect('/error/{action}', controller='error')
     routes_map.connect('/error/{action}/{id}', controller='error')
     #==========================================================================
     # CUSTOM ROUTES HERE
     #==========================================================================
     #MAIN PAGE
     routes_map.connect('home', '/', controller='home', action='index')
     routes_map.connect('bugtracker', "http://bitbucket.org/marcinkuzminski/rhodecode/issues", _static=True)
     routes_map.connect('gpl_license', "http://www.gnu.org/licenses/gpl.html", _static=True)
     map.connect('home', '/', controller='home', action='index')
     map.connect('bugtracker', "http://bitbucket.org/marcinkuzminski/rhodecode/issues", _static=True)
     map.connect('gpl_license', "http://www.gnu.org/licenses/gpl.html", _static=True)
     map.connect('rhodecode_official', "http://rhodecode.org", _static=True)
     #ADMIN REPOSITORY REST ROUTES
     with routes_map.submapper(path_prefix='/_admin', controller='admin/repos') as m:
         m.connect("repos", "/repos",
              action="create", conditions=dict(method=["POST"]))
         m.connect("repos", "/repos",
              action="index", conditions=dict(method=["GET"]))
         m.connect("formatted_repos", "/repos.{format}",
              action="index",
             conditions=dict(method=["GET"]))
         m.connect("new_repo", "/repos/new",
              action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_repo", "/repos/new.{format}",

rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo

➞

Show inline comments

		deleted file
		binary diff not shown

rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po

➞

Show inline comments

deleted file

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1274,25 +1274,25 @@ background:url("../images/header_inner.p @@
 border-top:2px solid #FFFFFF;
+}
 #footer div#footer-inner p {
 padding:15px 25px 15px 0;
 color:#FFF;
 font-weight:700;
+}
 #footer div#footer-inner .footer-link {
 float:left;
 padding-left:10px;
+}
 #footer div#footer-inner .footer-link a {
+#footer div#footer-inner .footer-link a,#footer div#footer-inner .footer-link-right a {
 color:#FFF;
+}
 #login div.title {
 width:420px;
 clear:both;
 overflow:hidden;
 position:relative;
 background:#003367 url("../images/header_inner.png") repeat-x;
 margin:0 auto;
 padding:0;
+}

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -88,25 +88,25 @@ @@
 	    <div id="main">
 	        ${next.main()}
 	    </div>
 	</div>
     <!-- END CONTENT -->
 	<!-- footer -->
 	<div id="footer">
 	   <div id="footer-inner" class="title bottom-left-rounded-corner bottom-right-rounded-corner">
 	       <div>
 	           <p class="footer-link">${h.link_to(_('Submit a bug'),h.url('bugtracker'))}</p>
 		       <p class="footer-link">${h.link_to(_('GPL license'),h.url('gpl_license'))}</p>
 		       <p>RhodeCode ${c.rhodecode_version} &copy; 2010-2011 by Marcin Kuzminski</p>
+		       <p class="footer-link-right"><a href="${h.url('rhodecode_official')}">RhodeCode</a> ${c.rhodecode_version} &copy; 2010-2011 by Marcin Kuzminski</p>
 	       </div>
 	   </div>
         <script type="text/javascript">
         function tooltip_activate(){
         ${h.tooltip.activate()}
+        }
         tooltip_activate();
         </script>
 	</div>
 	<!-- end footer -->
 </body>

setup.py

➞

Show inline comments

@@ @@ -69,36 +69,37 @@ except ImportError: @@
 #packages
 packages = find_packages(exclude=['ez_setup'])
 setup(
     name='RhodeCode',
     version=get_version(),
     description=description,
     long_description=long_description,
     keywords=keywords,
     license='BSD',
     author='Marcin Kuzminski',
     author_email='marcin@python-works.com',
-    url='http://hg.python-works.com',
+    url='http://rhodecode.org',
     install_requires=requirements,
     classifiers=classifiers,
     setup_requires=["PasteScript>=1.6.3"],
     data_files=data_files,
     packages=packages,
     include_package_data=True,
     test_suite='nose.collector',
     package_data=package_data,
     message_extractors={'rhodecode': [
             ('**.py', 'python', None),
             ('templates/**.mako', 'mako', {'input_encoding': 'utf-8'}),
             ('templates/**.html', 'mako', {'input_encoding': 'utf-8'}),
             ('public/**', 'ignore', None)]},
     zip_safe=False,
     paster_plugins=['PasteScript', 'Pylons'],
     entry_points="""
     [paste.app_factory]
     main = rhodecode.config.middleware:make_app
     [paste.app_install]
     main = pylons.util:PylonsInstaller
     [paste.global_paster_command]
     make-index = rhodecode.lib.indexers:MakeIndex

0 comments (0 inline, 0 general)