Mercurial > kallithea
changeset 986:5256b255269a beta
removed obsolete css from 404 page, and implemented rhodecode title app in the error page
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 31 Jan 2011 23:28:21 +0100 |
| parents | 4e38b2bc8835 |
| children | cb8a69bca04e |
| files | rhodecode/controllers/error.py rhodecode/templates/errors/error_404.html rhodecode/templates/errors/error_document.html |
| diffstat | 3 files changed, 3 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/error.py Mon Jan 31 23:21:48 2011 +0100 +++ b/rhodecode/controllers/error.py Mon Jan 31 23:28:21 2011 +0100 @@ -29,7 +29,7 @@ import logging import paste.fileapp -from pylons import tmpl_context as c, request +from pylons import tmpl_context as c, request, config from pylons.i18n.translation import _ from pylons.middleware import media_path @@ -52,6 +52,7 @@ def document(self): resp = request.environ.get('pylons.original_response') + c.rhodecode_name = config.get('rhodecode_title') log.debug('### %s ###', resp.status)
--- a/rhodecode/templates/errors/error_404.html Mon Jan 31 23:21:48 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -## -*- coding: utf-8 -*- -<%inherit file="./../base/base.html"/> - -<%def name="title()"> - ${_('Repository not found')} -</%def> - -<%def name="breadcrumbs()"> - ${h.link_to(u'Home',h.url('home'))} - / - ${h.link_to(u'Admin',h.url('admin_home'))} -</%def> - -<%def name="page_nav()"> - ${self.menu('admin')} -</%def> -<%def name="js()"> - -</%def> -<%def name="main()"> - - <h2 class="no-link no-border">${_('Not Found')}</h2> - <p class="normal">${_('The specified repository "%s" is unknown, sorry.') % c.repo_name}</p> - <p class="normal"> - <a href="${h.url('new_repo',repo=c.repo_name_cleaned)}"> - ${_('Create "%s" repository as %s' % (c.repo_name,c.repo_name_cleaned))}</a> - - </p> - <p class="normal">${h.link_to(_('Go back to the main repository list page'),h.url('home'))}</p> - <div class="page-footer"> - </div> -</%def> \ No newline at end of file
--- a/rhodecode/templates/errors/error_document.html Mon Jan 31 23:21:48 2011 +0100 +++ b/rhodecode/templates/errors/error_document.html Mon Jan 31 23:28:21 2011 +0100 @@ -11,9 +11,7 @@ <meta name="robots" content="index, nofollow"/> <!-- stylesheets --> - <link rel="stylesheet" type="text/css" href="/css/reset.css" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen" /> - <link id="color" rel="stylesheet" type="text/css" href="/css/colors/blue.css" /> <style type="text/css"> #main_div{ border: 0px solid #000; @@ -37,7 +35,7 @@ <div id="login"> <div class="table"> <div id="main_div"> - <div style="font-size:2.0em;margin: 10px">RhodeCode</div> + <div style="font-size:2.0em;margin: 10px">${c.rhodecode_name}</div> <h1 class="error_message">${c.error_message}</h1> <p>${c.error_explanation}</p>