From 08f006a90cab43d85437266990cb929da197123f Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Thu, 5 Mar 2015 14:21:46 -0500
Subject: [PATCH] Add the namespaces box to the right hand side and make other
 small UI improvements to the repo list view

---
 static/css/directives/repo-list-grid.css  |  6 ++-
 static/css/pages/repo-list.css            | 26 +++++++++++
 static/directives/repo-list-grid.html     |  5 +-
 static/js/directives/ui/repo-list-grid.js | 17 +++++--
 static/js/pages/repo-list.js              |  4 ++
 static/partials/repo-list.html            | 56 +++++++++++++----------
 6 files changed, 81 insertions(+), 33 deletions(-)
 create mode 100644 static/css/pages/repo-list.css

diff --git a/static/css/directives/repo-list-grid.css b/static/css/directives/repo-list-grid.css
index 301905e11..f4cb56e05 100644
--- a/static/css/directives/repo-list-grid.css
+++ b/static/css/directives/repo-list-grid.css
@@ -105,10 +105,8 @@
 
 .new-repo-listing {
   display: block;
-  border-bottom: 1px solid #eee;
   font-size: 14px;
   line-height: normal;
-  padding-bottom: 30px;
 }
 
 .new-repo-listing .description {
@@ -129,3 +127,7 @@
 .repo-list-grid {
   padding-top: 10px;
 }
+
+.repo-list-title .avatar {
+  margin-right: 10px;
+}
diff --git a/static/css/pages/repo-list.css b/static/css/pages/repo-list.css
new file mode 100644
index 000000000..c92110fc1
--- /dev/null
+++ b/static/css/pages/repo-list.css
@@ -0,0 +1,26 @@
+.repo-list .repo-list-panel {
+  padding: 20px;
+  padding-top: 0px;
+}
+
+.repo-list .repo-list-namespaces h4 {
+  margin: 6px;
+  margin-bottom: 20px;
+}
+
+.repo-list .namespaces-list {
+  margin: 20px;
+  padding: 0px;
+  margin-bottom: 0px;
+}
+
+.repo-list .namespaces-list li {
+  list-style: none;
+  margin: 4px;
+  margin-bottom: 10px;
+  font-size: 16px;
+}
+
+.repo-list .namespaces-list li .avatar {
+  margin-right: 10px;
+}
diff --git a/static/directives/repo-list-grid.html b/static/directives/repo-list-grid.html
index 223027c62..0a93c2d56 100644
--- a/static/directives/repo-list-grid.html
+++ b/static/directives/repo-list-grid.html
@@ -8,8 +8,9 @@
     </div>
     <div ng-if="!starred" class="repo-list-title">
       <span class="avatar" size="24" hash="namespace.avatar"></span>
-      <a ng-if="user.username == namespace.name">{{ namespace.name }}</a>
-      <a ng-if="user.username != namespace.name" href="/organization/{{ namespace.name }}">{{ namespace.name }}</a>
+      <span ng-if="!isOrganization(namespace.name)">{{ namespace.name }}</span>
+      <a ng-if="isOrganization(namespace.name)"
+         href="/organization/{{ namespace.name }}">{{ namespace.name }}</a>
     </div>
 
     <!-- Repositories -->
diff --git a/static/js/directives/ui/repo-list-grid.js b/static/js/directives/ui/repo-list-grid.js
index ae4d8ab81..7dddc5e1c 100644
--- a/static/js/directives/ui/repo-list-grid.js
+++ b/static/js/directives/ui/repo-list-grid.js
@@ -1,11 +1,12 @@
 /**
  * An element that displays a list of repositories in a grid.
- *
  */
-angular.module('quay').directive('repoListGrid', function() {
-  return {
-    templateUrl: '/static/directives/repo-list-grid.html',
+angular.module('quay').directive('repoListGrid', function () {
+  var directiveDefinitionObject = {
     priority: 0,
+    templateUrl: '/static/directives/repo-list-grid.html',
+    replace: false,
+    transclude: true,
     restrict: 'C',
     scope: {
       repositories: '=repositories',
@@ -14,5 +15,11 @@ angular.module('quay').directive('repoListGrid', function() {
       namespace: '=namespace',
       toggleStar: '&toggleStar'
     },
+    controller: function($scope, $element, UserService) {
+      $scope.isOrganization = function(namespace) {
+        return !!UserService.getOrganization(namespace);
+      };
+    }
   };
-});
+  return directiveDefinitionObject;
+});
\ No newline at end of file
diff --git a/static/js/pages/repo-list.js b/static/js/pages/repo-list.js
index dae52e501..0a0f9509d 100644
--- a/static/js/pages/repo-list.js
+++ b/static/js/pages/repo-list.js
@@ -46,6 +46,10 @@
       }
     });
 
+    $scope.isOrganization = function(namespace) {
+      return !!UserService.getOrganization(namespace);
+    };
+
     // Star a repository or unstar a repository.
     $scope.toggleStar = function(repo) {
       if (repo.is_starred) {
diff --git a/static/partials/repo-list.html b/static/partials/repo-list.html
index 73a24b0d9..45473349c 100644
--- a/static/partials/repo-list.html
+++ b/static/partials/repo-list.html
@@ -1,4 +1,4 @@
-<div class="page-content">
+<div class="repo-list page-content">
   <div class="cor-title">
     <span class="cor-title-link"></span>
     <span class="cor-title-content">Repositories</span>
@@ -9,6 +9,8 @@
       </a>
     </span>
   </div>
+
+  <!-- Not signed in -->
   <div class="co-main-content-panel" ng-if="user.anonymous" >
     <!-- The user is not logged in -->
     <div class="cor-container signin-container row">
@@ -21,33 +23,39 @@
     </div>
   </div>
 
-    <div class="cor-tab-panel" ng-if="!user.anonymous" >
-      <div class="cor-tabs">
-        <li class="cor-tab"><i class="fa fa-star starred"></i></li>
-        <li class="cor-tab" ng-repeat="namespace in namespaces">
-          <span class="avatar" size="36" hash="namespace.avatar"></span>
-        </li>
-
-      </div> <!-- /cor-tabs -->
-
-      <div class="cor-tab-content">
-
-    <!-- The user is logged in -->
-    <div ng-if="!user.anonymous">
-
-      <!-- Starred Repository Listing -->
-      <div class="repo-list-grid" repositories="starred_repositories.value" starred="true" toggle-star="toggleStar(repository)"></div>
-
-      <!-- User and Org Repository Listings -->
-      <div ng-repeat="namespace in namespaces">
-        <div class="repo-list-grid" repositories="namespace.repositories.value" starred="false" user="user" namespace="namespace" toggle-star="toggleStar(repository)"></div>
+  <!-- Signed in -->
+  <div class="row"  ng-if="!user.anonymous">
+    <div class="col-lg-3 col-lg-push-9 col-md-3 col-md-push-9 col-sm-12">
+      <div class="co-main-content-panel repo-list-namespaces">
+        <h4>Users and Organizations</h4>
+        <ul class="namespaces-list">
+          <li ng-repeat="namespace in namespaces">
+            <span ng-if="!isOrganization(namespace.name)">
+              <span class="avatar" size="30" hash="namespace.avatar"></span>
+              {{ namespace.name }}
+            </span>
+            <a href="/organization/{{ namespace.name }}" ng-if="isOrganization(namespace.name)">
+              <span class="avatar" size="30" hash="namespace.avatar"></span>
+              {{ namespace.name }}
+            </a>
+          </li>
+        </ul>
       </div>
-
     </div>
 
-    </div>
-    </div>
+    <div class="col-lg-9 col-lg-pull-3 col-md-9 col-md-pull-3 col-sm-12">
+      <div class="repo-list-panel co-main-content-panel">
+        <!-- Starred Repository Listing -->
+        <div class="repo-list-grid" repositories="starred_repositories.value" starred="true" toggle-star="toggleStar(repository)"></div>
 
+        <!-- User and Org Repository Listings -->
+        <div ng-repeat="namespace in namespaces">
+          <div class="repo-list-grid" repositories="namespace.repositories.value" starred="false" user="user" namespace="namespace" toggle-star="toggleStar(repository)"></div>
+        </div>
+      </div>
+    </div>
   </div>
+
+
 </div>