ff : staff web UI repairs

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/staff/fulfillment/index.tt2 b/Open-ILS/src/templates/staff/fulfillment/index.tt2
index 2d022de..67bfd89 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/index.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/index.tt2
@@ -101,5 +101,5 @@
     </div>
   </body>
   [% INCLUDE "staff/t_base_js.tt2" %]
-  <script src="fulfillment/app.js"></script>
+  <script src="[% ctx.media_prefix %]/js/ui/default/staff/fulfillment/app.js"></script>
 </html>

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_circulating.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_circulating.tt2
index 8561ec6..9728e8f 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_circulating.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_circulating.tt2
@@ -12,11 +12,11 @@
       </ul>
     </div>
     <div class="col-lg-6 text-right">
-      <div ng-include="'./fulfillment/actions'"></div>
+      <div ng-include="'./fulfillment/t_actions'"></div>
     </div>
   </div>
 
   <br/>
 
-  <div ng-include="'./fulfillment/item_table'"></div>
+  <div ng-include="'./fulfillment/t_item_table'"></div>
 </div>

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_ill.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_ill.tt2
index a7e3cd4..bd60714 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_ill.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_ill.tt2
@@ -13,27 +13,27 @@
 <div class="tab-content">
   <div class="tab-pane" ng-class="{active : tab_pending}">
     <div ng-if="tab_pending">
-      <div ng-include="'./fulfillment/pending'"></div>
+      <div ng-include="'./fulfillment/t_pending'"></div>
     </div>
   </div>
   <div class="tab-pane" ng-class="{active : tab_inbound}">
     <div ng-if="tab_inbound">
-      <div ng-include="'./fulfillment/inbound'"></div>
+      <div ng-include="'./fulfillment/t_inbound'"></div>
     </div>
   </div>
   <div class="tab-pane" ng-class="{active : tab_outbound}">
     <div ng-if="tab_outbound">
-      <div ng-include="'./fulfillment/outbound'"></div>
+      <div ng-include="'./fulfillment/t_outbound'"></div>
     </div>
   </div>
   <div class="tab-pane" ng-class="{active : tab_circulating}">
     <div ng-if="tab_circulating">
-      <div ng-include="'./fulfillment/circulating'"></div>
+      <div ng-include="'./fulfillment/t_circulating'"></div>
     </div>
   </div>
   <div class="tab-pane" ng-class="{active : tab_status}">
     <div ng-if="tab_status">
-      <div ng-include="'./fulfillment/status'"></div>
+      <div ng-include="'./fulfillment/t_status'"></div>
     </div>
   </div>
 </div>

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_inbound.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_inbound.tt2
index dd11503..5f59793 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_inbound.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_inbound.tt2
@@ -13,11 +13,11 @@
       </ul>
     </div>
     <div class="col-lg-6 text-right">
-      <div ng-include="'./fulfillment/actions'"></div>
+      <div ng-include="'./fulfillment/t_actions'"></div>
     </div>
   </div>
 
   <br/>
 
-  <div ng-include="'./fulfillment/item_table'"></div>
+  <div ng-include="'./fulfillment/t_item_table'"></div>
 </div>

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_outbound.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_outbound.tt2
index 564bdbf..d9f6547 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_outbound.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_outbound.tt2
@@ -12,11 +12,11 @@
       </ul>
     </div>
     <div class="col-lg-6 text-right">
-      <div ng-include="'./fulfillment/actions'"></div>
+      <div ng-include="'./fulfillment/t_actions'"></div>
     </div>
   </div>
 
   <br/>
 
-  <div ng-include="'./fulfillment/item_table'"></div>
+  <div ng-include="'./fulfillment/t_item_table'"></div>
 </div>

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
index cac9945..f079322 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
@@ -15,7 +15,7 @@
     </div>
 
     <div class="col-lg-6 text-right">
-      <div ng-include="'./fulfillment/actions'"></div>
+      <div ng-include="'./fulfillment/t_actions'"></div>
     </div>
   </div>
 

diff --git a/Open-ILS/web/js/ui/default/staff/fulfillment/app.js b/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
index 6759ce2..8c84300 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
+++ b/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
@@ -8,9 +8,7 @@
  */
 
 
-angular.module('ffMain', 
-['ngRoute', 'egNetMod', 'egAuthMod', 'egStartupMod', 
-  'egUserMod', 'egUiMod', 'egFlattenerMod', 'egPCRUDMod', 'egOrgMod'])
+angular.module('ffMain', ['ngRoute', 'egCoreMod', 'egUiMod'])
 
 .config(function($routeProvider, $locationProvider) {
 
@@ -19,15 +17,16 @@ angular.module('ffMain',
     var resolver = {delay : function(egStartup) {return egStartup.go()}};
 
     // record management UI
-    $routeProvider.when('/fulfillment/records', {
-        templateUrl: './fulfillment/records',
+    /*$routeProvider.when('/fulfillment/records', {
+        templateUrl: './fulfillment/t_records',
         controller: 'ILLCtrl',
         resolve : resolver
     });
+    */
     
     // Default to ILL management tabs
     $routeProvider.when('/fulfillment/status/:barcode', {
-        templateUrl: './fulfillment/ill',
+        templateUrl: './fulfillment/t_ill',
         controller: 'ILLCtrl',
         resolve : resolver
     });
@@ -35,7 +34,7 @@ angular.module('ffMain',
 
     // Default to ILL management tabs
     $routeProvider.otherwise({
-        templateUrl: './fulfillment/ill',
+        templateUrl: './fulfillment/t_ill',
         controller: 'ILLCtrl',
         resolve : resolver
     });
@@ -79,7 +78,8 @@ function($rootScope, egOrg, egAuth) {
  * Top-level page controller.  Handles global components, like the org 
  * selector.
  */
-.controller('FFMainCtrl', ['$scope', '$route', 'egStartup', 'ffService', 'egAuth',
+.controller('FFMainCtrl', 
+['$scope', '$route', 'egStartup', 'ffService', 'egAuth',
 function ($scope, $route, egStartup, ffService, egAuth) {
 
     // run after startup so we can guarantee access to org units