Merge lp:~jonas-drange/ubuntu-webcatalog/1259856-upgrade-global-nav into lp:ubuntu-webcatalog

[Jonas G. Drange]

new menu item "discourse", expanding the amount of visible items

new menu item "discourse", expanding the amount of visible items

[Ubuntu One Auto Pilot (otto-pilot)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

[Michael Nelson (michael.nelson)]

10:24 < jgdx> Can anyone take a look at https://code.launchpad.net/~jonas-drange/ubuntu-webcatalog/1259856-upgrade-global-nav/+merge/198984 and https://code.launchpad.net/~jonas-drange/software-center-agent/1259856-upgrade-global-nav/+merge/198985 ? Trivial mps that have already been approved in https://code.launchpad.net/~jonas-drange/ubuntuone-servers/1259856-new-global-nav-item/+merge/198521
10:24 < jgdx> but for some reason I could not self-approve
10:25 -!- mfoord [<email address hidden>] has joined #u1-reviews
10:25 < jgdx> noodles, perhaps you could take a peek when you have some spare seconds? :) ^
10:26 < noodles> jgdx: sure - I'm just writing my "won't be around mostly today due to sickness email", but it sounds trivial... :)
10:26 < noodles> heh, already reviewed even. OK :-)

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~jonas-drange/ubuntu-webcatalog/1259856-upgrade-global-nav into lp:ubuntu-webcatalog failed. Below is the output from the failed tests.

[localhost] local: /usr/bin/python /usr/bin/virtualenv --no-site-packages virtualenv
The --no-site-packages flag is deprecated; it is now the default behavior.
New python executable in virtualenv/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
[localhost] local: virtualenv/bin/pip install -r test_requirements.txt
Downloading/unpacking coverage (from -r test_requirements.txt (line 2))
  Running setup.py egg_info for package coverage

    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Downloading/unpacking mock (from -r test_requirements.txt (line 3))
  Running setup.py egg_info for package mock

    warning: no files found matching '*.png' under directory 'docs'
    warning: no files found matching '*.css' under directory 'docs'
    warning: no files found matching '*.html' under directory 'docs'
    warning: no files found matching '*.js' under directory 'docs'
Downloading/unpacking piston-mini-client (from -r test_requirements.txt (line 4))
  Downloading piston-mini-client-0.7.5.tar.gz
  Running setup.py egg_info for package piston-mini-client

Downloading/unpacking oauthlib (from piston-mini-client->-r test_requirements.txt (line 4))
  Running setup.py egg_info for package oauthlib

Downloading/unpacking httplib2 (from piston-mini-client->-r test_requirements.txt (line 4))
  Running setup.py egg_info for package httplib2

Installing collected packages: coverage, mock, piston-mini-client, oauthlib, httplib2
  Running setup.py install for coverage
    building 'coverage.tracer' extension
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c coverage/tracer.c -o build/temp.linux-x86_64-2.7/coverage/tracer.o
    gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro build/temp.linux-x86_64-2.7/coverage/tracer.o -o build/lib.linux-x86_64-2.7/coverage/tracer.so

    warning: no previously-included files matching '*.pyc' found anywhere in distribution
    Installing coverage2 script to /mnt/tarmac/cache/ubuntu-webcatalog/merges/trunk/virtualenv/bin
    Installing coverage-2.7 script to /mnt/tarmac/cache/ubuntu-webcatalog/merges/trunk/virtualenv/bin
    Installing coverage script to /mnt/tarmac/cache/ubuntu-webcatalog/merges/trunk/virtualenv/bin
  Running setup.py install for mock

    warning: no files found matching '*.png' under directory 'docs'
    warning: no files found matching '*.css' under directory 'docs'
    warning: no files found matching '*.html' under directory 'docs'
    warning: no files found matching '*.js' under directory 'docs'
  Running setup.py install for piston-mini-client

  Running setup.py install for oauthlib

  Running setup.py install for httplib2

Successfully installe...

[lp:~jonas-drange/ubuntu-webcatalog/1259856-upgrade-global-nav]

196. By Jonas G. Drange on 2013-12-16

require django1.5.4

=== modified file 'setup.py'
--- setup.py	2013-04-09 13:41:57 +0000
+++ setup.py	2013-12-16 11:18:49 +0000
@@ -34,7 +34,7 @@
     packages = find_packages('src'),
     package_dir = {'': 'src'},
     install_requires = [
-        'django',
+        'django==1.5.4',
         'setuptools',
         'south==0.7.6',
         'configglue==1.0.1',

=== modified file 'src/webcatalog/static/js/one-global-navigation-min.js'
--- src/webcatalog/static/js/one-global-navigation-min.js	2013-06-20 15:48:43 +0000
+++ src/webcatalog/static/js/one-global-navigation-min.js	2013-12-16 11:18:49 +0000
@@ -1,1 +1,1 @@
-YUI.add("one-global-navigation",function(e,t){"use strict";function n(t,n){t=t||[{url:"www.ubuntu.com",title:"Ubuntu"},{url:"community.ubuntu.com",title:"Community"},{url:"askubuntu.com",title:"Ask!"},{url:"developer.ubuntu.com",title:"Developer"},{url:"design.ubuntu.com",title:"Design"},{url:"www.ubuntu.com/certification",title:"Hardware"},{url:"shop.ubuntu.com",title:"Shop"},{url:"apps.ubuntu.com",title:"Apps"},{url:"help.ubuntu.com",title:"Help"},{url:"ubuntuforums.org",title:"Forum"},{url:"one.ubuntu.com",title:"Ubuntu One"},{url:"www.launchpad.net",title:"Launchpad"},{url:"juju.ubuntu.com",title:"Juju"},{url:"maas.ubuntu.com",title:"MAAS"},{url:"www.canonical.com",title:"Canonical"}],n=n||6,this.location=document.URL.replace(/https?:\/\//i,"");var r,i,s;r=this.getActiveUrl(t),r&&(t[this.getActiveUrl(t)].active=!0),i=e.Template.Micro.revive(e.U1.Templates["global-nav"]),e.one("body").prepend(i({length:n,links:t})),s=e.one(".u-nav-global-more"),e.one(document).on("click",function(){s.removeClass("u-nav-global-show")}),s.one("a").on("click",function(e){e.preventDefault(),e.stopPropagation(),s.toggleClass("u-nav-global-show")})}n.prototype={getActiveUrl:function(e){var t,n,r,i;return t=new RegExp("^"+this.location,"i"),n=this._filterUrls(e,this.location),r=n&&n.length?this._reduceUrlList(n):n[0],i=r?r.index:!1,i},_filterUrls:function(t,n){return e.Array.filter(t,function(e,t){if(n.toLowerCase().indexOf(e.url)>=0)return e.index=t,!0},this)},_reduceUrlList:function(t){return e.Array.reduce(t,t[0],function(e,t){return e.url.length>t.url.length?e:t},this)}},e.namespace("U1").GlobalNav=n},"0.1.0",{requires:["node","template-micro","array-extras","one-global-navigation-templates"]});
+YUI.add("one-global-navigation",function(e,t){"use strict";function n(t,n){t=t||[{url:"www.ubuntu.com",title:"Ubuntu"},{url:"community.ubuntu.com",title:"Community"},{url:"askubuntu.com",title:"Ask!"},{url:"developer.ubuntu.com",title:"Developer"},{url:"design.ubuntu.com",title:"Design"},{url:"discourse.ubuntu.com",title:"Discourse"},{url:"www.ubuntu.com/certification",title:"Hardware"},{url:"shop.ubuntu.com",title:"Shop"},{url:"apps.ubuntu.com",title:"Apps"},{url:"help.ubuntu.com",title:"Help"},{url:"ubuntuforums.org",title:"Forum"},{url:"one.ubuntu.com",title:"Ubuntu One"},{url:"www.launchpad.net",title:"Launchpad"},{url:"juju.ubuntu.com",title:"Juju"},{url:"maas.ubuntu.com",title:"MAAS"},{url:"www.canonical.com",title:"Canonical"}],n=n||7,this.location=document.URL.replace(/https?:\/\//i,"");var r,i,s;r=this.getActiveUrl(t),r&&(t[this.getActiveUrl(t)].active=!0),i=e.Template.Micro.revive(e.U1.Templates["global-nav"]),e.one("body").prepend(i({length:n,links:t})),s=e.one(".u-nav-global-more"),e.one(document).on("click",function(){s.removeClass("u-nav-global-show")}),s.one("a").on("click",function(e){e.preventDefault(),e.stopPropagation(),s.toggleClass("u-nav-global-show")})}n.prototype={getActiveUrl:function(e){var t,n,r,i;return t=new RegExp("^"+this.location,"i"),n=this._filterUrls(e,this.location),r=n&&n.length?this._reduceUrlList(n):n[0],i=r?r.index:!1,i},_filterUrls:function(t,n){return e.Array.filter(t,function(e,t){if(n.toLowerCase().indexOf(e.url)>=0)return e.index=t,!0},this)},_reduceUrlList:function(t){return e.Array.reduce(t,t[0],function(e,t){return e.url.length>t.url.length?e:t},this)}},e.namespace("U1").GlobalNav=n},"0.1.0",{requires:["node","template-micro","array-extras","one-global-navigation-templates"]});

=== modified file 'src/webcatalog/static/js/one-global-navigation-templates-min.js'
--- src/webcatalog/static/js/one-global-navigation-templates-min.js	2013-06-24 16:33:06 +0000
+++ src/webcatalog/static/js/one-global-navigation-templates-min.js	2013-12-16 11:18:49 +0000
@@ -1,1 +1,1 @@
-YUI.add("one-global-navigation-templates",function(e,t){"use strict";var n={};n["global-nav"]=function(e,t,n){var r="",i=function(e){return e||e===0?e:r},s="\n<div class='u-nav-global'><div class='u-nav-global-nav'><ul>\n";return e.Array.each(n.links,function(e,r){s+="\n<li><a ",e.active&&(s+="class='u-nav-global-active'"),s+=' href="http://'+t(i(e.url))+'">'+t(i(e.title))+"</a></li>\n",n.length&&r===n.length&&(s+='<li class="u-nav-global-more"><a href="#more">More<i>\u203a</i></a><ul>'),s+="\n"}),s+="\n</ul></ul></div></div>\n",s},e.namespace("U1.Templates"),e.U1.Templates=n},"@VERSION@",{requires:["template-micro"]});
+YUI.add("one-global-navigation-templates",function(e,t){"use strict";var n,r=function(e,t,n){var r="",i=function(e){return e||e===0?e:r},s="\n<div class='u-nav-global'><div class='u-nav-global-nav'><ul>\n";return e.Array.each(n.links,function(e,r){s+="\n<li><a ",e.active&&(s+="class='u-nav-global-active'"),s+=' href="http://'+t(i(e.url))+'">'+t(i(e.title))+"</a></li>\n",n.length&&r===n.length&&(s+='<li class="u-nav-global-more"><a href="#more">More<i>\u203a</i></a><ul>'),s+="\n"}),s+="\n</ul></ul></div></div>\n",s};n=e.Template.Micro,e.Template.register("global-nav",n.revive(r))},"@VERSION@",{requires:["template-micro"]});