Ubuntu Developer Portal

Merge lp:~ya-bo-ng/developer-ubuntu-com/update-global-nav into lp:developer-ubuntu-com

  1. update-global-nav
  2. Merge into stable
Proposed by Anthony Dillon
Status: Merged
Merged at revision: 229
Proposed branch: lp:~ya-bo-ng/developer-ubuntu-com/update-global-nav
Merge into: lp:developer-ubuntu-com
Diff against target: 67 lines (+9/-10)
1 file modified
templates/website_base.html (+9/-10)
To merge this branch: bzr merge lp:~ya-bo-ng/developer-ubuntu-com/update-global-nav
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+306064@code.launchpad.net

Description of the change

Updated the global navigation script.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/website_base.html'
2--- templates/website_base.html 2016-04-11 15:57:56 +0000
3+++ templates/website_base.html 2016-09-19 09:22:04 +0000
4@@ -3,7 +3,7 @@
5 <html lang="{{ LANGUAGE_CODE }}">
6 <head>
7 {% block defaulthead %}
8-
9+
10 {% block defaultmeta %}
11 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
12 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
13@@ -29,7 +29,7 @@
14 <script src="{% assets 'sites/ubuntu/latest/u/js/plugins/Imager.js' %}"></script>
15 <script>var website_assets="{% assets 'sites/ubuntu/latest/u' %}";</script>
16 {% endblock defaultheadjs %}
17-
18+
19 {% endblock defaulthead %}
20 {% block extrahead %}{% endblock %}
21 {% render_block "css" %}
22@@ -81,14 +81,14 @@
23 <a href="https://myapps.developer.ubuntu.com/">My Apps</a>
24 </li>
25 <li>
26- <a href="/logout?next={{request.path}}"">{% trans "Log out" %}</a>
27+ <a href="/logout?next={{request.path}}">{% trans "Log out" %}</a>
28 </li>
29 </ul>
30 </li>
31 {% else %}
32 <li class="login">
33 <a href="https://myapps.developer.ubuntu.com/">{% trans "My Apps" %}</a>
34- </li>
35+ </li>
36 {% endif %}
37 </ul>
38
39@@ -172,23 +172,22 @@
40 if(!core){ var core = {}; }
41 core.globalPrepend = 'body';
42 </script>
43-<script src="{% assets 'sites/ubuntu/latest/u/js/plugins/yui-combined.min.js' %}"></script>
44-<script src="{% assets 'sites/ubuntu/latest/u/js/global.js' %}"></script>
45+<script src="https://assets.ubuntu.com/v1/40d25181-yui-combined.min.js"></script>
46+<script src="https://assets.ubuntu.com/v1/ab9f5f4b-global.js"></script>
47
48 <script src="{% assets 'sites/guidelines/js/responsive/core.js' %}"></script>
49-<script src="{% assets 'sites/ubuntu/latest/u/js/global.js' %}"></script>
50 <script src="{% assets 'sites/ubuntu/latest/u/js/scratch.js' %}"></script>
51 <script src="{% assets 'sites/ubuntu/latest/u/js/plugins/respond.min.js' %}"></script>
52
53 <script type="text/javascript">
54 var _gaq = _gaq || [];
55-
56- /* Save to developer.ubuntu.com profile */
57+
58+ /* Save to developer.ubuntu.com profile */
59 _gaq.push(['_setAccount', 'UA-1018242-33']);
60 _gaq.push(['_setDomainName', '.ubuntu.com']);
61 _gaq.push(['_trackPageview']);
62
63- /* Save to www.ubuntu.com profile */
64+ /* Save to www.ubuntu.com profile */
65 _gaq.push(['b._setAccount', 'UA-1018242-4']);
66 _gaq.push(['b._setDomainName', '.ubuntu.com']);
67 _gaq.push(['b._trackPageview']);

Subscribers

People subscribed via source and target branches