launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #13067
[Merge] lp:~rvb/maas/fix-favicon into lp:maas
Raphaël Badin has proposed merging lp:~rvb/maas/fix-favicon into lp:maas.
Commit message:
Add reference to favicon.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~rvb/maas/fix-favicon/+merge/128354
Add reference to favicon. Instead of assuming that the favicon will be picked up in the default location (http://host/favicon.ico), use an explicit location. This is required so that the packaged version (which uses a 'MAAS/' prefix) will have the favicon.
--
https://code.launchpad.net/~rvb/maas/fix-favicon/+merge/128354
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/fix-favicon into lp:maas.
=== modified file 'src/maasserver/middleware.py'
--- src/maasserver/middleware.py 2012-08-16 07:32:11 +0000
+++ src/maasserver/middleware.py 2012-10-06 14:02:23 +0000
@@ -79,7 +79,6 @@
reverse('combo-raphael'),
# Static resources are publicly visible.
settings.STATIC_URL,
- reverse('favicon'),
reverse('robots'),
reverse('api-doc'),
# Metadata service is for use by nodes; no login.
=== modified file 'src/maasserver/templates/maasserver/base.html'
--- src/maasserver/templates/maasserver/base.html 2012-08-03 16:36:26 +0000
+++ src/maasserver/templates/maasserver/base.html 2012-10-06 14:02:23 +0000
@@ -3,6 +3,7 @@
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="en-us" />
+ <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico"/>
<link rel="stylesheet" href="{% url "combo-maas" %}?{{ CSS_LIST|join:"&" }}" />
<title>{% block title %}{% endblock %} | {% include "maasserver/site_title.html" %}</title>
{% block js-conf %}{% include "maasserver/js-conf.html" %}{% endblock %}
=== modified file 'src/maasserver/urls.py'
--- src/maasserver/urls.py 2012-10-03 07:47:24 +0000
+++ src/maasserver/urls.py 2012-10-06 14:02:23 +0000
@@ -78,9 +78,6 @@
r'^robots\.txt$', direct_to_template,
{'template': 'maasserver/robots.txt', 'mimetype': 'text/plain'},
name='robots'),
- url(
- r'^favicon\.ico$', redirect_to, {'url': '/static/img/favicon.ico'},
- name='favicon'),
)
## URLs for logged-in users.
Follow ups
