kallithea Changeset - 5256b255269a

Changeset - 5256b255269a

Parent rev.

Child rev.

[Not reviewed]

beta

1 2 0

Marcin Kuzminski - 15 years ago 2011-01-31 23:28:21
marcin@python-works.com

removed obsolete css from 404 page, and implemented rhodecode title app in the error page

3 files changed with 3 insertions and 36 deletions:

rhodecode/controllers/error.py

rhodecode/templates/errors/error_404.html

rhodecode/templates/errors/error_document.html

0 comments (0 inline, 0 general)

rhodecode/controllers/error.py

➞

Show inline comments

@@ @@ -20,47 +20,48 @@ @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
 import cgi
 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
 from rhodecode.lib.base import BaseController, render
 log = logging.getLogger(__name__)
 class ErrorController(BaseController):
     """Generates error documents as and when they are required.
     The ErrorDocuments middleware forwards to ErrorController when error
     related status codes are returned from the application.
     This behavior can be altered by changing the parameters to the
     ErrorDocuments middleware in your config/middleware.py file.
     """
     def __before__(self):
         pass#disable all base actions since we don't need them here
     def document(self):
         resp = request.environ.get('pylons.original_response')
         c.rhodecode_name = config.get('rhodecode_title')
         log.debug('### %s ###', resp.status)
         e = request.environ
         c.serv_p = r'%(protocol)s://%(host)s/' % {
                                                 'protocol': e.get('wsgi.url_scheme'),
                                                 'host':e.get('HTTP_HOST'),
+                                                }
         c.error_message = cgi.escape(request.GET.get('code', str(resp.status)))
         c.error_explanation = self.get_error_explanation(resp.status_int)

rhodecode/templates/errors/error_404.html

➞

Show inline comments

deleted file

rhodecode/templates/errors/error_document.html

➞

Show inline comments

@@ @@ -2,51 +2,49 @@ @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
     <head>
         <title>Error - ${c.error_message}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 	    %if c.redirect_time:
 	        <meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/>
 	    %endif
         <link rel="icon" href="/images/hgicon.png" type="image/png" />
         <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;
 	       width: 500px;
 	       margin: auto;
 	       text-align: center;
 	       margin-top: 200px;
 	       font-size: 1.6em;
+	     }
 	     .error_message{
 	        text-align: center;
 	        color:#003367;
 	        font-size: 1.6em;
 	        margin:10px;
+	     }
 	    </style>
     </head>
     <body>
         <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>
 			        %if c.redirect_time:
 			            <p>${_('You will be redirected to %s in %s seconds') % (c.redirect_module,c.redirect_time)}</p>
 				    %endif
 				</div>
             </div>
             <!-- end login -->
         </div>

0 comments (0 inline, 0 general)