From f206b4b95e61b5cce5a74c1be4f5de0b1492e497 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <josephschorr@users.noreply.github.com>
Date: Wed, 8 Mar 2017 13:06:57 -0500
Subject: [PATCH] Move tag actions into a menu and fix view history action

---
 .../directives/repo-view/repo-panel-tags.html | 29 ++++++++++++-------
 .../directives/repo-view/repo-panel-tags.js   | 10 +++++++
 static/partials/repo-view.html                |  1 +
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/static/directives/repo-view/repo-panel-tags.html b/static/directives/repo-view/repo-panel-tags.html
index fab02e409..8bb75e848 100644
--- a/static/directives/repo-view/repo-panel-tags.html
+++ b/static/directives/repo-view/repo-panel-tags.html
@@ -26,16 +26,25 @@
    </span>
 
    <span class="co-checked-actions" ng-if="checkedTags.checked.length">
-     <a class="btn btn-default"
-        ng-click="showHistory(true, getTagNames(checkedTags.checked))"
-        ng-if="repository.can_write">
-       <i class="fa fa-history"></i><span class="text">View History</span>
-     </a>
-     <button class="btn btn-primary"
-             ng-click="askDeleteMultipleTags(checkedTags.checked)"
-             ng-if="repository.can_write">
-       <i class="fa fa-times"></i><span class="text">Delete</span>
-     </button>
+    <div class="dropdown">
+      <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
+        <i class="fa fa-cog"></i>
+        Actions
+        <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu" role="menu">
+        <li>
+          <a ng-click="showHistory(checkedTags.checked)">
+            <i class="fa fa-history"></i><span class="text">View Tags History</span>
+          </a>
+        </li>
+        <li ng-if="repository.can_write">
+          <a ng-click="askDeleteMultipleTags(checkedTags.checked)">
+            <i class="fa fa-times"></i><span class="text">Delete Tags</span>
+          </a>
+        </li>
+      </ul>
+    </div>
    </span>
 
    <span class="co-filter-box">
diff --git a/static/js/directives/repo-view/repo-panel-tags.js b/static/js/directives/repo-view/repo-panel-tags.js
index 998d73f05..105eafebe 100644
--- a/static/js/directives/repo-view/repo-panel-tags.js
+++ b/static/js/directives/repo-view/repo-panel-tags.js
@@ -11,6 +11,7 @@ angular.module('quay').directive('repoPanelTags', function () {
     scope: {
       'repository': '=repository',
       'selectedTags': '=selectedTags',
+      'historyFilter': '=historyFilter',
       'imagesResource': '=imagesResource',
       'imageLoader': '=imageLoader',
 
@@ -349,6 +350,15 @@ angular.module('quay').directive('repoPanelTags', function () {
         });
       };
 
+      $scope.showHistory = function(checked) {
+        if (!checked.length) {
+          return;
+        }
+
+        $scope.historyFilter = $scope.getTagNames(checked);
+        $scope.setTab('history');
+      };
+
       $scope.getTagNames = function(checked) {
         var names = checked.map(function(tag) {
           return tag.name;
diff --git a/static/partials/repo-view.html b/static/partials/repo-view.html
index f2e58e783..746345390 100644
--- a/static/partials/repo-view.html
+++ b/static/partials/repo-view.html
@@ -86,6 +86,7 @@
                  repository="viewScope.repository"
                  image-loader="viewScope.imageLoader"
                  selected-tags="viewScope.selectedTags"
+                 history-filter="viewScope.historyFilter"
                  is-enabled="tagsShown"></div>
           </div>