diff --git a/wiki/request.py b/wiki/request.py index b130d214..62845603 100644 --- a/wiki/request.py +++ b/wiki/request.py @@ -937,7 +937,7 @@ space between words. Group page name is not allowed.""") % self.user.name #### DEBUT HACK : pour le www, on redirige vers du www if self.remote_addr in self.cfg.ip_url_replace.keys(): - url = url.replace(self.cfg.ip_url_replace[self.remote_addr][0],self.cfg.ip-url_replace[self.remote_addr][1]) + url = url.replace(self.cfg.ip_url_replace[self.remote_addr][0],self.cfg.ip_url_replace[self.remote_addr][1]) #### FIN DU HACK self.http_headers(["Status: 302", "Location: %s" % url]) diff --git a/wiki/static/crans-www/css/screen.css b/wiki/static/crans-www/css/screen.css index 8183373d..2570fb8a 100644 --- a/wiki/static/crans-www/css/screen.css +++ b/wiki/static/crans-www/css/screen.css @@ -34,7 +34,7 @@ pre { #message { background:transparent url(../img/translucide2.png) repeat; border:1px solid #232323; - margin:0 auto; + margin:1em auto; padding:5px; } diff --git a/wiki/theme/crans-www.py b/wiki/theme/crans-www.py index 127da90b..df943dcc 100644 --- a/wiki/theme/crans-www.py +++ b/wiki/theme/crans-www.py @@ -62,14 +62,6 @@ class Theme(ThemeBase): making sure the main content arrives first. """ parent = d['page'].getParentPage() - html = [ - u'
', - self.logo(), - u'
', - self.startPage(), - self.msg(d) - ] - title = [ self.title(d)[:-6], # On enlève parent and wikiutil.link_tag(self.request, @@ -77,10 +69,17 @@ class Theme(ThemeBase): u'Haut') or u'', u'' ] + html = [ + u'
', + self.logo(), + u'
', + self.startPage(), + ] + if d['page'].page_name != 'VieCrans' : html += title - + html += [self.msg(d)] return u'\n'.join(html) def footer(self, d, **keywords):