diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-19 14:04:56 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-19 14:04:56 -0600 |
| commit | 5bb37b94801263a8954bac93d33b0da15c85e96f (patch) | |
| tree | b8960ac6f5f89a4f73d047075f8fcaf9aac6f86c | |
| parent | 1bc231c766c41f61aee6d91c631bd972426b277b (diff) | |
| parent | 3c0411f51f43ade8c7d47df4f3843fd79d4709b5 (diff) | |
| download | mediagoblin-5bb37b94801263a8954bac93d33b0da15c85e96f.tar.lz mediagoblin-5bb37b94801263a8954bac93d33b0da15c85e96f.tar.xz mediagoblin-5bb37b94801263a8954bac93d33b0da15c85e96f.zip | |
Merge remote branch 'remotes/inconexo/613_custom_title'
| -rw-r--r-- | mediagoblin/config_spec.ini | 3 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 4d412346..eef6f6e0 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -1,4 +1,7 @@ [mediagoblin] +# HTML title of the pages +html_title = string(default="GNU MediaGoblin") + # database stuff db_host = string() db_name = string(default="mediagoblin") diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 925386e5..0d6b9e40 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -19,7 +19,7 @@ <html> <head> <meta charset="utf-8"> - <title>{% block title %}{% trans %}GNU MediaGoblin{% endtrans %}{% endblock title %}</title> + <title>{{ app_config['html_title'] }}</title> <link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/extlib/reset.css') }}"/> <link rel="stylesheet" type="text/css" |