[open-ils-commits] [GIT] Evergreen ILS branch master updated. bb05739a8d277d7cab1d99fc6027d549f26caa8c

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  bb05739a8d277d7cab1d99fc6027d549f26caa8c (commit)
       via  ae0e16afa8867140bd2dd386111994fa1af96f71 (commit)
      from  0eba8e8b68bf214a065bf2e14e84dd7b4893ecee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bb05739a8d277d7cab1d99fc6027d549f26caa8c
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Mon Jul 24 18:11:41 2017 -0400

    LP#1670448: Rearrange space for bib record action buttons
    
    The addition of the view/place order button pushed other action buttons to a
    2nd row. We also need to make room for the forthcoming serials button. This
    commit 1) changes the div classes for the navigation buttons and action buttons
    so that it is now a 50/50 split of screen space and 2) moves some action items
    into a 'Other Actions' menu.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

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 a2b3a5b..51357fa 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -4,7 +4,7 @@
 </div>
 
 <div ng-show="record_id" class="row col-md-12 pad-vert">
-  <div class="col-md-8">
+  <div class="col-md-6">
     <button type="button" ng-disabled="from_route" class="btn btn-default" ng-click="opac_call('rdetailStart')">
        [% l('Start') %]
     </button>
@@ -21,16 +21,11 @@
        [% l('Back To Results') %] ( {{ search_result_index }} / {{ search_result_hit_count }} )
     </button>
   </div>
-  <div class="col-md-4">
+  <div class="col-md-6">
+    <div class="pull-right">
     <button type="button" class="btn btn-default" ng-click="selectedHoldingsVolCopyAdd()">
         [% l('Add Volumes') %]
     </button>
-    <button type="button" class="btn btn-default" ng-click="add_to_record_bucket()">
-        [% l('Add To Bucket') %]
-    </button>
-    <button type="button" class="btn btn-default" ng-click="view_place_orders()">
-        [% l('View/Place Orders') %]
-    </button>
     <div class="btn-group" uib-dropdown dropdown-append-to-body>
         <button id="mark-for-button" type="button" class="btn btn-default" uib-dropdown-toggle>
             [% l('Mark for:') %] <span class="caret"></span>
@@ -65,6 +60,24 @@
             </li>
         </ul>
     </div>
+        <div class="btn-group" uib-dropdown dropdown-append-to-body>
+        <button id="other-actions-button" type="button" class="btn btn-default" uib-dropdown-toggle>
+            [% l('Other Actions:') %] <span class="caret"></span>
+        </button>
+        <ul uib-dropdown-menu role="menu" aria-labelledby="other-actions-button">
+             <li role="menuitem">
+                    <a ng-click="add_to_record_bucket()">
+                        [% l('Add To Bucket') %]
+                    </a>
+            </li>
+            <li role="menuitem">
+                   <a ng-click="view_place_orders()">
+                        [% l('View/Place Orders') %]
+                   </a>
+            </li>
+        </ul>
+        </div>
+    </div>
   </div>
 </div>
 

commit ae0e16afa8867140bd2dd386111994fa1af96f71
Author: Christine Morgan <cmorgan at noblenet.org>
Date:   Mon Jul 3 16:08:11 2017 -0400

    LP1670448 - Move View/Place Orders to Record Summary
    
    Removes View/Place Orders option from menu in Holdings View and adds a View/Place Orders button to Record Summary
    
    Signed-off-by: Christine Morgan <cmorgan at noblenet.org>
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.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 0848890..a2b3a5b 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -28,6 +28,9 @@
     <button type="button" class="btn btn-default" ng-click="add_to_record_bucket()">
         [% l('Add To Bucket') %]
     </button>
+    <button type="button" class="btn btn-default" ng-click="view_place_orders()">
+        [% l('View/Place Orders') %]
+    </button>
     <div class="btn-group" uib-dropdown dropdown-append-to-body>
         <button id="mark-for-button" type="button" class="btn btn-default" uib-dropdown-toggle>
             [% l('Mark for:') %] <span class="caret"></span>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
index c7247c7..c4ca14b 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
@@ -42,8 +42,6 @@
       label="[% l('Book Item Now') %]"></eg-grid-action>
     <eg-grid-action handler="requestItems"
       label="[% l('Request Items') %]"></eg-grid-action>
-    <eg-grid-action handler="view_place_orders"
-      label="[% l('View/Place Orders') %]"></eg-grid-action>
     <eg-grid-action handler="attach_to_peer_bib"
       label="[% l('Link as Conjoined to Previously Marked Bib Record') %]"></eg-grid-action>
     <eg-grid-action handler="markLibAsVolTarget"

-----------------------------------------------------------------------

Summary of changes:
 .../src/templates/staff/cat/catalog/t_catalog.tt2  |   26 ++++++++++++++++----
 .../src/templates/staff/cat/catalog/t_holdings.tt2 |    2 -
 2 files changed, 21 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Evergreen ILS