MAAS

Merge ~ltrager/maas:favicon into maas:master

  1. Git
  2. lp:~ltrager/maas
  3. favicon
  4. Merge into master
Proposed by Lee Trager
Status: Merged
Approved by: Lee Trager
Approved revision: fb81a8d9f6935507f5b4ee488ad93c1dcfd8cd61
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ltrager/maas:favicon
Merge into: maas:master
Diff against target: 30 lines (+2/-2)
2 files modified
src/maasserver/templates/maasserver/base.html (+1/-1)
src/maasserver/templates/maasserver/index.html (+1/-1)
Reviewer Review Type Date Requested Status
Newell Jensen (community) Approve
Review via email: mp+342690@code.launchpad.net

Commit message

LP: #1738127 Add favicon to the UI

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/static/assets/images/icons/maas-favicon-32px.png b/src/maasserver/static/assets/images/icons/maas-favicon-32px.png
0new file mode 1006440new file mode 100644
index 0000000..d4d6e2f
1Binary files /dev/null and b/src/maasserver/static/assets/images/icons/maas-favicon-32px.png differ1Binary files /dev/null and b/src/maasserver/static/assets/images/icons/maas-favicon-32px.png differ
diff --git a/src/maasserver/templates/maasserver/base.html b/src/maasserver/templates/maasserver/base.html
index 3bf942b..8afbaa1 100755
--- a/src/maasserver/templates/maasserver/base.html
+++ b/src/maasserver/templates/maasserver/base.html
@@ -14,7 +14,7 @@
14 <base href="{% url 'index' %}">14 <base href="{% url 'index' %}">
15 <title>{% block title %}{% endblock %} | {% include "maasserver/site_title.html" %}</title>15 <title>{% block title %}{% endblock %} | {% include "maasserver/site_title.html" %}</title>
1616
17 <link rel="shortcut icon" href="{{ STATIC_URL }}assets/images/logos/favicon.ico">17 <link rel="shortcut icon" href="{{ STATIC_URL }}assets/images/icons/maas-favicon-32px.png">
1818
19 <!-- stylesheets -->19 <!-- stylesheets -->
20 {% block css-conf %}20 {% block css-conf %}
diff --git a/src/maasserver/templates/maasserver/index.html b/src/maasserver/templates/maasserver/index.html
index bc6e679..a9c03cf 100755
--- a/src/maasserver/templates/maasserver/index.html
+++ b/src/maasserver/templates/maasserver/index.html
@@ -14,7 +14,7 @@
14 <base href="{% url 'index' %}">14 <base href="{% url 'index' %}">
15 <title data-ng-bind="title + ' | ' + site + ' MAAS'"></title>15 <title data-ng-bind="title + ' | ' + site + ' MAAS'"></title>
1616
17 <link rel="shortcut icon" href="{{ STATIC_URL }}assets/images/logos/favicon.ico">17 <link rel="shortcut icon" href="{{ STATIC_URL }}assets/images/icons/maas-favicon-32px.png">
1818
19 {% include "maasserver/css-conf.html" %}19 {% include "maasserver/css-conf.html" %}
20</head>20</head>

Subscribers

People subscribed via source and target branches