From ae2c9d67c0c0a6962b4586658a7dbad4e7d8b062 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Thu, 1 Oct 2015 20:31:08 +0000
Subject: [PATCH] webstaff: move some "mark for" buttons to record summary

This patch moves the "Mark for..." overlay, volume transfer,
and conjoined items buttons from the MARC editor to
the record summary (next to the "Add To Bucket" button).

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../src/templates/staff/cat/catalog/t_catalog.tt2  | 28 ++++++++++++++++++++++
 .../src/templates/staff/cat/share/t_marcedit.tt2   | 14 -----------
 Open-ILS/src/templates/staff/css/cat.css.tt2       |  5 ++++
 .../web/js/ui/default/staff/cat/catalog/app.js     | 28 ++++++++++++++++++++++
 .../js/ui/default/staff/cat/services/marcedit.js   | 12 ----------
 5 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
index 8437ee832d..05b25cd39e 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -25,6 +25,34 @@
     <button type="button" class="btn btn-default" ng-click="add_to_record_bucket()">
         [% l('Add To Bucket') %]
     </button>
+    <div class="btn-group" dropdown dropdown-append-to-body>
+        <button id="mark-for-button" type="button" class="btn btn-default" dropdown-toggle>
+            [% l('Mark for:') %] <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu" role="menu" aria-labelledby="mark-for-button">
+            <li role="menuitem">
+                <a ng-click="markOverlay()">
+                    [% l('Overlay Target') %]
+                    <span class="target-record-aside" ng-if="current_overlay_target">[% l('(Currently [_1])', '{{current_overlay_target}}') %]</span>
+                </a>
+            </li>
+            <li role="menuitem">
+                <a ng-click="markVolTransfer()">
+                    [% l('Volume Transfer') %]
+                    <span class="target-record-aside" ng-if="current_voltransfer_target">[% l('(Currently [_1])', '{{current_voltransfer_target}}') %]</span>
+                </a>
+            </li>
+            <li role="menuitem">
+                    <a ng-click="markConjoined()">
+                        [% l('Conjoined Items') %]
+                    <span class="target-record-aside" ng-if="current_conjoined_target">[% l('(Currently [_1])', '{{current_conjoined_target}}') %]</span>
+                </a>
+            </li>
+            <li role="menuitem">
+                <a ng-click="clearRecordMarks()">[% l('Reset Record Marks') %]</a>
+            </li>
+        </ul>
+    </div>
   </div>
 </div>
 
diff --git a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2 b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
index 5ee22e4328..f41595081f 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
@@ -1,19 +1,5 @@
 <div>
   <div ng-show="bre" class="row pad-vert marcfastitemadd" ng-hide="brandNewRecord">
-    <div class="col-md-5">
-      <label>[% l('Mark for:') %]</label>
-      <div class="btn-group">
-        <span class="btn-group">
-          <button class="btn btn-default" ng-click="markOverlay()">[% l('Overlay Target') %]</button>
-        </span>
-        <span class="btn-group">
-          <button class="btn btn-default" ng-click="markVolTransfer()">[% l('Volume Transfer') %]</button>
-        </span>
-        <span class="btn-group">
-          <button class="btn btn-default" ng-click="markConjoined()">[% l('Conjoined Items') %]</button>
-        </span>
-      </div>
-    </div>
     <div class="col-md-2">
       <label><input type="checkbox" ng-model="enable_fast_add"/> [% l('Add Item') %]</label>
     </div>
diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2
index ede00075cf..4faae17cab 100644
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -3,6 +3,11 @@
     color: red;
 }
 
+.target-record-aside {
+    font-size: 80%;
+    font-style: italic;
+}
+
 .marcrecord {
     //background-color: #f5f5f5;
 }
diff --git a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
index 4b2bf9d5fc..ce8acac4e4 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
@@ -311,6 +311,34 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
         });
     }
 
+    $scope.current_overlay_target     = egCore.hatch.getLocalItem('eg.cat.marked_overlay_record');
+    $scope.current_voltransfer_target = egCore.hatch.getLocalItem('eg.cat.marked_volume_transfer_record');
+    $scope.current_conjoined_target   = egCore.hatch.getLocalItem('eg.cat.marked_conjoined_record');
+
+    $scope.markConjoined = function () {
+        $scope.current_conjoined_target = $scope.record_id;
+        egCore.hatch.setLocalItem('eg.cat.marked_conjoined_record',$scope.record_id);
+    };
+
+    $scope.markVolTransfer = function () {
+        $scope.current_voltransfer_target = $scope.record_id;
+        egCore.hatch.setLocalItem('eg.cat.marked_volume_transfer_record',$scope.record_id);
+    };
+
+    $scope.markOverlay = function () {
+        $scope.current_overlay_target = $scope.record_id;
+        egCore.hatch.setLocalItem('eg.cat.marked_overlay_record',$scope.record_id);
+    };
+
+    $scope.clearRecordMarks = function () {
+        $scope.current_overlay_target     = null;
+        $scope.current_voltransfer_target = null;
+        $scope.current_conjoined_target   = null;
+        egCore.hatch.removeLocalItem('eg.cat.marked_volume_transfer_record');
+        egCore.hatch.removeLocalItem('eg.cat.marked_conjoined_record');
+        egCore.hatch.removeLocalItem('eg.cat.marked_overlay_record');
+    }
+
     $scope.stop_unload = false;
     $scope.$watch('stop_unload',
         function(newVal, oldVal) {
diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
index 3ec54d693a..cb978f32b6 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
@@ -1265,18 +1265,6 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                     alert($scope.record.toBreaker());
                 };
 
-                $scope.markConjoined = function () {
-                    egCore.hatch.setLocalItem('eg.cat.marked_conjoined_record',$scope.recordId);
-                };
-
-                $scope.markVolTransfer = function () {
-                    egCore.hatch.setLocalItem('eg.cat.marked_volume_transfer_record',$scope.recordId);
-                };
-
-                $scope.markOverlay = function () {
-                    egCore.hatch.setLocalItem('eg.cat.marked_overlay_record',$scope.recordId);
-                };
-
                 $scope.$watch('recordId',
                     function(newVal, oldVal) {
                         if (newVal && newVal !== oldVal) {
-- 
2.11.0