Merge lp://staging/~blake-rouse/maas/sticky-header-directive into lp://staging/~maas-committers/maas/trunk
Proposed by
Blake Rouse
Status: | Merged |
---|---|
Approved by: | Blake Rouse |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3856 |
Proposed branch: | lp://staging/~blake-rouse/maas/sticky-header-directive |
Merge into: | lp://staging/~maas-committers/maas/trunk |
Prerequisite: | lp://staging/~ricgard/maas/sticky-header |
Diff against target: |
240 lines (+187/-3) 6 files modified
src/maasserver/context_processors.py (+1/-0) src/maasserver/static/js/angular/directives/sticky_header.js (+109/-0) src/maasserver/static/js/angular/directives/tests/test_sticky_header.js (+74/-0) src/maasserver/static/partials/node-details.html (+1/-1) src/maasserver/static/partials/nodes-list.html (+1/-1) src/maasserver/templates/maasserver/index.html (+1/-1) |
To merge this branch: | bzr merge lp://staging/~blake-rouse/maas/sticky-header-directive |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ricardo Bánffy (community) | Approve | ||
Review via email: mp+256965@code.staging.launchpad.net |
Commit message
Add sticky-header directive.
Directive is used to keep the padding-top on the main#body in sync with the height of the header. Since the header is fixed to the top of the page, this is needed so the header does not overlay the page content.
To post a comment you must log in.
The attempt to merge lp:~blake-rouse/maas/sticky-header-directive into lp:maas failed. Below is the output from the failed tests.
Ign http:// security. ubuntu. com trusty-security InRelease security. ubuntu. com trusty-security Release.gpg [933 B] security. ubuntu. com trusty-security Release [63.5 kB] nova.clouds. archive. ubuntu. com trusty InRelease nova.clouds. archive. ubuntu. com trusty-updates InRelease nova.clouds. archive. ubuntu. com trusty Release.gpg nova.clouds. archive. ubuntu. com trusty-updates Release.gpg [933 B] nova.clouds. archive. ubuntu. com trusty Release nova.clouds. archive. ubuntu. com trusty-updates Release [63.5 kB] security. ubuntu. com trusty- security/ main Sources [79.3 kB] security. ubuntu. com trusty- security/ universe Sources [21.4 kB] security. ubuntu. com trusty- security/ main amd64 Packages [264 kB] nova.clouds. archive. ubuntu. com trusty/main Sources nova.clouds. archive. ubuntu. com trusty/universe Sources nova.clouds. archive. ubuntu. com trusty/main amd64 Packages nova.clouds. archive. ubuntu. com trusty/universe amd64 Packages nova.clouds. archive. ubuntu. com trusty/main Translation-en nova.clouds. archive. ubuntu. com trusty/universe Translation-en nova.clouds. archive. ubuntu. com trusty-updates/main Sources [195 kB] security. ubuntu. com trusty- security/ universe amd64 Packages [99.8 kB] security. ubuntu. com trusty- security/ main Translation-en security. ubuntu. com trusty- security/ universe Translation-en nova.clouds. archive. ubuntu. com trusty- updates/ universe Sources [113 kB] nova.clouds. archive. ubuntu. com trusty-updates/main amd64 Packages [507 kB] nova.clouds. archive. ubuntu. com trusty- updates/ universe amd64 Packages [273 kB] nova.clouds. archive. ubuntu. com trusty-updates/main Translation-en nova.clouds. archive. ubuntu. com trusty- updates/ universe Translation-en nova.clouds. archive. ubuntu. com trusty/main Translation-en_US nova.clouds. archive. ubuntu. com trusty/universe Translation-en_US FRONTEND= noninteractive apt-get -y \ no-install- recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium- chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery- hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python- django- piston python-django-south python- djorm-ext- pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-iscpy python-jinja2 python-jsonschema python-lockfile python-lxml python-mock python-netaddr python-netifaces python-no...
Get:1 http://
Get:2 http://
Ign http://
Ign http://
Hit http://
Get:3 http://
Hit http://
Get:4 http://
Get:5 http://
Get:6 http://
Get:7 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Get:8 http://
Get:9 http://
Hit http://
Hit http://
Get:10 http://
Get:11 http://
Get:12 http://
Hit http://
Hit http://
Ign http://
Ign http://
Fetched 1,680 kB in 3s (526 kB/s)
Reading package lists...
sudo DEBIAN_
--