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

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 {
+.page-footer .copyright {
-  font-size: 11px;
+  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;
 }

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', {templateUrl: '/static/partials/view-repo.html', controller: RepoCtrl,
-      when('/repository/:namespace/:name/tag/:tag', {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;

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);

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>

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>

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>

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>

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">

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,13 +74,37 @@ 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 -->
+    <div ng-class="!hideFooter ? 'wrapper' : ''">
       <nav class="navbar navbar-default header-bar" role="navigation"></nav>
 
       {% block body_content %}
 
       {% 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(){
     f[z]=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>

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 -->