Merge lp:~matsubara/juju-gui/tarmac-test into lp:~juju-gui/juju-gui/juju-gui-test

[Diogo Matsubara]

test change

test change

[Diogo Matsubara (matsubara)]

review: Approve

[Jujugui Lander (jujugui-lander)]

Attempt to merge into lp:~juju-gui/juju-gui/juju-gui-test failed due to conflicts:

text conflict in README

=== modified file '.jshintignore'
--- .jshintignore	2013-05-14 17:31:39 +0000
+++ .jshintignore	2013-06-26 14:26:26 +0000
@@ -1,3 +1,4 @@
 app/assets/javascripts/prettify.js
 app/assets/javascripts/FileSaver.js
 app/assets/javascripts/unscaled-pack-layout.js
+app/assets/javascripts/Object.observe.poly.js

=== modified file 'CHANGES.yaml'
--- CHANGES.yaml	2013-05-23 22:12:32 +0000
+++ CHANGES.yaml	2013-06-26 14:26:26 +0000
@@ -22,29 +22,60 @@
 # [NUMBER].[NUMBER].[NUMBER] per http://semver.org/ .
 
 - unreleased:
+- 0.6.1:
+    - >
+      Fix critical jumping service bug (LP bug 1192596) and related drag
+      problems on service creation.
+    - Add feedback link.
+    - Add prototype of data binding conflict resolution (feature-flagged).
+    - >
+      Add SetCharm to Go sandbox, in continuing preparation for supporting
+      charm upgrades (not yet exposed to end-user).
+    - Add incremental progress on charm sharing widget (feature-flagged).
+    - Reduce test fragility and make other test improvements.
+- 0.6.0:
+    - New charm browser for finding available charms.
+    - Visual styling changes.
+    - The beginnings of a Go backend sandbox.
+    - Bug fixes and improved CI reliability.
+    - Automatic view portal zoom and centering.
+    - Support for Google Analytics.
+    - Linting of yuidoc comments.
+    - Linting of copyright headers.
+    - Linting of project documentation files.
+    - Utility for recording and playback of websocket traffic for debugging.
+    - Caching of search results.
+    - Improved development HTTP server behavior.
+    - Improved project documentation.
 - 0.5.0:
     - Visual styling fixes.
     - Many small bugfixes.
     - Internal code reorganization and refactoring.
-    - Configuration values can now be multi-line.  The text entry widget
+    - >
+      Configuration values can now be multi-line.  The text entry widget
       automatically grows to accomodate multiple lines.
     - Mousewheel zoom now works in firefox.
     - The environment view now shows some help text when the canvas is empty.
     - Changes to support faster deplyoment of the GUI charm (make npm-cache).
-    - Experimental keyboard shortcuts.  These will certainly change in the
+    - >
+      Experimental keyboard shortcuts.  These will certainly change in the
       future so don't train your fingers just yet.
     - Experimental import/output functionality.  Also sure to change.
-    - No longer reports trivial errors caused by being in restricted
+    - >
+      No longer reports trivial errors caused by being in restricted
       (read-only) mode.  E.g., moving a service does not generate an error.
     - Much nicer default layout of the services.
-    - Removed HTML5 application cache as it was causing more problems than it
+    - >
+      Removed HTML5 application cache as it was causing more problems than it
       was solving.
     - Added licensing info to project (AGPL).
-    - Fixed a memory leak in the code that reacts to changes coming from the
+    - >
+      Fixed a memory leak in the code that reacts to changes coming from the
       Juju environment.
 - 0.4.0:
     - Support for Juju Core (Go Juju).
-    - New "sandbox" mode for in-browser-memory fake juju (set "sandbox" to
+    - >
+      New "sandbox" mode for in-browser-memory fake juju (set "sandbox" to
       "true" in config.js).
     - Support for Firefox.
     - Support for Landscape integration.

=== modified file 'Makefile'
--- Makefile	2013-05-29 19:06:28 +0000
+++ Makefile	2013-06-26 14:26:26 +0000
@@ -38,7 +38,7 @@
 		-e '^app/assets/javascripts/gallery-.*\.js$$' \
 		-e '^server.js$$')
 THIRD_PARTY_JS=app/assets/javascripts/reconnecting-websocket.js
-LINT_IGNORE='app/assets/javascripts/prettify.js, app/assets/javascripts/FileSaver.js, app/assets/javascripts/spinner.js'
+LINT_IGNORE='app/assets/javascripts/prettify.js, app/assets/javascripts/FileSaver.js, app/assets/javascripts/spinner.js, app/assets/javascripts/Object.observe.poly.js'
 NODE_TARGETS=node_modules/chai node_modules/cryptojs node_modules/d3 \
     node_modules/expect.js node_modules/express \
     node_modules/graceful-fs node_modules/grunt node_modules/jshint \
@@ -143,7 +143,7 @@
 # As an optimization, we stash this value in the local PWD variable.
 PWD=$(shell pwd)
 
-all: build
+all: build virtualenv/bin/python
 	@echo "\nDebug and production environments built."
 	@echo "Run 'make help' to list the main available targets."
 
@@ -172,7 +172,7 @@
 	bin/generateTemplates
 
 yuidoc/index.html: node_modules/yuidocjs $(JSFILES)
-	node_modules/.bin/yuidoc -o yuidoc -x assets app
+	node_modules/.bin/yuidoc --lint -o yuidoc -x assets app
 
 main-doc:
 	make -C docs SPHINXOPTS=-W html
@@ -203,12 +203,12 @@
 
 $(NON_SPRITE_IMAGES):
 	mkdir -p build-shared/juju-ui/assets/images
-	cp app/assets/images/non-sprites/* build-shared/juju-ui/assets/images/
+	cp -r app/assets/images/non-sprites/* build-shared/juju-ui/assets/images/
 
 install-npm-packages: $(NODE_TARGETS)
 
 $(NODE_TARGETS): package.json
-	npm install
+	npm install --cache-min=999999999
 	# Keep all targets up to date, not just new/changed ones.
 	for dirname in $(NODE_TARGETS); do touch $$dirname ; done
 	@# Check to see if we made what we expected to make, and warn if we did
@@ -262,7 +262,8 @@
 undocumented:
 	bin/lint-yuidoc --generate-undocumented > undocumented
 
-yuidoc-lint: $(JSFILES)
+lint-yuidoc: $(JSFILES)
+	node_modules/.bin/yuidoc --lint -x assets app
 	bin/lint-yuidoc
 
 recess: node_modules/recess
@@ -272,10 +273,23 @@
 	node_modules/recess/bin/recess lib/views/stylesheet.less \
 	    --config recess.json | grep -q Perfect
 
-lint: test-prep jshint gjslint recess yuidoc-lint test-filtering
+lint: test-prep jshint gjslint recess lint-license-headers test-filtering \
+		lint-yuidoc
+
+lint-license-headers:
+	@# Take the list of JS files in one long line and break them into
+	@# multiple lines (this assumes there are no spaces in the paths).
+	@# Remove non-JS files, remove third-party files, and remove files in
+	@# the root of the project.  Finally, search for copyright notices in
+	@# the files and report files that do not have one.
+	echo $(JSFILES) | sed 's/ /\n/g' \
+	| grep '\.js$$' | grep -v /assets/ | grep / \
+	| xargs -I {} sh -c "grep -L '^Copyright (C) 2[^ ]* Canonical Ltd.' {}" \
+	|| (echo "The above files are missing copyright headers."; false)
 
 virtualenv/bin/python:
-	virtualenv virtualenv
+	virtualenv virtualenv --system-site-packages
+	virtualenv/bin/easy_install archives/selenium-2.33.0.tar.gz
 
 virtualenv/bin/gjslint virtualenv/bin/fixjsstyle: virtualenv/bin/python
 	virtualenv/bin/easy_install archives/closure_linter-latest.tar.gz
@@ -317,6 +331,7 @@
 
 LINK_DEBUG_FILES=$(call shared-link-files-list,debug) \
 	build-debug/juju-ui/app.js \
+	build-debug/juju-ui/websocket-logging.js \
 	build-debug/juju-ui/models \
 	build-debug/juju-ui/store \
 	build-debug/juju-ui/subapps \
@@ -363,6 +378,7 @@
 $(LINK_DEBUG_FILES):
 	$(call link-files,debug)
 	ln -sf "$(PWD)/app/app.js" build-debug/juju-ui/
+	ln -sf "$(PWD)/app/websocket-logging.js" build-debug/juju-ui/
 	ln -sf "$(PWD)/app/models" build-debug/juju-ui/
 	ln -sf "$(PWD)/app/store" build-debug/juju-ui/
 	ln -sf "$(PWD)/app/subapps" build-debug/juju-ui/
@@ -456,6 +472,7 @@
 clean:
 	rm -rf build-shared build-debug build-prod
 	find app/assets/javascripts/ -type l | xargs rm -rf
+	rm -f test/test_startup.js
 
 clean-deps:
 	rm -rf node_modules virtualenv
@@ -585,8 +602,9 @@
 # targets are alphabetically sorted, they like it that way :-)
 .PHONY: beautify build build-files build-devel clean clean-all clean-deps \
 	clean-docs code-doc debug devel docs dist gjslint help \
-	install-npm-packages jshint lint main-doc npm-cache npm-cache-file \
-	prep prod recess server spritegen test test-debug test-misc test-prep \
-	test-prod undocumented view-code-doc view-docs view-main-doc yuidoc-lint
+	install-npm-packages jshint lint lint-yuidoc main-doc npm-cache \
+	npm-cache-file prep prod recess server spritegen test test-debug \
+	test-misc test-prep test-prod undocumented view-code-doc view-docs \
+	view-main-doc
 
 .DEFAULT_GOAL := all

=== modified file 'README'
--- README	2013-06-13 22:48:11 +0000
+++ README	2013-06-26 14:26:26 +0000
@@ -2,8 +2,12 @@
    alongside the whole project documentation. To do this, you need the
    dependencies described in the "Documentation" section of the HACKING
    file.
+<<<<<<< TREE
 
 foo
+=======
+one line change
+>>>>>>> MERGE-SOURCE
 ======
 README
 ======

=== modified file 'app/app.js'
--- app/app.js	2013-05-28 12:43:25 +0000
+++ app/app.js	2013-06-26 14:26:26 +0000
@@ -47,12 +47,16 @@
    */
   var JujuGUI = Y.Base.create('juju-gui', Y.App, [
                                                   Y.juju.SubAppRegistration,
-                                                  Y.juju.NSRouter], {
+                                                  Y.juju.NSRouter,
+                                                  Y.juju.Cookies], {
 
     /*
       Extension properties
     */
-    subApplications: [],
+    subApplications: [{
+      type: Y.juju.subapps.Browser,
+      config: {}
+    }],
 
     defaultNamespace: 'charmstore',
     /*
@@ -132,7 +136,7 @@
 
     },
 
-    /**
+    /*
      * Declarative keybindings on the window object.
      *
      * Prefix supported are:
@@ -197,14 +201,18 @@
         },
         help: 'Navigate to the Environment overview.'
       },
-      '+': {
+      'S-+': {
         fire: 'zoom_in',
         help: 'Zoom In'
       },
-      '-': {
+      'S--': {
         fire: 'zoom_out',
         help: 'Zoom Out'
       },
+      'S-0': {
+        fire: 'panToCenter',
+        help: 'Center the Environment overview'
+      },
       'esc': {
         fire: 'clearState',
         callback: function() {
@@ -226,7 +234,6 @@
 
       'S-d': {
         callback: function(evt) {
-          /* global saveAs: false */
           this.env.exportEnvironment(function(r) {
             var exportData = JSON.stringify(r.result, undefined, 2);
             var exportBlob = new Blob([exportData],
@@ -235,8 +242,16 @@
           });
         },
         help: 'Export the environment'
+      },
+
+      'C-S-d': {
+        callback: function(evt) {
+          Y.fire('saveWebsocketLog');
+        },
+        help: 'Save the websocket log to a file'
       }
 
+
     },
 
     /**
@@ -284,12 +299,22 @@
       });
       this._keybindings = Y.one(window).on('keydown', function(evt) {
         //Normalize key-code
+        var source = evt.target.getDOMNode();
+        // Target filtering, we want to listen on window
+        // but not honor hotkeys when focused on
+        // text oriented input fields
+        if (['INPUT', 'TEXTAREA'].indexOf(source.tagName) !== -1) {
+          return;
+        }
         var symbolic = [];
         if (evt.ctrlKey) { symbolic.push('C');}
         if (evt.altKey) { symbolic.push('A');}
         if (evt.shiftKey) { symbolic.push('S');}
-        symbolic.push(code_map[evt.keyCode] ||
-                      String.fromCharCode(evt.keyCode).toLowerCase());
+        if (code_map[evt.keyCode]) {
+          symbolic.push(code_map[evt.which]);
+        } else {
+          symbolic.push(String.fromCharCode(evt.which).toLowerCase());
+        }
         var trigger = symbolic.join('-');
         var spec = this.keybindings[trigger];
         if (spec) {
@@ -335,15 +360,19 @@
         }
       }
 
-      // XXX: #1185002 the charm browser subapp feature flag needs to be
-      // removed
-      if (window.flags.browser_enabled) {
-        this.subApplications.push({
-          type: Y.juju.subapps.Browser,
-          config: {}
-        });
+      if (window.flags && window.flags.websocket_capture) {
+        this.websocketLogging = new Y.juju.WebsocketLogging();
       }
 
+      /**
+        Reference to the juju.Cookies instance.
+
+        @property cookieHandler
+        @type {juju.Cookies}
+        @default null
+      */
+      this.cookieHandler = null;
+
       this.renderEnvironment = true;
       // If this property has a value other than '/' then
       // navigate to it after logging in.
@@ -418,7 +447,7 @@
         };
         var apiBackend = this.get('apiBackend');
         // The sandbox mode does not support the Go API (yet?).
-        if (this.get('sandbox') && apiBackend === 'python') {
+        if (this.get('sandbox')) {
           var sandboxModule = Y.namespace('juju.environments.sandbox');
           var State = Y.namespace('juju.environments').FakeBackend;
           var state = new State({charmStore: this.charm_store});
@@ -427,8 +456,18 @@
             credentials[envOptions.user] = envOptions.password;
             state.set('authorizedUsers', credentials);
           }
-          envOptions.conn = new sandboxModule.ClientConnection(
-              {juju: new sandboxModule.PyJujuAPI({state: state})});
+          if (apiBackend === 'python') {
+            envOptions.conn = new sandboxModule.ClientConnection(
+                {juju: new sandboxModule.PyJujuAPI({state: state})});
+          } else if (apiBackend === 'go') {
+            envOptions.conn = new sandboxModule.ClientConnection(
+                {juju: new sandboxModule.GoJujuAPI({state: state})});
+          } else {
+            // Clean ourselves up before giving up the ghost, for tests' sake.
+            this.destroy();
+            throw 'unrecognized backend type: ' + apiBackend;
+          }
+
         }
         this.env = juju.newEnvironment(envOptions, apiBackend);
       }
@@ -518,10 +557,6 @@
         env: this.env,
         app: this
       });
-      this.charmPanel.setDefaultSeries(this.env.get('defaultSeries'));
-      this.env.after('defaultSeriesChange', Y.bind(function(ev) {
-        this.charmPanel.setDefaultSeries(ev.newVal);
-      }, this));
 
       // Halt the default navigation on the juju logo to allow us to show
       // the real root view without namespaces
@@ -534,7 +569,10 @@
         }, this);
       }
 
-      Y.one('#logout-trigger').on('click', this.logout, this);
+      Y.one('#logout-trigger').on('click', function(e) {
+        e.halt();
+        this.logout();
+      }, this);
 
       // Attach SubApplications. The subapps should share the same db.
       cfg.db = this.db;
@@ -565,7 +603,7 @@
         catch (err) {
           // Unable to create simulator, usually due to mocks or an
           // unsupported environment
-          console.log('Unable to create simulator: ', err);
+          console.log('Unable to create simulator: ');
         }
       }
     },
@@ -908,7 +946,7 @@
       // If the Juju environment is not connected, exit without letting the
       // route dispatch proceed. On env connection change, the app will
       // re-dispatch and this route callback will be executed again.
-      if (!this.env.get('connected')) {
+      if (!this.env || !this.env.get('connected')) {
         return;
       }
       var credentials = this.env.getCredentials();
@@ -1181,6 +1219,24 @@
         finalPath = this.nsRouter.url({ gui: matches[idx].path });
       }
       return finalPath;
+    },
+
+    /**
+     * Make sure the user agrees to cookie usage.
+     *
+     * @method authorizeCookieUse
+     * @param {Object} req The request.
+     * @param {Object} res The response.
+     * @param {Object} next The next route handler.
+     *
+     */
+    authorizeCookieUse: function(req, res, next) {
+      var analyticsEnabled = this.get('useAnalytics');
+      if (analyticsEnabled) {
+        this.cookieHandler = this.cookieHandler || new Y.juju.Cookies();
+        this.cookieHandler.check();
+      }
+      next();
     }
 
   }, {
@@ -1203,7 +1259,7 @@
        * `namespace`: (optional) when namespace is specified this route should
        *   only match when the URL fragment occurs in that namespace. The
        *   default namespace (as passed to this.nsRouter) is assumed if no
-       *   namespace  attribute is specified.
+       *   namespace attribute is specified.
        *
        * `model`: `model.name` (required)
        *
@@ -1224,6 +1280,7 @@
           { path: '*', callbacks: 'show_notifications_view'},
           { path: '*', callbacks: 'toggleStaticViews'},
           { path: '*', callbacks: 'show_environment'},
+          { path: '*', callbacks: 'authorizeCookieUse'},
           // Charms.
           { path: '/charms/',
             callbacks: 'show_charm_collection',
@@ -1271,7 +1328,7 @@
 
   Y.namespace('juju').App = JujuGUI;
 
-}, '0.5.2', {
+}, '0.5.3', {
   requires: [
     'juju-charm-models',
     'juju-charm-panel',
@@ -1291,6 +1348,7 @@
     'juju-views',
     'juju-view-login',
     'juju-landscape',
+    'juju-websocket-logging',
     'io',
     'json-parse',
     'app-base',
@@ -1298,6 +1356,8 @@
     'base',
     'node',
     'model',
+    'app-cookies-extension',
+    'cookie',
     'app-subapp-extension',
     'sub-app',
     'subapp-browser',

=== added file 'app/assets/images/charm-app-servers-160.png'
Binary files app/assets/images/charm-app-servers-160.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-app-servers-160.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-app-servers-64.png'
Binary files app/assets/images/charm-app-servers-64.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-app-servers-64.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-app-servers-96.png'
Binary files app/assets/images/charm-app-servers-96.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-app-servers-96.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-applications-160.png'
Binary files app/assets/images/charm-applications-160.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-applications-160.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-applications-64.png'
Binary files app/assets/images/charm-applications-64.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-applications-64.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-applications-96.png'
Binary files app/assets/images/charm-applications-96.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-applications-96.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-cache-proxy-160.png'
Binary files app/assets/images/charm-cache-proxy-160.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-cache-proxy-160.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-cache-proxy-64.png'
Binary files app/assets/images/charm-cache-proxy-64.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-cache-proxy-64.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-cache-proxy-96.png'
Binary files app/assets/images/charm-cache-proxy-96.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-cache-proxy-96.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-databases-160.png'
Binary files app/assets/images/charm-databases-160.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-databases-160.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-databases-64.png'
Binary files app/assets/images/charm-databases-64.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-databases-64.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-databases-96.png'
Binary files app/assets/images/charm-databases-96.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-databases-96.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-file-servers-160.png'
Binary files app/assets/images/charm-file-servers-160.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-file-servers-160.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-file-servers-64.png'
Binary files app/assets/images/charm-file-servers-64.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-file-servers-64.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-file-servers-96.png'
Binary files app/assets/images/charm-file-servers-96.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-file-servers-96.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-misc-160.png'
Binary files app/assets/images/charm-misc-160.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-misc-160.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-misc-64.png'
Binary files app/assets/images/charm-misc-64.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-misc-64.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/charm-misc-96.png'
Binary files app/assets/images/charm-misc-96.png	1970-01-01 00:00:00 +0000 and app/assets/images/charm-misc-96.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/email-click.png'
Binary files app/assets/images/email-click.png	1970-01-01 00:00:00 +0000 and app/assets/images/email-click.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/email-hover.png'
Binary files app/assets/images/email-hover.png	1970-01-01 00:00:00 +0000 and app/assets/images/email-hover.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/email-normal.png'
Binary files app/assets/images/email-normal.png	1970-01-01 00:00:00 +0000 and app/assets/images/email-normal.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/facebook-click.png'
Binary files app/assets/images/facebook-click.png	1970-01-01 00:00:00 +0000 and app/assets/images/facebook-click.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/facebook-hover.png'
Binary files app/assets/images/facebook-hover.png	1970-01-01 00:00:00 +0000 and app/assets/images/facebook-hover.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/facebook-normal.png'
Binary files app/assets/images/facebook-normal.png	1970-01-01 00:00:00 +0000 and app/assets/images/facebook-normal.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/google-click.png'
Binary files app/assets/images/google-click.png	1970-01-01 00:00:00 +0000 and app/assets/images/google-click.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/google-hover.png'
Binary files app/assets/images/google-hover.png	1970-01-01 00:00:00 +0000 and app/assets/images/google-hover.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/google-normal.png'
Binary files app/assets/images/google-normal.png	1970-01-01 00:00:00 +0000 and app/assets/images/google-normal.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/header_notification_centre.png'
Binary files app/assets/images/header_notification_centre.png	1970-01-01 00:00:00 +0000 and app/assets/images/header_notification_centre.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/header_notification_left.png'
Binary files app/assets/images/header_notification_left.png	1970-01-01 00:00:00 +0000 and app/assets/images/header_notification_left.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/header_notification_right.png'
Binary files app/assets/images/header_notification_right.png	1970-01-01 00:00:00 +0000 and app/assets/images/header_notification_right.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/juju_logo_dark.png'
Binary files app/assets/images/juju_logo_dark.png	1970-01-01 00:00:00 +0000 and app/assets/images/juju_logo_dark.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/non-sprites/category-app-server.svg'
--- app/assets/images/non-sprites/category-app-server.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category-app-server.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="category-app-server.svg">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931703"
+     inkscape:cx="85.779492"
+     inkscape:cy="6.1041666"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4469"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <g
+       style="stroke:#505050;stroke-opacity:1;display:inline"
+       id="g4781-3"
+       transform="matrix(1.5005353,0,0,1.4833177,-852.22207,-34.476776)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4783-4"
+         d="m 996.33998,725.99069 7.65092,-3.80699 0,-8.70167 -7.65092,3.26312 z"
+         style="color:#000000;fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:2.01851225;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.982494;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 996.35027,726.0088 -7.35894,-3.81802 0,-8.72686 7.35894,3.27257 z"
+         id="path4785-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4787-1"
+         d="m 996.50004,716.7407 7.50006,-3.26798 -7.50006,-3.81266 -7.50001,3.81266 z"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:1.98247516;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1011.6499,726.00881 7.3589,-3.81802 0,-8.72688 -7.3589,3.27258 z"
+         id="path4789-0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4791-1"
+         d="m 1011.6602,725.99068 -7.651,-3.80699 0,-8.70165 7.651,3.26312 z"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2.01853108;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1011.5,716.7407 7.5001,-3.26798 -7.5001,-3.81266 -7.5,3.81266 z"
+         id="path4793-3"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4795-6"
+         d="m 1003.6526,713.34891 7.3564,-3.81813 0,-8.7271 -7.3564,3.27267 z"
+         style="color:#000000;fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:1.9821583;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2.01884151;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1003.6629,713.33046 -7.65353,-3.8069 0,-8.70143 7.65353,3.26304 z"
+         id="path4797-0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4799-9"
+         d="m 1003.5,704.08064 7.5001,-3.26799 L 1003.5,697 996,700.81265 z"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== added file 'app/assets/images/non-sprites/category-application.svg'
--- app/assets/images/non-sprites/category-application.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category-application.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="category-application.svg">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931703"
+     inkscape:cx="85.779492"
+     inkscape:cy="6.1041666"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4469"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <g
+       style="stroke:#505050;stroke-width:0.99999881;stroke-opacity:1;display:inline"
+       id="g4746-5"
+       transform="matrix(1.5000001,0,0,1.4999966,-852.18459,-227.09334)">
+      <path
+         style="color:#000000;fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:1.99999762;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1004,847 14,-7 0,-16 -14,6 z"
+         id="path4748-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4750-9"
+         d="m 1004,847 -14,-7 0,-16 14,6 z"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.99999762;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.99999762;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1004,830 14,-6 -14,-7 -14,7 z"
+         id="path4752-1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

=== added file 'app/assets/images/non-sprites/category-cache-proxy.svg'
--- app/assets/images/non-sprites/category-cache-proxy.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category-cache-proxy.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="category-cache-proxy.svg">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931703"
+     inkscape:cx="85.779492"
+     inkscape:cy="6.1041666"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4469"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#505050;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3598"
+       sodipodi:cx="1012"
+       sodipodi:cy="420"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="m 1016,420 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       transform="matrix(-1.625,0,0,1.625,2289.3155,329.90378)" />
+    <path
+       transform="matrix(-1.625,0,0,1.625,2316.3155,329.90378)"
+       d="m 1016,420 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4"
+       sodipodi:cy="420"
+       sodipodi:cx="1012"
+       id="path4368"
+       style="color:#000000;fill:#505050;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(-3.2499973,0,0,3.2499973,3933.8128,-352.59507)"
+       d="m 1016,420 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4"
+       sodipodi:cy="420"
+       sodipodi:cx="1012"
+       id="path4370"
+       style="color:#000000;fill:none;stroke:#505050;stroke-width:0.92307782;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#505050;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4372"
+       sodipodi:cx="1012"
+       sodipodi:cy="420"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="m 1016,420 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       transform="matrix(-1.5,0,0,1.5,2178.3155,407.90378)" />
+    <path
+       style="color:#000000;fill:none;stroke:#505050;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:3.70000005;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 672.31551,1012.4038 -28.00004,0"
+       id="path4374"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:none;stroke:#505050;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:3.70000005;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 661.31551,1039.9038 -17.00004,-28"
+       id="path4376"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>

=== added file 'app/assets/images/non-sprites/category-database.svg'
--- app/assets/images/non-sprites/category-database.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category-database.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="category-database.svg">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931703"
+     inkscape:cx="85.779492"
+     inkscape:cy="6.1041666"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4469"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <g
+       style="stroke:#505050;stroke-width:1;stroke-opacity:1;display:inline"
+       id="g4760-2"
+       transform="matrix(1.4999997,0,0,1.4999997,-851.68417,-316.59602)">
+      <path
+         transform="matrix(0.78787872,0,0,1.3333333,212.57582,-288.66662)"
+         d="m 1021,877 c 0,1.65685 -7.3873,3 -16.5,3 -9.1127,0 -16.5,-1.34315 -16.5,-3 0,-1.65685 7.3873,-3 16.5,-3 9.1127,0 16.5,1.34315 16.5,3 z"
+         sodipodi:ry="3"
+         sodipodi:rx="16.5"
+         sodipodi:cy="877"
+         sodipodi:cx="1004.5"
+         id="path4762-0"
+         style="color:#000000;fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:1.95133114;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 991,881 0,21.66665 0,0 c 0,2.20914 5.82029,4 13,4 7.1797,0 13,-1.79086 13,-4 L 1017,881"
+         id="path4764-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccssc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.95133114;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4766-6"
+         sodipodi:cx="1004.5"
+         sodipodi:cy="877"
+         sodipodi:rx="16.5"
+         sodipodi:ry="3"
+         d="m 1021,877 c 0,1.65685 -7.3873,3 -16.5,3 -7.46799,0 -14.00492,-0.91199 -15.93778,-2.22354"
+         transform="matrix(0.78787872,0,0,1.3333333,212.57582,-281.33332)"
+         sodipodi:start="0"
+         sodipodi:end="2.8797933"
+         sodipodi:open="true" />
+      <path
+         sodipodi:open="true"
+         sodipodi:end="2.8797933"
+         sodipodi:start="0"
+         transform="matrix(0.78787872,0,0,1.3333333,212.57582,-273.99995)"
+         d="m 1021,877 c 0,1.65685 -7.3873,3 -16.5,3 -7.46799,0 -14.00492,-0.91199 -15.93778,-2.22354"
+         sodipodi:ry="3"
+         sodipodi:rx="16.5"
+         sodipodi:cy="877"
+         sodipodi:cx="1004.5"
+         id="path4768-5"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.95133114;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>

=== added file 'app/assets/images/non-sprites/category-file-server.svg'
--- app/assets/images/non-sprites/category-file-server.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category-file-server.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="category-file-server.svg">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931703"
+     inkscape:cx="85.779492"
+     inkscape:cy="6.1041666"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4469"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#505050;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 634.81553,996.90381 c -2.46705,0 -4.5,2.03295 -4.5,4.49999 l 0,3 0,1.5 0,25.5 c 0,2.4671 2.03295,4.5 4.5,4.5 l 9.5,0 0,-3 -9.5,0 c -0.85695,0 -1.5,-0.643 -1.5,-1.5 l 0,-25.5 0,-1.5 0,-3 c 0,-0.857 0.64305,-1.49999 1.5,-1.49999 l 12,0 c 0.8569,0 1.5,0.64299 1.5,1.49999 -0.002,0.047 -0.002,0.094 0,0.1406 l 0,1.3593 1.2657,0 0.2343,0 24,0 c 0.8569,0 1.5,0.6431 1.5,1.5 l 0,27 0,4.2188 c 1.7336,-0.6275 3,-2.2811 3,-4.2188 l 0,-27 c 0,-2.467 -2.0329,-4.49996 -4.5,-4.49996 l -23.1093,0 c -0.6631,-1.66422 -2.0029,-3 -3.8907,-3 l -12,0 z m 15.32985,16.99989 c -1.662,0 -3,1.338 -3,3 l 0,25.0001 c 0,1.662 1.338,3 3,3 l 19.17015,0 c 1.662,0 3,-1.338 3,-3 l 0,-25 c 0,-1.662 -1.338,-3 -3,-3 z m 2.41915,4.0001 c 0.016,-2e-4 0.031,-2e-4 0.047,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 l 13.775,0 c 0.7845,-0.011 1.506,0.7075 1.506,1.5 0,0.7925 -0.7215,1.5112 -1.506,1.5 l -13.775,0 c -0.7774,0.1238 -1.5963,-0.4779 -1.719,-1.2632 -0.1227,-0.7853 0.4727,-1.6126 1.2501,-1.7368 z m 0,6 c 0.016,-2e-4 0.031,-2e-4 0.047,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 l 13.775,0 c 0.7845,-0.011 1.506,0.7075 1.506,1.5 0,0.7926 -0.7215,1.5112 -1.506,1.5 l -13.775,0 c -0.7774,0.1238 -1.5963,-0.4779 -1.719,-1.2632 -0.1227,-0.7853 0.4727,-1.6126 1.2501,-1.7368 z m 0,6 c 0.016,-2e-4 0.031,-2e-4 0.047,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 l 7.775,0 c 0.7845,-0.011 1.506,0.7075 1.506,1.5 0,0.7926 -0.7215,1.5112 -1.506,1.5 l -7.775,0 c -0.7774,0.1238 -1.5963,-0.4779 -1.719,-1.2632 -0.1227,-0.7853 0.4727,-1.6126 1.2501,-1.7368 z"
+       id="rect4570-0"
+       sodipodi:nodetypes="csccssccssccssscccccssccssscsccsssssssssccccccsccsccccccccsccsccccccccsccscc" />
+  </g>
+</svg>

=== added file 'app/assets/images/non-sprites/category-misc.svg'
--- app/assets/images/non-sprites/category-misc.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category-misc.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="New document 3">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.3664629"
+     inkscape:cx="37.208976"
+     inkscape:cy="23.504348"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <g
+       style="stroke:#505050;stroke-opacity:1;display:inline"
+       id="g4736-4"
+       transform="matrix(1.4999966,0,0,1.4999966,-851.71092,-137.06381)">
+      <path
+         transform="matrix(1.3636397,0,0,1.3636397,-365.09423,-280.72982)"
+         d="m 1015,772 c 0,6.07513 -4.9249,11 -11,11 -6.07513,0 -11,-4.92487 -11,-11 0,-6.07513 4.92487,-11 11,-11 6.0751,0 11,4.92487 11,11 z"
+         sodipodi:ry="11"
+         sodipodi:rx="11"
+         sodipodi:cy="772"
+         sodipodi:cx="1004"
+         id="path4738-2"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.466663;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4740-2"
+         d="m 1003.6667,762.90178 0,18.19643"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1011.8793,767.45089 -15.75859,9.09821"
+         id="path4742-7"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4744-6"
+         d="m 1011.8793,776.54911 -15.75858,-9.09823"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== added directory 'app/assets/images/non-sprites/category_icons'
=== added file 'app/assets/images/non-sprites/category_icons/category-app-server.svg'
--- app/assets/images/non-sprites/category_icons/category-app-server.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category_icons/category-app-server.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="category-app-server.svg">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931703"
+     inkscape:cx="85.779492"
+     inkscape:cy="6.1041666"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4469"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <g
+       style="stroke:#505050;stroke-opacity:1;display:inline"
+       id="g4781-3"
+       transform="matrix(1.5005353,0,0,1.4833177,-852.22207,-34.476776)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4783-4"
+         d="m 996.33998,725.99069 7.65092,-3.80699 0,-8.70167 -7.65092,3.26312 z"
+         style="color:#000000;fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:2.01851225;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.982494;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 996.35027,726.0088 -7.35894,-3.81802 0,-8.72686 7.35894,3.27257 z"
+         id="path4785-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4787-1"
+         d="m 996.50004,716.7407 7.50006,-3.26798 -7.50006,-3.81266 -7.50001,3.81266 z"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:1.98247516;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1011.6499,726.00881 7.3589,-3.81802 0,-8.72688 -7.3589,3.27258 z"
+         id="path4789-0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4791-1"
+         d="m 1011.6602,725.99068 -7.651,-3.80699 0,-8.70165 7.651,3.26312 z"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2.01853108;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1011.5,716.7407 7.5001,-3.26798 -7.5001,-3.81266 -7.5,3.81266 z"
+         id="path4793-3"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4795-6"
+         d="m 1003.6526,713.34891 7.3564,-3.81813 0,-8.7271 -7.3564,3.27267 z"
+         style="color:#000000;fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:1.9821583;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2.01884151;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1003.6629,713.33046 -7.65353,-3.8069 0,-8.70143 7.65353,3.26304 z"
+         id="path4797-0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4799-9"
+         d="m 1003.5,704.08064 7.5001,-3.26799 L 1003.5,697 996,700.81265 z"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== added file 'app/assets/images/non-sprites/category_icons/category-application.svg'
--- app/assets/images/non-sprites/category_icons/category-application.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category_icons/category-application.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="category-application.svg">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931703"
+     inkscape:cx="85.779492"
+     inkscape:cy="6.1041666"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4469"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <g
+       style="stroke:#505050;stroke-width:0.99999881;stroke-opacity:1;display:inline"
+       id="g4746-5"
+       transform="matrix(1.5000001,0,0,1.4999966,-852.18459,-227.09334)">
+      <path
+         style="color:#000000;fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:1.99999762;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1004,847 14,-7 0,-16 -14,6 z"
+         id="path4748-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4750-9"
+         d="m 1004,847 -14,-7 0,-16 14,6 z"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.99999762;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.99999762;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1004,830 14,-6 -14,-7 -14,7 z"
+         id="path4752-1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

=== added file 'app/assets/images/non-sprites/category_icons/category-cache-proxy.svg'
--- app/assets/images/non-sprites/category_icons/category-cache-proxy.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category_icons/category-cache-proxy.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="category-cache-proxy.svg">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931703"
+     inkscape:cx="85.779492"
+     inkscape:cy="6.1041666"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4469"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#505050;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3598"
+       sodipodi:cx="1012"
+       sodipodi:cy="420"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="m 1016,420 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       transform="matrix(-1.625,0,0,1.625,2289.3155,329.90378)" />
+    <path
+       transform="matrix(-1.625,0,0,1.625,2316.3155,329.90378)"
+       d="m 1016,420 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4"
+       sodipodi:cy="420"
+       sodipodi:cx="1012"
+       id="path4368"
+       style="color:#000000;fill:#505050;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(-3.2499973,0,0,3.2499973,3933.8128,-352.59507)"
+       d="m 1016,420 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4"
+       sodipodi:cy="420"
+       sodipodi:cx="1012"
+       id="path4370"
+       style="color:#000000;fill:none;stroke:#505050;stroke-width:0.92307782;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#505050;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4372"
+       sodipodi:cx="1012"
+       sodipodi:cy="420"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="m 1016,420 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z"
+       transform="matrix(-1.5,0,0,1.5,2178.3155,407.90378)" />
+    <path
+       style="color:#000000;fill:none;stroke:#505050;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:3.70000005;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 672.31551,1012.4038 -28.00004,0"
+       id="path4374"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:none;stroke:#505050;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:3.70000005;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 661.31551,1039.9038 -17.00004,-28"
+       id="path4376"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>

=== added file 'app/assets/images/non-sprites/category_icons/category-database.svg'
--- app/assets/images/non-sprites/category_icons/category-database.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category_icons/category-database.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="category-database.svg">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931703"
+     inkscape:cx="85.779492"
+     inkscape:cy="6.1041666"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4469"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <g
+       style="stroke:#505050;stroke-width:1;stroke-opacity:1;display:inline"
+       id="g4760-2"
+       transform="matrix(1.4999997,0,0,1.4999997,-851.68417,-316.59602)">
+      <path
+         transform="matrix(0.78787872,0,0,1.3333333,212.57582,-288.66662)"
+         d="m 1021,877 c 0,1.65685 -7.3873,3 -16.5,3 -9.1127,0 -16.5,-1.34315 -16.5,-3 0,-1.65685 7.3873,-3 16.5,-3 9.1127,0 16.5,1.34315 16.5,3 z"
+         sodipodi:ry="3"
+         sodipodi:rx="16.5"
+         sodipodi:cy="877"
+         sodipodi:cx="1004.5"
+         id="path4762-0"
+         style="color:#000000;fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:1.95133114;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 991,881 0,21.66665 0,0 c 0,2.20914 5.82029,4 13,4 7.1797,0 13,-1.79086 13,-4 L 1017,881"
+         id="path4764-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccssc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.95133114;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4766-6"
+         sodipodi:cx="1004.5"
+         sodipodi:cy="877"
+         sodipodi:rx="16.5"
+         sodipodi:ry="3"
+         d="m 1021,877 c 0,1.65685 -7.3873,3 -16.5,3 -7.46799,0 -14.00492,-0.91199 -15.93778,-2.22354"
+         transform="matrix(0.78787872,0,0,1.3333333,212.57582,-281.33332)"
+         sodipodi:start="0"
+         sodipodi:end="2.8797933"
+         sodipodi:open="true" />
+      <path
+         sodipodi:open="true"
+         sodipodi:end="2.8797933"
+         sodipodi:start="0"
+         transform="matrix(0.78787872,0,0,1.3333333,212.57582,-273.99995)"
+         d="m 1021,877 c 0,1.65685 -7.3873,3 -16.5,3 -7.46799,0 -14.00492,-0.91199 -15.93778,-2.22354"
+         sodipodi:ry="3"
+         sodipodi:rx="16.5"
+         sodipodi:cy="877"
+         sodipodi:cx="1004.5"
+         id="path4768-5"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.95133114;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>

=== added file 'app/assets/images/non-sprites/category_icons/category-file-server.svg'
--- app/assets/images/non-sprites/category_icons/category-file-server.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category_icons/category-file-server.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="category-file-server.svg">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931703"
+     inkscape:cx="85.779492"
+     inkscape:cy="6.1041666"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4469"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#505050;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 634.81553,996.90381 c -2.46705,0 -4.5,2.03295 -4.5,4.49999 l 0,3 0,1.5 0,25.5 c 0,2.4671 2.03295,4.5 4.5,4.5 l 9.5,0 0,-3 -9.5,0 c -0.85695,0 -1.5,-0.643 -1.5,-1.5 l 0,-25.5 0,-1.5 0,-3 c 0,-0.857 0.64305,-1.49999 1.5,-1.49999 l 12,0 c 0.8569,0 1.5,0.64299 1.5,1.49999 -0.002,0.047 -0.002,0.094 0,0.1406 l 0,1.3593 1.2657,0 0.2343,0 24,0 c 0.8569,0 1.5,0.6431 1.5,1.5 l 0,27 0,4.2188 c 1.7336,-0.6275 3,-2.2811 3,-4.2188 l 0,-27 c 0,-2.467 -2.0329,-4.49996 -4.5,-4.49996 l -23.1093,0 c -0.6631,-1.66422 -2.0029,-3 -3.8907,-3 l -12,0 z m 15.32985,16.99989 c -1.662,0 -3,1.338 -3,3 l 0,25.0001 c 0,1.662 1.338,3 3,3 l 19.17015,0 c 1.662,0 3,-1.338 3,-3 l 0,-25 c 0,-1.662 -1.338,-3 -3,-3 z m 2.41915,4.0001 c 0.016,-2e-4 0.031,-2e-4 0.047,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 l 13.775,0 c 0.7845,-0.011 1.506,0.7075 1.506,1.5 0,0.7925 -0.7215,1.5112 -1.506,1.5 l -13.775,0 c -0.7774,0.1238 -1.5963,-0.4779 -1.719,-1.2632 -0.1227,-0.7853 0.4727,-1.6126 1.2501,-1.7368 z m 0,6 c 0.016,-2e-4 0.031,-2e-4 0.047,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 l 13.775,0 c 0.7845,-0.011 1.506,0.7075 1.506,1.5 0,0.7926 -0.7215,1.5112 -1.506,1.5 l -13.775,0 c -0.7774,0.1238 -1.5963,-0.4779 -1.719,-1.2632 -0.1227,-0.7853 0.4727,-1.6126 1.2501,-1.7368 z m 0,6 c 0.016,-2e-4 0.031,-2e-4 0.047,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 0.047,0 0.094,0 0.141,0 l 7.775,0 c 0.7845,-0.011 1.506,0.7075 1.506,1.5 0,0.7926 -0.7215,1.5112 -1.506,1.5 l -7.775,0 c -0.7774,0.1238 -1.5963,-0.4779 -1.719,-1.2632 -0.1227,-0.7853 0.4727,-1.6126 1.2501,-1.7368 z"
+       id="rect4570-0"
+       sodipodi:nodetypes="csccssccssccssscccccssccssscsccsssssssssccccccsccsccccccccsccsccccccccsccscc" />
+  </g>
+</svg>

=== added file 'app/assets/images/non-sprites/category_icons/category-misc.svg'
--- app/assets/images/non-sprites/category_icons/category-misc.svg	1970-01-01 00:00:00 +0000
+++ app/assets/images/non-sprites/category_icons/category-misc.svg	2013-06-26 14:26:26 +0000
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="47.94035"
+   height="47.94035"
+   id="svg4400"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="New document 3">
+  <defs
+     id="defs4402" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.3664629"
+     inkscape:cx="37.208976"
+     inkscape:cy="23.504348"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4405">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-630.31553,-996.96343)">
+    <g
+       style="stroke:#505050;stroke-opacity:1;display:inline"
+       id="g4736-4"
+       transform="matrix(1.4999966,0,0,1.4999966,-851.71092,-137.06381)">
+      <path
+         transform="matrix(1.3636397,0,0,1.3636397,-365.09423,-280.72982)"
+         d="m 1015,772 c 0,6.07513 -4.9249,11 -11,11 -6.07513,0 -11,-4.92487 -11,-11 0,-6.07513 4.92487,-11 11,-11 6.0751,0 11,4.92487 11,11 z"
+         sodipodi:ry="11"
+         sodipodi:rx="11"
+         sodipodi:cy="772"
+         sodipodi:cx="1004"
+         id="path4738-2"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:1.466663;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4740-2"
+         d="m 1003.6667,762.90178 0,18.19643"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1011.8793,767.45089 -15.75859,9.09821"
+         id="path4742-7"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4744-6"
+         d="m 1011.8793,776.54911 -15.75858,-9.09823"
+         style="color:#000000;fill:none;stroke:#505050;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== added file 'app/assets/images/twitter-click.png'
Binary files app/assets/images/twitter-click.png	1970-01-01 00:00:00 +0000 and app/assets/images/twitter-click.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/twitter-hover.png'
Binary files app/assets/images/twitter-hover.png	1970-01-01 00:00:00 +0000 and app/assets/images/twitter-hover.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/images/twitter-normal.png'
Binary files app/assets/images/twitter-normal.png	1970-01-01 00:00:00 +0000 and app/assets/images/twitter-normal.png	2013-06-26 14:26:26 +0000 differ
=== added file 'app/assets/javascripts/Object.observe.poly.js'
--- app/assets/javascripts/Object.observe.poly.js	1970-01-01 00:00:00 +0000
+++ app/assets/javascripts/Object.observe.poly.js	2013-06-26 14:26:26 +0000
@@ -0,0 +1,246 @@
+/*
+  Tested against Chromium build with Object.observe and acts EXACTLY the same,
+  though Chromium build is MUCH faster
+
+  Trying to stay as close to the spec as possible,
+  this is a work in progress, feel free to comment/update
+
+  Specification:
+    http://wiki.ecmascript.org/doku.php?id=harmony:observe
+
+  Built using parts of:
+    https://github.com/tvcutsem/harmony-reflect/blob/master/examples/observer.js
+
+  Limits so far;
+    Built using polling... Will update again with polling/getter&setters to make things better at some point
+*/
+'use strict';
+if (!Object.observe) {
+  (function(extend, global) {
+    var isCallable = (function(toString) {
+      var s = toString.call(toString),
+          u = typeof u;
+      return typeof global.alert === 'object' ?
+          function(f) {
+            return s === toString.call(f) || (!!f && typeof f.toString == u && typeof f.valueOf == u && /^\s*\bfunction\b/.test('' + f));
+          } :
+          function(f) {
+            return s === toString.call(f);
+          }
+;
+    })(extend.prototype.toString);
+    var isNumeric = function(n) {
+      return !isNaN(parseFloat(n)) && isFinite(n);
+    };
+    var sameValue = function(x, y) {
+      if (x === y) {
+        return x !== 0 || 1 / x === 1 / y;
+      }
+      return x !== x && y !== y;
+    };
+    var isAccessorDescriptor = function(desc) {
+      if (typeof(desc) === 'undefined') {
+        return false;
+      }
+      return ('get' in desc || 'set' in desc);
+    };
+    var isDataDescriptor = function(desc) {
+      if (typeof(desc) === 'undefined') {
+        return false;
+      }
+      return ('value' in desc || 'writable' in desc);
+    };
+
+    var validateArguments = function(O, callback) {
+      if (typeof(O) !== 'object') {
+        // Throw Error
+        throw new TypeError('Object.observeObject called on non-object');
+      }
+      if (isCallable(callback) === false) {
+        // Throw Error
+        throw new TypeError('Object.observeObject: Expecting function');
+      }
+      if (Object.isFrozen(callback) === true) {
+        // Throw Error
+        throw new TypeError('Object.observeObject: Expecting unfrozen function');
+      }
+    };
+
+    var Observer = (function() {
+      var wraped = [];
+      var Observer = function(O, callback) {
+        validateArguments(O, callback);
+        Object.getNotifier(O).addListener(callback);
+        if (wraped.indexOf(O) === -1) {
+          wraped.push(O);
+        }else {
+          Object.getNotifier(O)._checkPropertyListing();
+        }
+      };
+
+      Observer.prototype.deliverChangeRecords = function(O) {
+        Object.getNotifier(O).deliverChangeRecords();
+      };
+
+      wraped.lastScanned = 0;
+      var f = (function(wrapped) {
+        return function() {
+          var i = 0, l = wrapped.length, startTime = new Date(), takingTooLong = false;
+          for (i = wrapped.lastScanned; (i < l) && (!takingTooLong); i++) {
+            Object.getNotifier(wrapped[i])._checkPropertyListing();
+            takingTooLong = ((new Date()) - startTime) > 100; // make sure we don't take more than 100 milliseconds to scan all objects
+          }
+          wrapped.lastScanned = i < l ? i : 0; // reset wrapped so we can make sure that we pick things back up
+          setTimeout(f, 100);
+        };
+      })(wraped);
+      setTimeout(f, 100);
+
+      return Observer;
+    })();
+
+    var Notifier = function(watching) {
+      var _listeners = [], _updates = [], _updater = false, properties = [], values = [];
+      var self = this;
+      Object.defineProperty(self, '_watching', {
+        get: (function(watched) {
+          return function() {
+            return watched;
+          };
+        })(watching)
+      });
+      var wrapProperty = function(object, prop) {
+        var propType = typeof(object[prop]), descriptor = Object.getOwnPropertyDescriptor(object, prop);
+        if ((prop === 'getNotifier') || isAccessorDescriptor(descriptor) || (!descriptor.enumerable)) {
+          return false;
+        }
+        if ((object instanceof Array) && isNumeric(prop)) {
+          var idx = properties.length;
+          properties[idx] = prop;
+          values[idx] = object[prop];
+          return true;
+        }
+        (function(idx, prop) {
+          properties[idx] = prop;
+          values[idx] = object[prop];
+          Object.defineProperty(object, prop, {
+            get: function() {
+              return values[idx];
+            },
+            set: function(value) {
+              if (!sameValue(values[idx], value)) {
+                Object.getNotifier(object).queueUpdate(object, prop, 'updated', values[idx]);
+                values[idx] = value;
+              }
+            }
+          });
+        })(properties.length, prop);
+        return true;
+      };
+      self._checkPropertyListing = function(dontQueueUpdates) {
+        var object = self._watching, keys = Object.keys(object), i = 0, l = keys.length;
+        var newKeys = [], oldKeys = properties.slice(0), updates = [];
+        var prop, queueUpdates = !dontQueueUpdates, propType, value, idx;
+
+        for (i = 0; i < l; i++) {
+          prop = keys[i];
+          value = object[prop];
+          propType = typeof(value);
+          if ((idx = properties.indexOf(prop)) === -1) {
+            if (wrapProperty(object, prop) && queueUpdates) {
+              self.queueUpdate(object, prop, 'new', null, object[prop]);
+            }
+          }else {
+            if ((object instanceof Array) && (isNumeric(prop))) {
+              if (values[idx] !== value) {
+                if (queueUpdates) {
+                  self.queueUpdate(object, prop, 'updated', values[idx], value);
+                }
+                values[idx] = value;
+              }
+            }
+            oldKeys.splice(oldKeys.indexOf(prop), 1);
+          }
+        }
+        if (queueUpdates) {
+          l = oldKeys.length;
+          for (i = 0; i < l; i++) {
+            idx = properties.indexOf(oldKeys[i]);
+            self.queueUpdate(object, oldKeys[i], 'deleted', values[idx]);
+            properties.splice(idx, 1);
+            values.splice(idx, 1);
+          }
+        }
+      };
+      self.addListener = function(callback) {
+        var idx = _listeners.indexOf(callback);
+        if (idx === -1) {
+          _listeners.push(callback);
+        }
+      };
+      self.removeListener = function(callback) {
+        var idx = _listeners.indexOf(callback);
+        if (idx > -1) {
+          _listeners.splice(idx, 1);
+        }
+      };
+      self.listeners = function() {
+        return _listeners;
+      };
+      self.queueUpdate = function(what, prop, type, was) {
+        this.queueUpdates([{
+          type: type,
+          object: what,
+          name: prop,
+          oldValue: was
+        }]);
+      };
+      self.queueUpdates = function(updates) {
+        var self = this, i = 0, l = updates.length || 0, update;
+        for (i = 0; i < l; i++) {
+          update = updates[i];
+          _updates.push(update);
+        }
+        if (_updater) {
+          clearTimeout(_updater);
+        }
+        _updater = setTimeout(function() {
+          _updater = false;
+          self.deliverChangeRecords();
+        }, 100);
+      };
+      self.deliverChangeRecords = function() {
+        var i = 0, l = _listeners.length, keepRunning = true;
+        for (i = 0; i < l && keepRunning; i++) {
+          if (typeof(_listeners[i]) === 'function') {
+            if (_listeners[i] === console.log) {
+              console.log(_updates);
+            }else {
+              keepRunning = !(_listeners[i](_updates));
+            }
+          }
+        }
+        _updates = [];
+      };
+      self._checkPropertyListing(true);
+    };
+
+    var _notifiers = [], _indexes = [];
+    extend.getNotifier = function(O) {
+      var idx = _indexes.indexOf(O), notifier = idx > -1 ? _notifiers[idx] : false;
+      if (!notifier) {
+        idx = _indexes.length;
+        _indexes[idx] = O;
+        notifier = _notifiers[idx] = new Notifier(O);
+      }
+      return notifier;
+    };
+    extend.observe = function(O, callback) {
+      return new Observer(O, callback);
+    };
+    extend.unobserve = function(O, callback) {
+      validateArguments(O, callback);
+      extend.getNotifier(O).removeListener(callback);
+    };
+  })(Object, this);
+}

=== added file 'app/assets/javascripts/app-cookies-extension.js'
--- app/assets/javascripts/app-cookies-extension.js	1970-01-01 00:00:00 +0000
+++ app/assets/javascripts/app-cookies-extension.js	2013-06-26 14:26:26 +0000
@@ -0,0 +1,75 @@
+/*
+This file is part of the Juju GUI, which lets users view and manage Juju
+environments within a graphical interface (https://launchpad.net/juju-gui).
+Copyright (C) 2013 Canonical Ltd.
+
+This program is free software: you can redistribute it and/or modify it under
+the terms of the GNU Affero General Public License version 3, as published by
+the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
+General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+'use strict';
+
+YUI.add('app-cookies-extension', function(Y) {
+
+  /**
+    A cookies warning handler, enabled when using analytics.
+
+     @class Cookies
+     @extension App
+     @param {Object} test_node DOM node only passed in in tests.
+   */
+  function Cookies(test_node) {
+    this.node = test_node || Y.one('.cookie-policy');
+  }
+
+  Cookies.prototype = {
+
+    /**
+      Check that the user accepted cookie usage, and if not display a cookie
+      usage warning.
+
+      @method check
+      @return {undefined} Side-effects only.
+    */
+    check: function() {
+      var self = this;
+      if (Y.Cookie.get('_cookies_accepted') !== 'true') {
+        this.node.setStyle('display', 'block');
+        Y.one('.link-cta').once('click', function(evt) {
+          evt.preventDefault();
+          self.close();
+        });
+      }
+    },
+
+    /**
+      Close the cookie usage warning and set a cookie to denote user agreement.
+
+      @method close
+      @return {undefined} Side-effects only.
+    */
+    close: function() {
+      this.node.setStyle('display', 'none');
+      Y.Cookie.set('_cookies_accepted', 'true',
+          {expires: new Date('January 12, 2025')});
+    }
+
+  };
+
+  Y.namespace('juju').Cookies = Cookies;
+
+}, '0.1.0', {
+  requires: [
+    'base',
+    'cookie'
+  ]
+});

=== modified file 'app/assets/javascripts/ns-routing-app-extension.js'
--- app/assets/javascripts/ns-routing-app-extension.js	2013-05-22 18:47:13 +0000
+++ app/assets/javascripts/ns-routing-app-extension.js	2013-06-26 14:26:26 +0000
@@ -61,9 +61,29 @@
     return result;
   }
 
-  var Routes = {
-    pairs: function() {return pairs(this);}
-  };
+  var Routes = (function() {
+    function Routes() {
+      return Object.create(this, {
+        defaultNamespacePresent: {
+          enumerable: false,
+          writable: true
+        },
+        hash: {
+          enumerable: false,
+          writable: true
+        },
+        search: {
+          enumerable: false,
+          writable: true
+        },
+        pairs: {
+          enumable: false,
+          value: function() {return pairs(this);}
+        }
+      });
+    }
+    return Routes;
+  })();
 
   // Multi dimensional router (TARDIS).
   var _Router = {
@@ -81,6 +101,24 @@
     },
 
     /**
+      Return the #hash portion of the URL if present.
+
+      @method getHash
+      @param {String} url to parse hash from.
+      @return {String} hash || null.
+    */
+    getHash: function(url) {
+      // This will return an array with three values  the whole matched hash,
+      // the hash symbol, and then the hash without the hash.
+      // It is quoted to shush the linter about the .
+      var match = url.match('(#)(.[^?\/]*)?');
+      if (!match) {
+        return undefined;
+      }
+      return match[2];
+    },
+
+    /**
      * Split a URL into components, a subset of the
      * Location Object.
      *
@@ -94,6 +132,7 @@
       };
       var origin = this._regexUrlOrigin.exec(url);
       result.search = this.getQS(url);
+      result.hash = this.getHash(url);
 
       if (origin) {
         // Take the match.
@@ -105,8 +144,9 @@
       }
 
       if (result.search) {
-        result.pathname = result.pathname.substr(0,
-                          (result.pathname.length - result.search.length) - 1);
+        result.pathname = result.pathname.substr(
+            0,
+            (result.pathname.length - result.search.length) - 1);
       }
 
       return result;
@@ -127,20 +167,23 @@
      **/
     parse: function(url, combineFlags) {
       combineFlags = Y.mix(this.combineFlags || {}, combineFlags, true);
-      var result = Object.create(Routes, {
-        defaultNamespacePresent: {
-          enumerable: false,
-          writable: true
-        }
-      });
+      var result = new Routes();
       var parts = this.split(url);
       url = parts.pathname;
+      result.hash = parts.hash;
+      result.search = parts.search;
 
+      // If there was a hash we need to split it off url
+      if (result.hash) {
+        url = url.slice(0, url.indexOf('#'));
+      }
       parts = url.split(this._fragment);
-      //  > '/foo/bar'.split(this._fragment)
-      //    ["/foo/bar"]
-      //  > :baz:/foo/bar'.split(this._fragment)
-      //    ["", ":baz:", "/foo/bar"]
+      // Example output
+      // '/foo/bar'.split(this._fragment)
+      // ["/foo/bar"]
+      //
+      // ':baz:/foo/bar'.split(this._fragment)
+      // ["", ":baz:", "/foo/bar"]
       if (parts[0]) {
         // This is a URL fragment without a namespace.
         parts[0] = rtrim(parts[0], '/') + '/';
@@ -225,11 +268,20 @@
       });
 
       url = slash(url);
+
+      if (components.hash) {
+        url += '#' + components.hash;
+      }
+
+      if (components.search) {
+        url += '?' + components.search;
+      }
       return url;
     },
 
     /**
-     * Smartly combine new namespaced url components with old.
+     * Smartly combine new namespaced url components with old. Hash and
+     * query string parameters from the incoming URL are preserved.
      *
      * @method combine
      * @param {Object} orig url.
@@ -260,7 +312,7 @@
         // original value).
         delete incoming[this.defaultNamespace];
       }
-      var output = {};
+      var output = new Routes();
       Y.each(orig, function(v, k) {
         if (v && !Y.Lang.isArray(v)) {
           v = [v];
@@ -290,9 +342,11 @@
           }
         });
       });
+
+      output.hash = incoming.hash;
+      output.search = incoming.search;
       url = this.url(output, {excludeRootPaths: true});
       return url;
-
     }
   };
 
@@ -363,11 +417,7 @@
         delete options.overrideAllNamespaces;
       } else {
         var loc = Y.getLocation();
-        var qs = this.nsRouter.getQS(url);
         result = this.nsRouter.combine(loc.pathname, url);
-        if (qs) {
-          result += '?' + qs;
-        }
       }
       if (Y.App.prototype._navigate.call(this, result, options)) {
         return true;

=== modified file 'app/assets/javascripts/reconnecting-websocket.js'
--- app/assets/javascripts/reconnecting-websocket.js	2012-07-24 18:18:43 +0000
+++ app/assets/javascripts/reconnecting-websocket.js	2013-06-26 14:26:26 +0000
@@ -38,7 +38,7 @@
  *  onopen  // sometime later...
  *  onmessage
  *  onmessage
- *  etc... 
+ *  etc...
  *
  * It is API compatible with the standard WebSocket API.
  *
@@ -46,7 +46,7 @@
  */
 
 YUI.add("reconnecting-websocket", function(Y) {
-            
+
 function ReconnectingWebSocket(url, protocols) {
 
     // These can be altered by calling code.
@@ -58,7 +58,7 @@
     var ws;
     var forcedClose = false;
     var timedOut = false;
-    
+
     this.url = url;
     this.protocols = protocols;
     this.readyState = WebSocket.CONNECTING;
@@ -81,7 +81,7 @@
         if (self.debug || ReconnectingWebSocket.debugAll) {
             console.debug('ReconnectingWebSocket', 'attempt-connect', url);
         }
-        
+
         var localWs = ws;
         var timeout = setTimeout(function() {
             if (self.debug || ReconnectingWebSocket.debugAll) {
@@ -91,7 +91,7 @@
             localWs.close();
             timedOut = false;
         }, self.timeoutInterval);
-        
+
         ws.onopen = function(event) {
             clearTimeout(timeout);
             if (self.debug || ReconnectingWebSocket.debugAll) {
@@ -101,7 +101,7 @@
             reconnectAttempt = false;
             self.onopen(event);
         };
-        
+
         ws.onclose = function(event) {
             clearTimeout(timeout);
             ws = null;
@@ -125,7 +125,8 @@
             if (self.debug || ReconnectingWebSocket.debugAll) {
                 console.debug('ReconnectingWebSocket', 'onmessage', url, event.data);
             }
-        	self.onmessage(event);
+            Y.fire('websocketReceive', event.data);
+            self.onmessage(event);
         };
         ws.onerror = function(event) {
             if (self.debug || ReconnectingWebSocket.debugAll) {
@@ -141,6 +142,7 @@
             if (self.debug || ReconnectingWebSocket.debugAll) {
                 console.debug('ReconnectingWebSocket', 'send', url, data);
             }
+            Y.fire('websocketSend', data);
             return ws.send(data);
         } else {
             throw 'INVALID_STATE_ERR : Pausing to reconnect websocket';
@@ -174,4 +176,4 @@
 
 }, "0.1.0", {
         requires: ["base"]
-});
\ No newline at end of file
+});

=== removed file 'app/assets/stylesheets/bootstrap-responsive-2.0.4.css'
--- app/assets/stylesheets/bootstrap-responsive-2.0.4.css	2012-07-18 21:14:50 +0000
+++ app/assets/stylesheets/bootstrap-responsive-2.0.4.css	1970-01-01 00:00:00 +0000
@@ -1,815 +0,0 @@
-/*!
- * Bootstrap Responsive v2.0.4
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 28px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-      -ms-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-.visible-phone {
-  display: none !important;
-}
-
-.visible-tablet {
-  display: none !important;
-}
-
-.hidden-desktop {
-  display: none !important;
-}
-
-@media (max-width: 767px) {
-  .visible-phone {
-    display: inherit !important;
-  }
-  .hidden-phone {
-    display: none !important;
-  }
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .visible-tablet {
-    display: inherit !important;
-  }
-  .hidden-tablet {
-    display: none !important;
-  }
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important ;
-  }
-}
-
-@media (max-width: 480px) {
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  .page-header h1 small {
-    display: block;
-    line-height: 18px;
-  }
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-  .form-horizontal .control-group > label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-  .modal {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    left: 10px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade.in {
-    top: auto;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-  .carousel-caption {
-    position: static;
-  }
-}
-
-@media (max-width: 767px) {
-  body {
-    padding-right: 20px;
-    padding-left: 20px;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    margin-right: -20px;
-    margin-left: -20px;
-  }
-  .container-fluid {
-    padding: 0;
-  }
-  .dl-horizontal dt {
-    float: none;
-    width: auto;
-    clear: none;
-    text-align: left;
-  }
-  .dl-horizontal dd {
-    margin-left: 0;
-  }
-  .container {
-    width: auto;
-  }
-  .row-fluid {
-    width: 100%;
-  }
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-  [class*="span"],
-  .row-fluid [class*="span"] {
-    display: block;
-    float: none;
-    width: auto;
-    margin-left: 0;
-  }
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    display: block;
-    width: 100%;
-    min-height: 28px;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-        -ms-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block;
-    width: auto;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .row {
-    margin-left: -20px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    margin-left: 20px;
-  }
-  .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 724px;
-  }
-  .span12 {
-    width: 724px;
-  }
-  .span11 {
-    width: 662px;
-  }
-  .span10 {
-    width: 600px;
-  }
-  .span9 {
-    width: 538px;
-  }
-  .span8 {
-    width: 476px;
-  }
-  .span7 {
-    width: 414px;
-  }
-  .span6 {
-    width: 352px;
-  }
-  .span5 {
-    width: 290px;
-  }
-  .span4 {
-    width: 228px;
-  }
-  .span3 {
-    width: 166px;
-  }
-  .span2 {
-    width: 104px;
-  }
-  .span1 {
-    width: 42px;
-  }
-  .offset12 {
-    margin-left: 764px;
-  }
-  .offset11 {
-    margin-left: 702px;
-  }
-  .offset10 {
-    margin-left: 640px;
-  }
-  .offset9 {
-    margin-left: 578px;
-  }
-  .offset8 {
-    margin-left: 516px;
-  }
-  .offset7 {
-    margin-left: 454px;
-  }
-  .offset6 {
-    margin-left: 392px;
-  }
-  .offset5 {
-    margin-left: 330px;
-  }
-  .offset4 {
-    margin-left: 268px;
-  }
-  .offset3 {
-    margin-left: 206px;
-  }
-  .offset2 {
-    margin-left: 144px;
-  }
-  .offset1 {
-    margin-left: 82px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 28px;
-    margin-left: 2.762430939%;
-    *margin-left: 2.709239449638298%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-        -ms-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .span12 {
-    width: 99.999999993%;
-    *width: 99.9468085036383%;
-  }
-  .row-fluid .span11 {
-    width: 91.436464082%;
-    *width: 91.38327259263829%;
-  }
-  .row-fluid .span10 {
-    width: 82.87292817100001%;
-    *width: 82.8197366816383%;
-  }
-  .row-fluid .span9 {
-    width: 74.30939226%;
-    *width: 74.25620077063829%;
-  }
-  .row-fluid .span8 {
-    width: 65.74585634900001%;
-    *width: 65.6926648596383%;
-  }
-  .row-fluid .span7 {
-    width: 57.182320438000005%;
-    *width: 57.129128948638304%;
-  }
-  .row-fluid .span6 {
-    width: 48.618784527%;
-    *width: 48.5655930376383%;
-  }
-  .row-fluid .span5 {
-    width: 40.055248616%;
-    *width: 40.0020571266383%;
-  }
-  .row-fluid .span4 {
-    width: 31.491712705%;
-    *width: 31.4385212156383%;
-  }
-  .row-fluid .span3 {
-    width: 22.928176794%;
-    *width: 22.874985304638297%;
-  }
-  .row-fluid .span2 {
-    width: 14.364640883%;
-    *width: 14.311449393638298%;
-  }
-  .row-fluid .span1 {
-    width: 5.801104972%;
-    *width: 5.747913482638298%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 714px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 652px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 590px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 528px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 466px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 404px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 342px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 280px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 218px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 156px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 94px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 32px;
-  }
-}
-
-@media (min-width: 1200px) {
-  .row {
-    margin-left: -30px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    margin-left: 30px;
-  }
-  .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 1170px;
-  }
-  .span12 {
-    width: 1170px;
-  }
-  .span11 {
-    width: 1070px;
-  }
-  .span10 {
-    width: 970px;
-  }
-  .span9 {
-    width: 870px;
-  }
-  .span8 {
-    width: 770px;
-  }
-  .span7 {
-    width: 670px;
-  }
-  .span6 {
-    width: 570px;
-  }
-  .span5 {
-    width: 470px;
-  }
-  .span4 {
-    width: 370px;
-  }
-  .span3 {
-    width: 270px;
-  }
-  .span2 {
-    width: 170px;
-  }
-  .span1 {
-    width: 70px;
-  }
-  .offset12 {
-    margin-left: 1230px;
-  }
-  .offset11 {
-    margin-left: 1130px;
-  }
-  .offset10 {
-    margin-left: 1030px;
-  }
-  .offset9 {
-    margin-left: 930px;
-  }
-  .offset8 {
-    margin-left: 830px;
-  }
-  .offset7 {
-    margin-left: 730px;
-  }
-  .offset6 {
-    margin-left: 630px;
-  }
-  .offset5 {
-    margin-left: 530px;
-  }
-  .offset4 {
-    margin-left: 430px;
-  }
-  .offset3 {
-    margin-left: 330px;
-  }
-  .offset2 {
-    margin-left: 230px;
-  }
-  .offset1 {
-    margin-left: 130px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 28px;
-    margin-left: 2.564102564%;
-    *margin-left: 2.510911074638298%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-        -ms-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.45299145300001%;
-    *width: 91.3997999636383%;
-  }
-  .row-fluid .span10 {
-    width: 82.905982906%;
-    *width: 82.8527914166383%;
-  }
-  .row-fluid .span9 {
-    width: 74.358974359%;
-    *width: 74.30578286963829%;
-  }
-  .row-fluid .span8 {
-    width: 65.81196581200001%;
-    *width: 65.7587743226383%;
-  }
-  .row-fluid .span7 {
-    width: 57.264957265%;
-    *width: 57.2117657756383%;
-  }
-  .row-fluid .span6 {
-    width: 48.717948718%;
-    *width: 48.6647572286383%;
-  }
-  .row-fluid .span5 {
-    width: 40.170940171000005%;
-    *width: 40.117748681638304%;
-  }
-  .row-fluid .span4 {
-    width: 31.623931624%;
-    *width: 31.5707401346383%;
-  }
-  .row-fluid .span3 {
-    width: 23.076923077%;
-    *width: 23.0237315876383%;
-  }
-  .row-fluid .span2 {
-    width: 14.529914530000001%;
-    *width: 14.4767230406383%;
-  }
-  .row-fluid .span1 {
-    width: 5.982905983%;
-    *width: 5.929714493638298%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 1160px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 1060px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 960px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 860px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 760px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 660px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 560px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 460px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 360px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 260px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 160px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 60px;
-  }
-  .thumbnails {
-    margin-left: -30px;
-  }
-  .thumbnails > li {
-    margin-left: 30px;
-  }
-  .row-fluid .thumbnails {
-    margin-left: 0;
-  }
-}
-
-@media (max-width: 979px) {
-  body {
-    padding-top: 0;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: static;
-  }
-  .navbar-fixed-top {
-    margin-bottom: 18px;
-  }
-  .navbar-fixed-bottom {
-    margin-top: 18px;
-  }
-  .navbar-fixed-top .navbar-inner,
-  .navbar-fixed-bottom .navbar-inner {
-    padding: 5px;
-  }
-  .navbar .container {
-    width: auto;
-    padding: 0;
-  }
-  .navbar .brand {
-    padding-right: 10px;
-    padding-left: 10px;
-    margin: 0 0 0 -5px;
-  }
-  .nav-collapse {
-    clear: both;
-  }
-  .nav-collapse .nav {
-    float: none;
-    margin: 0 0 9px;
-  }
-  .nav-collapse .nav > li {
-    float: none;
-  }
-  .nav-collapse .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > .divider-vertical {
-    display: none;
-  }
-  .nav-collapse .nav .nav-header {
-    color: #999999;
-    text-shadow: none;
-  }
-  .nav-collapse .nav > li > a,
-  .nav-collapse .dropdown-menu a {
-    padding: 6px 15px;
-    font-weight: bold;
-    color: #999999;
-    -webkit-border-radius: 3px;
-       -moz-border-radius: 3px;
-            border-radius: 3px;
-  }
-  .nav-collapse .btn {
-    padding: 4px 10px 4px;
-    font-weight: normal;
-    -webkit-border-radius: 4px;
-       -moz-border-radius: 4px;
-            border-radius: 4px;
-  }
-  .nav-collapse .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > li > a:hover,
-  .nav-collapse .dropdown-menu a:hover {
-    background-color: #222222;
-  }
-  .nav-collapse.in .btn-group {
-    padding: 0;
-    margin-top: 5px;
-  }
-  .nav-collapse .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    display: block;
-    float: none;
-    max-width: none;
-    padding: 0;
-    margin: 0 15px;
-    background-color: transparent;
-    border: none;
-    -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-            border-radius: 0;
-    -webkit-box-shadow: none;
-       -moz-box-shadow: none;
-            box-shadow: none;
-  }
-  .nav-collapse .dropdown-menu:before,
-  .nav-collapse .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .dropdown-menu .divider {
-    display: none;
-  }
-  .nav-collapse .navbar-form,
-  .nav-collapse .navbar-search {
-    float: none;
-    padding: 9px 15px;
-    margin: 9px 0;
-    border-top: 1px solid #222222;
-    border-bottom: 1px solid #222222;
-    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-  }
-  .navbar .nav-collapse .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  .nav-collapse,
-  .nav-collapse.collapse {
-    height: 0;
-    overflow: hidden;
-  }
-  .navbar .btn-navbar {
-    display: block;
-  }
-  .navbar-static .navbar-inner {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-}
-
-@media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-}

=== added file 'app/assets/stylesheets/juju-bootstrap.css'
--- app/assets/stylesheets/juju-bootstrap.css	1970-01-01 00:00:00 +0000
+++ app/assets/stylesheets/juju-bootstrap.css	2013-06-26 14:26:26 +0000
@@ -0,0 +1,156 @@
+/*
+To help gradually move away from bootstrap when so much of the application
+relies on its styles, when you find a bootstrap specific class style copy the
+__not overridden__ styles into this file.
+*/
+.btn {
+  display: inline-block;
+  padding: 4px 10px 4px;
+  margin-bottom: 0;
+  font-size: 13px;
+  line-height: 18px;
+  color: #333333;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  vertical-align: middle;
+  cursor: pointer;
+  background-color: #f5f5f5;
+  background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+  background-repeat: repeat-x;
+  border: 1px solid #cccccc;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+  border-bottom-color: #b3b3b3;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: #e6e6e6;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+  -moz-transition: background-position 0.1s linear;
+  -ms-transition: background-position 0.1s linear;
+  -o-transition: background-position 0.1s linear;
+  transition: background-position 0.1s linear;
+}
+
+.btn-primary, .btn-primary:hover, .btn-warning, .btn-warning:hover, .btn-danger, .btn-danger:hover, .btn-success, .btn-success:hover, .btn-info, .btn-info:hover, .btn-inverse, .btn-inverse:hover {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-danger {
+  background-color: #da4f49;
+  background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(top, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  border-color: #bd362f #bd362f #802420;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-danger:hover, .btn-danger:active, .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] {
+  background-color: #bd362f;
+}
+
+.navbar .btn {
+  display: inline-block;
+  padding: 4px 10px 4px;
+  line-height: 18px;
+}
+
+.navbar .dropdown-menu:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.navbar .dropdown-menu:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 4px 0;
+  margin: 1px 0 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding;
+  background-clip: padding-box;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.dropdown-menu a {
+  display: block;
+  padding: 3px 15px;
+  clear: both;
+  font-weight: normal;
+  line-height: 18px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.icon-arrow-right {
+  background-position: -264px -96px;
+}
+
+[class^="icon-"], [class*=" icon-"] {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  line-height: 14px;
+  vertical-align: text-top;
+  background-image: url("../images/glyphicons-halflings.png");
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+}

=== modified file 'app/config-debug.js'
--- app/config-debug.js	2013-05-29 16:50:27 +0000
+++ app/config-debug.js	2013-06-26 14:26:26 +0000
@@ -48,5 +48,9 @@
   // There is also a hotkey to toggle the simulator.
   simulateEvents: true,
   readOnly: false,
+  // Enable Google Analytics usage and calls. Also implies using cookies.
+  // For the debug configuration, analytics should generally be false to
+  // prevent muddying the gathered statistics.
+  useAnalytics: false,
   login_help: 'For this demonstration, use the password "admin" to connect.'
 };

=== modified file 'app/config-prod.js'
--- app/config-prod.js	2013-05-28 12:52:54 +0000
+++ app/config-prod.js	2013-06-26 14:26:26 +0000
@@ -47,6 +47,10 @@
   // You can also use the :flags:/simulateEvents feature flag.
   simulateEvents: false,
   readOnly: false,
+  // Enable Google Analytics usage and calls. Also implies using cookies.
+  // XXX: BradCrittenden 2013-06-10 bug=1189502: set to 'true' by default
+  // only after this bug is resolved, exposing the setting in the charm.
+  useAnalytics: false,
   login_help: (
       'The password is the admin-secret from the Juju environment.  This can ' +
       'often be found by looking in ~/.juju/environments.yaml.')

=== modified file 'app/index.html'
--- app/index.html	2013-05-28 18:53:33 +0000
+++ app/index.html	2013-06-26 14:26:26 +0000
@@ -42,15 +42,32 @@
     <link rel="stylesheet" href="/juju-ui/assets/combined-css/all-static.css">
     <link rel="stylesheet" href="/juju-ui/assets/juju-gui.css">
     <link rel="stylesheet" href="/juju-ui/assets/sprite.css">
+
     <!--[if lt IE 9]>
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
+
+    <!-- Set up Google analytics async tracking.
+         If the domain is set to 'jujucharms.com' as you'd expect, the tracker
+         does not work for deployments outside of our demo site.
+    -->
+    <script type="text/javascript">
+      var _gaq = _gaq || [];
+      window._gaq = _gaq;
+      window.ga_id = 'UA-41463568-2';
+      _gaq.push(['_setAccount', window.ga_id]);
+      _gaq.push (['_gat._anonymizeIp']);
+      _gaq.push(['_setDomainName', 'none']);
+      _gaq.push(['_setAllowLinker', true]);
+      _gaq.push(['_trackPageview']);
+    </script>
+
   </head>
 
   <body>
       <!-- This <img> tag is here just to force early loading of the background
-        image so it displays more quickly.  This makes a large improvment to the
-        way the app looks while loading on a slow connection. -->
+        image so it displays more quickly.  This makes a large improvement to
+        the way the app looks while loading on a slow connection. -->
       <img src="/juju-ui/assets/images/pattern_tile.png" style="display: none;">
 
       <div id="full-screen-mask" class="crosshatch-background">
@@ -89,58 +106,49 @@
         </div>
       </div>
       <div id="notifier-box"></div>
+      <div class="cookie-policy" style="display:none;">
+        <div class="wrapper">
+          <a href="" class="link-cta">Close</a>
+          <p>
+            We use cookies to improve your experience. By your continued use of
+            this application you accept such use. To change your settings please
+            <a href="http://www.ubuntu.com/privacy-policy#cookies">see our policy</a>
+          </p>
+        </div>
+      </div>
       <div id="viewport-wrapper">
         <div id="vp-left-border"></div>
         <div id="viewport">
-            <div class="navbar">
+          <div class="navbar">
+            <div class="navbar-inner">
               <div id="nav-brand-env">
-                <span>
-                  <a class="brand" href="/">
-                    <i class="sprite juju_logo" title="Juju GUI"></i>
-                  </a>
-                </span>
-                <span class="nav-container">
-                  <span class="nav-section">
-                    <i class="sprite environment_icon"> </i>
-                      <span id="environment-name" draggable="true"></span>
-                    <span id="provider-type" class="provider-type"></span>
-                  </span>
-                </span>
-              </div>
-              <div id="nav-alerts-charms">
-                <span class="nav-container">
-                  <span class="nav-section">
-                    <i class="sprite alert_icon"></i>
-                    Alerts
-                    <span id="notifications"></span>
-                  </span>
-                </span>
-                <span class="nav-container">
-                  <span class="nav-section active-border">
-                    <div id="logout-trigger">Logout</div>
-                  </span>
-                </span>
-                <span class="nav-container" id="charm-search-trigger-container">
-                  <span class="nav-section active-border">
-                    <span id="charm-search-trigger">
-                      <i id="charm-search-icon" class="sprite charm_icon"></i>
-                      Charms
-                      <i id="charm-search-chevron" class="sprite chevron_down"></i>
-                    </span>
-                    <input type="text" id="charm-search-field"
-                     required="required" placeholder="Search for a charm" />
-                  </span>
-                </span>
-              </div>
-            </div>
-            <div id="content">
-                <div id="shortcut-help" style="display:none"></div>
-                <div id="subapp-browser-min" style="display: none;"></div>
-                <div id="subapp-browser"></div>
-                <div id="main">
-                </div> <!-- /container -->
-            </div>
-
+                <a class="brand" href="/">
+                  <i class="sprite juju_logo_dark" title="Juju GUI"></i>
+                </a>
+                <div id="environment-switcher">
+                  <i class="sprite environment_icon"> </i>
+                  <span id="environment-name" draggable="true"></span>
+                  <span id="provider-type" class="provider-type"></span>
+                </div>
+              </div>
+              <ul class="nav">
+                <li>
+                  <span id="notifications"></span>
+                  Alerts
+                </li>
+                <li>
+                  <a href="" id="logout-trigger">Logout</a>
+                </li>
+              </ul>
+            </div>
+          </div>
+          <div id="content">
+              <div id="shortcut-help" style="display:none"></div>
+              <div id="subapp-browser-min" style="display: none;"></div>
+              <div id="subapp-browser"></div>
+              <div id="main">
+              </div> <!-- /container -->
+          </div>
         </div>
         <div id="vp-right-border"></div>
     </div>
@@ -349,8 +357,26 @@
           // We need to activate the hotkeys when running the application
           // in production. Unit tests should call it manually.
           app.activateHotkeys();
+
+          if (!juju_config.useAnalytics) {
+            window['ga-disable-' + window.ga_id] = true;
+          }
         });
+
       };
     </script>
+
+    <script type="text/javascript">
+      (function() {
+      var ga = document.createElement('script');
+      ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ?
+                'https://ssl' : 'http://www') +
+                '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0];
+      s.parentNode.insertBefore(ga, s);
+      })();
+    </script>
+
   </body>
 </html>

=== modified file 'app/models/browser.js'
--- app/models/browser.js	2013-05-17 14:51:05 +0000
+++ app/models/browser.js	2013-06-26 14:26:26 +0000
@@ -30,7 +30,7 @@
   var models = Y.namespace('juju.models'),
       ns = Y.namespace('juju.models.browser');
 
-  /**
+  /*
    * The filters are hard coded for now but will need to be updated. The
    * *right* place for them to live isn't obvious at the moment so they may
    * move. There are notes for an API call to provide a list, but we don't
@@ -86,6 +86,31 @@
     },
 
     /**
+       Clears all filter data
+
+       @method _clear
+       @private
+     */
+    _clear: function() {
+      this.setAttrs({
+        categories: [],
+        provider: [],
+        series: [],
+        text: '',
+        type: []
+      });
+    },
+
+    /**
+       Resets the filter
+
+       @method reset
+     */
+    reset: function() {
+      this._clear();
+      this._setDefaults();
+    },
+    /**
        Given the current filters, generate a query string to use for api
        calls.
 

=== modified file 'app/models/charm.js'
--- app/models/charm.js	2013-05-29 15:19:30 +0000
+++ app/models/charm.js	2013-06-26 14:26:26 +0000
@@ -323,18 +323,22 @@
 
 
   /**
-   * Model to represent the Charms from the Charmworld1 Api.
+   * Model to represent the Charms from the Charmworld2 Api.
    *
    * @class BrowserCharm
    * @extends {Charm}
    *
    */
   models.BrowserCharm = Y.Base.create('browser-charm', Charm, [], {
+    // Only care about at most, this number of related charms per interface.
+    maxRelatedCharms: 5,
+
     /**
-     * Load the recent commits into a format we can use nicely.
-     *
-     * @method _loadRecentCommits
-     *
+
+      Load the recent commits into a format we can use nicely.
+
+      @method _loadRecentCommits
+
      */
     _loadRecentCommits: function() {
       var source = this.get('code_source'),
@@ -375,6 +379,28 @@
     },
 
     /**
+      Given the set of data for relatedCharms, make it compatible with the
+      model api to be used in the charm-token widget, for example.
+
+      @method _convertRelatedData
+      @param {Object} data a related charm object.
+
+     */
+    _convertRelatedData: function(data) {
+      return {
+        // Only show the icon if it has one and the charm has been reviewed to
+        // have a safe icon.
+        shouldShowIcon: data.has_icon && data.is_approved,
+        id: data.id,
+        mainCategory: data.categories[0],
+        name: data.name,
+        recent_commit_count: data.commits_in_past_30_days,
+        recent_download_count: data.downloads_in_past_30_days,
+        weight: data.weight
+      };
+    },
+
+    /**
      * Initializer
      *
      * @method initializer
@@ -384,6 +410,57 @@
       if (cfg && cfg.downloads_in_past_30_days) {
         this.set('recent_download_count', cfg.downloads_in_past_30_days);
       }
+    },
+
+    /**
+      Build the relatedCharms attribute from api data
+
+      @method buildRelatedCharms
+      @param {Object} provides the list of provides interfaces/charms.
+      @param {Object} requires the list of requires interfaces/charms.
+
+    */
+    buildRelatedCharms: function(provides, requires) {
+      var charms = {
+        all: {},
+        provides: {},
+        requires: {}
+      };
+
+      var buildWeightedList = function(relationName, relationData, scope) {
+        Y.Object.each(relationData, function(face, key) {
+          // The relations are in the order of score, so we can limit them right
+          // off the bat.
+          charms[relationName][key] = face.slice(0, this.maxRelatedCharms);
+          charms[relationName][key].forEach(function(relation, idx) {
+            // Update the related object with the converted version so that it's
+            // follows the model ATTRS
+            charms[relationName][key][idx] = this._convertRelatedData(relation);
+            // Then track the highest provides charm to be in the running for
+            // overall most weighted related charm.
+            charms.all[relation.id] = charms[relationName][key][idx];
+          }, scope);
+        }, scope);
+      };
+
+      buildWeightedList('provides', provides, this);
+      buildWeightedList('requires', requires, this);
+
+      // Find the highest weight charms, but make sure there are no
+      // duplicates. We build the object to index on key and remove dupes,
+      // then we get a list of results and sort them by weight, grabbing the
+      // top set.
+      var allCharmsList = Y.Object.values(charms.all);
+
+      allCharmsList.sort(function(charm1, charm2) {
+        return charm2.weight - charm1.weight;
+      });
+
+      this.set('relatedCharms', {
+        overall: allCharmsList.slice(0, this.maxRelatedCharms),
+        provides: charms.provides,
+        requires: charms.requires
+      });
     }
   }, {
     ATTRS: {
@@ -461,19 +538,22 @@
           return tmp.join('/');
         }
       },
-      /**
-        Does this charm have an icon file. Helper used for template rendering
-        decisions.
-
-      */
-      hasIcon: {
+      shouldShowIcon: {
         /**
-          @method hasIcon.valueFn
-          @return {Boolean} Does the Charm have an icon file.
+          Should this charm display its icon. Helper used for template
+          rendering decisions.
+
+          @method shouldShowIcon.valueFn
+          @return {Boolean} Does the charm have an icon that should be shown?
 
          */
         valueFn: function() {
-          return this.get('files').indexOf('icon.svg') !== -1 ? true : false;
+          if (this.get('files').indexOf('icon.svg') !== -1 &&
+              this.get('is_approved')) {
+            return true;
+          } else {
+            return false;
+          }
         }
       },
       is_approved: {},
@@ -493,8 +573,33 @@
           return val;
         }
       },
+      /**
+        The mainCategory is a helper since we can only show one icon per
+        charm, but we permit multiple categories. An initial pass just grabs
+        the first category to use as an icon if required.
+
+        @attribute mainCategory
+        @default null
+        @type {String}
+
+       */
+      mainCategory: {
+        /**
+          @method mainCategory.valueFn
+          @return {String|Null} If a category is found its value else null.
+
+         */
+        valueFn: function() {
+          var categories = this.get('categories');
+          if (categories.length > 0) {
+            return categories[0];
+          } else {
+            return null;
+          }
+        }
+      },
       maintainer: {},
-      /**
+      /*
         API related metdata information for this charm object.
 
         This includes information such as related charms calculated by the
@@ -521,7 +626,7 @@
       /**
        * This attr is a mapper to the relations ATTR in the new API. It's
        * provided for backwards compatibility with the original Charm model.
-       * This can be removed when Charmworld1 is the one true model used in
+       * This can be removed when Charmworld2 is the one true model used in
        * all Juju Gui code.
        *
        * @attribute provides
@@ -605,13 +710,28 @@
           return 0;
         }
       },
+      /**
+        The related charms object is three parts for use in our situations.
+        The keys are
+        - overall: the top scored related charms regardless of interface or
+                   provide/requires
+        - provides: a nested object of the related charms for each provide
+                    interface
+        - requires: a nested object of the related charms for each require
+                    interface
+        @attribute relatedCharms
+        @default undefined
+        @type {Object}
+
+       */
+      relatedCharms: {},
       relations: {},
 
       /**
        * This attr is a mapper to the relations ATTR in the new API. It's
        * provided for backwards compatibility with the original Charm model.
        *
-       * This can be removed when Charmworld1 is the one true model used in
+       * This can be removed when Charmworld2 is the one true model used in
        * all Juju Gui code.
        *
        * @attribute requires

=== modified file 'app/models/handlers.js'
--- app/models/handlers.js	2013-05-17 14:51:05 +0000
+++ app/models/handlers.js	2013-06-26 14:26:26 +0000
@@ -97,7 +97,7 @@
   };
   models.utils = utils; // Exported for testing purposes.
 
-  /**
+  /*
      Each handler is called passing the db instance, the action to be
      performed ("add", "change" or "remove"), the change coming from
      the environment, and a (optional) kind identifying what will be
@@ -133,7 +133,7 @@
       } else {
         data = change;
       }
-      modelList.process_delta(action, data);
+      modelList.process_delta(action, data, db);
     },
 
     /**
@@ -164,7 +164,7 @@
         public_address: change.PublicAddress
       };
       db.units.process_delta(action, unitData);
-      db.machines.process_delta(action, machineData);
+      db.machines.process_delta(action, machineData, db);
     },
 
     /**

=== modified file 'app/models/models.js'
--- app/models/models.js	2013-05-17 14:51:05 +0000
+++ app/models/models.js	2013-06-26 14:26:26 +0000
@@ -70,6 +70,8 @@
           Y.each(data, function(value, key) {
             instance[key] = value;
           });
+          // Lazy model lists don't fire change events
+          list.fire('change');
         }
       }
     }
@@ -80,6 +82,7 @@
     } else {
       console.warn('Unknown change kind in _process_delta:', action);
     }
+    return instance;
   };
 
   /**
@@ -148,6 +151,9 @@
         /**
           Dynamically calculate a display name that accounts for Juju Core name
           prefixes.
+
+          @attribute displayName
+          @type {String}
          */
         getter: function() {
           return this.get('id').replace('service-', '');
@@ -253,8 +259,21 @@
       return name.replace('unit-', '').replace(/^(.+)-(\d+)$/, '$1/$2');
     },
 
-    process_delta: function(action, data) {
-      _process_delta(this, action, data, {relation_errors: {}});
+    process_delta: function(action, data, db) {
+      var instance = _process_delta(this, action, data, {relation_errors: {}});
+      if (!instance || !db) {return;}
+      // Apply this action for this instance to all service models as well.
+      // In the future we can transition from using db.units to always
+      // looking at db.services[serviceId].units
+      var service = db.services.getById(instance.service);
+      if (!service) { return; }
+      // Get the unit list for this service. (lazy)
+      var unitList = service.get('units');
+      if (!unitList) {
+        unitList = new models.ServiceUnitList();
+        service.set('units', unitList);
+      }
+      _process_delta(unitList, action, data, {relation_errors: {}});
     },
 
     _setDefaultsAndCalculatedValues: function(obj) {
@@ -321,8 +340,15 @@
       var aggregate = this.get_informative_states_for_service(service);
       var sum = Y.Array.reduce(
           Y.Object.values(aggregate), 0, function(a, b) {return a + b;});
+      var previous_unit_count = service.get('unit_count');
       service.set('unit_count', sum);
       service.set('aggregated_status', aggregate);
+
+      // Set Google Analytics tracking event.
+      if (previous_unit_count !== sum && window._gaq) {
+        window._gaq.push(['_trackEvent', 'Service Stats', 'Update',
+          service.get('id'), sum]);
+      }
     },
     ATTRS: {}
   });

=== modified file 'app/modules-debug.js'
--- app/modules-debug.js	2013-05-24 14:10:58 +0000
+++ app/modules-debug.js	2013-06-26 14:26:26 +0000
@@ -42,6 +42,11 @@
   // Don't load YUI CSS from YUI servers.
   fetchCSS: false,
 
+  // Do not attempt to dispatch a new route when an anchor tag appears in the
+  // url. This is intended to keep charm details from reloading on tab
+  // selection in the browser.
+  navigateOnHash: false,
+
   groups: {
     gallery: {
       modules: {
@@ -101,12 +106,18 @@
         }
       }
     },
-
     filesaver: {
       modules: {
         'FileSaver': {
           fullpath: '/juju-ui/assets/javascripts/FileSaver.js'
         }
+      },
+      observe: {
+        modules: {
+          'observe': {
+            fullpath: '/juju-ui/assets/javascripts/Object.observe.poly.js'
+          }
+        }
       }
     },
 
@@ -134,6 +145,10 @@
           fullpath: '/juju-ui/widgets/overlay-indicator.js'
         },
 
+        'browser-sharing-widget': {
+          fullpath: '/juju-ui/widgets/sharing-widget.js'
+        },
+
         'browser-search-widget': {
           fullpath: '/juju-ui/widgets/charm-search.js'
         },
@@ -145,7 +160,9 @@
         'juju-inspector-widget': {
           fullpath: '/juju-ui/widgets/inspector-widget.js'
         },
-
+        'juju-databinding': {
+          fullpath: '/juju-ui/views/databinding.js'
+        },
         'reconnecting-websocket': {
           fullpath: '/juju-ui/assets/javascripts/reconnecting-websocket.js'
         },
@@ -158,6 +175,10 @@
           fullpath: '/juju-ui/assets/javascripts/app-subapp-extension.js'
         },
 
+        'app-cookies-extension': {
+          fullpath: '/juju-ui/assets/javascripts/app-cookies-extension.js'
+        },
+
         'sub-app': {
           fullpath: '/juju-ui/assets/javascripts/sub-app.js'
         },
@@ -243,6 +264,10 @@
           fullpath: '/juju-ui/templates.js'
         },
 
+        'juju-view-container': {
+          fullpath: '/juju-ui/views/view-container.js'
+        },
+
         'juju-views': {
           use: [
             'handlebars',
@@ -323,6 +348,10 @@
           fullpath: '/juju-ui/store/charm.js'
         },
 
+        'juju-websocket-logging': {
+          fullpath: '/juju-ui/websocket-logging.js'
+        },
+
         'juju-controllers': {
           use: [
             'juju-env',

=== modified file 'app/store/charm.js'
--- app/store/charm.js	2013-05-29 17:42:37 +0000
+++ app/store/charm.js	2013-06-26 14:26:26 +0000
@@ -157,12 +157,12 @@
   /**
    * Api helper for the updated charmworld api v1.
    *
-   * @class Charmworld1
+   * @class Charmworld2
    * @extends {Base}
    *
    */
-  ns.Charmworld1 = Y.Base.create('charmworld1', Y.Base, [], {
-    _apiRoot: 'api/1',
+  ns.Charmworld2 = Y.Base.create('charmworld2', Y.Base, [], {
+    _apiRoot: 'api/2',
 
     /**
      * Send the actual request and handle response from the api.
@@ -370,6 +370,25 @@
       }
 
       this._makeRequest('charms/interesting', callbacks);
+    },
+
+    /**
+      Fetch the related charm info from the charmworld api.
+
+      @method related
+      @param {String} charmID The charm to find related charms for.
+      @param {Object} callbacks The success/failure callbacks to use.
+      @param {Object} bindscope An object scope to perform callbacks in.
+      @return {Object} data loaded from the api call.
+
+     */
+    related: function(charmID, callbacks, bindScope) {
+      var endpoint = 'charm/' + charmID + '/related';
+      if (bindScope) {
+        callbacks.success = Y.bind(callbacks.success, bindScope);
+        callbacks.failure = Y.bind(callbacks.failure, bindScope);
+      }
+      this._makeRequest(endpoint, callbacks);
     }
   }, {
     ATTRS: {
@@ -384,6 +403,9 @@
       apiHost: {
         required: true,
         setter: function(val) {
+          if (val && !val.match(/\/$/)) {
+            val = val + '/';
+          }
           // Make sure we update the datasource if our apiHost changes.
           var source = val + this._apiRoot + '/';
           this.set('datasource', new Y.DataSource.IO({ source: source }));

=== modified file 'app/store/env/fakebackend.js'
--- app/store/env/fakebackend.js	2013-05-22 14:14:04 +0000
+++ app/store/env/fakebackend.js	2013-06-26 14:26:26 +0000
@@ -263,7 +263,9 @@
     },
 
     /**
-    Log out.  If already logged out, no error is raised.
+      Log out.  If already logged out, no error is raised.
+      @method logout
+      @return {undefined} Nothing.
     */
     logout: function() {
       this.set('authenticated', false);
@@ -287,7 +289,7 @@
       configYAML: The charm configuration options, expressed as a YAML
         string.  You may provide only one of config or configYAML.
       unitCount: The number of units to be deployed.
-    @return {undefined} Get the result from the callback.
+    @return {undefined} All results are passed to the callback.
     */
     deploy: function(charmId, callback, options) {
       if (!this.get('authenticated')) {
@@ -300,9 +302,7 @@
       this._loadCharm(
           charmId,
           {
-            /**
-              Deploy the successfully-obtained charm.
-            */
+            // On success deploy the successfully-obtained charm.
             success: function(charm) {
               self._deployFromCharm(charm, callback, options);
             },
@@ -312,6 +312,48 @@
     },
 
     /**
+    Set the given service to use the given charm, optionally forcing units in
+    error state to use the charm.
+
+    @method setCharm
+    @param {String} serviceName The name of the service to set.
+    @param {String} charmId The charm to use.
+    @param {Boolean} force Whether or not to force the issue.
+    @param {Function} callback A call that will receive an object, potentially
+      with an "error" attribute containing a string describing the problem.
+    @return {undefined} All results are passed to the callback.
+    */
+    setCharm: function(serviceName, charmId, force, callback) {
+      if (!this.get('authenticated')) {
+        return callback(UNAUTHENTICATEDERROR);
+      }
+      var self = this;
+      var service = this.db.services.getById(serviceName);
+      if (!service) {
+        return callback({error: 'Service "' + serviceName + '" not found.'});
+      }
+      var serviceInError = this.db.units.get_units_for_service(service)
+        .some(function(unit) {
+            return (/error/).test(unit.agent_state);
+          });
+      if (serviceInError && !force) {
+        return callback({error: 'Cannot set charm on a service with units in ' +
+              'error without the force flag.'});
+      }
+      this._loadCharm(
+          charmId,
+          {
+            success: function(charm) {
+              service.set('charm', charm.get('id'));
+              self.changes.services[service.get('id')] = [service, true];
+              callback({});
+            },
+            failure: callback
+          }
+      );
+    },
+
+    /**
     Get a charm from a URL, via charmStore and/or db.  Uses callbacks.
 
     @method _loadCharm
@@ -343,18 +385,15 @@
         this.get('charmStore').loadByPath(
             charmIdParts.charm_store_path,
             {
-              /**
-                Convert the charm data to a charm and use the success callback.
-              */
+              // Convert the charm data to a charm and use the success
+              // callback.
               success: function(data) {
                 var charm = self._getCharmFromData(data);
                 if (callbacks.success) {
                   callbacks.success(charm);
                 }
               },
-              /**
-                Inform the caller of an error using the charm store.
-              */
+              // Inform the caller of an error using the charm store.
               failure: function(e) {
                 // This is most likely an IOError stemming from an
                 // invalid charm pointing to a bad URL and a read of a
@@ -399,6 +438,7 @@
     /**
     Deploy a charm, given the charm, a callback, and options.
 
+    @method _deployFromCharm
     @param {Object} charm The charm to be deployed, from the db.
     @param {Function} callback A call that will receive an object either
       with an "error" attribute containing a string describing the problem,

=== modified file 'app/store/env/go.js'
--- app/store/env/go.js	2013-05-21 16:30:38 +0000
+++ app/store/env/go.js	2013-06-26 14:26:26 +0000
@@ -388,6 +388,59 @@
     },
 
     /**
+       Set a service's charm.
+
+       @method setCharm
+       @param {String} charm_url The URL of the charm.
+       @param {String} service_name The name of the service to be deployed.
+       @param {Function} callback A callable that must be called once the
+         operation is performed.
+       @return {undefined} Sends a message to the server only.
+     */
+    setCharm: function(service_name, charm_url, force, callback) {
+      var intermediateCallback = null;
+      if (callback) {
+        intermediateCallback = Y.bind(this.handleSetCharm, this,
+            callback, service_name, charm_url);
+      }
+      this._send_rpc(
+          { Type: 'Client',
+            Request: 'ServiceSetCharm',
+            Params: {
+              ServiceName: service_name,
+              CharmUrl: charm_url,
+              Force: force
+            }
+          },
+          intermediateCallback
+      );
+    },
+
+    /**
+       Transform the data returned from juju-core 'setCharm' into a form which
+       is suitable for the user callback.
+
+       @method handleSetCharm
+       @param {Function} userCallback The callback originally submitted by the
+         call site.
+       @param {String} service_name The name of the service.  Passed in since
+         it is not part of the response.
+       @param {String} charm_url The URL of the charm.  Passed in since
+         it is not part of the response.
+       @param {Object} data The response returned by the server.
+       @return {undefined} Nothing.
+     */
+    handleSetCharm: function(userCallback, service_name, charm_url, data) {
+      var transformedData = {
+        err: data.Error,
+        service_name: service_name,
+        charm_url: charm_url
+      };
+      // Call the original user callback.
+      userCallback(transformedData);
+    },
+
+    /**
      * Add units to the provided service.
      *
      * @method add_unit

=== modified file 'app/store/env/sandbox.js'
--- app/store/env/sandbox.js	2013-05-17 14:51:05 +0000
+++ app/store/env/sandbox.js	2013-06-26 14:26:26 +0000
@@ -19,7 +19,7 @@
 'use strict';
 
 /**
-Sandbox APIs mimicking communications with the Go and Juju backends.
+Sandbox APIs mimicking communications with the Go and Python backends.
 
 @module env
 @submodule env.sandbox
@@ -682,6 +682,236 @@
   });
 
   sandboxModule.PyJujuAPI = PyJujuAPI;
+
+  /**
+  A sandbox Juju environment using the Go API.
+
+  @class GoJujuAPI
+  */
+  function GoJujuAPI(config) {
+    GoJujuAPI.superclass.constructor.apply(this, arguments);
+  }
+
+  GoJujuAPI.NAME = 'sandbox-go-juju-api';
+  GoJujuAPI.ATTRS = {
+    state: {},
+    client: {}
+  };
+
+  Y.extend(GoJujuAPI, Y.Base, {
+
+    /**
+    Initializes.
+
+    @method initializer
+    @return {undefined} Nothing.
+    */
+    initializer: function() {
+      this.connected = false;
+    },
+
+    /**
+    Opens the connection to the sandbox Juju environment.
+    Called by ClientConnection, which sends itself.
+
+    @method open
+    @param {Object} client A ClientConnection.
+    @return {undefined} Nothing.
+    */
+    open: function(client) {
+      if (!this.connected) {
+        this.connected = true;
+        this.set('client', client);
+      } else if (this.get('client') !== client) {
+        throw 'INVALID_STATE_ERR : Connection is open to another client.';
+      }
+    },
+
+    /**
+    Closes the connection to the sandbox Juju environment.
+    Called by ClientConnection.
+
+    @method close
+    @return {undefined} Nothing.
+    */
+    close: function() {
+      if (this.connected) {
+        this.connected = false;
+        this.set('client', undefined);
+      }
+    },
+
+    /**
+    Do any extra work to destroy the object.
+
+    @method destructor
+    @return {undefined} Nothing.
+    */
+    destructor: function() {
+      this.close();
+    },
+
+    /**
+    Receives messages from the client and dispatches them.
+
+    @method receive
+    @param {Object} data A hash of data sent from the client.
+    @return {undefined} Nothing.
+    */
+    receive: function(data) {
+      console.log('client message', data);
+      if (this.connected) {
+        this['handle' + data.Type + data.Request](data,
+            this.get('client'), this.get('state'));
+      } else {
+        throw CLOSEDERROR;
+      }
+    },
+
+    /**
+    Handle Login messages to the state object.
+
+    @method handleAdminLogin
+    @param {Object} data The contents of the API arguments.
+    @param {Object} client The active ClientConnection.
+    @param {Object} state An instance of FakeBackend.
+    @return {undefined} Side effects only.
+    */
+    handleAdminLogin: function(data, client, state) {
+      data.Error = !state.login(data.Params.AuthTag, data.Params.Password);
+      client.receive(data);
+    },
+
+    /**
+    Handle EnvironmentView messages.
+
+    @method handleClientServiceGet
+    @param {Object} data The contents of the API arguments.
+    @param {Object} client The active ClientConnection.
+    @param {Object} state An instance of FakeBackend.
+    @return {undefined} Side effects only.
+    */
+    handleClientEnvironmentInfo: function(data, client, state) {
+      client.receive({
+        ProviderType: state.get('providerType'),
+        DefaultSeries: state.get('defaultSeries'),
+        Name: 'Sandbox'
+      });
+    },
+
+    /**
+    Handle WatchAll messages.
+
+    @method handleClientWatchAll
+    @param {Object} data The contents of the API arguments.
+    @param {Object} client The active ClientConnection.
+    @param {Object} state An instance of FakeBackend.
+    @return {undefined} Side effects only.
+    */
+    handleClientWatchAll: function(data, client, state) {
+      // TODO wire up delta stream to "Next" responses here.
+      client.receive({Response: {AllWatcherId: '42'}});
+    },
+
+    /**
+    Handle AllWatcher Next messages.
+
+    @method handleAllWatcherNext
+    @param {Object} data The contents of the API arguments.
+    @param {Object} client The active ClientConnection.
+    @param {Object} state An instance of FakeBackend.
+    @return {undefined} Side effects only.
+    */
+    handleAllWatcherNext: function(data, client, state) {
+      // This is a noop for the moment because it must exist but the current
+      // functionality does not depend on it having any effect.
+      // TODO See if there are any changes and if so, send them.
+    },
+
+    /**
+    Handle ServiceDeploy messages
+
+    @method handleClientServiceDeploy
+    @param {Object} data The contents of the API arguments.
+    @param {Object} client The active ClientConnection.
+    @param {Object} state An instance of FakeBackend.
+    @return {undefined} Side effects only.
+    */
+    handleClientServiceDeploy: function(data, client, state) {
+      var callback = function(result) {
+        var response = {RequestId: data.RequestId};
+        if (result.error) {
+          response.Error = result.error;
+        }
+        client.receive(response);
+      };
+      state.deploy(data.Params.CharmUrl, callback, {
+        name: data.Params.ServiceName,
+        config: data.Params.Config,
+        configYAML: data.Params.ConfigYAML,
+        unitCount: data.Params.NumUnits
+      });
+    },
+
+    /**
+    Handle ServiceSetCharm messages
+
+    @method handleClientServiceSetCharm
+    @param {Object} data The contents of the API arguments.
+    @param {Object} client The active ClientConnection.
+    @param {Object} state An instance of FakeBackend.
+    @return {undefined} Side effects only.
+    */
+    handleClientServiceSetCharm: function(data, client, state) {
+      var callback = function(result) {
+        var response = {RequestId: data.RequestId};
+        if (result.error) {
+          response.Error = result.error;
+        }
+        client.receive(response);
+      };
+      state.setCharm(data.Params.ServiceName, data.Params.CharmUrl,
+          data.Params.Force, callback);
+    },
+
+    /**
+    Handle SetAnnotations messages
+
+    @method handleClientSetAnnotations
+    @param {Object} data The contents of the API arguments.
+    @param {Object} client The active ClientConnection.
+    @param {Object} state An instance of FakeBackend.
+    @return {undefined} Side effects only.
+    */
+    handleClientSetAnnotations: function(data, client, state) {
+      var serviceId = /service-([^ ]*)$/.exec(data.Params.Tag)[1];
+      var reply = state.updateAnnotations(serviceId, data.Params.Pairs);
+      client.receive({
+        RequestId: data.RequestId,
+        Error: reply.error});
+    },
+
+    /**
+    Handle ServiceGet messages
+
+    @method handleClientServiceGet
+    @param {Object} data The contents of the API arguments.
+    @param {Object} client The active ClientConnection.
+    @param {Object} state An instance of FakeBackend.
+    @return {undefined} Side effects only.
+    */
+    handleClientServiceGet: function(data, client, state) {
+      var reply = state.getService(data.Params.ServiceName);
+      // TODO Include the optional Config or Constraints in the response.
+      client.receive({
+        RequestId: data.RequestId,
+        Error: reply.error,
+        Response: {Service: data.Params.ServiceName}});
+    }
+
+  });
+
+  sandboxModule.GoJujuAPI = GoJujuAPI;
 }, '0.1.0', {
   requires: [
     'base',

=== modified file 'app/subapps/browser/browser.js'
--- app/subapps/browser/browser.js	2013-05-29 18:00:54 +0000
+++ app/subapps/browser/browser.js	2013-06-26 14:26:26 +0000
@@ -34,6 +34,7 @@
 
      @class Browser
      @extends {juju.SubApp}
+
    */
   ns.Browser = Y.Base.create('subapp-browser', Y.juju.SubApp, [], {
     // Mark the entire subapp has hidden.
@@ -41,10 +42,11 @@
     viewmodes: ['minimized', 'fullscreen', 'sidebar'],
 
     /**
-        Show or hide the details panel.
-
-        @method _detailsVisible
-        @param {Boolean} visible set the panel to hide or show.
+      Show or hide the details panel.
+
+      @method _detailsVisible
+      @param {Boolean} visible set the panel to hide or show.
+
      */
     _detailsVisible: function(visible) {
       var detailsNode = Y.one('.bws-view-data');
@@ -59,11 +61,12 @@
     },
 
     /**
-        Given the current subapp state, generate a url to pass up to the
-        routing code to route to.
-
-        @method _getStateUrl
-        @param {Object} change the values to change in the current state.
+      Given the current subapp state, generate a url to pass up to the
+      routing code to route to.
+
+      @method _getStateUrl
+      @param {Object} change the values to change in the current state.
+
      */
     _getStateUrl: function(change) {
       var urlParts = [];
@@ -82,6 +85,9 @@
       urlParts.push(this._viewState.viewmode);
       if (this._viewState.search) {
         urlParts.push('search');
+      } else if (this._oldState.search) {
+        // We had a search, but are moving away; clear the old search.
+        this._filter.reset();
       }
       if (this._viewState.charmID) {
         urlParts.push(this._viewState.charmID);
@@ -97,11 +103,12 @@
     },
 
     /**
-       Generate a standard shared set of cfg all Views can expect to see.
-
-       @method _getViewCfg
-       @param {Object} cfg additional config to merge into the default view
-       config.
+     Generate a standard shared set of cfg all Views can expect to see.
+
+     @method _getViewCfg
+     @param {Object} cfg additional config to merge into the default view
+     config.
+
      */
     _getViewCfg: function(cfg) {
       // We always add the _filter data to every request because most of them
@@ -123,6 +130,7 @@
     _initState: function() {
       this._oldState = {
         charmID: null,
+        hash: null,
         querystring: null,
         search: null,
         viewmode: null
@@ -149,6 +157,7 @@
        Determine if we should render the charm details based on the current
        state.
 
+       @method _shouldShowCharm
        @return {Boolean} true if should show.
      */
     _shouldShowCharm: function() {
@@ -169,23 +178,34 @@
        Determine if we should render the editorial content based on the current
        state.
 
+       @method _shouldShowEditorial
        @return {Boolean} true if should show.
      */
     _shouldShowEditorial: function() {
-      if (
-          !this._viewState.search &&
+      var should = false;
+      // If the viewmode has changed, and seach is not enabled then yes
+      if (!this._viewState.search &&
           this._hasStateChanged('viewmode')
       ) {
-        return true;
-      } else {
-        return false;
-      }
+        should = true;
+      }
+
+      // Even if viewmode hasn't changed, but search has changed and is false
+      // then yes
+      if (!this._viewState.search &&
+          this._hasStateChanged('search')
+      ) {
+        should = true;
+      }
+
+      return should;
     },
 
     /**
        Determine if we should render the search results based on the current
        state.
 
+       @method _shouldShowSearch
        @return {Boolean} true if should show.
      */
     _shouldShowSearch: function() {
@@ -231,17 +251,23 @@
       // Clear out any parts of /sidebar/search, /sidebar, or /search from the
       // id. See if we still really have an id.
       var match =
-          /^(sidebar|fullscreen|minimized|search|test\/index\.html)\/?(search)?/;
+          /^\/?(sidebar|fullscreen|minimized|search|test\/index\.html)\/?(search)?\/?/;
 
       if (id && id.match(match)) {
         // Strip it out.
         id = id.replace(match, '');
-
         // if the id is now empty, set it to null.
         if (id === '') {
           id = null;
         }
       }
+
+      if (id) {
+        // Strip any extra slashes off the start/end of the id.
+        id = id.replace(/^\//, '');
+        id = id.replace(/\/$/, '');
+      }
+
       return id;
     },
 
@@ -260,6 +286,21 @@
     },
 
     /**
+      Does our app instance have a valid store? If not, then we should ignore
+      a lot of work since we can't do it anyway. Sanity check our
+      information. During test running, for instance, we don't have a valid
+      store to work with and that's ok.
+
+      @method _hasValidStore
+      @return {Boolean} do we have a valid store or not.
+
+     */
+    _hasValidStore: function() {
+      var store = this.get('store');
+      return !store.get('noop');
+    },
+
+    /**
        Update the oldState with the viewState now that we're done processing
        the request.
 
@@ -282,10 +323,15 @@
       // Update the viewmode. Every request has a viewmode.
       var path = req.path,
           params = req.params,
-          query = req.query;
+          query = req.query,
+          hash = window.location.hash;
 
       this._viewState.viewmode = params.viewmode;
 
+      if (hash) {
+        this._viewState.hash = hash.replace('/', '');
+      }
+
       // Check for a charm id in the request.
       if (params.id && params.id !== 'search') {
         this._viewState.charmID = params.id;
@@ -387,11 +433,20 @@
     renderCharmDetails: function(req, res, next) {
       var charmID = this._viewState.charmID;
       var extraCfg = {
+        activeTab: this._viewState.hash,
         charmID: charmID,
         container: Y.Node.create('<div class="charmview"/>'),
         deploy: this.get('deploy')
       };
 
+      // If the only thing that changed was the hash, then don't redraw. It's
+      // just someone clicking a tab in the UI.
+      if (this._details && this._hasStateChanged('hash') &&
+          !(this._hasStateChanged('charmID') ||
+            this._hasStateChanged('viewmode'))) {
+        return;
+      }
+
       // The details view needs to know if we're using a fullscreen template
       // or the sidebar version.
       if (this._viewState.viewmode === 'fullscreen') {
@@ -448,7 +503,6 @@
         extraCfg.activeID = this._viewState.charmID;
       }
 
-
       this._editorial = new Y.juju.browser.views.EditorialView(
           this._getViewCfg(extraCfg));
 
@@ -456,6 +510,16 @@
         // Add any sidebar charms to the running cache.
         this._cache = Y.merge(this._cache, ev.cache);
       }, this);
+      this._editorial.on(this._editorial.EV_CATEGORY_LINK_CLICKED,
+          function(ev) {
+            var change = {
+              search: true,
+              filter: {
+                categories: [ev.category]
+              }
+            };
+            this.fire('viewNavigate', {change: change});
+          });
 
       this._editorial.render(this._cache.interesting);
       this._editorial.addTarget(this);
@@ -622,9 +686,6 @@
         if (this._search) {
           this._search.set('activeID', null);
         }
-
-
-
       }
 
       // Sync that the state has changed.
@@ -633,6 +694,100 @@
     },
 
     /**
+      When there's no charm or viewmode default to a sidebar view for all
+      pages.
+
+      @method routeSidebarDefault
+      @param {Request} req current request object.
+      @param {Response} res current response object.
+      @param {function} next callable for the next route in the chain.
+
+     */
+    routeSidebarDefault: function(req, res, next) {
+      // Check if there's any path. If there is, someone else will handle
+      // routing it. Just carry on.
+      if (req.path.replace(/\//, '') !== '') {
+        next();
+        return;
+      }
+
+      // For the * request there will be no req.params. Update it forcing
+      // sidebar default viewmode.
+      req.params = {
+        viewmode: 'sidebar'
+      };
+
+      // Update the state for the rest of things to figure out what to do.
+      this._updateState(req);
+
+      // Once the state is updated determine visibility of our Nodes.
+      this.updateVisible();
+
+      // Don't bother routing if we're hidden.
+      if (!this.hidden) {
+        this.sidebar(req, res, next);
+      } else {
+        // Let the next route go on.
+        next();
+      }
+    },
+
+    /**
+      A url direct to a charm id works, however it needs to default the
+      viewmode to sidebar in that case.
+
+      Almost any url with a component to it matches this route. We need to
+      check if there are exactly *two* parts and if so, check if they're a
+      valid id-able segment. (Not /sidebar/search for instance)
+
+      @method routeDirectCharmId
+      @param {Request} req current request object.
+      @param {Response} res current response object.
+      @param {function} next callable for the next route in the chain.
+
+     */
+    routeDirectCharmId: function(req, res, next) {
+      // If we don't have a valid store we can't do any work here.
+      if (!this._hasValidStore()) {
+        return;
+      }
+
+      // Check if we have exactly two url parts in our path.
+      // The best way to count the parts is to strip the start/end slash and
+      // then split on the rest. We only care if there are exactly two parts.
+      var idBits = req.path.replace(/^\//, '').replace(/\/$/, '').split('/'),
+          id = null;
+
+      if (idBits.length === 2) {
+        id = this._stripViewMode(req.path);
+      }
+      if (!id) {
+        next();
+        return;
+      } else {
+        // We've got a valid id. Setup the params for our view state.
+        req.params = {
+          id: id,
+          viewmode: 'sidebar'
+        };
+      }
+
+      // Update the state for the rest of things to figure out what to do.
+      this._updateState(req);
+
+      // Once the state is updated determine visibility of our Nodes.
+      this.updateVisible();
+
+      // Don't bother routing if we're hidden.
+      if (!this.hidden) {
+        this.sidebar(req, res, next);
+      } else {
+        // Let the next route go on.
+        next();
+      }
+    },
+
+    /**
        Dispatch to the correct viewmode based on the route that was hit.
 
        @method routeView
@@ -681,6 +836,8 @@
       Based on the viewmode and the hidden check what divs we should be
       showing or hiding.
 
+      @method updateVisible
+      @return {undefined} Nothing.
     */
     updateVisible: function() {
       var minview = this.get('minNode'),
@@ -723,8 +880,8 @@
 
       /**
          @attribute store
-         @default Charmworld1
-         @type {Charmworld1}
+         @default Charmworld2
+         @type {Charmworld2}
        */
       store: {
         /**
@@ -733,7 +890,7 @@
            tests there's no config for talking to the api so we have to watch
            out in test runs and allow the store to be broken.
 
-           method store.valueFn
+           @method store.valueFn
         */
         valueFn: function() {
           var cfg = {
@@ -746,7 +903,7 @@
           } else {
             cfg.apiHost = window.juju_config.charmworldURL;
           }
-          return new Y.juju.Charmworld1(cfg);
+          return new Y.juju.Charmworld2(cfg);
         }
       },
 
@@ -759,8 +916,8 @@
         value: [
           // Show the sidebar on all places if its not manually shut off or
           // turned into a fullscreen route.
-          { path: '*', callbacks: 'routeView'},
-          { path: '/*id/', callbacks: 'routeView'},
+          { path: '*', callbacks: 'routeSidebarDefault'},
+          { path: '/*id/', callbacks: 'routeDirectCharmId'},
           { path: '/:viewmode/', callbacks: 'routeView' },
           { path: '/:viewmode/search/', callbacks: 'routeView' },
           { path: '/:viewmode/search/*id/', callbacks: 'routeView' },
@@ -797,6 +954,8 @@
         /**
           Find the minNode and cache it for later use.
 
+          @attribute minNode
+          @readOnly
         */
         valueFn: function() {
           return Y.one('#subapp-browser-min');

=== modified file 'app/subapps/browser/templates/browser_charm.handlebars'
--- app/subapps/browser/templates/browser_charm.handlebars	2013-05-29 14:11:48 +0000
+++ app/subapps/browser/templates/browser_charm.handlebars	2013-06-26 14:26:26 +0000
@@ -1,5 +1,5 @@
 <div class="charm yui3-g">
-    <div class="content yui3-u-{{#if isFullscreen}}5-6{{else}}1{{/if}}">
+    <div class="content yui3-u-{{#if isFullscreen}}3-4{{else}}1{{/if}}">
         <div class="nav">
             <a href="" class="back">
                 {{#if isFullscreen}}
@@ -9,11 +9,16 @@
                     Close
                 {{/if}}
             </a>
+            {{! The add class is used by the deploy method in
+                test/test_charm_running.py.  If you change this name, change
+                the other one too! }}
             <a href="" class="add">Add</a>
-            <a href="" class="share">
-                <img src="/juju-ui/assets/images/browser_share_button_icon.png"
-                    alt="Share" />Share
-            </a>
+            {{#if shareFlag}}
+              <a href="" class="share">
+                  <img src="/juju-ui/assets/images/browser_share_button_icon.png"
+                      alt="Share" />Share
+              </a>
+            {{/if}}
         </div>
 
         {{#if failingProviders}}
@@ -33,11 +38,17 @@
                         title="This charm has been reviewed."></span>
                 {{/if}}
 
-                {{#if hasIcon}}
+                {{#if shouldShowIcon}}
                     <img src="{{charmFilePath id 'icon.svg'}}" alt="{{ name }} icon" class="icon">
                 {{else}}
-                    <div class="charm-icon">
-                    </div>
+                    {{#if mainCategory}}
+                      <div title="category {{mainCategory}}"
+                          class="category-icon sprite charm-{{mainCategory}}-160">