From c31eea8f790db4bf0ebe90277b9bdb59266c3375 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Wed, 1 Apr 2015 15:04:01 -0400
Subject: [PATCH] Restyle the billing invoices tab

---
 static/css/directives/ui/billing-invoices.css | 25 ++++++++
 .../css/directives/ui/prototype-manager.css   |  5 ++
 static/css/quay.css                           | 58 -------------------
 static/directives/billing-invoices.html       | 32 +++-------
 ...billing-invoice.js => billing-invoices.js} |  5 --
 5 files changed, 39 insertions(+), 86 deletions(-)
 create mode 100644 static/css/directives/ui/billing-invoices.css
 rename static/js/directives/ui/{billing-invoice.js => billing-invoices.js} (88%)

diff --git a/static/css/directives/ui/billing-invoices.css b/static/css/directives/ui/billing-invoices.css
new file mode 100644
index 000000000..10011237c
--- /dev/null
+++ b/static/css/directives/ui/billing-invoices.css
@@ -0,0 +1,25 @@
+
+.billing-invoices-element .invoice-title {
+  padding: 6px;
+  cursor: pointer;
+}
+
+.billing-invoices-element .invoice-status .success {
+  color: green;
+}
+
+.billing-invoices-element .invoice-status .pending {
+  color: steelblue;
+}
+
+.billing-invoices-element .invoice-status .danger {
+  color: red;
+}
+
+.billing-invoices-element .invoice-amount:before {
+  content: '$';
+}
+
+.billing-invoices-element .fa-download {
+  color: #aaa;
+}
\ No newline at end of file
diff --git a/static/css/directives/ui/prototype-manager.css b/static/css/directives/ui/prototype-manager.css
index bc8138a61..41ccb9824 100644
--- a/static/css/directives/ui/prototype-manager.css
+++ b/static/css/directives/ui/prototype-manager.css
@@ -1,3 +1,8 @@
 .prototype-manager-element i.fa {
   margin-right: 4px;
+}
+
+.prototype-manager-element td {
+  padding: 10px !important;
+  vertical-align: middle !important;
 }
\ No newline at end of file
diff --git a/static/css/quay.css b/static/css/quay.css
index c357bd8e1..3d674254e 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -3267,64 +3267,6 @@ p.editable:hover i {
   max-width: 100%;
 }
 
-.billing-invoices-element .invoice-title {
-  padding: 6px;
-  cursor: pointer;
-}
-
-.billing-invoices-element .invoice-status .success {
-  color: green;
-}
-
-.billing-invoices-element .invoice-status .pending {
-  color: steelblue;
-}
-
-.billing-invoices-element .invoice-status .danger {
-  color: red;
-}
-
-.billing-invoices-element .invoice-amount:before {
-  content: '$';
-}
-
-.billing-invoices-element .invoice-details {
-  margin-left: 10px;
-  margin-bottom: 10px;
-
-  padding: 4px;
-  padding-left: 6px;
-  border-left: 2px solid #eee !important;
-}
-
-.billing-invoices-element .invoice-details td {
-  border: 0px solid transparent !important;
-}
-
-.billing-invoices-element .invoice-details dl {
-  margin: 0px;
-}
-
-.billing-invoices-element .invoice-details dd {
-  margin-left: 10px;
-  padding: 6px;
-  margin-bottom: 10px;
-}
-
-.billing-invoices-element .invoice-title:hover {
-  color: steelblue;
-}
-
-.prototype-manager-element thead th {
-  padding: 4px;
-  color: #666;
-}
-
-.prototype-manager-element td {
-  padding: 10px !important;
-  vertical-align: middle !important;
-}
-
 .org-list h2 {
   margin-bottom: 20px;
 }
diff --git a/static/directives/billing-invoices.html b/static/directives/billing-invoices.html
index e022fef03..e4cf9cfe1 100644
--- a/static/directives/billing-invoices.html
+++ b/static/directives/billing-invoices.html
@@ -1,25 +1,23 @@
 <div class="billing-invoices-element">
-  <div ng-show="loading">
-    <div class="quay-spinner"></div>
-  </div>
+  <div class="cor-loader" ng-show="loading"></div>
 
   <div ng-show="!loading && !invoices">
     No invoices have been created
   </div>
 
   <div ng-show="!loading && invoices">
-    <table class="table">
+    <table class="co-table">
       <thead>
-        <th>Billing Date/Time</th>
-        <th>Amount Due</th>
-        <th>Status</th>
-        <th></th>
+        <td>Billing Date/Time</td>
+        <td>Amount Due</td>
+        <td>Status</td>
+        <td class="options-col"></td>
       </thead>
 
       <tbody class="invoice" ng-repeat="invoice in invoices">
         <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-datetime">{{ invoice.date * 1000 | date:'medium' }}</span></td>
+          <td><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>
@@ -28,24 +26,12 @@
               <span class="pending" ng-show="!invoice.paid && !invoice.attempted">Payment pending</span>
             </span>
           </td>
-          <td>
+          <td class="options-col">
             <a ng-show="invoice.paid" href="/receipt?id={{ invoice.id }}" download="receipt.pdf" target="_new">
               <i class="fa fa-download" data-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">
-          <td colspan="3">
-            <dl class="dl-normal">
-              <dt>Billing Period</dt>
-              <dd>
-                <span>{{ invoice.period_start * 1000 | date:'mediumDate' }}</span> -
-                <span>{{ invoice.period_end * 1000 | date:'mediumDate' }}</span>
-              </dd>
-            </dl>
-          </td>
-        </tr>
       </tbody>
     </table>
   </div>
diff --git a/static/js/directives/ui/billing-invoice.js b/static/js/directives/ui/billing-invoices.js
similarity index 88%
rename from static/js/directives/ui/billing-invoice.js
rename to static/js/directives/ui/billing-invoices.js
index f7ff123f7..e2943a575 100644
--- a/static/js/directives/ui/billing-invoice.js
+++ b/static/js/directives/ui/billing-invoices.js
@@ -15,11 +15,6 @@ angular.module('quay').directive('billingInvoices', function () {
     },
     controller: function($scope, $element, $sce, ApiService) {
       $scope.loading = false;
-      $scope.invoiceExpanded = {};
-
-      $scope.toggleInvoice = function(id) {
-        $scope.invoiceExpanded[id] = !$scope.invoiceExpanded[id];
-      };
 
       var update = function() {
         var hasValidUser = !!$scope.user;