[snapshot/master] use concise g.*domain variables instead of config[][] within controllers and templates
---
web/app/snapshot/controllers/archive.py | 2 +-
web/app/snapshot/controllers/package.py | 2 +-
web/app/snapshot/controllers/removal.py | 2 +-
web/app/snapshot/controllers/root.py | 2 +-
web/app/snapshot/templates/page.mako | 6 +++---
web/app/snapshot/templates/root.mako | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/web/app/snapshot/controllers/archive.py b/web/app/snapshot/controllers/archive.py
index e29029d..4504247 100644
--- a/web/app/snapshot/controllers/archive.py
+++ b/web/app/snapshot/controllers/archive.py
@@ -131,7 +131,7 @@ class ArchiveController(BaseController):
crumbs = []
url = request.environ.get('SCRIPT_NAME') + "/"
- crumbs.append( { 'url': url, 'name': config['app_conf']['snapshot.domain'], 'sep': '|' });
+ crumbs.append( { 'url': url, 'name': g.domain, 'sep': '|' });
crumbs.append( { 'url': None, 'name': 'archive:', 'sep': '' });
diff --git a/web/app/snapshot/controllers/package.py b/web/app/snapshot/controllers/package.py
index 747e848..6979210 100644
--- a/web/app/snapshot/controllers/package.py
+++ b/web/app/snapshot/controllers/package.py
@@ -31,7 +31,7 @@ class PackageController(BaseController):
crumbs = []
url = urllib.quote(request.environ.get('SCRIPT_NAME')) + "/"
- crumbs.append( { 'url': url, 'name': config['app_conf']['snapshot.domain'], 'sep': '|' });
+ crumbs.append( { 'url': url, 'name': g.domain, 'sep': '|' });
if is_binary:
crumbs.append( { 'url': None, 'name': 'binary package:', 'sep': '' });
diff --git a/web/app/snapshot/controllers/removal.py b/web/app/snapshot/controllers/removal.py
index 7a4873c..6943386 100644
--- a/web/app/snapshot/controllers/removal.py
+++ b/web/app/snapshot/controllers/removal.py
@@ -29,7 +29,7 @@ class RemovalController(BaseController):
crumbs = []
url = urllib.quote(request.environ.get('SCRIPT_NAME')) + "/"
- crumbs.append( { 'url': url, 'name': config['app_conf']['snapshot.domain'], 'sep': '|' });
+ crumbs.append( { 'url': url, 'name': g.domain, 'sep': '|' });
url += 'removal/'
crumbs.append( { 'url': url, 'name': 'removal' });
diff --git a/web/app/snapshot/controllers/root.py b/web/app/snapshot/controllers/root.py
index 3f3448c..42744cd 100644
--- a/web/app/snapshot/controllers/root.py
+++ b/web/app/snapshot/controllers/root.py
@@ -28,7 +28,7 @@ class RootController(BaseController):
crumbs = []
url = urllib.quote(request.environ.get('SCRIPT_NAME')) + "/"
- crumbs.append( { 'url': url, 'name': config['app_conf']['snapshot.domain'] });
+ crumbs.append( { 'url': url, 'name': g.domain });
if not page is None:
crumbs.append( { 'url': None, 'name': page, 'sep': '' });
diff --git a/web/app/snapshot/templates/page.mako b/web/app/snapshot/templates/page.mako
index 6e10775..1d38b53 100644
--- a/web/app/snapshot/templates/page.mako
+++ b/web/app/snapshot/templates/page.mako
@@ -3,16 +3,16 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
% if c.title == "":
- <title>${config['app_conf']['snapshot.domain']}</title>
+ <title>${g.domain}</title>
% else:
- <title>${c.title} - ${config['app_conf']['snapshot.domain']}</title>
+ <title>${c.title} - ${g.domain}</title>
% endif
<link rel="stylesheet" type="text/css" href="/static/style.css" />
<link rel="icon" type="image/vnd.microsoft.icon" href="/static/favicon.ico" />
</head>
<body>
<div id="top">
- <a id="logo" href="http://${config['app_conf']['snapshot.domain']}"><img src="/static/images/top.png" alt="${config['app_conf']['snapshot.domain']}" width="644" height="71"/></a>
+ <a id="logo" href="http://${g.domain}";><img src="/static/images/top.png" alt="${g.domain}" width="644" height="71"/></a>
</div>
% if not c.breadcrumbs is UNDEFINED and (len(c.breadcrumbs) != 0):
<div id="pageheader">
diff --git a/web/app/snapshot/templates/root.mako b/web/app/snapshot/templates/root.mako
index 0ceeb6a..9f03982 100644
--- a/web/app/snapshot/templates/root.mako
+++ b/web/app/snapshot/templates/root.mako
@@ -46,7 +46,7 @@ Search in the index of source packages:<br />
<li><a href="oldnews">older news</a></li>
<li><a href="http://lists.debian.org/debian-snapshot/";>mailinglist</a></li>
<li><a href="http://git.debian.org/?p=mirror/snapshot.debian.org.git;a=blob_plain;f=API";>machine-usable interface</a></li>
- <li><a href="http://${config['app_conf']['snapshot.masterdomain']}/removal">removal logs</a></li>
+ <li><a href="http://${g.masterdomain}/removal";>removal logs</a></li>
</ul>
</td>
--
1.5.6.5
Reply to: