Merge branch 'master' of https://bitbucket.org/yackob03/quay

endpoints/web.py

@@ -77,6 +77,11 @@ def signin():
   return index('')
 
 
+@app.route('/contact/')
+def contact():
+  return index('')
+
+
 @app.route('/new/')
 @no_cache
 def new():

static/css/quay.css

@@ -496,11 +496,11 @@ i.toggle-icon:hover {
   width: 40px;
 }
 
-.repo-circle .fa-hdd {
+.repo-circle .fa-hdd-o {
   font-size: 36px;
 }
 
-.repo-circle.no-background .fa-hdd {
+.repo-circle.no-background .fa-hdd-o {
   font-size: 30px;
 }
 
@@ -2617,3 +2617,7 @@ p.editable:hover i {
   font-weight: bold;
   font-size: .4em;
 }
+
+.contact-options {
+  margin-top: 60px;
+}

static/directives/repo-circle.html

@@ -1,2 +1,2 @@
 <i class="fa fa-lock fa-lg" style="{{ repo.is_public ? 'visibility: hidden' : 'visibility: inherit' }}" title="Private Repository"></i>
-<i class="fa fa-hdd"></i>
+<i class="fa fa-hdd-o"></i>

static/js/app.js

@@ -771,6 +771,8 @@ quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'rest
                       reloadOnSearch: false, controller: UserAdminCtrl}).
       when('/guide/', {title: 'Guide', description:'Guide to using private docker repositories on Quay.io', templateUrl: '/static/partials/guide.html',
                        controller: GuideCtrl}).
+      when('/contact/', {title: 'Contact Us', description:'Different ways for you to get a hold of us when you need us most.', templateUrl: '/static/partials/contact.html',
+                       controller: ContactCtrl}).
       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('/security/', {title: 'Security', description: 'Security features used when transmitting and storing data',
@@ -1665,7 +1667,7 @@ quayApp.directive('repoSearch', function () {
         },
         template: function (datum) {
           template = '<div class="repo-mini-listing">';
-          template += '<i class="fa fa-hdd fa-lg"></i>'
+          template += '<i class="fa fa-hdd-o 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>'

static/js/controllers.js

@@ -48,6 +48,9 @@ function GuideCtrl($scope) {
 function SecurityCtrl($scope) {
 }
 
+function ContactCtrl($scope) {
+}
+
 function RepoListCtrl($scope, $sanitize, Restangular, UserService, ApiService) {
   $scope.namespace = null;
   $scope.page = 1;

static/partials/contact.html

@@ -0,0 +1,44 @@
+<div class="container">
+  <h2>
+    Contact Us<br>
+    <small>We are here to help!</small>
+  </h2>
+
+  <div class="row contact-options">
+    <div class="col-sm-3 text-center">
+      <span class="fa-stack fa-3x text-center">
+        <i class="fa fa-circle fa-stack-2x"></i>
+        <i class="fa fa-envelope fa-stack-1x fa-inverse"></i>
+      </span>
+      <h4>Email Us</h4>
+      <h4><a href="mailto:support@quay.io">support@quay.io</a></h4>
+    </div>
+
+    <div class="col-sm-3 text-center">
+      <span class="fa-stack fa-3x">
+        <i class="fa fa-circle fa-stack-2x"></i>
+        <i class="fa fa-comment fa-stack-1x fa-inverse"></i>
+      </span>
+      <h4>IRC</h4>
+      <h4><a href="irc://chat.freenode.net:6665/quayio">Freenode: #quayio</a></h4>
+    </div>
+
+    <div class="col-sm-3 text-center">
+      <span class="fa-stack fa-3x">
+        <i class="fa fa-circle fa-stack-2x"></i>
+        <i class="fa fa-phone fa-stack-1x fa-inverse"></i>
+      </span>
+      <h4>Call Us</h4>
+      <h4><a href="tel:+1-888-930-3475">888-930-3475</a></h4>
+    </div>
+
+    <div class="col-sm-3 text-center">
+      <span class="fa-stack fa-3x">
+        <i class="fa fa-circle fa-stack-2x"></i>
+        <i class="fa fa-twitter fa-stack-1x fa-inverse"></i>
+      </span>
+      <h4>Tweet Us</h4>
+      <h4><a href="https://twitter.com/quayio">@quayio</a></h4>
+    </div>
+  </div>
+</div>

static/partials/plans.html

@@ -11,7 +11,7 @@
               <span class="hidden-sm-inline">Public Repositories</span>
               <span class="visible-sm-inline">Public Repos</span>
             </span>
-            <i class="fa fa-hdd visible-lg"></i> 
+            <i class="fa fa-hdd-o visible-lg"></i> 
           </div>
           <div class="feature">
              <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"

templates/base.html

@@ -13,7 +13,7 @@
 
     <link rel="stylesheet" href="/static/lib/loading-bar.css">
 
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.0/css/font-awesome.css">
+    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css">
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.no-icons.min.css">
     <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
 
@@ -110,18 +110,18 @@ var isProd = document.location.hostname === 'quay.io';
       <div class="page-footer-padder">
         <nav class="page-footer visible-lg visible-md">
           <div class="row">         
-            <div class="col-md-7">
+            <div class="col-md-8">
               <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="/security/">Security</a></li>
-                <li><b><a href="mailto:support@quay.io">Contact Support</a></b></li>
+                <li><b><a href="/contact/">Contact Us</a></b></li>
               </ul>
             </div>
 
-            <div class="col-md-5 logo-container">
+            <div class="col-md-4 logo-container">
               <a href="https://devtable.com"><img class="dt-logo" src="/static/img/dt-logo.png"></a>
             </div>
           </div> <!-- row -->