webstaff: Use tabs instead of Actions For this Record

Thus, do away with that menu altogether (YAY!)

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>

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 477e558..21bd748 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -1,13 +1,6 @@
 
-<div class="row pad-vert col-md-12 alert alert-info alert-less-pad strong-text-2">
-  <span ng-if="record_tab == 'catalog'">[% l('Catalog') %]</span>
-  <span ng-if="record_tab == 'marc_html'">[% l('MARC HTML') %]</span>
-  <span ng-if="record_tab == 'marc_edit'">[% l('Edit MARC') %]</span>
-  <span ng-if="record_tab == 'holds'">[% l('Holds for Record') %]</span>
-</div>
-
 <div ng-show="record_id" class="row col-md-12">
-    <eg-record-summary record-id="record_id" record="summary_pane_record"></eg-record-summary>
+    <eg-record-summary record-id="record_id" no-marc-link="true" record="summary_pane_record"></eg-record-summary>
 </div>
 
 <div ng-show="record_id" class="row col-md-12 pad-vert">
@@ -30,37 +23,42 @@
   </div> <!-- padding -->
   <div class="col-md-3">
     <!-- actions for this record menu -->
-    <div class="btn-group pull-right" dropdown>
-      <button type="button" 
-          class="btn btn-default dropdown-toggle" ng-disabled="!record_id">
-        [% l('Actions for This Record') %] 
-        <span class="caret"></span>
-      </button>
-      <ul class="dropdown-menu dropdown-menu-right" role="menu">
-        <li><a href ng-click="set_record_tab('catalog')">
-            [% l('OPAC View') %]</a></li>
-        <li><a href ng-click="set_record_tab('marc_edit')">
-            [% l('MARC Edit') %]</a></li>
-        <li><a href ng-click="set_record_tab('marc_html')">
-            [% l('MARC View') %]</a></li>
-        <li class="divider"></li>
-        <li><a href ng-click="set_record_tab('holds')">
-            [% l('View Holds') %]</a></li>
-        <li><a href ng-click="mark_hold_transfer_dest()">
-            [% l('Mark as Title Hold Transfer Destination') %]</a></li>
-        <li><a href ng-click="transfer_holds_to_marked()">
-            [% l('Transfer All Title Holds') %]</a></li>
-        <li><a href ng-click="set_default_record_tab()">
-            [% l('Set bottom view as default') %]</a></li>
-      </ul>
+    <div class="btn btn-default pull-right" ng-click="set_default_record_tab()">
+      [% l('Set bottom view as default') %]
     </div>
   </div>
 </div>
 
+<ul class="nav nav-tabs">
+  <li ng-class="{active : record_tab == 'catalog'}">
+    <a ng-click="set_record_tab('catalog')" >
+        [% l('OPAC View') %]
+    </a>
+  </li>
+  <li ng-class="{disabled : !record_id, active : record_tab == 'marc_edit'}">
+    <a ng-click="set_record_tab('marc_edit')" >
+        [% l('MARC Edit') %]
+    </a>
+  </li>
+  <li ng-class="{disabled : !record_id, active : record_tab == 'marc_html'}">
+    <a ng-click="set_record_tab('marc_html')" >
+        [% l('MARC View') %]
+    </a>
+  </li>
+  <li ng-class="{disabled : !record_id, active : record_tab == 'holds'}">
+    <a ng-click="set_record_tab('holds')" >
+        [% l('View Holds') %]
+    </a>
+  </li>
+</ul>
+
+<div class="tab-content">
+  <div class="tab-pane active">
+
 <div class="row col-md-12">
   <!-- ng-show allows the catalog iframe to stay loaded (unlike ng-if) -->
   <div ng-show="record_tab == 'catalog'">
-    <eg-embed-frame frame="opac_iframe" url="catalog_url" handlers="handlers" onchange="handle_page"></eg-embed-frame>
+    <eg-embed-frame save-space="300" frame="opac_iframe" url="catalog_url" handlers="handlers" onchange="handle_page"></eg-embed-frame>
   </div>
   <div ng-show="record_tab == 'marc_edit'">
     <eg-marc-edit-record dirty-flag="stop_unload" record-id="record_id"/>
@@ -74,3 +72,5 @@
   </div>
 </div>
 
+  </div>
+</div>

diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
index 3095b7d..c88663f 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
@@ -19,6 +19,10 @@
 
     <eg-grid-menu-item handler="detail_view" 
       label="[% l('Detail View') %]"></eg-grid-menu-item>
+    <eg-grid-menu-item handler="mark_hold_transfer_dest" 
+      label="[% l('Mark as Title Hold Transfer Destination') %]"></eg-grid-menu-item>
+    <eg-grid-menu-item handler="transfer_holds_to_marked" 
+      label="[% l('Transfer All Title Holds') %]"></eg-grid-menu-item>
 
     <eg-grid-action handler="grid_actions.show_recent_circs" group="[% l('Copy') %]"
       label="[% l('Show Last Few Circulations') %]"></eg-grid-action>

diff --git a/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2 b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
index 7ce48d2..6a8a6b3 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
@@ -1,22 +1,22 @@
-<div class="strong-text-2 container">
-  <div class="row">
-    <div class="col-md-2">[% l('Record Summary') %]</div>
-    <div class="col-md-1">
+<div class="strong-text-2">
+  <div class="flex-row" style="justify-content: space-between">
+    <div class="flex-cell">[% l('Record Summary') %]</div>
+    <div ng-if="!noMarcLink" class="flex-cell">
       <a target="_self" 
         href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.id()}}/marc_html">
         (MARC)
       </a>
     </div>
-    <div class="col-md-8">
+    <div class="flex-3">
       <!-- padding -->
     </div>
-    <div class="col-md-1">
-      <a href ng-click="toggle_expand_summary()"
+    <div class="flex-cell">
+      <a class="pull-right" href ng-click="toggle_expand_summary()"
         title="[% l('Collapse Record Summary Display') %]"
         ng-hide="collapse_summary()">
         <span class="glyphicon glyphicon-resize-small"></span>
       </a>
-      <a href ng-click="toggle_expand_summary()"
+      <a class="pull-right" href ng-click="toggle_expand_summary()"
         title="[% l('Expand Record Summary Display') %]"
         ng-show="collapse_summary()">
         <span class="glyphicon glyphicon-resize-full"></span>

diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2
index 300668c..5485655 100644 (file)
--- a/Open-ILS/src/templates/staff/css/style.css.tt2
+++ b/Open-ILS/src/templates/staff/css/style.css.tt2
@@ -395,6 +395,12 @@ table.list tr.selected td { /* deprecated? */
 .flex-2 { /* meh, convience */
   flex: 2;
 }
+.flex-3 { /* meh, convience */
+  flex: 3;
+}
+.flex-4 { /* meh, convience */
+  flex: 4;
+}
 
 /* TODO: match media size to Bootstrap "md" col resizing */
 @media all and (max-width: 800px) {

diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/record.js b/Open-ILS/web/js/ui/default/staff/cat/services/record.js
index 19e86ad..6f79a70 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/cat/services/record.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/record.js
@@ -70,7 +70,8 @@ angular.module('egCoreMod')
         restrict : 'AE',
         scope : {
             recordId : '=',
-            record : '='
+            record : '=',
+            noMarcLink : '@'
         },
         templateUrl : './cat/share/t_record_summary',
         controller :