From 4c6012f756b6ebeb440419a16eb5a46ba57c161c Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Mon, 18 Nov 2013 14:49:54 -0500
Subject: [PATCH 01/21] Add ability to download receipts in PDF form

---
 endpoints/web.py               | 24 +++++++++++++++++++++---
 requirements.txt               |  1 +
 static/partials/org-admin.html | 12 +++++++++---
 util/invoice.py                | 16 ++++++++++++++++
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/endpoints/web.py b/endpoints/web.py
index 9f8712629..ff6f1790a 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -1,15 +1,16 @@
 import logging
 import requests
+import stripe
 
 from flask import (abort, redirect, request, url_for, render_template,
-                   make_response)
+                   make_response, Response)
 from flask.ext.login import login_user, UserMixin, login_required
 from flask.ext.principal import identity_changed, Identity, AnonymousIdentity
 
 from data import model
 from app import app, login_manager, mixpanel
-from auth.permissions import QuayDeferredPermissionUser
-
+from auth.permissions import QuayDeferredPermissionUser, AdministerOrganizationPermission
+from util.invoice import renderInvoiceToPdf
 
 logger = logging.getLogger(__name__)
 
@@ -102,6 +103,23 @@ def privacy():
   return render_template('privacy.html')
 
 
+@app.route('/receipt', methods=['GET'])
+def receipt():
+  id =  request.args.get('id')
+  if id:
+    invoice = stripe.Invoice.retrieve(id)
+    if invoice:
+      org = model.get_user_or_org_by_customer_id(invoice.customer)
+      if org and org.organization:
+        admin_org = AdministerOrganizationPermission(org.username)
+        if admin_org.can():
+          file_data = renderInvoiceToPdf(invoice, org)          
+          return Response(file_data,
+                          mimetype="application/pdf",
+                          headers={"Content-Disposition":
+                                     "attachment;filename=receipt.pdf"})
+  abort(404)
+
 def common_login(db_user):
   if login_user(_LoginWrappedDBUser(db_user.username, db_user)):
     logger.debug('Successfully signed in as: %s' % db_user.username)
diff --git a/requirements.txt b/requirements.txt
index 494ed9198..dc2c2a6ec 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,3 +31,4 @@ requests==2.0.0
 six==1.4.1
 stripe==1.9.8
 wsgiref==0.1.2
+xhtml2pdf
\ No newline at end of file
diff --git a/static/partials/org-admin.html b/static/partials/org-admin.html
index 46e3af4ea..d31d10279 100644
--- a/static/partials/org-admin.html
+++ b/static/partials/org-admin.html
@@ -49,12 +49,13 @@
                 <th>Billing Date/Time</th>
                 <th>Amount Due</th>
                 <th>Status</th>
+                <th></th>
               </thead>
               
               <tbody class="invoice" ng-repeat="invoice in invoices">
-                <tr class="invoice-title" ng-click="toggleInvoice(invoice.id)">
-                  <td><span class="invoice-datetime">{{ invoice.date * 1000 | date:'medium' }}</span></td>
-                  <td><span class="invoice-amount">{{ invoice.amount_due / 100 }}</span></td>
+                <tr class="invoice-title">
+                  <td ng-click="toggleInvoice(invoice.id)"><span class="invoice-datetime">{{ invoice.date * 1000 | date:'medium' }}</span></td>
+                  <td ng-click="toggleInvoice(invoice.id)"><span class="invoice-amount">{{ invoice.amount_due / 100 }}</span></td>
                   <td>
                     <span class="invoice-status">
                       <span class="success" ng-show="invoice.paid">Paid - Thank you!</span>
@@ -63,6 +64,11 @@
                       <span class="pending" ng-show="!invoice.paid && !invoice.attempted">Payment pending</span>
                     </span>
                   </td>
+                  <td>
+                    <a ng-show="invoice.paid" href="/receipt?id={{ invoice.id }}" download="receipt.pdf" target="_new">
+                      <i class="fa fa-download" title="Download Receipt" bs-tooltip="tooltip.title"></i>
+                    </a>
+                  </td>
                 </tr>
 
                 <tr ng-class="invoiceExpanded[invoice.id] ? 'in' : 'out'" class="invoice-details panel-collapse collapse">
diff --git a/util/invoice.py b/util/invoice.py
index 773c428f1..86dd2eea4 100644
--- a/util/invoice.py
+++ b/util/invoice.py
@@ -1,5 +1,7 @@
 from datetime import datetime
 from jinja2 import Environment, FileSystemLoader
+from xhtml2pdf import pisa
+import StringIO
 
 jinja_options = {
   "loader": FileSystemLoader('util'),
@@ -7,6 +9,20 @@ jinja_options = {
 
 env = Environment(**jinja_options)
 
+
+def renderInvoiceToPdf(invoice, user):
+  """ Renders a nice PDF display for the given invoice. """
+  sourceHtml = renderInvoiceToHtml(invoice, user)
+  output = StringIO.StringIO()
+  pisaStatus = pisa.CreatePDF(sourceHtml, dest=output)
+  if pisaStatus.err:
+    return None
+  
+  value = output.getvalue()
+  output.close()
+  return value
+
+
 def renderInvoiceToHtml(invoice, user):
   """ Renders a nice HTML display for the given invoice. """
   def get_price(price):

From bde0a29296262a49409e30383e451d012d1bb7da Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Mon, 18 Nov 2013 15:00:08 -0500
Subject: [PATCH 02/21] Switcht the requirements and -nover files to the
 standard formatting.

---
 requirements-nover.txt |  3 ++-
 requirements.txt       | 16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/requirements-nover.txt b/requirements-nover.txt
index 8d95e3e48..dc0d069a0 100644
--- a/requirements-nover.txt
+++ b/requirements-nover.txt
@@ -16,4 +16,5 @@ marisa-trie
 apscheduler
 python-daemon
 paramiko
-python-digitalocean
\ No newline at end of file
+python-digitalocean
+xhtml2pdf
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index dc2c2a6ec..48a6fffa3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,30 +5,34 @@ Flask-Mail==0.9.0
 Flask-Principal==0.4.0
 Jinja2==2.7.1
 MarkupSafe==0.18
+Pillow==2.2.1
 PyMySQL==0.6.1
 Werkzeug==0.9.4
 argparse==1.2.1
 beautifulsoup4==4.3.2
 blinker==1.3
-boto==2.15.0
+boto==2.17.0
 distribute==0.6.34
 ecdsa==0.10
 eventlet==0.14.0
 greenlet==0.4.1
 gunicorn==18.0
+html5lib==1.0b3
 itsdangerous==0.23
 lockfile==0.9.1
 marisa-trie==0.5.1
 mixpanel-py==3.0.0
 paramiko==1.12.0
-peewee==2.1.4
+peewee==2.1.5
 py-bcrypt==0.4
+pyPdf==1.13
 pycrypto==2.6.1
 python-daemon==1.6
-python-dateutil==2.1
-python-digitalocean==0.5
-requests==2.0.0
+python-dateutil==2.2
+python-digitalocean==0.5.1
+reportlab==2.7
+requests==2.0.1
 six==1.4.1
 stripe==1.9.8
 wsgiref==0.1.2
-xhtml2pdf
\ No newline at end of file
+xhtml2pdf==0.0.5

From a079919a771df88b08909e6f372b6f68601e1459 Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Mon, 18 Nov 2013 15:58:42 -0500
Subject: [PATCH 03/21] Add the required apt packages for proper PIL usage.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 35ea35a87..6b394eecf 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ to prepare a new host:
 sudo apt-get install software-properties-common
 sudo apt-add-repository -y ppa:nginx/stable
 sudo apt-get update
-sudo apt-get install -y git python-virtualenv python-dev phantomjs 
+sudo apt-get install -y git python-virtualenv python-dev phantomjs libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev
 sudo apt-get install -y nginx-full
 ```
 

From 949a2de01c7cbc02ccbfd26264363e86fca42440 Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Mon, 18 Nov 2013 15:59:07 -0500
Subject: [PATCH 04/21] Add a script to detect freeloaders for our own
 entertainment.

---
 tools/freeloaders.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 tools/freeloaders.py

diff --git a/tools/freeloaders.py b/tools/freeloaders.py
new file mode 100644
index 000000000..ad6b37722
--- /dev/null
+++ b/tools/freeloaders.py
@@ -0,0 +1,25 @@
+from data import model
+from data.database import User
+from app import stripe
+from data.plans import get_plan
+
+def get_private_allowed(customer):
+  if not customer.stripe_id:
+    return 0
+
+  subscription = stripe.Customer.retrieve(customer.stripe_id).subscription
+  if subscription is None:
+    return 0
+
+  plan = get_plan(subscription.plan.id)
+  return plan['privateRepos']
+
+# Find customers who have more private repositories than their plans allow
+users = User.select()
+
+usage = [(user.username, model.get_private_repo_count(user.username),
+          get_private_allowed(user)) for user in users]
+
+for username, used, allowed in usage:
+  if used > allowed:
+    print('Violation: %s %s > %s' % (username, used, allowed))

From 738973cf3957c30285aca4b6e42d2b45673ff27e Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Mon, 18 Nov 2013 17:11:06 -0500
Subject: [PATCH 05/21] Add the snapshot endpoint to web.py and have the
 phantomjs running only load the page's HTML once there are no further pending
 XHR requests

---
 endpoints/web.py         | 12 ++++++++++++
 static/js/app.js         | 12 +++++++++++-
 util/phantomjs-runner.js | 37 +++++++++++++++++++++++++++++++++++++
 util/seo.py              | 27 +++++++++++++++++++++++++++
 4 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 util/phantomjs-runner.js
 create mode 100644 util/seo.py

diff --git a/endpoints/web.py b/endpoints/web.py
index ff6f1790a..c76d2f60b 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -11,6 +11,7 @@ from data import model
 from app import app, login_manager, mixpanel
 from auth.permissions import QuayDeferredPermissionUser, AdministerOrganizationPermission
 from util.invoice import renderInvoiceToPdf
+from util.seo import renderSnapshot
 
 logger = logging.getLogger(__name__)
 
@@ -49,6 +50,17 @@ def index(path):
   return render_template('index.html')
 
 
+@app.route('/snapshot', methods=['GET'])
+@app.route('/snapshot/', methods=['GET'])
+@app.route('/snapshot/<path:path>', methods=['GET'])
+def snapshot(path = ''):
+  result = renderSnapshot(path)
+  if result:
+    return result
+
+  abort(404)
+
+
 @app.route('/plans/')
 def plans():
   return index('')
diff --git a/static/js/app.js b/static/js/app.js
index 26d7aa5da..13b63a5b6 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -1053,7 +1053,8 @@ quayApp.directive('ngBlur', function() {
   };
 });
 
-quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', function($location, $rootScope, Restangular, UserService) {
+quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', '$http',
+   function($location, $rootScope, Restangular, UserService, $http) {
   Restangular.setErrorInterceptor(function(response) {
     if (response.status == 401) {
       $('#sessionexpiredModal').modal({});
@@ -1068,4 +1069,13 @@ quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', function($
       $rootScope.title = current.$$route.title;
     }
   });
+
+  var initallyChecked = false;
+  window.__isLoading = function() {
+    if (!initallyChecked) {
+      initallyChecked = true;
+      return true;
+    }
+    return $http.pendingRequests.length > 0;
+  };
 }]);
diff --git a/util/phantomjs-runner.js b/util/phantomjs-runner.js
new file mode 100644
index 000000000..30b0439fa
--- /dev/null
+++ b/util/phantomjs-runner.js
@@ -0,0 +1,37 @@
+var system = require('system');
+var url = system.args[1] || '';
+if(url.length > 0) {
+  var page = require('webpage').create();  
+  page.open(url, function (status) {
+    if (status == 'success') {     
+      var delay, checker = (function() {
+        var html = page.evaluate(function () {
+          var found = document.getElementsByTagName('html')[0].outerHTML || '';
+          if (window.__isLoading && !window.__isLoading()) {
+            return found;
+          }
+          if (found.indexOf('404 Not Found') > 0) {
+            return found;
+          }
+          return null;
+        });
+
+        if (html) {
+          if (html.indexOf('404 Not Found') > 0) {
+            console.log('Not Found');
+            phantom.exit();
+            return;
+          }
+
+          clearTimeout(delay);
+          console.log(html);
+          phantom.exit();
+        }
+      });
+      delay = setInterval(checker, 100);
+    } else {
+      console.log('Not Found');
+      phantom.exit();
+    }
+  });
+}
\ No newline at end of file
diff --git a/util/seo.py b/util/seo.py
new file mode 100644
index 000000000..6958e2c67
--- /dev/null
+++ b/util/seo.py
@@ -0,0 +1,27 @@
+import subprocess
+import urllib
+import os
+import logging
+import codecs
+
+from bs4 import BeautifulSoup
+
+logger = logging.getLogger(__name__)
+logging.basicConfig(level=logging.DEBUG)
+
+def renderSnapshot(path):
+    final_url = 'http://localhost:5000/' + path
+    logger.info('Snapshotting url: %s -> %s' % (path, final_url))
+    out_html = subprocess.check_output(['phantomjs', '--ignore-ssl-errors=yes',
+                                        'util/phantomjs-runner.js', final_url])
+
+    if not out_html or out_html.strip() == 'Not Found':
+      return None
+
+    # Remove script tags
+    soup = BeautifulSoup(out_html)
+    to_extract = soup.findAll('script')
+    for item in to_extract:
+        item.extract()
+
+    return soup.prettify()

From af4c67d7cb45a546dda8c31a0436f7eaf6b4d7f2 Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Mon, 18 Nov 2013 18:42:02 -0500
Subject: [PATCH 06/21] Switch from eventlet to gevent, it seems to work better
 with flask static files.

---
 README.md              | 2 +-
 requirements-nover.txt | 2 +-
 requirements.txt       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6b394eecf..a37e0d31d 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ running:
 
 ```
 sudo nginx -c `pwd`/nginx.conf
-STACK=prod gunicorn -D --workers 4 -b unix:/tmp/gunicorn.sock --worker-class eventlet -t 2000 application:application
+STACK=prod gunicorn -D --workers 4 -b unix:/tmp/gunicorn.sock --worker-class gevent -t 2000 application:application
 ```
 
 set up the snapshot script:
diff --git a/requirements-nover.txt b/requirements-nover.txt
index dc0d069a0..f42a8a90d 100644
--- a/requirements-nover.txt
+++ b/requirements-nover.txt
@@ -9,7 +9,7 @@ boto
 pymysql
 stripe
 gunicorn
-eventlet
+gevent
 mixpanel-py
 beautifulsoup4
 marisa-trie
diff --git a/requirements.txt b/requirements.txt
index 48a6fffa3..712c818c8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ blinker==1.3
 boto==2.17.0
 distribute==0.6.34
 ecdsa==0.10
-eventlet==0.14.0
+gevent==0.13.8
 greenlet==0.4.1
 gunicorn==18.0
 html5lib==1.0b3

From 6355b4a217cfc2b8f0150e013ee29d46ce41d42a Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Mon, 18 Nov 2013 18:42:27 -0500
Subject: [PATCH 07/21] Fix some things with the seo snapshots and use the pep8
 style guite.

---
 endpoints/web.py            |  4 ++--
 static/partials/header.html | 20 +++++++++++---------
 util/seo.py                 | 29 +++++++++++++----------------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/endpoints/web.py b/endpoints/web.py
index c76d2f60b..188533721 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -11,7 +11,7 @@ from data import model
 from app import app, login_manager, mixpanel
 from auth.permissions import QuayDeferredPermissionUser, AdministerOrganizationPermission
 from util.invoice import renderInvoiceToPdf
-from util.seo import renderSnapshot
+from util.seo import render_snapshot
 
 logger = logging.getLogger(__name__)
 
@@ -54,7 +54,7 @@ def index(path):
 @app.route('/snapshot/', methods=['GET'])
 @app.route('/snapshot/<path:path>', methods=['GET'])
 def snapshot(path = ''):
-  result = renderSnapshot(path)
+  result = render_snapshot(path)
   if result:
     return result
 
diff --git a/static/partials/header.html b/static/partials/header.html
index 34e2d2231..1bb22afbf 100644
--- a/static/partials/header.html
+++ b/static/partials/header.html
@@ -22,15 +22,17 @@
 
   
   <ul class="nav navbar-nav navbar-right" ng-switch on="user.anonymous">
-    <form class="navbar-form navbar-left" role="search">
-      <div class="form-group">
-        <input id="repoSearch" type="text" class="form-control" placeholder="Find Repo">
-      </div>
-    </form>
-    
-    <span class="navbar-left user-tools" ng-show="!user.anonymous">
-      <a href="/new/"><i class="fa fa-upload user-tool" bs-tooltip="tooltip.title" data-placement="bottom" title="Create new repository"></i></a>
-    </span>
+    <li>
+      <form class="navbar-form navbar-left" role="search">
+        <div class="form-group">
+          <input id="repoSearch" type="text" class="form-control" placeholder="Find Repo">
+        </div>
+      </form>
+      
+      <span class="navbar-left user-tools" ng-show="!user.anonymous">
+        <a href="/new/"><i class="fa fa-upload user-tool" bs-tooltip="tooltip.title" data-placement="bottom" title="Create new repository"></i></a>
+      </span>
+    </li>
 
     <li class="dropdown" ng-switch-when="false">
       <a href="javascript:void(0)" class="dropdown-toggle user-dropdown" data-toggle="dropdown">
diff --git a/util/seo.py b/util/seo.py
index 6958e2c67..c44d2a9ea 100644
--- a/util/seo.py
+++ b/util/seo.py
@@ -1,27 +1,24 @@
 import subprocess
-import urllib
-import os
 import logging
-import codecs
 
 from bs4 import BeautifulSoup
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
 
-def renderSnapshot(path):
-    final_url = 'http://localhost:5000/' + path
-    logger.info('Snapshotting url: %s -> %s' % (path, final_url))
-    out_html = subprocess.check_output(['phantomjs', '--ignore-ssl-errors=yes',
-                                        'util/phantomjs-runner.js', final_url])
+def render_snapshot(path):
+  final_url = 'http://localhost:5000/' + path
+  logger.info('Snapshotting url: %s -> %s' % (path, final_url))
+  out_html = subprocess.check_output(['phantomjs', '--ignore-ssl-errors=yes',
+                                      'util/phantomjs-runner.js', final_url])
 
-    if not out_html or out_html.strip() == 'Not Found':
-      return None
+  if not out_html or out_html.strip() == 'Not Found':
+    return None
 
-    # Remove script tags
-    soup = BeautifulSoup(out_html)
-    to_extract = soup.findAll('script')
-    for item in to_extract:
-        item.extract()
+  # Remove script tags
+  soup = BeautifulSoup(out_html.decode('utf8'))
+  to_extract = soup.findAll('script')
+  for item in to_extract:
+    item.extract()
 
-    return soup.prettify()
+  return str(soup)

From 84b9fdd007ebdb9b78f84a2d047b189fd423dbc2 Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Mon, 18 Nov 2013 18:43:50 -0500
Subject: [PATCH 08/21] Remove the old SEO snapshots stuff.

---
 README.md                         |  3 --
 seo-snapshots/README.md           | 13 -------
 seo-snapshots/crawl.py            | 60 -------------------------------
 seo-snapshots/make_snapshot.py    | 46 ------------------------
 seo-snapshots/phantomjs-runner.js | 23 ------------
 5 files changed, 145 deletions(-)
 delete mode 100644 seo-snapshots/README.md
 delete mode 100644 seo-snapshots/crawl.py
 delete mode 100644 seo-snapshots/make_snapshot.py
 delete mode 100644 seo-snapshots/phantomjs-runner.js

diff --git a/README.md b/README.md
index a37e0d31d..12a9d4179 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,6 @@ sudo nginx -c `pwd`/nginx.conf
 STACK=prod gunicorn -D --workers 4 -b unix:/tmp/gunicorn.sock --worker-class gevent -t 2000 application:application
 ```
 
-set up the snapshot script:
-(instructions in the seo-snapshots directory)[seo-snapshots/README.md]
-
 start the workers:
 
 ```
diff --git a/seo-snapshots/README.md b/seo-snapshots/README.md
deleted file mode 100644
index 1340fc7fe..000000000
--- a/seo-snapshots/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Follow the instructions to set up a host of the whole project before attempting to run.
-
-to run once:
-
-```
-python make_snapshot.py
-```
-
-cron line to update every 30 minutes:
-
-```
-0,30 * * * * cd /home/ubuntu/quay/seo-snapshots && ../venv/bin/python make_snapshot.py
-```
\ No newline at end of file
diff --git a/seo-snapshots/crawl.py b/seo-snapshots/crawl.py
deleted file mode 100644
index 79adcef57..000000000
--- a/seo-snapshots/crawl.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import subprocess
-import urllib
-import os
-import logging
-import codecs
-
-from bs4 import BeautifulSoup
-from Queue import Queue
-
-
-logger = logging.getLogger(__name__)
-logging.basicConfig(level=logging.DEBUG)
-
-
-BASE_URL = 'http://localhost:5000'
-OUTPUT_PATH = 'snapshots/'
-
-aware_of = set()
-crawl_queue = Queue()
-
-def crawl_url(url):
-  final_url = BASE_URL + url
-  to_write = OUTPUT_PATH + url + 'index.html'
-
-  logger.info('Snapshotting url: %s -> %s' % (final_url, to_write))
-
-  out_html = subprocess.check_output(['phantomjs', '--ignore-ssl-errors=yes',
-                                      'phantomjs-runner.js', final_url])
-
-  # Remove script tags
-  soup = BeautifulSoup(out_html)
-  to_extract = soup.findAll('script')
-  for item in to_extract:
-    item.extract()
-
-  # Find all links and add them to the crawl queue
-  for link in soup.findAll('a'):
-    to_add = link.get('href')
-
-    if to_add not in aware_of and to_add.startswith('/'):
-      logger.info('Adding link to be crawled: %s' % to_add)
-      crawl_queue.put(to_add)
-      aware_of.add(to_add)
-
-  to_write_dir = os.path.dirname(to_write)
-
-  if not os.path.exists(to_write_dir):
-    os.makedirs(to_write_dir)
-
-  with codecs.open(to_write, 'w', 'utf-8') as output_file:
-    output_file.write(soup.prettify())
-
-# Seed the crawler
-crawl_queue.put('/')
-aware_of.add('/')
-
-# Crawl
-while not crawl_queue.empty():
-  to_crawl = crawl_queue.get()
-  crawl_url(to_crawl)
diff --git a/seo-snapshots/make_snapshot.py b/seo-snapshots/make_snapshot.py
deleted file mode 100644
index 37c5738f0..000000000
--- a/seo-snapshots/make_snapshot.py
+++ /dev/null
@@ -1,46 +0,0 @@
-import subprocess
-import urllib
-import os
-import logging
-import codecs
-
-from bs4 import BeautifulSoup
-
-
-logger = logging.getLogger(__name__)
-logging.basicConfig(level=logging.DEBUG)
-
-
-BASE_URL = 'https://localhost/'
-OUTPUT_PATH = '../static/snapshots/'
-
-URLS = [
-  '',
-  'guide/',
-  'plans/',
-  'repository/',
-  'signin/',
-]
-
-for url in URLS:
-  final_url = BASE_URL + url
-  to_write = OUTPUT_PATH + url + 'index.html'
-
-  logger.info('Snapshotting url: %s -> %s' % (final_url, to_write))
-
-  out_html = subprocess.check_output(['phantomjs', '--ignore-ssl-errors=yes',
-                                      'phantomjs-runner.js', final_url])
-
-  # Remove script tags
-  soup = BeautifulSoup(out_html)
-  to_extract = soup.findAll('script')
-  for item in to_extract:
-      item.extract()
-
-  to_write_dir = os.path.dirname(to_write)
-
-  if not os.path.exists(to_write_dir):
-    os.makedirs(to_write_dir)
-
-  with codecs.open(to_write, 'w', 'utf-8') as output_file:
-    output_file.write(soup.prettify())
diff --git a/seo-snapshots/phantomjs-runner.js b/seo-snapshots/phantomjs-runner.js
deleted file mode 100644
index e001b73c8..000000000
--- a/seo-snapshots/phantomjs-runner.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var system = require('system');
-var url = system.args[1] || '';
-if(url.length > 0) {
-  var page = require('webpage').create();  
-  page.open(url, function (status) {
-    if (status == 'success') {
-      var delay, checker = (function() {
-        var html = page.evaluate(function () {
-          var ready = document.getElementsByClassName('ready-indicator')[0];
-          if(ready.getAttribute('data-status') == 'ready') {
-            return document.getElementsByTagName('html')[0].outerHTML;
-          }
-        });
-        if(html) {
-          clearTimeout(delay);
-          console.log(html);
-          phantom.exit();
-        }
-      });
-      delay = setInterval(checker, 100);
-    }
-  });
-}

From c6f2132094abe877bed42de397a5dc1214404f27 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Mon, 18 Nov 2013 19:03:35 -0500
Subject: [PATCH 09/21] - Convert to Angular 1.2.1 - Change the header into a
 directive - Change the repo search into a directive - Fix ZeroClipboard issue
 that occurs in the new Chrome beta - Add support for dynamic <meta
 description>

---
 static/css/quay.css                           |   4 +-
 .../header-bar.html}                          |   2 +-
 static/directives/markdown-view.html          |   2 +-
 static/directives/repo-search.html            |   1 +
 static/js/app.js                              | 134 ++++++++++++++++--
 static/js/controllers.js                      |  86 +++--------
 static/lib/ZeroClipboard.min.js               |  15 +-
 templates/base.html                           |   7 +-
 templates/index.html                          |   4 +-
 templates/privacy.html                        |   4 +
 templates/tos.html                            |   6 +-
 11 files changed, 162 insertions(+), 103 deletions(-)
 rename static/{partials/header.html => directives/header-bar.html} (96%)
 create mode 100644 static/directives/repo-search.html

diff --git a/static/css/quay.css b/static/css/quay.css
index bf3f1124a..871a82f26 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -673,8 +673,8 @@ form input.ng-valid.ng-dirty,
   text-align: center;
 }
 
-#repoSearch {
-  width: 300px;
+.repo-search-box {
+  width: 240px;
 }
 
 .repo-mini-listing {
diff --git a/static/partials/header.html b/static/directives/header-bar.html
similarity index 96%
rename from static/partials/header.html
rename to static/directives/header-bar.html
index 34e2d2231..7231c5768 100644
--- a/static/partials/header.html
+++ b/static/directives/header-bar.html
@@ -24,7 +24,7 @@
   <ul class="nav navbar-nav navbar-right" ng-switch on="user.anonymous">
     <form class="navbar-form navbar-left" role="search">
       <div class="form-group">
-        <input id="repoSearch" type="text" class="form-control" placeholder="Find Repo">
+        <span class="repo-search"></span>
       </div>
     </form>
     
diff --git a/static/directives/markdown-view.html b/static/directives/markdown-view.html
index fe915b857..c47184387 100644
--- a/static/directives/markdown-view.html
+++ b/static/directives/markdown-view.html
@@ -1 +1 @@
-<span class="markdown-view-content" ng-bind-html-unsafe="getMarkedDown(content, firstLineOnly)"></span>
+<span class="markdown-view-content" ng-bind-html="getMarkedDown(content, firstLineOnly)"></span>
diff --git a/static/directives/repo-search.html b/static/directives/repo-search.html
new file mode 100644
index 000000000..2f313db34
--- /dev/null
+++ b/static/directives/repo-search.html
@@ -0,0 +1 @@
+<input type="text" class="form-control repo-search-box" placeholder="Find Repo">
diff --git a/static/js/app.js b/static/js/app.js
index 13b63a5b6..4a784f92c 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -47,7 +47,7 @@ function getMarkedDown(string) {
 }
 
 // Start the application code itself.
-quayApp = angular.module('quay', ['restangular', 'angularMoment', 'angulartics', 'angulartics.mixpanel', '$strap.directives', 'ngCookies'], function($provide) {
+quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'angulartics', 'angulartics.mixpanel', '$strap.directives', 'ngCookies'], function($provide) {
     $provide.factory('UserService', ['Restangular', function(Restangular) {
       var userResponse = {
         verified: false,
@@ -399,22 +399,23 @@ quayApp = angular.module('quay', ['restangular', 'angularMoment', 'angulartics',
       when('/repository/:namespace/:name/tag/:tag', {templateUrl: '/static/partials/view-repo.html', controller: RepoCtrl}).
       when('/repository/:namespace/:name/image/:image', {templateUrl: '/static/partials/image-view.html', controller: ImageViewCtrl}).
       when('/repository/:namespace/:name/admin', {templateUrl: '/static/partials/repo-admin.html', controller:RepoAdminCtrl}).
-      when('/repository/', {title: 'Repositories', templateUrl: '/static/partials/repo-list.html', controller: RepoListCtrl}).
-      when('/user/', {title: 'Account Settings', templateUrl: '/static/partials/user-admin.html', controller: UserAdminCtrl}).
-      when('/guide/', {title: 'Guide', templateUrl: '/static/partials/guide.html', controller: GuideCtrl}).
-      when('/plans/', {title: 'Plans and Pricing', templateUrl: '/static/partials/plans.html', controller: PlansCtrl}).
-      when('/signin/', {title: 'Sign In', templateUrl: '/static/partials/signin.html', controller: SigninCtrl}).
-      when('/new/', {title: 'Create new repository', templateUrl: '/static/partials/new-repo.html', controller: NewRepoCtrl}).
-
-      when('/organizations/', {title: 'Organizations', templateUrl: '/static/partials/organizations.html', controller: OrgsCtrl}).
-      when('/organizations/new/', {title: 'New Organization', templateUrl: '/static/partials/new-organization.html', controller: NewOrgCtrl}).
-
+      when('/repository/', {title: 'Repositories', description: 'Public and private docker repositories list',
+                            templateUrl: '/static/partials/repo-list.html', controller: RepoListCtrl}).
+      when('/user/', {title: 'Account Settings', description:'Account settings for Quay', templateUrl: '/static/partials/user-admin.html', controller: UserAdminCtrl}).
+      when('/guide/', {title: 'Guide', description:'Guide to using private docker repositories on Quay', templateUrl: '/static/partials/guide.html', controller: GuideCtrl}).
+      when('/plans/', {title: 'Plans and Pricing', description: 'Plans and pricing for private docker repositories on Quay',
+                       templateUrl: '/static/partials/plans.html', controller: PlansCtrl}).
+      when('/signin/', {title: 'Sign In', description: 'Sign into Quay', templateUrl: '/static/partials/signin.html', controller: SigninCtrl}).
+      when('/new/', {title: 'Create new repository', description: 'Create a new public or private docker repository, optionally constructing from a dockerfile',
+                     templateUrl: '/static/partials/new-repo.html', controller: NewRepoCtrl}).
+      when('/organizations/', {title: 'Organizations', description: 'Private docker repository hosting for businesses and organizations',
+                                 templateUrl: '/static/partials/organizations.html', controller: OrgsCtrl}).
+      when('/organizations/new/', {title: 'New Organization', description: 'Create a new organization on Quay',
+                                   templateUrl: '/static/partials/new-organization.html', controller: NewOrgCtrl}).
       when('/organization/:orgname', {templateUrl: '/static/partials/org-view.html', controller: OrgViewCtrl}).
       when('/organization/:orgname/admin', {templateUrl: '/static/partials/org-admin.html', controller: OrgAdminCtrl}).
       when('/organization/:orgname/teams/:teamname', {templateUrl: '/static/partials/team-view.html', controller: TeamViewCtrl}).
-
       when('/v1/', {title: 'Activation information', templateUrl: '/static/partials/v1-page.html', controller: V1Ctrl}).
-
       when('/', {title: 'Hosted Private Docker Registry', templateUrl: '/static/partials/landing.html', controller: LandingCtrl}).
       otherwise({redirectTo: '/'});
   }]).
@@ -434,12 +435,12 @@ quayApp.directive('markdownView', function () {
       'content': '=content',
       'firstLineOnly': '=firstLineOnly'
     },
-    controller: function($scope, $element) {
+    controller: function($scope, $element, $sce) {
       $scope.getMarkedDown = function(content, firstLineOnly) {
         if (firstLineOnly) {
           content = getFirstTextLine(content);
         }
-        return getMarkedDown(content);
+        return $sce.trustAsHtml(getMarkedDown(content));
       };
     }
   };
@@ -595,6 +596,103 @@ quayApp.directive('markdownInput', function () {
 });
 
 
+quayApp.directive('repoSearch', function () {
+  var number = 0;
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/repo-search.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+    },
+    controller: function($scope, $element, $location, UserService, Restangular) {
+      var searchToken = 0;
+      $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
+        ++searchToken;
+      }, true);
+        
+      var element = $($element[0].childNodes[0]);
+      element.typeahead({
+        name: 'repositories',
+        remote: {
+          url: '/api/find/repository?query=%QUERY',
+          replace: function (url, uriEncodedQuery) {
+            url = url.replace('%QUERY', uriEncodedQuery);              
+            url += '&cb=' + searchToken;
+            return url;
+          },
+          filter: function(data) {
+            var datums = [];
+            for (var i = 0; i < data.repositories.length; ++i) {
+              var repo = data.repositories[i];
+              datums.push({
+                'value': repo.name,
+                'tokens': [repo.name, repo.namespace],
+                'repo': repo
+              });
+            }
+            return datums;
+          }
+        },
+        template: function (datum) {
+          template = '<div class="repo-mini-listing">';
+          template += '<i class="fa fa-hdd fa-lg"></i>'
+          template += '<span class="name">' + datum.repo.namespace +'/' + datum.repo.name + '</span>'
+          if (datum.repo.description) {
+            template += '<span class="description">' + getFirstTextLine(datum.repo.description) + '</span>'
+          }
+
+          template += '</div>'
+          return template;
+        }
+      });
+
+      element.on('typeahead:selected', function (e, datum) {
+        element.typeahead('setQuery', '');
+        document.location = '/repository/' + datum.repo.namespace + '/' + datum.repo.name;
+      });
+    }
+  };
+  return directiveDefinitionObject;
+});
+
+
+quayApp.directive('headerBar', function () {
+  var number = 0;
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/header-bar.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+    },
+    controller: function($scope, $element, $location, UserService, Restangular) {
+      $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
+        $scope.user = currentUser;
+      }, true);
+        
+      $scope.signout = function() {
+        var signoutPost = Restangular.one('signout');
+        signoutPost.customPOST().then(function() {
+            UserService.load();
+            $location.path('/');
+        });
+      };
+        
+      $scope.appLinkTarget = function() {
+        if ($("div[ng-view]").length === 0) {
+            return "_self";
+        }
+        return "";
+      };
+    }
+  };
+  return directiveDefinitionObject;
+});
+
+
 quayApp.directive('entitySearch', function () {
   var number = 0;
   var directiveDefinitionObject = {
@@ -1068,6 +1166,12 @@ quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', '$http',
     if (current.$$route.title) {
       $rootScope.title = current.$$route.title;
     }
+
+    if (current.$$route.description) {
+      $rootScope.description = current.$$route.description;
+    } else {
+      $rootScope.description = 'Hosted private docker repositories. Includes full user management and history. Free for public repositories.';
+    }
   });
 
   var initallyChecked = false;
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 8bba4f712..5e39f7fb7 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -1,5 +1,6 @@
 $.fn.clipboardCopy = function() { 
-  var clip = new ZeroClipboard($(this),  { 'moviePath': 'static/lib/ZeroClipboard.swf' });
+  var clip = new ZeroClipboard($(this),  { 'moviePath': 'static/lib/ZeroClipboard.swf' });  
+
   clip.on('complete', function() {
     // Resets the animation.
     var elem = $('#clipboardCopied')[0];
@@ -14,74 +15,6 @@ $.fn.clipboardCopy = function() {
   });
 };
 
-function HeaderCtrl($scope, $location, UserService, Restangular) {
-  var searchToken = 0;
-
-  $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {    
-    $scope.user = currentUser;
-    ++searchToken;
-  }, true);
-
-  $scope.signout = function() {
-    var signoutPost = Restangular.one('signout');
-    signoutPost.customPOST().then(function() {
-      UserService.load();
-      $location.path('/');
-    });
-  };
-
-  $scope.appLinkTarget = function() {
-    if ($("div[ng-view]").length === 0) {
-      return "_self";
-    }
-    return "";
-  };
-
-  $scope.$on('$includeContentLoaded', function() {
-    // THIS IS BAD, MOVE THIS TO A DIRECTIVE
-    $('#repoSearch').typeahead({
-        name: 'repositories',
-        remote: {
-          url: '/api/find/repository?query=%QUERY',
-          replace: function (url, uriEncodedQuery) {
-            url = url.replace('%QUERY', uriEncodedQuery);              
-            url += '&cb=' + searchToken;
-            return url;
-          },
-          filter: function(data) {
-            var datums = [];
-            for (var i = 0; i < data.repositories.length; ++i) {
-              var repo = data.repositories[i];
-              datums.push({
-                'value': repo.name,
-                'tokens': [repo.name, repo.namespace],
-                'repo': repo
-              });
-            }
-            return datums;
-          }
-        },
-        template: function (datum) {
-          template = '<div class="repo-mini-listing">';
-          template += '<i class="fa fa-hdd fa-lg"></i>'
-          template += '<span class="name">' + datum.repo.namespace +'/' + datum.repo.name + '</span>'
-          if (datum.repo.description) {
-            template += '<span class="description">' + getFirstTextLine(datum.repo.description) + '</span>'
-          }
-
-          template += '</div>'
-          return template;
-        },
-
-    });
-
-    $('#repoSearch').on('typeahead:selected', function (e, datum) {
-        $('#repoSearch').typeahead('setQuery', '');
-        document.location = '/repository/' + datum.repo.namespace + '/' + datum.repo.name
-    });
-  });
-}
-
 function SigninCtrl($scope, $location, $timeout, Restangular, KeyService, UserService) {
   $scope.sendRecovery = function() {
     var signinPost = Restangular.one('recovery');
@@ -307,6 +240,11 @@ function RepoCtrl($scope, Restangular, $routeParams, $rootScope, $location, $tim
     var repositoryFetch = Restangular.one('repository/' + namespace + '/' + name);
     repositoryFetch.get().then(function(repo) {
       $rootScope.title = namespace + '/' + name;
+      
+      var kind = repo.is_public ? 'public' : 'private';
+      $rootScope.description = jQuery(getFirstTextLine(repo.description)).text() ||
+        'View of a ' + kind + ' docker repository on Quay';
+
       $scope.repo = repo;
 
       $scope.setTag($routeParams.tag);
@@ -666,6 +604,8 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
     var permissionsFetch = Restangular.one('repository/' + namespace + '/' + name + '/permissions/' + kind + '/');
     permissionsFetch.get().then(function(resp) {
       $rootScope.title = 'Settings - ' + namespace + '/' + name;
+      $rootScope.description = 'Administrator settings for ' + namespace + '/' + name +
+          ': Permissions, web hooks and other settings';
       $scope.permissions[kind] = resp.permissions;
       checkLoading();
     }, function() {
@@ -890,6 +830,8 @@ function ImageViewCtrl($scope, $routeParams, $rootScope, Restangular) {
     };
     $scope.image = image;
     $rootScope.title = 'View Image - ' + image.id;
+    $rootScope.description = 'Viewing docker image ' + image.id + ' under repository ' + namespace + '/' + name +
+        ': Image changes tree and list view';
   }, function() {
     $rootScope.title = 'Unknown Image';
     $scope.loading = false;
@@ -1068,13 +1010,14 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, Restangula
 
   $scope.upgradePlan = function() {
     var callbacks = {
+      'started': function() { $scope.planChanging = true; },
       'opened': function() { $scope.planChanging = true; },
       'closed': function() { $scope.planChanging = false; },
       'success': subscribedToPlan,
       'failure': function() { $('#couldnotsubscribeModal').modal(); $scope.planChanging = false; }
     };
 
-    PlanService.changePlan($scope, null, $scope.planRequired.stripeId, null, callbacks);
+    PlanService.changePlan($scope, null, $scope.planRequired.stripeId, callbacks);
   };
  
   // Watch the namespace on the repo. If it changes, we update the plan and the public/private
@@ -1128,6 +1071,7 @@ function OrgViewCtrl($rootScope, $scope, Restangular, $routeParams) {
       $scope.loading = false;
 
       $rootScope.title = orgname;
+      $rootScope.description = 'Viewing organization ' + orgname;
     }, function() {
       $scope.loading = false;
     });
@@ -1279,6 +1223,7 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
       if (resp && resp.is_admin) {
         $scope.organization = resp;
         $rootScope.title = orgname + ' (Admin)';
+        $rootScope.description = 'Administration page for organization ' + orgname;
       }
 
       $scope.loading = false;
@@ -1356,6 +1301,7 @@ function TeamViewCtrl($rootScope, $scope, Restangular, $routeParams) {
       $scope.canEditMembers = resp.can_edit;
       $scope.loading = !$scope.organization || !$scope.members;
       $rootScope.title = teamname + ' (' + orgname + ')';
+      $rootScope.description = 'Team management page for team ' + teamname + ' under organization ' + orgname;
     }, function() {
       $scope.organization = null;
       $scope.members = null;
diff --git a/static/lib/ZeroClipboard.min.js b/static/lib/ZeroClipboard.min.js
index 32535fddf..bfea72566 100755
--- a/static/lib/ZeroClipboard.min.js
+++ b/static/lib/ZeroClipboard.min.js
@@ -1,8 +1,9 @@
 /*!
- * zeroclipboard
- * The Zero Clipboard library provides an easy way to copy text to the clipboard using an invisible Adobe Flash movie, and a JavaScript interface.
- * Copyright 2012 Jon Rohan, James M. Greene, .
- * Released under the MIT license
- * http://jonrohan.github.com/ZeroClipboard/
- * v1.1.7
- */(function(){"use strict";var a=function(a,b){var c=a.style[b];a.currentStyle?c=a.currentStyle[b]:window.getComputedStyle&&(c=document.defaultView.getComputedStyle(a,null).getPropertyValue(b));if(c=="auto"&&b=="cursor"){var d=["a"];for(var e=0;e<d.length;e++)if(a.tagName.toLowerCase()==d[e])return"pointer"}return c},b=function(a){if(!l.prototype._singleton)return;a||(a=window.event);var b;this!==window?b=this:a.target?b=a.target:a.srcElement&&(b=a.srcElement),l.prototype._singleton.setCurrent(b)},c=function(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent&&a.attachEvent("on"+b,c)},d=function(a,b,c){a.removeEventListener?a.removeEventListener(b,c,!1):a.detachEvent&&a.detachEvent("on"+b,c)},e=function(a,b){if(a.addClass)return a.addClass(b),a;if(b&&typeof b=="string"){var c=(b||"").split(/\s+/);if(a.nodeType===1)if(!a.className)a.className=b;else{var d=" "+a.className+" ",e=a.className;for(var f=0,g=c.length;f<g;f++)d.indexOf(" "+c[f]+" ")<0&&(e+=" "+c[f]);a.className=e.replace(/^\s+|\s+$/g,"")}}return a},f=function(a,b){if(a.removeClass)return a.removeClass(b),a;if(b&&typeof b=="string"||b===undefined){var c=(b||"").split(/\s+/);if(a.nodeType===1&&a.className)if(b){var d=(" "+a.className+" ").replace(/[\n\t]/g," ");for(var e=0,f=c.length;e<f;e++)d=d.replace(" "+c[e]+" "," ");a.className=d.replace(/^\s+|\s+$/g,"")}else a.className=""}return a},g=function(b){var c={left:0,top:0,width:b.width||b.offsetWidth||0,height:b.height||b.offsetHeight||0,zIndex:9999},d=a(b,"zIndex");d&&d!="auto"&&(c.zIndex=parseInt(d,10));while(b){var e=parseInt(a(b,"borderLeftWidth"),10),f=parseInt(a(b,"borderTopWidth"),10);c.left+=isNaN(b.offsetLeft)?0:b.offsetLeft,c.left+=isNaN(e)?0:e,c.top+=isNaN(b.offsetTop)?0:b.offsetTop,c.top+=isNaN(f)?0:f,b=b.offsetParent}return c},h=function(a){return(a.indexOf("?")>=0?"&":"?")+"nocache="+(new Date).getTime()},i=function(a){var b=[];return a.trustedDomains&&(typeof a.trustedDomains=="string"?b.push("trustedDomain="+a.trustedDomains):b.push("trustedDomain="+a.trustedDomains.join(","))),b.join("&")},j=function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},k=function(a){if(typeof a=="string")throw new TypeError("ZeroClipboard doesn't accept query strings.");return a.length?a:[a]},l=function(a,b){a&&(l.prototype._singleton||this).glue(a);if(l.prototype._singleton)return l.prototype._singleton;l.prototype._singleton=this,this.options={};for(var c in o)this.options[c]=o[c];for(var d in b)this.options[d]=b[d];this.handlers={},l.detectFlashSupport()&&p()},m,n=[];l.prototype.setCurrent=function(b){m=b,this.reposition(),b.getAttribute("title")&&this.setTitle(b.getAttribute("title")),this.setHandCursor(a(b,"cursor")=="pointer")},l.prototype.setText=function(a){a&&a!==""&&(this.options.text=a,this.ready()&&this.flashBridge.setText(a))},l.prototype.setTitle=function(a){a&&a!==""&&this.htmlBridge.setAttribute("title",a)},l.prototype.setSize=function(a,b){this.ready()&&this.flashBridge.setSize(a,b)},l.prototype.setHandCursor=function(a){this.ready()&&this.flashBridge.setHandCursor(a)},l.version="1.1.7";var o={moviePath:"ZeroClipboard.swf",trustedDomains:null,text:null,hoverClass:"zeroclipboard-is-hover",activeClass:"zeroclipboard-is-active",allowScriptAccess:"sameDomain"};l.setDefaults=function(a){for(var b in a)o[b]=a[b]},l.destroy=function(){l.prototype._singleton.unglue(n);var a=l.prototype._singleton.htmlBridge;a.parentNode.removeChild(a),delete l.prototype._singleton},l.detectFlashSupport=function(){var a=!1;try{new ActiveXObject("ShockwaveFlash.ShockwaveFlash")&&(a=!0)}catch(b){navigator.mimeTypes["application/x-shockwave-flash"]&&(a=!0)}return a};var p=function(){var a=l.prototype._singleton,b=document.getElementById("global-zeroclipboard-html-bridge");if(!b){var c='      <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="global-zeroclipboard-flash-bridge" width="100%" height="100%">         <param name="movie" value="'+a.options.moviePath+h(a.options.moviePath)+'"/>         <param name="allowScriptAccess" value="'+a.options.allowScriptAccess+'"/>         <param name="scale" value="exactfit"/>         <param name="loop" value="false"/>         <param name="menu" value="false"/>         <param name="quality" value="best" />         <param name="bgcolor" value="#ffffff"/>         <param name="wmode" value="transparent"/>         <param name="flashvars" value="'+i(a.options)+'"/>         <embed src="'+a.options.moviePath+h(a.options.moviePath)+'"           loop="false" menu="false"           quality="best" bgcolor="#ffffff"           width="100%" height="100%"           name="global-zeroclipboard-flash-bridge"           allowScriptAccess="always"           allowFullScreen="false"           type="application/x-shockwave-flash"           wmode="transparent"           pluginspage="http://www.macromedia.com/go/getflashplayer"           flashvars="'+i(a.options)+'"           scale="exactfit">         </embed>       </object>';b=document.createElement("div"),b.id="global-zeroclipboard-html-bridge",b.setAttribute("class","global-zeroclipboard-container"),b.setAttribute("data-clipboard-ready",!1),b.style.position="absolute",b.style.left="-9999px",b.style.top="-9999px",b.style.width="15px",b.style.height="15px",b.style.zIndex="9999",b.innerHTML=c,document.body.appendChild(b)}a.htmlBridge=b,a.flashBridge=document["global-zeroclipboard-flash-bridge"]||b.children[0].lastElementChild};l.prototype.resetBridge=function(){this.htmlBridge.style.left="-9999px",this.htmlBridge.style.top="-9999px",this.htmlBridge.removeAttribute("title"),this.htmlBridge.removeAttribute("data-clipboard-text"),f(m,this.options.activeClass),m=null,this.options.text=null},l.prototype.ready=function(){var a=this.htmlBridge.getAttribute("data-clipboard-ready");return a==="true"||a===!0},l.prototype.reposition=function(){if(!m)return!1;var a=g(m);this.htmlBridge.style.top=a.top+"px",this.htmlBridge.style.left=a.left+"px",this.htmlBridge.style.width=a.width+"px",this.htmlBridge.style.height=a.height+"px",this.htmlBridge.style.zIndex=a.zIndex+1,this.setSize(a.width,a.height)},l.dispatch=function(a,b){l.prototype._singleton.receiveEvent(a,b)},l.prototype.on=function(a,b){var c=a.toString().split(/\s/g);for(var d=0;d<c.length;d++)a=c[d].toLowerCase().replace(/^on/,""),this.handlers[a]||(this.handlers[a]=b);this.handlers.noflash&&!l.detectFlashSupport()&&this.receiveEvent("onNoFlash",null)},l.prototype.addEventListener=l.prototype.on,l.prototype.off=function(a,b){var c=a.toString().split(/\s/g);for(var d=0;d<c.length;d++){a=c[d].toLowerCase().replace(/^on/,"");for(var e in this.handlers)e===a&&this.handlers[e]===b&&delete this.handlers[e]}},l.prototype.removeEventListener=l.prototype.off,l.prototype.receiveEvent=function(a,b){a=a.toString().toLowerCase().replace(/^on/,"");var c=m;switch(a){case"load":if(b&&parseFloat(b.flashVersion.replace(",",".").replace(/[^0-9\.]/gi,""))<10){this.receiveEvent("onWrongFlash",{flashVersion:b.flashVersion});return}this.htmlBridge.setAttribute("data-clipboard-ready",!0);break;case"mouseover":e(c,this.options.hoverClass);break;case"mouseout":f(c,this.options.hoverClass),this.resetBridge();break;case"mousedown":e(c,this.options.activeClass);break;case"mouseup":f(c,this.options.activeClass);break;case"datarequested":var d=c.getAttribute("data-clipboard-target"),g=d?document.getElementById(d):null;if(g){var h=g.value||g.textContent||g.innerText;h&&this.setText(h)}else{var i=c.getAttribute("data-clipboard-text");i&&this.setText(i)}break;case"complete":this.options.text=null}if(this.handlers[a]){var j=this.handlers[a];typeof j=="function"?j.call(c,this,b):typeof j=="string"&&window[j].call(c,this,b)}},l.prototype.glue=function(a){a=k(a);for(var d=0;d<a.length;d++)j(a[d],n)==-1&&(n.push(a[d]),c(a[d],"mouseover",b))},l.prototype.unglue=function(a){a=k(a);for(var c=0;c<a.length;c++){d(a[c],"mouseover",b);var e=j(a[c],n);e!=-1&&n.splice(e,1)}},typeof module!="undefined"?module.exports=l:typeof define=="function"&&define.amd?define(function(){return l}):window.ZeroClipboard=l})();
\ No newline at end of file
+* ZeroClipboard
+* The ZeroClipboard library provides an easy way to copy text to the clipboard using an invisible Adobe Flash movie and a JavaScript interface.
+* Copyright (c) 2013 Jon Rohan, James M. Greene
+* Licensed MIT
+* http://zeroclipboard.org/
+* v1.2.3
+*/
+!function(){"use strict";var a,b=function(){var a=/\-([a-z])/g,b=function(a,b){return b.toUpperCase()};return function(c){return c.replace(a,b)}}(),c=function(a,c){var d,e,f,g,h,i;if(window.getComputedStyle?d=window.getComputedStyle(a,null).getPropertyValue(c):(e=b(c),d=a.currentStyle?a.currentStyle[e]:a.style[e]),"cursor"===c&&(!d||"auto"===d))for(f=a.tagName.toLowerCase(),g=["a"],h=0,i=g.length;i>h;h++)if(f===g[h])return"pointer";return d},d=function(a){if(p.prototype._singleton){a||(a=window.event);var b;this!==window?b=this:a.target?b=a.target:a.srcElement&&(b=a.srcElement),p.prototype._singleton.setCurrent(b)}},e=function(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent&&a.attachEvent("on"+b,c)},f=function(a,b,c){a.removeEventListener?a.removeEventListener(b,c,!1):a.detachEvent&&a.detachEvent("on"+b,c)},g=function(a,b){if(a.addClass)return a.addClass(b),a;if(b&&"string"==typeof b){var c=(b||"").split(/\s+/);if(1===a.nodeType)if(a.className){for(var d=" "+a.className+" ",e=a.className,f=0,g=c.length;g>f;f++)d.indexOf(" "+c[f]+" ")<0&&(e+=" "+c[f]);a.className=e.replace(/^\s+|\s+$/g,"")}else a.className=b}return a},h=function(a,b){if(a.removeClass)return a.removeClass(b),a;if(b&&"string"==typeof b||void 0===b){var c=(b||"").split(/\s+/);if(1===a.nodeType&&a.className)if(b){for(var d=(" "+a.className+" ").replace(/[\n\t]/g," "),e=0,f=c.length;f>e;e++)d=d.replace(" "+c[e]+" "," ");a.className=d.replace(/^\s+|\s+$/g,"")}else a.className=""}return a},i=function(){var a,b,c,d=1;return"function"==typeof document.body.getBoundingClientRect&&(a=document.body.getBoundingClientRect(),b=a.right-a.left,c=document.body.offsetWidth,d=Math.round(100*(b/c))/100),d},j=function(a){var b={left:0,top:0,width:0,height:0,zIndex:999999999},d=c(a,"z-index");if(d&&"auto"!==d&&(b.zIndex=parseInt(d,10)),a.getBoundingClientRect){var e,f,g,h=a.getBoundingClientRect();"pageXOffset"in window&&"pageYOffset"in window?(e=window.pageXOffset,f=window.pageYOffset):(g=i(),e=Math.round(document.documentElement.scrollLeft/g),f=Math.round(document.documentElement.scrollTop/g));var j=document.documentElement.clientLeft||0,k=document.documentElement.clientTop||0;b.left=h.left+e-j,b.top=h.top+f-k,b.width="width"in h?h.width:h.right-h.left,b.height="height"in h?h.height:h.bottom-h.top}return b},k=function(a,b){var c=!(b&&b.useNoCache===!1);return c?(-1===a.indexOf("?")?"?":"&")+"nocache="+(new Date).getTime():""},l=function(a){var b=[],c=[];return a.trustedOrigins&&("string"==typeof a.trustedOrigins?c.push(a.trustedOrigins):"object"==typeof a.trustedOrigins&&"length"in a.trustedOrigins&&(c=c.concat(a.trustedOrigins))),a.trustedDomains&&("string"==typeof a.trustedDomains?c.push(a.trustedDomains):"object"==typeof a.trustedDomains&&"length"in a.trustedDomains&&(c=c.concat(a.trustedDomains))),c.length&&b.push("trustedOrigins="+encodeURIComponent(c.join(","))),"string"==typeof a.amdModuleId&&a.amdModuleId&&b.push("amdModuleId="+encodeURIComponent(a.amdModuleId)),"string"==typeof a.cjsModuleId&&a.cjsModuleId&&b.push("cjsModuleId="+encodeURIComponent(a.cjsModuleId)),b.join("&")},m=function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;d>c;c++)if(b[c]===a)return c;return-1},n=function(a){if("string"==typeof a)throw new TypeError("ZeroClipboard doesn't accept query strings.");return a.length?a:[a]},o=function(a,b,c,d,e){e?window.setTimeout(function(){a.call(b,c,d)},0):a.call(b,c,d)},p=function(a,b){if(a&&(p.prototype._singleton||this).glue(a),p.prototype._singleton)return p.prototype._singleton;p.prototype._singleton=this,this.options={};for(var c in s)this.options[c]=s[c];for(var d in b)this.options[d]=b[d];this.handlers={},p.detectFlashSupport()&&v()},q=[];p.prototype.setCurrent=function(b){a=b,this.reposition();var d=b.getAttribute("title");d&&this.setTitle(d);var e=this.options.forceHandCursor===!0||"pointer"===c(b,"cursor");return r.call(this,e),this},p.prototype.setText=function(a){return a&&""!==a&&(this.options.text=a,this.ready()&&this.flashBridge.setText(a)),this},p.prototype.setTitle=function(a){return a&&""!==a&&this.htmlBridge.setAttribute("title",a),this},p.prototype.setSize=function(a,b){return this.ready()&&this.flashBridge.setSize(a,b),this},p.prototype.setHandCursor=function(a){return a="boolean"==typeof a?a:!!a,r.call(this,a),this.options.forceHandCursor=a,this};var r=function(a){this.ready()&&this.flashBridge.setHandCursor(a)};p.version="1.2.3";var s={moviePath:"ZeroClipboard.swf",trustedOrigins:null,text:null,hoverClass:"zeroclipboard-is-hover",activeClass:"zeroclipboard-is-active",allowScriptAccess:"sameDomain",useNoCache:!0,forceHandCursor:!1};p.setDefaults=function(a){for(var b in a)s[b]=a[b]},p.destroy=function(){p.prototype._singleton.unglue(q);var a=p.prototype._singleton.htmlBridge;a.parentNode.removeChild(a),delete p.prototype._singleton},p.detectFlashSupport=function(){var a=!1;if("function"==typeof ActiveXObject)try{new ActiveXObject("ShockwaveFlash.ShockwaveFlash")&&(a=!0)}catch(b){}return!a&&navigator.mimeTypes["application/x-shockwave-flash"]&&(a=!0),a};var t=null,u=null,v=function(){var a,b,c=p.prototype._singleton,d=document.getElementById("global-zeroclipboard-html-bridge");if(!d){var e={};for(var f in c.options)e[f]=c.options[f];e.amdModuleId=t,e.cjsModuleId=u;var g=l(e),h='      <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="global-zeroclipboard-flash-bridge" width="100%" height="100%">         <param name="movie" value="'+c.options.moviePath+k(c.options.moviePath,c.options)+'"/>         <param name="allowScriptAccess" value="'+c.options.allowScriptAccess+'"/>         <param name="scale" value="exactfit"/>         <param name="loop" value="false"/>         <param name="menu" value="false"/>         <param name="quality" value="best" />         <param name="bgcolor" value="#ffffff"/>         <param name="wmode" value="transparent"/>         <param name="flashvars" value="'+g+'"/>         <embed src="'+c.options.moviePath+k(c.options.moviePath,c.options)+'"           loop="false" menu="false"           quality="best" bgcolor="#ffffff"           width="100%" height="100%"           name="global-zeroclipboard-flash-bridge"           allowScriptAccess="always"           allowFullScreen="false"           type="application/x-shockwave-flash"           wmode="transparent"           pluginspage="http://www.macromedia.com/go/getflashplayer"           flashvars="'+g+'"           scale="exactfit">         </embed>       </object>';d=document.createElement("div"),d.id="global-zeroclipboard-html-bridge",d.setAttribute("class","global-zeroclipboard-container"),d.setAttribute("data-clipboard-ready",!1),d.style.position="absolute",d.style.left="-9999px",d.style.top="-9999px",d.style.width="15px",d.style.height="15px",d.style.zIndex="9999",d.innerHTML=h,document.body.appendChild(d)}c.htmlBridge=d,a=document["global-zeroclipboard-flash-bridge"],a&&(b=a.length)&&(a=a[b-1]),c.flashBridge=a||d.children[0].lastElementChild};p.prototype.resetBridge=function(){return this.htmlBridge.style.left="-9999px",this.htmlBridge.style.top="-9999px",this.htmlBridge.removeAttribute("title"),this.htmlBridge.removeAttribute("data-clipboard-text"),h(a,this.options.activeClass),a=null,this.options.text=null,this},p.prototype.ready=function(){var a=this.htmlBridge.getAttribute("data-clipboard-ready");return"true"===a||a===!0},p.prototype.reposition=function(){if(!a)return!1;var b=j(a);return this.htmlBridge.style.top=b.top+"px",this.htmlBridge.style.left=b.left+"px",this.htmlBridge.style.width=b.width+"px",this.htmlBridge.style.height=b.height+"px",this.htmlBridge.style.zIndex=b.zIndex+1,this.setSize(b.width,b.height),this},p.dispatch=function(a,b){p.prototype._singleton.receiveEvent(a,b)},p.prototype.on=function(a,b){for(var c=a.toString().split(/\s/g),d=0;d<c.length;d++)a=c[d].toLowerCase().replace(/^on/,""),this.handlers[a]||(this.handlers[a]=b);return this.handlers.noflash&&!p.detectFlashSupport()&&this.receiveEvent("onNoFlash",null),this},p.prototype.addEventListener=p.prototype.on,p.prototype.off=function(a,b){for(var c=a.toString().split(/\s/g),d=0;d<c.length;d++){a=c[d].toLowerCase().replace(/^on/,"");for(var e in this.handlers)e===a&&this.handlers[e]===b&&delete this.handlers[e]}return this},p.prototype.removeEventListener=p.prototype.off,p.prototype.receiveEvent=function(b,c){b=b.toString().toLowerCase().replace(/^on/,"");var d=a,e=!0;switch(b){case"load":if(c&&parseFloat(c.flashVersion.replace(",",".").replace(/[^0-9\.]/gi,""))<10)return this.receiveEvent("onWrongFlash",{flashVersion:c.flashVersion}),void 0;this.htmlBridge.setAttribute("data-clipboard-ready",!0);break;case"mouseover":g(d,this.options.hoverClass);break;case"mouseout":h(d,this.options.hoverClass),this.resetBridge();break;case"mousedown":g(d,this.options.activeClass);break;case"mouseup":h(d,this.options.activeClass);break;case"datarequested":var f=d.getAttribute("data-clipboard-target"),i=f?document.getElementById(f):null;if(i){var j=i.value||i.textContent||i.innerText;j&&this.setText(j)}else{var k=d.getAttribute("data-clipboard-text");k&&this.setText(k)}e=!1;break;case"complete":this.options.text=null}if(this.handlers[b]){var l=this.handlers[b];"string"==typeof l&&"function"==typeof window[l]&&(l=window[l]),"function"==typeof l&&o(l,d,this,c,e)}},p.prototype.glue=function(a){a=n(a);for(var b=0;b<a.length;b++)-1==m(a[b],q)&&(q.push(a[b]),e(a[b],"mouseover",d));return this},p.prototype.unglue=function(a){a=n(a);for(var b=0;b<a.length;b++){f(a[b],"mouseover",d);var c=m(a[b],q);-1!=c&&q.splice(c,1)}return this},"function"==typeof define&&define.amd?define(["require","exports","module"],function(a,b,c){return t=c&&c.id||null,p}):"object"==typeof module&&module&&"object"==typeof module.exports&&module.exports?(u=module.id||null,module.exports=p):window.ZeroClipboard=p}();
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 9e654bb91..5fd420571 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -10,7 +10,6 @@
     {% endblock %}
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="Hosted private docker repositories. Includes full user management and history. Free for public repositories.">
 
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.0/css/font-awesome.css">
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.no-icons.min.css">
@@ -38,7 +37,8 @@
     <script src="//code.jquery.com/jquery.js"></script>
     <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
 
-    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.min.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.min.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-route.min.js"></script>
     <script src="//cdn.jsdelivr.net/underscorejs/1.5.2/underscore-min.js"></script>
     <script src="//cdn.jsdelivr.net/restangular/1.1.3/restangular.js"></script>
 
@@ -74,8 +74,7 @@ mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8
   </head>
   <body>
     <!-- Nav bar -->
-    <nav class="navbar navbar-default" role="navigation" ng-include="'/static/partials/header.html'" ng-controller='HeaderCtrl' >
-    </nav>
+    <nav class="navbar navbar-default header-bar" role="navigation"></nav>
 
     {% block body_content %}
 
diff --git a/templates/index.html b/templates/index.html
index 664570e5d..3d09f1b6a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,6 +7,7 @@
 {% block added_meta %}
   <base href="/">
 
+  <meta name="description" content="{% raw %}{{ description }}{% endraw %}"></meta>
   <meta name="google-site-verification" content="GalDznToijTsHYmLjJvE4QaB9uk_IP16aaGDz5D75T4" />
   <meta name="fragment" content="!" />
 {% endblock %}
@@ -20,8 +21,7 @@
 
   <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.2.1/moment.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.3.3/d3.min.js"></script>
-  <script src="//cdnjs.cloudflare.com/ajax/libs/zeroclipboard/1.1.7/ZeroClipboard.min.js"></script>
-
+  <script src="static/lib/ZeroClipboard.min.js"></script>
   <script src="static/lib/jquery.overscroll.min.js"></script>
 
   <script src="static/lib/d3-tip.js" charset="utf-8"></script>
diff --git a/templates/privacy.html b/templates/privacy.html
index 24bfab27d..b2d575e17 100644
--- a/templates/privacy.html
+++ b/templates/privacy.html
@@ -4,6 +4,10 @@
   <title>Privacy Policy · Quay.io</title>
 {% endblock %}
 
+{% block added_meta %}
+  <meta name="description" content="Privacy policy for Quay - Hosted private docker repository">
+{% endblock %}
+
 {% block body_content %}
   <div class="container privacy-policy">
 
diff --git a/templates/tos.html b/templates/tos.html
index 6796e991c..34ec9bbf9 100644
--- a/templates/tos.html
+++ b/templates/tos.html
@@ -4,6 +4,10 @@
   <title>Terms of Service · Quay.io</title>
 {% endblock %}
 
+{% block added_meta %}
+  <meta name="description" content="Terms of service for Quay - Hosted private docker repository">
+{% endblock %}
+
 {% block body_content %}
   <div class="tos container">
     <h2>Terms of Service</h2>
@@ -95,4 +99,4 @@
       </li>
     </ol>
   </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From f5e6af37cf6804f6deeccdf9de05a75a7ac2620d Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Mon, 18 Nov 2013 19:17:58 -0500
Subject: [PATCH 10/21] Fix the nginx config to work with the new snapshots.
 Fix the snapshot creator to correctly create the request path.

---
 endpoints/web.py | 13 +++++++++----
 nginx.conf       |  2 +-
 util/seo.py      |  7 +++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/endpoints/web.py b/endpoints/web.py
index 188533721..625c6d58d 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -4,15 +4,18 @@ import stripe
 
 from flask import (abort, redirect, request, url_for, render_template,
                    make_response, Response)
-from flask.ext.login import login_user, UserMixin, login_required
-from flask.ext.principal import identity_changed, Identity, AnonymousIdentity
+from flask.ext.login import login_user, UserMixin
+from flask.ext.principal import identity_changed
+from urlparse import urlparse
 
 from data import model
 from app import app, login_manager, mixpanel
-from auth.permissions import QuayDeferredPermissionUser, AdministerOrganizationPermission
+from auth.permissions import (QuayDeferredPermissionUser,
+                              AdministerOrganizationPermission)
 from util.invoice import renderInvoiceToPdf
 from util.seo import render_snapshot
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -54,7 +57,9 @@ def index(path):
 @app.route('/snapshot/', methods=['GET'])
 @app.route('/snapshot/<path:path>', methods=['GET'])
 def snapshot(path = ''):
-  result = render_snapshot(path)
+  parsed = urlparse(request.url)
+  final_url = '%s://%s/%s' % (parsed.scheme, 'localhost', path)
+  result = render_snapshot(final_url)
   if result:
     return result
 
diff --git a/nginx.conf b/nginx.conf
index 7b1b3074f..cc97cf299 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -45,7 +45,7 @@ http {
         ssl_prefer_server_ciphers on;
 
         if ($args ~ "_escaped_fragment_") {
-            rewrite ^ /static/snapshots$uri/index.html;
+            rewrite ^ /snapshot$uri;
         }
 
         location /static/ {
diff --git a/util/seo.py b/util/seo.py
index c44d2a9ea..8a4514b3b 100644
--- a/util/seo.py
+++ b/util/seo.py
@@ -6,11 +6,10 @@ from bs4 import BeautifulSoup
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
 
-def render_snapshot(path):
-  final_url = 'http://localhost:5000/' + path
-  logger.info('Snapshotting url: %s -> %s' % (path, final_url))
+def render_snapshot(url):
+  logger.info('Snapshotting url: %s' % url)
   out_html = subprocess.check_output(['phantomjs', '--ignore-ssl-errors=yes',
-                                      'util/phantomjs-runner.js', final_url])
+                                      'util/phantomjs-runner.js', url])
 
   if not out_html or out_html.strip() == 'Not Found':
     return None

From 3a3bde2da9f2e36fe4a8f59d51041b1c60022da8 Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Tue, 19 Nov 2013 10:51:43 -0500
Subject: [PATCH 11/21] We have a new binary dependency: libevent-dev

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 12a9d4179..ba4eb11e8 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ to prepare a new host:
 sudo apt-get install software-properties-common
 sudo apt-add-repository -y ppa:nginx/stable
 sudo apt-get update
-sudo apt-get install -y git python-virtualenv python-dev phantomjs libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev
+sudo apt-get install -y git python-virtualenv python-dev phantomjs libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev libevent-dev
 sudo apt-get install -y nginx-full
 ```
 

From c7355f550943e9e333a58e6431c11189b561a033 Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Tue, 19 Nov 2013 10:52:06 -0500
Subject: [PATCH 12/21] Remove the old seo-snapshots instrumentation.

---
 static/js/controllers.js       | 6 ------
 static/partials/guide.html     | 2 +-
 static/partials/landing.html   | 2 +-
 static/partials/plans.html     | 2 +-
 static/partials/repo-list.html | 2 +-
 static/partials/signin.html    | 2 +-
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/static/js/controllers.js b/static/js/controllers.js
index 5e39f7fb7..dbe3dcc54 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -26,15 +26,12 @@ function SigninCtrl($scope, $location, $timeout, Restangular, KeyService, UserSe
       $scope.sent = false;
     });
   };
-
-  $scope.status = 'ready';
 };
 
 function PlansCtrl($scope, $location, UserService, PlanService) {
   // Load the list of plans.
   PlanService.getPlans(function(plans) {
     $scope.plans = plans;
-    $scope.status = 'ready';
   });
 
   $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
@@ -59,7 +56,6 @@ function PlansCtrl($scope, $location, UserService, PlanService) {
 }
 
 function GuideCtrl($scope) {
-  $scope.status = 'ready';
 }
 
 function RepoListCtrl($scope, Restangular, UserService) {
@@ -190,8 +186,6 @@ function LandingCtrl($scope, $timeout, $location, Restangular, UserService, KeyS
     });
   };
 
-  $scope.status = 'ready';
-
   browserchrome.update();
 }
 
diff --git a/static/partials/guide.html b/static/partials/guide.html
index 592ecc3a4..11dbf1707 100644
--- a/static/partials/guide.html
+++ b/static/partials/guide.html
@@ -1,4 +1,4 @@
-<div class="container ready-indicator" data-status="{{ status }}">
+<div class="container">
   <div class="alert alert-warning">Warning: Quay requires docker version 0.6.2 or higher to work</div>
 
   <h2>User Guide</h2>
diff --git a/static/partials/landing.html b/static/partials/landing.html
index d182bc7d2..7cc547d22 100644
--- a/static/partials/landing.html
+++ b/static/partials/landing.html
@@ -1,4 +1,4 @@
-<div class="jumbotron landing ready-indicator" data-status="{{ status }}">
+<div class="jumbotron landing">
   <div class="container">
     <div class="row messages">
       <div class="col-md-7">
diff --git a/static/partials/plans.html b/static/partials/plans.html
index 24ac8b1e4..40eee101f 100644
--- a/static/partials/plans.html
+++ b/static/partials/plans.html
@@ -1,4 +1,4 @@
-<div class="container plans ready-indicator" data-status="{{ status }}">
+<div class="container plans">
   <div class="callout">
     Plans &amp; Pricing
   </div>
diff --git a/static/partials/repo-list.html b/static/partials/repo-list.html
index 536701d94..c8175e2ef 100644
--- a/static/partials/repo-list.html
+++ b/static/partials/repo-list.html
@@ -2,7 +2,7 @@
   <i class="fa fa-spinner fa-spin fa-3x"></i>
 </div>
 
-<div class="container ready-indicator" ng-show="!loading" data-status="{{ loading ? '' : 'ready' }}">
+<div class="container" ng-show="!loading">
   <div class="repo-list" ng-show="!user.anonymous">
     <div ng-class="user.organizations.length ? 'section-header' : ''">
       <div class="button-bar-right">
diff --git a/static/partials/signin.html b/static/partials/signin.html
index b4b5f7685..8753ee0c1 100644
--- a/static/partials/signin.html
+++ b/static/partials/signin.html
@@ -1,4 +1,4 @@
-<div class="container signin-container ready-indicator" data-status="{{ loading ? '' : 'ready' }}">
+<div class="container signin-container">
   <div class="row">
     <div class="col-sm-6 col-sm-offset-3">
       <div class="panel-group" id="accordion">

From b8034cb357225f34b0edf26e494356615f11e740 Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Tue, 19 Nov 2013 17:04:57 -0500
Subject: [PATCH 13/21] Add a sitemap to let google know when to update things.

---
 static/sitemap.xml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 static/sitemap.xml

diff --git a/static/sitemap.xml b/static/sitemap.xml
new file mode 100644
index 000000000..5a331996c
--- /dev/null
+++ b/static/sitemap.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+   <url>
+      <loc>https://quay.io/</loc>
+      <changefreq>hourly</changefreq>
+      <priority>0.8</priority>
+   </url>
+   <url>
+      <loc>https://quay.io/plans/</loc>
+      <changefreq>monthly</changefreq>
+   </url>
+   <url>
+      <loc>https://quay.io/organizations/</loc>
+      <changefreq>monthly</changefreq>
+   </url>   
+   <url>
+      <loc>https://quay.io/repository/</loc>
+      <changefreq>always</changefreq>
+   </url>
+   <url>
+      <loc>https://quay.io/guide/</loc>
+      <changefreq>weekly</changefreq>
+   </url>
+   <url>
+      <loc>https://quay.io/tos</loc>
+      <changefreq>monthly</changefreq>
+      <priority>0.4</priority>
+   </url>
+   <url>
+      <loc>https://quay.io/privacy</loc>
+      <changefreq>monthly</changefreq>
+      <priority>0.4</priority>
+   </url>
+</urlset>
\ No newline at end of file

From b0ac7883e3f9c0dc3891a6b0fa3e7270f2b95e0a Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Tue, 19 Nov 2013 17:06:17 -0500
Subject: [PATCH 14/21] Fix so that credit card issues are displayed to the
 user

---
 endpoints/api.py                       | 44 +++++++++++++++-------
 static/directives/billing-options.html | 18 +++++++++
 static/js/app.js                       | 51 +++++++++++++++++++++++---
 static/js/controllers.js               |  5 ++-
 templates/base.html                    |  1 +
 templates/index.html                   |  1 -
 6 files changed, 99 insertions(+), 21 deletions(-)

diff --git a/endpoints/api.py b/endpoints/api.py
index b8ab44c77..5568f1465 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -1283,7 +1283,7 @@ def subscription_view(stripe_subscription, used_repos):
 @api_login_required
 def get_user_card_api():
   user = current_user.db_user()
-  return jsonify(get_card(user))
+  return get_card(user)
 
 
 @app.route('/api/organization/<orgname>/card', methods=['GET'])
@@ -1292,7 +1292,7 @@ def get_org_card_api(orgname):
   permission = AdministerOrganizationPermission(orgname)
   if permission.can():
     organization = model.get_organization(orgname)
-    return jsonify(get_card(organization))
+    return get_card(organization)
 
   abort(403)
 
@@ -1302,7 +1302,7 @@ def get_org_card_api(orgname):
 def set_user_card_api():
   user = current_user.db_user()
   token = request.get_json()['token']
-  return jsonify(set_card(user, token))
+  return set_card(user, token)
 
 
 @app.route('/api/organization/<orgname>/card', methods=['POST'])
@@ -1318,13 +1318,14 @@ def set_org_card_api(orgname):
 
 
 def set_card(user, token):
-  print token
-  
   if user.stripe_id:
     cus = stripe.Customer.retrieve(user.stripe_id)
     if cus:
-      cus.card = token
-      cus.save()
+      try:
+        cus.card = token
+        cus.save()
+      except stripe.CardError as e:
+        return carderror_response(e)
 
   return get_card(user)
 
@@ -1351,7 +1352,7 @@ def get_card(user):
           'last4': card.last4
         }
 
-  return {'card': card_info}
+  return jsonify({'card': card_info})
 
 @app.route('/api/user/plan', methods=['PUT'])
 @api_login_required
@@ -1363,6 +1364,14 @@ def subscribe_api():
   return subscribe(user, plan, token, USER_PLANS)
 
 
+def carderror_response(e):
+  resp = jsonify({
+    'carderror': e.message,
+  })
+  resp.status_code = 402
+  return resp
+
+
 def subscribe(user, plan, token, accepted_plans):
   plan_found = None
   for plan_obj in accepted_plans:
@@ -1387,9 +1396,13 @@ def subscribe(user, plan, token, accepted_plans):
       # They want a real paying plan, create the customer and plan
       # simultaneously
       card = token
-      cus = stripe.Customer.create(email=user.email, plan=plan, card=card)
-      user.stripe_id = cus.id
-      user.save()
+      
+      try:
+        cus = stripe.Customer.create(email=user.email, plan=plan, card=card)
+        user.stripe_id = cus.id
+        user.save()
+      except stripe.CardError as e:
+        return carderror_response(e)
 
       response_json = subscription_view(cus.subscription, private_repos)
       status_code = 201
@@ -1405,12 +1418,17 @@ def subscribe(user, plan, token, accepted_plans):
         cus.save()
 
     else:
-      cus.plan = plan
       # User may have been a previous customer who is resubscribing
       if token:
         cus.card = token
 
-      cus.save()
+      cus.plan = plan
+
+      try:
+        cus.save()
+      except stripe.CardError as e:
+        return carderror_response(e)
+          
       response_json = subscription_view(cus.subscription, private_repos)
 
   resp = jsonify(response_json)
diff --git a/static/directives/billing-options.html b/static/directives/billing-options.html
index 1543e5239..598586bcb 100644
--- a/static/directives/billing-options.html
+++ b/static/directives/billing-options.html
@@ -36,4 +36,22 @@
       </div>
     </div>
   </div>
+
+  <!-- Modal message dialog -->
+  <div class="modal fade" id="cannotchangecardModal">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h4 class="modal-title">Cannot change credit card</h4>
+        </div>
+        <div class="modal-body">
+          Your credit card could not be changed
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        </div>
+      </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+  </div><!-- /.modal -->
 </div>
diff --git a/static/js/app.js b/static/js/app.js
index 4a784f92c..381c54185 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -137,7 +137,26 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
           }
         }
       };
-        
+      
+      planService.handleCardError = function(resp) {
+        if (!planService.isCardError(resp)) { return; }
+
+        bootbox.dialog({
+          "message": resp.data.carderror,
+          "title": "Credit card issue",
+          "buttons": {
+            "close": {
+              "label": "Close",
+              "className": "btn-primary"
+            }
+          }
+        });
+      };
+
+      planService.isCardError = function(resp) {
+        return resp && resp.data && resp.data.carderror;
+      };
+
       planService.verifyLoaded = function(callback) {
         if (plans) {
           callback(plans);
@@ -259,7 +278,10 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
               return;
             }
         
-            planService.setSubscription(orgname, planId, callbacks['success'], callbacks['failure']);
+            planService.setSubscription(orgname, planId, callbacks['success'], function(resp) {
+              planService.handleCardError(resp);
+              callbacks['failure'](resp);
+            });
           });
         });
       };
@@ -269,7 +291,10 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
           callbacks['opening']();
         }
 
+        var submitted = false;
         var submitToken = function(token) {
+          if (submitted) { return; }
+          submitted = true;
           $scope.$apply(function() {            
             if (callbacks['started']) {
               callbacks['started']();
@@ -281,7 +306,10 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
 
             var url = orgname ? getRestUrl('organization', orgname, 'card') : 'user/card';
             var changeCardRequest = Restangular.one(url);
-            changeCardRequest.customPOST(cardInfo).then(callbacks['success'], callbacks['failure']);
+              changeCardRequest.customPOST(cardInfo).then(callbacks['success'], function(resp) {
+                planService.handleCardError(resp);
+                callbacks['failure'](resp);
+              });
           });
         };
 
@@ -321,7 +349,11 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
           callbacks['opening']();
         }
 
+        var submitted = false;
         var submitToken = function(token) {
+          if (submitted) { return; }
+          submitted = true;
+
           mixpanel.track('plan_subscribe');
 
           $scope.$apply(function() {
@@ -823,6 +855,7 @@ quayApp.directive('billingOptions', function () {
       });
 
       $scope.changeCard = function() {
+        var previousCard = $scope.currentCard;
         $scope.changingCard = true;
         var callbacks = {
           'opened': function() { $scope.changingCard = true; },
@@ -832,9 +865,13 @@ quayApp.directive('billingOptions', function () {
              $scope.currentCard = resp.card;
              $scope.changingCard = false;
           },
-          'failure': function() {
-             $('#couldnotchangecardModal').modal({});
+          'failure': function(resp) {
              $scope.changingCard = false;
+             $scope.currentCard = previousCard;
+
+             if (!PlanService.isCardError(resp)) {
+               $('#cannotchangecardModal').modal({});
+             }
           }
         };
 
@@ -925,7 +962,9 @@ quayApp.directive('planManager', function () {
           'opened': function() { $scope.planChanging = true; },
           'closed': function() { $scope.planChanging = false; },
           'success': subscribedToPlan,
-          'failure': function() { $scope.planChanging = false; }
+          'failure': function(resp) {            
+             $scope.planChanging = false;
+          }
         };
 
         PlanService.changePlan($scope, $scope.organization, planId, callbacks);
diff --git a/static/js/controllers.js b/static/js/controllers.js
index dbe3dcc54..1f3ec5b39 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -1008,7 +1008,10 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, Restangula
       'opened': function() { $scope.planChanging = true; },
       'closed': function() { $scope.planChanging = false; },
       'success': subscribedToPlan,
-      'failure': function() { $('#couldnotsubscribeModal').modal(); $scope.planChanging = false; }
+      'failure': function(resp) {
+        $('#couldnotsubscribeModal').modal();
+        $scope.planChanging = false;
+      }
     };
 
     PlanService.changePlan($scope, null, $scope.planRequired.stripeId, callbacks);
diff --git a/templates/base.html b/templates/base.html
index 5fd420571..1f4bbd8a0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -36,6 +36,7 @@
 
     <script src="//code.jquery.com/jquery.js"></script>
     <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.0.0/bootbox.min.js"></script>
 
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.min.js"></script>
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-route.min.js"></script>
diff --git a/templates/index.html b/templates/index.html
index 3d09f1b6a..b9b322e0b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -31,7 +31,6 @@
 {% block body_content %}
   <div ng-view></div>
 
-
   <!-- Modal message dialog -->
   <div class="modal fade" id="sessionexpiredModal" data-backdrop="static">
     <div class="modal-dialog">

From c7e9b0d9f65dd47cb4e859130afd88764fca3cc5 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Tue, 19 Nov 2013 17:34:14 -0500
Subject: [PATCH 15/21] Move the repo admin script requirements to the
 index.html. For some reason, they were not loading when added inside the
 partial.

---
 static/partials/repo-admin.html | 3 ---
 templates/index.html            | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index d9016b83a..bd5eff122 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -1,6 +1,3 @@
-<script src="static/lib/Blob.js"></script>
-<script src="static/lib/FileSaver.js"></script>
-<script src="static/lib/jquery.base64.min.js"></script>
 
 <div class="loading" ng-show="loading">
   <i class="fa fa-spinner fa-spin fa-3x"></i>
diff --git a/templates/index.html b/templates/index.html
index b9b322e0b..6d9f26bc4 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -26,6 +26,10 @@
 
   <script src="static/lib/d3-tip.js" charset="utf-8"></script>
   <script src="static/lib/browser-chrome.js"></script>
+
+  <script src="static/lib/Blob.js"></script>
+  <script src="static/lib/FileSaver.js"></script>
+  <script src="static/lib/jquery.base64.min.js"></script>
 {% endblock %}
 
 {% block body_content %}

From 45680d4a8e0128bc703e36432d28ad847ed511ca Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Wed, 20 Nov 2013 16:17:47 -0500
Subject: [PATCH 16/21] Fix the footer to be on all pages (except the repo view
 page due to an issue), fix the double body tag issue and add padding to
 content pages

---
 static/css/quay.css                | 48 ++++++++++++++++++++++--------
 static/js/app.js                   |  8 +++--
 static/js/controllers.js           |  8 ++++-
 static/partials/guide.html         |  2 +-
 static/partials/landing.html       | 33 --------------------
 static/partials/organizations.html |  2 +-
 static/partials/plans.html         |  2 +-
 static/partials/view-repo.html     |  2 +-
 templates/base.html                | 35 ++++++++++++++++++----
 templates/index.html               |  4 ++-
 10 files changed, 86 insertions(+), 58 deletions(-)

diff --git a/static/css/quay.css b/static/css/quay.css
index 871a82f26..34c5788c0 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -1,5 +1,26 @@
 * {
   font-family: 'Droid Sans', sans-serif;
+  margin: 0;
+}
+
+html, body {
+  height: 100%;
+}
+
+.content-container {
+  padding-bottom: 70px;
+}
+
+.wrapper {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  margin: 0 auto -136px;
+}
+
+.footer-container, .push {
+  height: 110px;
+  overflow: hidden;
 }
 
 .button-hidden {
@@ -624,49 +645,53 @@ form input.ng-valid.ng-dirty,
    }
 }
 
-.landing-footer {
+.page-footer {
   background-color: white;
   background-image: none;
   padding: 10px;
   padding-bottom: 40px;
-  margin-top: 10px;
+  margin-top: 52px;
   border-top: 1px solid #eee;
 }
 
-.landing-footer .row {
+.page-footer .row {
   max-width: 100%;
 }
 
-.landing-footer .copyright-container {
+.page-footer .logo-container {
   font-size: 11px;
   color: black;
   text-align: right;
   padding-right: 30px;
-  padding-top: 20px;
 }
 
-.landing-footer .copyright-container a {
+.page-footer .logo-container a {
   display: block;
+  margin-top: 4px;
+  margin-right: 10px;
 }
 
-.landing-footer .dt-logo {
+.page-footer .dt-logo {
   vertical-align: center;
   max-width: 150px;
 }
 
-.landing-footer .copyright {
-  font-size: 11px;
+.page-footer .copyright {
+  font-size: 12px;
   color: black;
 }
 
-.landing-footer ul {
+.page-footer ul {
   list-style-type: none;
   margin: 0px;
   padding-left: 0px;
+  margin-top: 10px;
 }
 
-.landing-footer li {
+.page-footer li {
   margin: 0px;
+  display: inline-block;
+  padding: 10px;
 }
 
 .user-welcome {
@@ -698,7 +723,6 @@ form input.ng-valid.ng-dirty,
   text-overflow: ellipsis;
 }
 
-
 .entity-mini-listing {
   margin: 2px;
 }
diff --git a/static/js/app.js b/static/js/app.js
index 381c54185..121f5aee3 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -427,8 +427,10 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
     // index rule to make sure that deep links directly deep into the app continue to work.
     // WARNING WARNING WARNING
     $routeProvider.
-      when('/repository/:namespace/:name', {templateUrl: '/static/partials/view-repo.html', controller: RepoCtrl, reloadOnSearch: false}).
-      when('/repository/:namespace/:name/tag/:tag', {templateUrl: '/static/partials/view-repo.html', controller: RepoCtrl}).
+      when('/repository/:namespace/:name', {templateUrl: '/static/partials/view-repo.html', controller: RepoCtrl,
+                                            hideFooter: true, reloadOnSearch: false}).
+      when('/repository/:namespace/:name/tag/:tag', {templateUrl: '/static/partials/view-repo.html', controller: RepoCtrl,
+                                                     hideFooter: true}).
       when('/repository/:namespace/:name/image/:image', {templateUrl: '/static/partials/image-view.html', controller: ImageViewCtrl}).
       when('/repository/:namespace/:name/admin', {templateUrl: '/static/partials/repo-admin.html', controller:RepoAdminCtrl}).
       when('/repository/', {title: 'Repositories', description: 'Public and private docker repositories list',
@@ -1211,6 +1213,8 @@ quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', '$http',
     } else {
       $rootScope.description = 'Hosted private docker repositories. Includes full user management and history. Free for public repositories.';
     }
+
+    $rootScope.hideFooter = !!current.$$route.hideFooter;
   });
 
   var initallyChecked = false;
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 1f3ec5b39..813b3ee29 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -192,6 +192,12 @@ function LandingCtrl($scope, $timeout, $location, Restangular, UserService, KeyS
 function RepoCtrl($scope, Restangular, $routeParams, $rootScope, $location, $timeout) {
   $rootScope.title = 'Loading...';
 
+  $scope.$on('$destroy', function() {
+    if ($scope.tree) {
+      $scope.tree.dispose();
+    }
+  });
+
   // Watch for changes to the tag parameter.
   $scope.$on('$routeUpdate', function(){
     $scope.setTag($location.search().tag, false);
@@ -308,7 +314,7 @@ function RepoCtrl($scope, Restangular, $routeParams, $rootScope, $location, $tim
 
       // Dispose of any existing tree.
       if ($scope.tree) {
-          $scope.tree.dispose();
+        $scope.tree.dispose();
       }
 
       // Create the new tree.
diff --git a/static/partials/guide.html b/static/partials/guide.html
index 11dbf1707..4a49eade8 100644
--- a/static/partials/guide.html
+++ b/static/partials/guide.html
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container content-container">
   <div class="alert alert-warning">Warning: Quay requires docker version 0.6.2 or higher to work</div>
 
   <h2>User Guide</h2>
diff --git a/static/partials/landing.html b/static/partials/landing.html
index 7cc547d22..fbde7f520 100644
--- a/static/partials/landing.html
+++ b/static/partials/landing.html
@@ -147,36 +147,3 @@
     </div>
   </div>
 </div>
-
-<nav class="landing-footer">
-  <div class="row">
-    <div class="col-md-2 col-md-offset-1">
-      <h4>About</h4>
-      <ul>
-        <li><a href="http://blog.devtable.com/">Blog</a></li>
-      </ul>
-    </div>
-
-    <div class="col-md-2">
-      <h4>Legal</h4>
-      <ul>
-        <li><a href="/tos" target="_self">Terms of Service</a></li>
-        <li><a href="/privacy" target="_self">Privacy Policy</a></li>
-      </ul>
-    </div>
-
-   <div class="col-md-2">
-      <h4>Support</h4>
-      <ul>
-        <li><a href="mailto:support@quay.io">Contact Support</a></li>
-        <li><a href="/guide/">User Guide</a></li>
-      </ul>
-    </div>
-
-    <div class="col-md-3 col-md-offset-2 copyright-container">
-      <a href="https://devtable.com"><img class="dt-logo" src="/static/img/dt-logo.png"></a>
-      <span class="copyright">&copy;2013 DevTable, LLC</span>
-    </div>
-  </div> <!-- row -->
-
-</nav>
diff --git a/static/partials/organizations.html b/static/partials/organizations.html
index b6ff064cc..1d9c2a96d 100644
--- a/static/partials/organizations.html
+++ b/static/partials/organizations.html
@@ -1,4 +1,4 @@
-<div class="container org-list">  
+<div class="container org-list conntent-container">  
   <div class="loading" ng-show="loading">
     <i class="fa fa-spinner fa-spin fa-3x"></i>
   </div>
diff --git a/static/partials/plans.html b/static/partials/plans.html
index 40eee101f..178169b79 100644
--- a/static/partials/plans.html
+++ b/static/partials/plans.html
@@ -1,4 +1,4 @@
-<div class="container plans">
+<div class="container plans content-container">
   <div class="callout">
     Plans &amp; Pricing
   </div>
diff --git a/static/partials/view-repo.html b/static/partials/view-repo.html
index f6fca33c2..841338da7 100644
--- a/static/partials/view-repo.html
+++ b/static/partials/view-repo.html
@@ -67,7 +67,7 @@
   <!-- Content view -->
   <div class="repo-content" ng-show="currentTag.image">
     <!-- Image History -->
-    <div id="image-history">     
+    <div id="image-history" style="max-height: 10px;">
       <div class="row">
         <!-- Tree View container -->
         <div  class="col-md-8">
diff --git a/templates/base.html b/templates/base.html
index 1f4bbd8a0..d0831634a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -40,6 +40,7 @@
 
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.min.js"></script>
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-route.min.js"></script>
+
     <script src="//cdn.jsdelivr.net/underscorejs/1.5.2/underscore-min.js"></script>
     <script src="//cdn.jsdelivr.net/restangular/1.1.3/restangular.js"></script>
 
@@ -64,7 +65,6 @@
     <script src="static/js/controllers.js"></script>
     <script src="static/js/graphing.js"></script>
 
-
 <!-- start Mixpanel --><script type="text/javascript">
 var isProd = document.location.hostname === 'quay.io';
 
@@ -74,12 +74,36 @@ b._i.push([a,e,d])};b.__SV=1.2}})(document,window.mixpanel||[]);
 mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8cc7cc29c869f9", { track_pageview : false, debug: !isProd });</script><!-- end Mixpanel -->
   </head>
   <body>
-    <!-- Nav bar -->
-    <nav class="navbar navbar-default header-bar" role="navigation"></nav>
+    <div ng-class="!hideFooter ? 'wrapper' : ''">
+      <nav class="navbar navbar-default header-bar" role="navigation"></nav>
 
-    {% block body_content %}
+      {% block body_content %}
 
-    {% endblock %}
+      {% endblock %}
+      
+      <div ng-class="!hideFooter ? 'push' : ''"></div>
+    </div>
+
+    <div class="footer-container" ng-show="!hideFooter">
+      <nav class="page-footer visible-lg visible-md">
+        <div class="row">         
+          <div class="col-md-7">
+            <ul>
+              <li><span class="copyright">&copy;2013 DevTable, LLC</span></li>
+              <li><a href="http://blog.devtable.com/">Blog</a></li>
+              <li><a href="/tos" target="_self">Terms of Service</a></li>
+              <li><a href="/privacy" target="_self">Privacy Policy</a></li>
+              <li><a href="/guide/">User Guide</a></li>
+              <li><b><a href="mailto:support@quay.io">Contact Support</a></b></li>
+            </ul>
+          </div>
+
+          <div class="col-md-5 logo-container">
+            <a href="https://devtable.com"><img class="dt-logo" src="/static/img/dt-logo.png"></a>
+          </div>
+        </div> <!-- row -->      
+      </nav>
+    </div>
 
     <!-- begin olark code -->
     <script data-cfasync="false" type='text/javascript'>/*<![CDATA[*/window.olark||(function(c){var f=window,d=document,l=f.location.protocol=="https:"?"https:":"http:",z=c.name,r="load";var nt=function(){
@@ -101,5 +125,6 @@ mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8
     /* custom configuration goes here (www.olark.com/documentation) */
     olark.identify('1189-336-10-9918');/*]]>*/</script><noscript><a href="https://www.olark.com/site/1189-336-10-9918/contact" title="Contact us" target="_blank">Questions? Feedback?</a> powered by <a href="http://www.olark.com?welcome" title="Olark live chat software">Olark live chat software</a></noscript>
     <!-- end olark code -->
+
   </body>
 </html>
diff --git a/templates/index.html b/templates/index.html
index 6d9f26bc4..bec4081c8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -22,7 +22,6 @@
   <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.2.1/moment.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.3.3/d3.min.js"></script>
   <script src="static/lib/ZeroClipboard.min.js"></script>
-  <script src="static/lib/jquery.overscroll.min.js"></script>
 
   <script src="static/lib/d3-tip.js" charset="utf-8"></script>
   <script src="static/lib/browser-chrome.js"></script>
@@ -33,6 +32,9 @@
 {% endblock %}
 
 {% block body_content %}
+  <!-- Note: Must be in the <body> tag -->
+  <script src="static/lib/jquery.overscroll.min.js"></script>
+
   <div ng-view></div>
 
   <!-- Modal message dialog -->

From 64fe16249d0aedbbef6ba0305e9cbbad4e54314a Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Thu, 21 Nov 2013 16:03:11 -0500
Subject: [PATCH 17/21] Guide improvements

---
 static/css/quay.css             | 23 ++++++++++++-
 static/partials/guide.html      | 59 +++++++++++++++++++++++----------
 static/partials/repo-admin.html | 18 ++++++----
 static/partials/view-repo.html  | 10 +++++-
 4 files changed, 84 insertions(+), 26 deletions(-)

diff --git a/static/css/quay.css b/static/css/quay.css
index 34c5788c0..306322197 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -7,6 +7,15 @@ html, body {
   height: 100%;
 }
 
+.tooltip {
+  word-break: normal !important;
+  word-wrap: normal !important;
+}
+
+.code-info {
+  border-bottom: 1px dashed #aaa;
+}
+
 .content-container {
   padding-bottom: 70px;
 }
@@ -831,7 +840,13 @@ p.editable:hover i {
 .repo .empty-message {
   padding: 6px;
   font-size: 1.8em;
-  color: #ccc;
+  color: #666;
+  margin-bottom: 10px;
+}
+
+.repo .empty-description {
+  max-width: 600px;
+  padding: 6px;
 }
 
 .repo dl.dl-horizontal dt {
@@ -1071,6 +1086,12 @@ p.editable:hover i {
   padding-left: 44px;
 }
 
+.repo-admin .right-info {
+  font-size: 11px;
+  margin-top: 10px;
+  text-align: right;
+}
+
 .repo-admin .entity-search input {
   width: 300px;
 }
diff --git a/static/partials/guide.html b/static/partials/guide.html
index 4a49eade8..e3af803a6 100644
--- a/static/partials/guide.html
+++ b/static/partials/guide.html
@@ -3,24 +3,36 @@
 
   <h2>User Guide</h2>
   <div class="user-guide container">
-  
-    <h3>Pulling a repository from Quay</h3>
+    <h3>Signing into Quay <span class="label label-default">Setup</span></h3>
     <div class="container">
-      <div class="alert alert-info">Note: <b>Private</b> repositories require you to be <b>logged in</b> or the pull will fail. See below for how to sign into Quay if you have never done so before. </div>
-      To pull a repository from Quay, run the following command:
+      To setup your Docker client for pushing to Quay, login with your credentials:
       <br><br>
-      <pre>docker pull quay.io/<i>username/repo_name</i></pre>
-    </div>
-    <br>
+      <pre>$ sudo docker login quay.io
 
+Login against server at https://quay.io/v1/
+Username: myusername
+Password: mypassword
+Email: my@email.com</pre>
+    </div>
+    <br>   
 
     <h3>Pushing a repository to Quay <span class="label label-success">Requires Write Access</span></h3>
     <div class="container">
-      First, tag the image with your repository name:<br><br>
-      <pre>docker tag <i>0u123imageid</i> quay.io/<i>username/repo_name</i></pre>
+      In order to push a repository to Quay, it must be <b>tagged</b> with the <b>quay.io</b> domain and the namespace under which it will live:
+      <br><br>
+      <pre>sudo docker tag <i>0u123imageid</i> quay.io/<i>username/repo_name</i></pre>
       <br>
-      Second, push the repository to Quay:<br><br>
-      <pre>docker push quay.io/<i>username/repo_name</i></pre>
+      Once tagged, the repository can be pushed to Quay:<br><br>
+      <pre>sudo docker push quay.io/<i>username/repo_name</i></pre>
+    </div>
+    <br>
+
+    <h3>Pulling a repository from Quay</h3>
+    <div class="container">
+      <div class="alert alert-info">Note: <b>Private</b> repositories require you to be <b>logged in</b> or the pull will fail. See above for how to sign into Quay if you have never done so before. </div>
+      To pull a repository from Quay, run the following command:
+      <br><br>
+      <pre>sudo docker pull quay.io/<i>username/repo_name</i></pre>
     </div>
     <br>
 
@@ -58,15 +70,28 @@
           <dt>Email</dt><dd>This value is ignored, any value may be used.</dd>
         </dl>
       </ul>
-
     </div>
-    <br>
 
-    <h3>Signing into Quay <span class="label label-default">Optional</span></h3>
+    <a name="#post-hook"></a>
+    <h3>Using push web hooks <span class="label label-info">Requires Admin Access</span></h3>
     <div class="container">
-      If you have never pushed a repository to Quay and wish to pull a <b>private</b> repository, you can sign into Quay by running the following command:
-      <br><br>
-      <pre>docker login quay.io</pre>
+      A repository can have one or more <b>push web hooks</b> setup, which will be invoked whenever <u>a successful push occurs</u>. Web hooks can be managed from the repository's admin interface.
+      <br><br> A web hook will be invoked
+      as an HTTP <b>POST</b> to the specified URL, with a JSON body describing the push:<br><br>
+      <pre>
+{
+  <span class="code-info" title="The number of images pushed" bs-tooltip="tooltip.title">"pushed_image_count"</span>: 2,
+  <span class="code-info" title="The name of the repository (without its namespace)" bs-tooltip="tooltip.title">"name"</span>: "ubuntu",
+  <span class="code-info" title="The full name of the repository" bs-tooltip="tooltip.title">"repository"</span>:"devtable/ubuntu",
+  <span class="code-info" title="The URL at which the repository can be pulled by Docker" bs-tooltip="tooltip.title">"docker_url"</span>: "quay.io/devtable/ubuntu",
+  <span class="code-info" title="Map of updated tag names to their latest image IDs" bs-tooltip="tooltip.title">"updated_tags"</span>: {
+    "latest": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc"
+  },
+  <span class="code-info" title="The namespace of the repository" bs-tooltip="tooltip.title">"namespace"</span>: "devtable",
+  <span class="code-info" title="Whether the repository is public or private" bs-tooltip="tooltip.title">"visibility"</span>: "private",
+  <span class="code-info" title="The Quay URL for the repository" bs-tooltip="tooltip.title">"homepage"</span>: "https://quay.io/repository/devtable/ubuntu"
+}
+</pre>
     </div>
   </div>
 </div>
diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index bd5eff122..c44504a37 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -20,7 +20,7 @@
     <div class="col-md-2">
       <ul class="nav nav-pills nav-stacked">
         <li class="active"><a href="javascript:void(0)" data-toggle="tab" data-target="#permissions">Permissions</a></li>
-        <li><a href="javascript:void(0)" data-toggle="tab" data-target="#webhook" ng-click="loadWebhooks()">Webhooks</a></li>
+        <li><a href="javascript:void(0)" data-toggle="tab" data-target="#webhook" ng-click="loadWebhooks()">Web Hooks</a></li>
         <li><a href="javascript:void(0)" data-toggle="tab" data-target="#publicprivate">Public/Private</a></li>
         <li><a href="javascript:void(0)" data-toggle="tab" data-target="#delete">Delete</a></li>
       </ul>
@@ -148,19 +148,19 @@
         <!-- Webhook tab -->
         <div id="webhook" class="tab-pane">
           <div class="panel panel-default">
-            <div class="panel-heading">Push Webhooks
-              <i class="info-icon fa fa-info-circle" data-placement="left" data-content="URLs which will be invoked when a successful push to the repository occurs."></i>
+            <div class="panel-heading">Push Web Hooks
+              <i class="info-icon fa fa-info-circle" data-placement="left" data-content="URLs which will be invoked with an HTTP POST and JSON payload when a successful push to the repository occurs."></i>
             </div>
 
             <div class="panel-body" ng-show="webhooksLoading">
-              Loading webhooks: <i class="fa fa-spinner fa-spin fa-2x" style="vertical-align: middle; margin-left: 4px"></i>
+              Loading web hooks: <i class="fa fa-spinner fa-spin fa-2x" style="vertical-align: middle; margin-left: 4px"></i>
             </div>
 
             <div class="panel-body" ng-show="!webhooksLoading">
               <table class="permissions" ng-form="newWebhookForm">
                 <thead>
                   <tr>
-                    <td style="width: 500px;">Webhook URL</td>
+                    <td style="width: 500px;">Web Hook URL</td>
                     <td></td>
                   </tr>
                 </thead>
@@ -171,13 +171,13 @@
                     <td>
                       <span class="delete-ui" tabindex="0">
                         <span class="delete-ui-button" ng-click="deleteWebhook(webhook)"><button class="btn btn-danger">Delete</button></span>
-                        <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Webhook"></i>
+                        <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Web Hook"></i>
                       </span>
                     </td>
                   </tr>
                   <tr>
                     <td>
-                      <input type="url" class="form-control" placeholder="New webhook url..." ng-model="newWebhook.url" required>
+                      <input type="url" class="form-control" placeholder="New web hook url..." ng-model="newWebhook.url" required>
                     </td>
                     <td>
                       <button class="btn btn-primary" type="submit" ng-click="createWebhook()">Create</button>
@@ -185,6 +185,10 @@
                   </tr>
                 </tbody>
               </table>
+
+              <div class="right-info">
+                Quay will <b>POST</b> to these web hooks whenever a push occurs. See the <a href="/guide">User Guide</a> for more information.
+              </div>
             </div>
           </div>
         </div>
diff --git a/static/partials/view-repo.html b/static/partials/view-repo.html
index 841338da7..b2782c47d 100644
--- a/static/partials/view-repo.html
+++ b/static/partials/view-repo.html
@@ -57,7 +57,15 @@
 
   <!-- Empty message -->
   <div class="repo-content" ng-show="!currentTag.image && !repo.is_building">
-    <div class="empty-message">(This repository is empty)</div>
+    <div class="empty-message">
+      This repository is empty
+    </div>
+
+    <div class="empty-description" ng-show="repo.can_write">
+      To push images to this repository:<br><br>
+      <pre>sudo docker tag <i>0u123imageidgoeshere</i> quay.io/{{repo.namespace}}/{{repo.name}}
+sudo docker push quay.io/{{repo.namespace}}/{{repo.name}}</pre>
+    </div>
   </div>
 
   <div class="repo-content" ng-show="!currentTag.image && repo.is_building">

From 4c21273cf4d9b329d7c196b1ee3f416c8b37aeb5 Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Fri, 22 Nov 2013 12:32:05 -0500
Subject: [PATCH 18/21] Add a trademark disclaimer for the Docker trademark.
 Make all references to Docker proper nouns.

---
 endpoints/web.py             |  5 +++++
 static/css/quay.css          |  9 +++++++++
 static/partials/landing.html | 10 +++++-----
 templates/disclaimer.html    | 16 ++++++++++++++++
 4 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 templates/disclaimer.html

diff --git a/endpoints/web.py b/endpoints/web.py
index 625c6d58d..3c6c5e07b 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -115,6 +115,11 @@ def tos():
   return render_template('tos.html')
 
 
+@app.route('/disclaimer', methods=['GET'])
+def disclaimer():
+  return render_template('disclaimer.html')
+
+
 @app.route('/privacy', methods=['GET'])
 def privacy():
   return render_template('privacy.html')
diff --git a/static/css/quay.css b/static/css/quay.css
index 306322197..15ae81f66 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -522,6 +522,15 @@ html, body {
   padding: 20px;
 }
 
+.jumbotron .disclaimer-link {
+  font-size: .5em;
+  vertical-align: top;
+}
+
+.jumbotron .disclaimer-link:hover {
+  text-decoration: none;
+}
+
 .landing .popover {
   font-size: 14px;
 }
diff --git a/static/partials/landing.html b/static/partials/landing.html
index fbde7f520..e5165fc88 100644
--- a/static/partials/landing.html
+++ b/static/partials/landing.html
@@ -3,9 +3,9 @@
     <div class="row messages">
       <div class="col-md-7">
         <div ng-show="user.anonymous">
-          <h1>Secure hosting for <b>private</b> docker repositories</h1>
-          <h3>Use the docker images <b>your team</b> needs with the safety of <b>private</b> repositories</h3>
-          <div class="sellcall"><a href="/plans">Private repository plans starting at $7/mo</a></div>
+          <h1>Secure hosting for <b>private</b> Docker<a class="disclaimer-link" href="/disclaimer" target="_self">*</a> repositories</h1>
+          <h3>Use the Docker images <b>your team</b> needs with the safety of <b>private</b> repositories</h3>
+          <div class="sellcall"><a href="/plans/">Private repository plans starting at $7/mo</a></div>
         </div>
 
         <div ng-show="!user.anonymous">
@@ -72,9 +72,9 @@
         <i class="fa fa-lock"></i>
         <b>Secure</b>
         <span class="shoutout-expand">
-	  Store your private docker containers where only you and your team
+          Store your private Docker containers where only you and your team
           can access it, with communication secured by <strong>SSL at all times</strong>
-	</span>
+        </span>
       </div>
 
       <div class="col-md-4 shoutout">
diff --git a/templates/disclaimer.html b/templates/disclaimer.html
new file mode 100644
index 000000000..3945b43a6
--- /dev/null
+++ b/templates/disclaimer.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+
+{% block title %}
+  <title>Docker Trademark Disclaimer · Quay.io</title>
+{% endblock %}
+
+{% block body_content %}
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12">
+        Quay.io is in no way (and we mean in no way) affiliated with or sponsored by Docker, Inc. Docker, Docker logo and dotCloud are trademarks or registered trademarks of Docker, Inc. in the United States and/or other countries. Docker, Inc. and other parties may also have trademark rights in other terms used herein.
+      </div>
+    </div>
+
+  </div>
+{% endblock %}
\ No newline at end of file

From 650348fc036492731e088153c006ff68f82196ad Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Fri, 22 Nov 2013 12:33:46 -0500
Subject: [PATCH 19/21] Back off on the message a bit for the disclaimer.

---
 templates/disclaimer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/disclaimer.html b/templates/disclaimer.html
index 3945b43a6..f1d06e622 100644
--- a/templates/disclaimer.html
+++ b/templates/disclaimer.html
@@ -8,7 +8,7 @@
   <div class="container">
     <div class="row">
       <div class="col-md-12">
-        Quay.io is in no way (and we mean in no way) affiliated with or sponsored by Docker, Inc. Docker, Docker logo and dotCloud are trademarks or registered trademarks of Docker, Inc. in the United States and/or other countries. Docker, Inc. and other parties may also have trademark rights in other terms used herein.
+        Quay.io is in no way affiliated with or sponsored by Docker, Inc. Docker, Docker logo and dotCloud are trademarks or registered trademarks of Docker, Inc. in the United States and/or other countries. Docker, Inc. and other parties may also have trademark rights in other terms used herein.
       </div>
     </div>
 

From b00f58d164aa7c040541972a27a25f54d022ce49 Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Fri, 22 Nov 2013 15:54:23 -0500
Subject: [PATCH 20/21] Add a security page and link it from the landing page
 and footer.

---
 endpoints/web.py              |  7 ++++++
 static/js/app.js              | 12 ++++++----
 static/js/controllers.js      |  3 +++
 static/partials/landing.html  |  9 ++++---
 static/partials/security.html | 44 +++++++++++++++++++++++++++++++++++
 templates/base.html           |  2 +-
 6 files changed, 66 insertions(+), 11 deletions(-)
 create mode 100644 static/partials/security.html

diff --git a/endpoints/web.py b/endpoints/web.py
index 3c6c5e07b..347969268 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -100,11 +100,18 @@ def new():
 def repository():
   return index('')
 
+
+@app.route('/security/')
+def security():
+  return index('')
+
+
 @app.route('/v1')
 @app.route('/v1/')
 def v1():
   return index('')
 
+
 @app.route('/status', methods=['GET'])
 def status():
   return make_response('Healthy')
diff --git a/static/js/app.js b/static/js/app.js
index 121f5aee3..ebcc79e01 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -435,16 +435,18 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
       when('/repository/:namespace/:name/admin', {templateUrl: '/static/partials/repo-admin.html', controller:RepoAdminCtrl}).
       when('/repository/', {title: 'Repositories', description: 'Public and private docker repositories list',
                             templateUrl: '/static/partials/repo-list.html', controller: RepoListCtrl}).
-      when('/user/', {title: 'Account Settings', description:'Account settings for Quay', templateUrl: '/static/partials/user-admin.html', controller: UserAdminCtrl}).
-      when('/guide/', {title: 'Guide', description:'Guide to using private docker repositories on Quay', templateUrl: '/static/partials/guide.html', controller: GuideCtrl}).
-      when('/plans/', {title: 'Plans and Pricing', description: 'Plans and pricing for private docker repositories on Quay',
+      when('/user/', {title: 'Account Settings', description:'Account settings for Quay.io', templateUrl: '/static/partials/user-admin.html', controller: UserAdminCtrl}).
+      when('/guide/', {title: 'Guide', description:'Guide to using private docker repositories on Quay.io', templateUrl: '/static/partials/guide.html', controller: GuideCtrl}).
+      when('/plans/', {title: 'Plans and Pricing', description: 'Plans and pricing for private docker repositories on Quay.io',
                        templateUrl: '/static/partials/plans.html', controller: PlansCtrl}).
-      when('/signin/', {title: 'Sign In', description: 'Sign into Quay', templateUrl: '/static/partials/signin.html', controller: SigninCtrl}).
+      when('/security/', {title: 'Security', description: 'Security features used when transmitting and storing data',
+                       templateUrl: '/static/partials/security.html', controller: SecurityCtrl}).
+      when('/signin/', {title: 'Sign In', description: 'Sign into Quay.io', templateUrl: '/static/partials/signin.html', controller: SigninCtrl}).
       when('/new/', {title: 'Create new repository', description: 'Create a new public or private docker repository, optionally constructing from a dockerfile',
                      templateUrl: '/static/partials/new-repo.html', controller: NewRepoCtrl}).
       when('/organizations/', {title: 'Organizations', description: 'Private docker repository hosting for businesses and organizations',
                                  templateUrl: '/static/partials/organizations.html', controller: OrgsCtrl}).
-      when('/organizations/new/', {title: 'New Organization', description: 'Create a new organization on Quay',
+      when('/organizations/new/', {title: 'New Organization', description: 'Create a new organization on Quay.io',
                                    templateUrl: '/static/partials/new-organization.html', controller: NewOrgCtrl}).
       when('/organization/:orgname', {templateUrl: '/static/partials/org-view.html', controller: OrgViewCtrl}).
       when('/organization/:orgname/admin', {templateUrl: '/static/partials/org-admin.html', controller: OrgAdminCtrl}).
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 813b3ee29..9ac49b60c 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -58,6 +58,9 @@ function PlansCtrl($scope, $location, UserService, PlanService) {
 function GuideCtrl($scope) {
 }
 
+function SecurityCtrl($scope) {
+}
+
 function RepoListCtrl($scope, Restangular, UserService) {
   $scope.namespace = null;
 
diff --git a/static/partials/landing.html b/static/partials/landing.html
index e5165fc88..d805f94bb 100644
--- a/static/partials/landing.html
+++ b/static/partials/landing.html
@@ -72,17 +72,16 @@
         <i class="fa fa-lock"></i>
         <b>Secure</b>
         <span class="shoutout-expand">
-          Store your private Docker containers where only you and your team
-          can access it, with communication secured by <strong>SSL at all times</strong>
+          Your data is transferred using <strong>SSL at all times</strong> and <strong>encrypted</strong> when at rest. More information available in our <a href="/security/">security guide</a>
         </span>
       </div>
 
       <div class="col-md-4 shoutout">
-        <i class="fa fa-user"></i>
+        <i class="fa fa-group"></i>
         <b>Shareable</b>
         <span class="shoutout-expand">
           Have to share a repository? No problem! Share with anyone you choose
-	</span>
+        </span>
       </div>
 
       <div class="col-md-4 shoutout">
@@ -90,7 +89,7 @@
         <b>Cloud Hosted</b>
         <span class="shoutout-expand">
           Accessible from anywhere, anytime
-	</span>
+        </span>
       </div>
     </div> <!-- row -->
   </div> <!-- container -->
diff --git a/static/partials/security.html b/static/partials/security.html
new file mode 100644
index 000000000..73e599aff
--- /dev/null
+++ b/static/partials/security.html
@@ -0,0 +1,44 @@
+<div class="container">
+  <div class="row">
+    <div class="col-md-12">
+      <h1>Quay.io Security</h1>
+      <p>We understand that when you upload one of your repositories to Quay.io that you are trusting us with some potentially very sensitive data. On this page we will lay out our security features and practices to help you make an informed decision about whether you can trust us with your data.</p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <h3>SSL Everwhere</h3>
+      <p>We expressly forbid connections to Quay.io using unencrypted HTTP traffic. This helps keep your data and account information safe on the wire. Our SSL traffic is decrypted on our application servers, so your traffic is encrypted even within the datacenter. We use a 4096-bit RSA key, and after the key exchange is complete, traffic is transferred using 256-bit AES, for the maximum encryption strength.</p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <h3>Encryption</h3>
+      <p>Our binary data is currently stored in Amazon's <a href="http://aws.amazon.com/s3/">S3</a> service. We use HTTPS when transferring your data internally between our application servers and S3, so your data is never exposed in plain text on any wire. We use their <a href="http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html">server side encryption</a> to protect your data while stored at rest in their data centers.</p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <h3>Passwords</h3>
+      <p>There have been a number of high profile leaks recently where companies have been storing their customers' passwords in plain text, an unsalted hash, or a <a href="http://en.wikipedia.org/wiki/Salt_(cryptography)">salted hash</a> where every salt is the same. At Quay.io we use the <a href="http://en.wikipedia.org/wiki/Bcrypt">bcrypt</a> algorithm to generate a salted hash from your password, using a unique salt for each password. This method of storage is safe against <a href="http://en.wikipedia.org/wiki/Rainbow_table">rainbow attacks</a> and is obviously superior to plain-text storage. Your credentials are also never written in plain text to our application logs, a leak that is commonly overlooked.</p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <h3>Access Controls</h3>
+      <p>Repositories will only ever be shared with people to whom you delegate access. Repositories created from the Docker command line are private by default and repositories must subsequently made public with an explicit action in the Quay.io UI. We have a test suite which is run before every code push which tests all methods which expose private data with all levels of access to ensure nothing is accidentally leaked.</p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <h3>Firewalls</h3>
+      <p>Our application servers and database servers are all protected with firewall settings that only allow communication with known hosts and host groups on sensitive ports (e.g. SSH). None of our servers have SSH password authentication enabled, preventing brute force password attacks.</p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <h3>Data Resilience</h3>
+      <p>While not related directly to security, many of you are probably worried about whether you can depend on the data you store in Quay.io. All binary data that we store is stored in Amazon S3 at the highest redundancy level, which Amazon claims provides <a href="http://aws.amazon.com/s3/faqs/#How_is_Amazon_S3_designed_to_achieve_99.999999999%_durability">11-nines of durability</a>. Our service metadata (e.g. logins, tags, teams) is stored in a database which is backed up nightly, and backups are preserved for 7 days.</p>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index d0831634a..6379a452b 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -93,7 +93,7 @@ mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8
               <li><a href="http://blog.devtable.com/">Blog</a></li>
               <li><a href="/tos" target="_self">Terms of Service</a></li>
               <li><a href="/privacy" target="_self">Privacy Policy</a></li>
-              <li><a href="/guide/">User Guide</a></li>
+              <li><a href="/security/">Security</a></li>
               <li><b><a href="mailto:support@quay.io">Contact Support</a></b></li>
             </ul>
           </div>

From 5f9da10a36709f00c8b0f92b6af33174289adecf Mon Sep 17 00:00:00 2001
From: yackob03 <jacob.moshenko@gmail.com>
Date: Fri, 22 Nov 2013 17:45:22 -0500
Subject: [PATCH 21/21] Make the asterisk smaller.

---
 static/css/quay.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/css/quay.css b/static/css/quay.css
index 15ae81f66..593c17020 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -523,8 +523,8 @@ html, body {
 }
 
 .jumbotron .disclaimer-link {
-  font-size: .5em;
-  vertical-align: top;
+  font-size: .3em;
+  vertical-align: 23px;
 }
 
 .jumbotron .disclaimer-link:hover {