Merge branch 'bobthe' into tutorial

static/css/quay.css

@@ -2474,6 +2474,28 @@ p.editable:hover i {
   font-size: 16px;
 }
 
+.repo-breadcrumb-element .crumb {
+  cursor: pointer;
+}
+
+.repo-breadcrumb-element .crumb:nth-last-of-type(3), .repo-breadcrumb-element .crumb:nth-last-of-type(3) a {
+  color: #aaa !important;
+}
+
+.repo-breadcrumb-element .crumb:nth-last-of-type(2), .repo-breadcrumb-element .crumb:nth-last-of-type(2) a {
+  color: #888 !important;
+}
+
+.repo-breadcrumb-element .crumb:after {
+  content: "/";
+  color: #ccc;
+  margin-left: 4px;
+}
+
+.repo-breadcrumb-element .crumb:hover, .repo-breadcrumb-element .crumb:hover a {
+  color: #2a6496 !important;
+  text-decoration: none;
+}
 
 /* Overrides for typeahead to work with bootstrap 3. */
 

static/directives/header-bar.html

@@ -15,7 +15,7 @@
 <div class="collapse navbar-collapse navbar-ex1-collapse">
   <ul class="nav navbar-nav">
     <li><a ng-href="/repository/" target="{{ appLinkTarget() }}">Repositories</a></li>
-    <li><a ng-href="/guide/" target="{{ appLinkTarget() }}">Guide</a></li>
+    <li><a href="http://docs.quay.io/">Documentation</a></li>
     <li><a ng-href="/tutorial/" target="{{ appLinkTarget() }}">Tutorial</a></li>
     <li><a ng-href="/plans/" target="{{ appLinkTarget() }}">Pricing</a></li>
     <li><a ng-href="/organizations/" target="{{ appLinkTarget() }}">Organizations</a></li>

static/directives/repo-breadcrumb.html

@@ -0,0 +1,15 @@
+<span class="repo-breadcrumb-element">
+  <span ng-show="!image">
+    <span class="crumb">
+      <a href="{{ '/repository/?namespace=' + repo.namespace }}">{{repo.namespace}}</a>
+    </span>
+    <span class="current">{{repo.name}}</span>
+  </span>
+  <span ng-show="image">
+    <span class="crumb">
+      <a href="{{ '/repository/?namespace=' + repo.namespace }}">{{repo.namespace}}</a>
+    </span>
+    <span class="crumb"><a href="{{ '/repository/' + repo.namespace + '/' + repo.name }}">{{repo.name}}</a></span>
+    <span class="current">{{image.id.substr(0, 12)}}</span>
+  </span>
+</span>

static/js/app.js

@@ -384,6 +384,15 @@ quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'angu
 
         return org.is_org_admin;
       };
+
+      userService.isKnownNamespace = function(namespace) {
+        if (namespace == userResponse.username) {
+          return true;
+        }
+
+        var org = userService.getOrganization(namespace);
+        return !!org;
+      };
         
       userService.currentUser = function() {
         return userResponse;
@@ -856,6 +865,24 @@ quayApp.directive('markdownView', function () {
 });
 
 
+quayApp.directive('repoBreadcrumb', function () {
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/repo-breadcrumb.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+      'repo': '=repo',
+      'image': '=image'
+    },
+    controller: function($scope, $element) {     
+    }
+  };
+  return directiveDefinitionObject;
+});
+
+
 quayApp.directive('repoCircle', function () {
   var directiveDefinitionObject = {
     priority: 0,
@@ -2450,13 +2477,13 @@ quayApp.directive('buildStatus', function () {
     },
     controller: function($scope, $element) {
         $scope.getBuildProgress = function(buildInfo) {
-            switch (buildInfo.status) {
+            switch (buildInfo.phase) {
               case 'building':
-                return (buildInfo.current_command / buildInfo.total_commands) * 100;
+                return (buildInfo.status.current_command / buildInfo.status.total_commands) * 100;
                 break;
                 
               case 'pushing':
-                return buildInfo.push_completion * 100;
+                return buildInfo.status.push_completion * 100;
                 break;
 
               case 'complete':
@@ -2474,7 +2501,7 @@ quayApp.directive('buildStatus', function () {
         };
 
         $scope.getBuildMessage = function(buildInfo) {
-            switch (buildInfo.status) {
+            switch (buildInfo.phase) {
             case 'initializing':
                 return 'Starting Dockerfile build';
                 break;
@@ -2494,7 +2521,7 @@ quayApp.directive('buildStatus', function () {
                 break;
                 
             case 'error':
-                return 'Dockerfile build failed: ' + buildInfo.message;
+                return 'Dockerfile build failed.';
                 break;
             }
         };

static/js/controllers.js

@@ -1298,7 +1298,7 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, ApiService
       $location.path('/repository/' + created.namespace + '/' + created.name);
     }, function(result) {
       $scope.creating = false;
-      $scope.createError = result.data;
+      $scope.createError = result.data ? result.data.message : 'Cannot create repository';
       $timeout(function() {
         $('#repoName').popover('show');
       });

static/partials/guide.html

@@ -1,4 +1,5 @@
-<button ng-click="startTour()">Start Tour</button>
-<div id="test-element">
-  This is a test element
+<div class="container">
+  <h3>Redirecting...</h3>
+  <META http-equiv="refresh" content="0;URL=http://docs.quay.io/getting-started.html">
+  If this page does not redirect, please <a href="http://docs.quay.io/getting-started.html"> click here</a>. 
 </div>

static/partials/image-view.html

@@ -4,11 +4,7 @@
       <a href="{{ '/repository/' + repo.namespace + '/' + repo.name }}" class="back"><i class="fa fa-chevron-left"></i></a>
       <h3>
         <i class="fa fa-archive fa-lg" style="color: #aaa; margin-right: 10px;"></i>
-        <span style="color: #aaa;"> {{repo.namespace}}</span>
-        <span style="color: #ccc">/</span>
-        <span style="color: #666;">{{repo.name}}</span>
-        <span style="color: #ccc">/</span>
-        <span>{{image.value.id.substr(0, 12)}}</span>
+        <span class="repo-breadcrumb" repo="repo" image="image.value"></span>
       </h3>
     </div>
 

static/partials/repo-admin.html

@@ -4,7 +4,8 @@
   <div class="header row">
     <a href="{{ '/repository/' + repo.namespace + '/' + repo.name }}" class="back"><i class="fa fa-chevron-left"></i></a>
     <h3>
-      <span class="repo-circle no-background" repo="repo"></span> <span style="color: #aaa;"> {{repo.namespace}}</span> <span style="color: #ccc">/</span> {{repo.name}}
+      <span class="repo-circle no-background" repo="repo"></span>
+      <span class="repo-breadcrumb" repo="repo"></span>
     </h3>
   </div>
   

static/partials/repo-list.html

@@ -38,7 +38,7 @@
         <div class="alert alert-info">
           <h4 ng-show="namespace == user.username">You don't have any repositories yet!</h4>
           <h4 ng-show="namespace != user.username">This organization doesn't have any repositories, or you have not been provided access.</h4>
-          <a href="/guide"><b>Click here</b> to learn how to create a repository</a>
+          <a href="http://docs.quay.io/getting-started.html"><b>Click here</b> to learn how to create a repository</a>
         </div>
       </div>
     </div>

static/partials/user-admin.html

@@ -185,7 +185,11 @@
                        ng-model="org.adminUser" required autofocus>
                 <input id="adminPassword" name="adminPassword" type="password" class="form-control" placeholder="Admin Password"
                        ng-model="org.adminPassword" required>
-                <span class="description">The username and password for the account that will become administrator of the organization</span>
+                <span class="description">
+                  The username and password for the account that will become an administrator of the organization.
+                  Note that this account <b>must be a separate Quay.io account</b> from the account that you are
+                  trying to convert, and <b>must already exist</b>.
+                </span>
               </div>
 
               <!-- Plans Table -->

static/partials/view-repo.html

@@ -10,7 +10,7 @@
     <div class="header">
       <h3>
         <span class="repo-circle" repo="repo"></span>
-        <span style="color: #aaa;"> {{repo.namespace}}</span> <span style="color: #ccc">/</span> {{repo.name}}
+        <span class="repo-breadcrumb" repo="repo"></span>
         <span class="settings-cog" ng-show="repo.can_admin" title="Repository Settings" bs-tooltip="tooltip.title" data-placement="bottom">
           <a href="{{ '/repository/' + repo.namespace + '/' + repo.name + '/admin' }}">
             <i class="fa fa-cog fa-lg"></i>

static/sitemap.xml

@@ -17,10 +17,6 @@
       <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>