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
=== modified file 'templates/website_base.html'
--- templates/website_base.html 2016-04-11 15:57:56 +0000
+++ templates/website_base.html 2016-09-19 09:22:04 +0000
@@ -3,7 +3,7 @@
3<html lang="{{ LANGUAGE_CODE }}">3<html lang="{{ LANGUAGE_CODE }}">
4<head>4<head>
5 {% block defaulthead %}5 {% block defaulthead %}
6 6
7 {% block defaultmeta %}7 {% block defaultmeta %}
8 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />8 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
9 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">9 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -29,7 +29,7 @@
29 <script src="{% assets 'sites/ubuntu/latest/u/js/plugins/Imager.js' %}"></script>29 <script src="{% assets 'sites/ubuntu/latest/u/js/plugins/Imager.js' %}"></script>
30 <script>var website_assets="{% assets 'sites/ubuntu/latest/u' %}";</script>30 <script>var website_assets="{% assets 'sites/ubuntu/latest/u' %}";</script>
31 {% endblock defaultheadjs %}31 {% endblock defaultheadjs %}
32 32
33 {% endblock defaulthead %}33 {% endblock defaulthead %}
34 {% block extrahead %}{% endblock %}34 {% block extrahead %}{% endblock %}
35 {% render_block "css" %}35 {% render_block "css" %}
@@ -81,14 +81,14 @@
81 <a href="https://myapps.developer.ubuntu.com/">My Apps</a>81 <a href="https://myapps.developer.ubuntu.com/">My Apps</a>
82 </li>82 </li>
83 <li>83 <li>
84 <a href="/logout?next={{request.path}}"">{% trans "Log out" %}</a>84 <a href="/logout?next={{request.path}}">{% trans "Log out" %}</a>
85 </li>85 </li>
86 </ul>86 </ul>
87 </li>87 </li>
88 {% else %}88 {% else %}
89 <li class="login">89 <li class="login">
90 <a href="https://myapps.developer.ubuntu.com/">{% trans "My Apps" %}</a>90 <a href="https://myapps.developer.ubuntu.com/">{% trans "My Apps" %}</a>
91 </li> 91 </li>
92 {% endif %}92 {% endif %}
93 </ul>93 </ul>
9494
@@ -172,23 +172,22 @@
172 if(!core){ var core = {}; }172 if(!core){ var core = {}; }
173 core.globalPrepend = 'body';173 core.globalPrepend = 'body';
174</script>174</script>
175<script src="{% assets 'sites/ubuntu/latest/u/js/plugins/yui-combined.min.js' %}"></script>175<script src="https://assets.ubuntu.com/v1/40d25181-yui-combined.min.js"></script>
176<script src="{% assets 'sites/ubuntu/latest/u/js/global.js' %}"></script>176<script src="https://assets.ubuntu.com/v1/ab9f5f4b-global.js"></script>
177177
178<script src="{% assets 'sites/guidelines/js/responsive/core.js' %}"></script>178<script src="{% assets 'sites/guidelines/js/responsive/core.js' %}"></script>
179<script src="{% assets 'sites/ubuntu/latest/u/js/global.js' %}"></script>
180<script src="{% assets 'sites/ubuntu/latest/u/js/scratch.js' %}"></script>179<script src="{% assets 'sites/ubuntu/latest/u/js/scratch.js' %}"></script>
181<script src="{% assets 'sites/ubuntu/latest/u/js/plugins/respond.min.js' %}"></script>180<script src="{% assets 'sites/ubuntu/latest/u/js/plugins/respond.min.js' %}"></script>
182181
183<script type="text/javascript">182<script type="text/javascript">
184 var _gaq = _gaq || [];183 var _gaq = _gaq || [];
185 184
186 /* Save to developer.ubuntu.com profile */ 185 /* Save to developer.ubuntu.com profile */
187 _gaq.push(['_setAccount', 'UA-1018242-33']);186 _gaq.push(['_setAccount', 'UA-1018242-33']);
188 _gaq.push(['_setDomainName', '.ubuntu.com']);187 _gaq.push(['_setDomainName', '.ubuntu.com']);
189 _gaq.push(['_trackPageview']);188 _gaq.push(['_trackPageview']);
190189
191 /* Save to www.ubuntu.com profile */ 190 /* Save to www.ubuntu.com profile */
192 _gaq.push(['b._setAccount', 'UA-1018242-4']);191 _gaq.push(['b._setAccount', 'UA-1018242-4']);
193 _gaq.push(['b._setDomainName', '.ubuntu.com']);192 _gaq.push(['b._setDomainName', '.ubuntu.com']);
194 _gaq.push(['b._trackPageview']);193 _gaq.push(['b._trackPageview']);

Subscribers

People subscribed via source and target branches