Merge lp:~dholbach/help-app/1428671 into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

[Daniel Holbach]

[Nicholas Skaggs (nskaggs)]

LGTM. All traces of d.u.c are gone.

review: Approve

=== modified file 'edit-here/themes/web/static/js/global.js'
--- edit-here/themes/web/static/js/global.js	2015-02-26 16:21:11 +0000
+++ edit-here/themes/web/static/js/global.js	2015-03-16 15:36:14 +0000
@@ -86,12 +86,6 @@
 };
 
 
-core.getURL = function(){
-	var url = document.URL;
-	url = url.replace('https://developer.ubuntu.com','http://developer.ubuntu.com');
-	return url;
-};
-
 core.trackClicks = function() {
 	YUI().use('node', function(Y) {
 		Y.all('#nav-global a').on('click',function(e) {
@@ -108,4 +102,4 @@
 
 if(!core.globalPrepend) {
 	core.setupGlobalNav();
-}
\ No newline at end of file
+}

=== modified file 'edit-here/themes/web/templates/_footer.html'
--- edit-here/themes/web/templates/_footer.html	2015-03-09 14:59:58 +0000
+++ edit-here/themes/web/templates/_footer.html	2015-03-16 15:36:14 +0000
@@ -53,7 +53,7 @@
         <ul class="inline clear">
             <li><a href="http://www.ubuntu.com/legal">Legal information</a>
             </li>
-            <li><a href="https://bugs.launchpad.net/developer-ubuntu-com/">Report a bug on this site</a>
+            <li><a href="https://bugs.launchpad.net/help-app/">Report a bug on this site</a>
             </li>
         </ul>
         <span class="accessibility-aid"><a href="#">Go to the top of the page</a></span>

=== modified file 'edit-here/themes/web/templates/base.html'
--- edit-here/themes/web/templates/base.html	2015-03-10 10:56:31 +0000
+++ edit-here/themes/web/templates/base.html	2015-03-16 15:36:14 +0000
@@ -58,11 +58,6 @@
 <script type="text/javascript">
     var _gaq = _gaq || [];
       
-    /* Save to developer.ubuntu.com profile */	
-    _gaq.push(['_setAccount', 'UA-1018242-33']);
-    _gaq.push(['_setDomainName', '.ubuntu.com']);
-    _gaq.push(['_trackPageview']);
-
     /* Save to www.ubuntu.com profile */	
     _gaq.push(['b._setAccount', 'UA-1018242-4']);
     _gaq.push(['b._setDomainName', '.ubuntu.com']);