kallithea Changeset - a12aef38b8b0

Changeset - a12aef38b8b0

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 11 years ago 2015-01-06 00:54:36
madski@unity3d.com

error: remove allmost unused code for redirect on error page

It is much better to just stop and show the error message.

2 files changed with 0 insertions and 13 deletions:

kallithea/controllers/error.py

kallithea/templates/errors/error_document.html

0 comments (0 inline, 0 general)

kallithea/controllers/error.py

➞

Show inline comments

@@ @@ -64,17 +64,12 @@ class ErrorController(BaseController): @@
                                     % {'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)
         #  redirect to when error with given seconds
         c.redirect_time = 0
         c.redirect_module = _('Home page')
         c.url_redirect = "/"
         return render('/errors/error_document.html')
     def img(self, id):
         """Serve Pylons' stock images"""
         return self._serve_file(os.path.join(media_path, 'img', id))

kallithea/templates/errors/error_document.html

➞

Show inline comments

@@ @@ -5,15 +5,12 @@ @@
         <title>Error - ${c.error_message}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <meta name="robots" content="index, nofollow"/>
         <link rel="icon" href="${h.url('/images/favicon.ico')}" type="image/png" />
         <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
         <!-- stylesheets -->
         <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen"/>
         <link rel="stylesheet" type="text/css" href="${h.url('/css/contextbar.css')}" media="screen"/>
         <style type="text/css">
          #main_div{
@@ @@ -40,17 +37,12 @@ @@
                 <div id="main_div">
                     <div style="font-size:2.0em;margin: 10px">${c.site_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>
     </body>
 </html>

0 comments (0 inline, 0 general)