From 3f25148c622b14ad022de5b1920e44ed1e5063f8 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 12 May 2014 11:26:32 -0400 Subject: [PATCH] file / directory name improvements and cleanup * remove t_ prefix from TT-loaded template files (not needed). * rename "parts" to "share", which better describes the contents * remove deprecated column_picker template Signed-off-by: Bill Erickson --- .../templates/staff/admin/workstation/index.tt2 | 2 +- .../src/templates/staff/{t_base.tt2 => base.tt2} | 6 +-- .../templates/staff/{t_base_js.tt2 => base_js.tt2} | 0 .../templates/staff/cat/bucket/record/index.tt2 | 2 +- .../src/templates/staff/circ/checkin/index.tt2 | 2 +- Open-ILS/src/templates/staff/circ/patron/index.tt2 | 2 +- Open-ILS/src/templates/staff/index.tt2 | 2 +- .../templates/staff/{t_navbar.tt2 => navbar.tt2} | 0 .../src/templates/staff/parts/column_picker.tt2 | 43 ---------------------- Open-ILS/src/templates/staff/share/README | 5 +++ .../staff/{parts => share}/t_alert_dialog.tt2 | 0 .../staff/{parts => share}/t_autogrid.tt2 | 0 .../staff/{parts => share}/t_confirm_dialog.tt2 | 0 .../src/templates/staff/{parts => }/statusbar.tt2 | 0 Open-ILS/web/js/ui/default/staff/services/grid.js | 2 +- Open-ILS/web/js/ui/default/staff/services/ui.js | 4 +- 16 files changed, 16 insertions(+), 54 deletions(-) rename Open-ILS/src/templates/staff/{t_base.tt2 => base.tt2} (93%) rename Open-ILS/src/templates/staff/{t_base_js.tt2 => base_js.tt2} (100%) rename Open-ILS/src/templates/staff/{t_navbar.tt2 => navbar.tt2} (100%) delete mode 100644 Open-ILS/src/templates/staff/parts/column_picker.tt2 create mode 100644 Open-ILS/src/templates/staff/share/README rename Open-ILS/src/templates/staff/{parts => share}/t_alert_dialog.tt2 (100%) rename Open-ILS/src/templates/staff/{parts => share}/t_autogrid.tt2 (100%) rename Open-ILS/src/templates/staff/{parts => share}/t_confirm_dialog.tt2 (100%) rename Open-ILS/src/templates/staff/{parts => }/statusbar.tt2 (100%) diff --git a/Open-ILS/src/templates/staff/admin/workstation/index.tt2 b/Open-ILS/src/templates/staff/admin/workstation/index.tt2 index daf08b774a..2d955ec4ee 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/index.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/index.tt2 @@ -1,5 +1,5 @@ [% - WRAPPER "staff/t_base.tt2"; + WRAPPER "staff/base.tt2"; ctx.page_title = l("Workstation Administration"); ctx.page_app = "egWorkstationAdmin"; %] diff --git a/Open-ILS/src/templates/staff/t_base.tt2 b/Open-ILS/src/templates/staff/base.tt2 similarity index 93% rename from Open-ILS/src/templates/staff/t_base.tt2 rename to Open-ILS/src/templates/staff/base.tt2 index c9a8d95eb2..5a361b2697 100644 --- a/Open-ILS/src/templates/staff/t_base.tt2 +++ b/Open-ILS/src/templates/staff/base.tt2 @@ -26,7 +26,7 @@ @@ -34,10 +34,10 @@
[% content %]
[% # status bar along bottom of page - INCLUDE "staff/parts/statusbar.tt2"; + INCLUDE "staff/statusbar.tt2"; # script imports - INCLUDE "staff/t_base_js.tt2"; + INCLUDE "staff/base_js.tt2"; # App-specific JS load commands go into an APP_JS block. PROCESS APP_JS; diff --git a/Open-ILS/src/templates/staff/t_base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2 similarity index 100% rename from Open-ILS/src/templates/staff/t_base_js.tt2 rename to Open-ILS/src/templates/staff/base_js.tt2 diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/index.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/index.tt2 index f92c4aa3b1..2f21e7258c 100644 --- a/Open-ILS/src/templates/staff/cat/bucket/record/index.tt2 +++ b/Open-ILS/src/templates/staff/cat/bucket/record/index.tt2 @@ -1,5 +1,5 @@ [% - WRAPPER "staff/t_base.tt2"; + WRAPPER "staff/base.tt2"; ctx.page_title = l("Record Buckets"); ctx.page_app = "egCatRecordBuckets"; ctx.page_ctrl = "RecordBucketCtrl"; diff --git a/Open-ILS/src/templates/staff/circ/checkin/index.tt2 b/Open-ILS/src/templates/staff/circ/checkin/index.tt2 index ef7d5a37bb..ea5d58c4ac 100644 --- a/Open-ILS/src/templates/staff/circ/checkin/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/checkin/index.tt2 @@ -1,5 +1,5 @@ [% - WRAPPER "staff/t_base.tt2"; + WRAPPER "staff/base.tt2"; ctx.page_title = l("Check In"); ctx.page_app = "egCheckinApp"; ctx.page_ctrl = "CheckinCtrl"; diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2 index 551b07d56a..f3f80cae4a 100644 --- a/Open-ILS/src/templates/staff/circ/patron/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2 @@ -1,5 +1,5 @@ [% - WRAPPER "staff/t_base.tt2"; + WRAPPER "staff/base.tt2"; ctx.page_title = l("Patron"); ctx.page_app = "egPatronApp"; ctx.page_ctrl = "PatronCtrl"; diff --git a/Open-ILS/src/templates/staff/index.tt2 b/Open-ILS/src/templates/staff/index.tt2 index 478ff2f755..b2e25f8782 100644 --- a/Open-ILS/src/templates/staff/index.tt2 +++ b/Open-ILS/src/templates/staff/index.tt2 @@ -1,5 +1,5 @@ [% - WRAPPER "staff/t_base.tt2"; + WRAPPER "staff/base.tt2"; ctx.page_title = l("Home"); ctx.page_app = "egHome"; %] diff --git a/Open-ILS/src/templates/staff/t_navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2 similarity index 100% rename from Open-ILS/src/templates/staff/t_navbar.tt2 rename to Open-ILS/src/templates/staff/navbar.tt2 diff --git a/Open-ILS/src/templates/staff/parts/column_picker.tt2 b/Open-ILS/src/templates/staff/parts/column_picker.tt2 deleted file mode 100644 index 49bd38e0a6..0000000000 --- a/Open-ILS/src/templates/staff/parts/column_picker.tt2 +++ /dev/null @@ -1,43 +0,0 @@ - -[%# -Must be wrapped in a btn-group/text-left div for correct display. -It's not done here since the caller may wish to add other buttons/ -dropdowns, etc. to the btn-group - -
- [ INCLUDE 'staff/parts/column_picker.tt2' listname=somelist ] -
-%] - -
- - -
- diff --git a/Open-ILS/src/templates/staff/share/README b/Open-ILS/src/templates/staff/share/README new file mode 100644 index 0000000000..bcbddf563f --- /dev/null +++ b/Open-ILS/src/templates/staff/share/README @@ -0,0 +1,5 @@ +Location for globally shared template files. These are generally used +by AngularJS directives. + +App-specific shared templates should live within the application's +directory. diff --git a/Open-ILS/src/templates/staff/parts/t_alert_dialog.tt2 b/Open-ILS/src/templates/staff/share/t_alert_dialog.tt2 similarity index 100% rename from Open-ILS/src/templates/staff/parts/t_alert_dialog.tt2 rename to Open-ILS/src/templates/staff/share/t_alert_dialog.tt2 diff --git a/Open-ILS/src/templates/staff/parts/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2 similarity index 100% rename from Open-ILS/src/templates/staff/parts/t_autogrid.tt2 rename to Open-ILS/src/templates/staff/share/t_autogrid.tt2 diff --git a/Open-ILS/src/templates/staff/parts/t_confirm_dialog.tt2 b/Open-ILS/src/templates/staff/share/t_confirm_dialog.tt2 similarity index 100% rename from Open-ILS/src/templates/staff/parts/t_confirm_dialog.tt2 rename to Open-ILS/src/templates/staff/share/t_confirm_dialog.tt2 diff --git a/Open-ILS/src/templates/staff/parts/statusbar.tt2 b/Open-ILS/src/templates/staff/statusbar.tt2 similarity index 100% rename from Open-ILS/src/templates/staff/parts/statusbar.tt2 rename to Open-ILS/src/templates/staff/statusbar.tt2 diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js index dad5239643..360ac91efe 100644 --- a/Open-ILS/web/js/ui/default/staff/services/grid.js +++ b/Open-ILS/web/js/ui/default/staff/services/grid.js @@ -69,7 +69,7 @@ angular.module('egGridMod', }, // TODO: avoid hard-coded url - templateUrl : '/eg/staff/parts/t_autogrid', + templateUrl : '/eg/staff/share/t_autogrid', link : function(scope, element, attrs) { // link() is called after page compilation, which means our diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js index f76f1cbf47..8605e26eea 100644 --- a/Open-ILS/web/js/ui/default/staff/services/ui.js +++ b/Open-ILS/web/js/ui/default/staff/services/ui.js @@ -91,7 +91,7 @@ function($modal , $interpolate) { service.open = function(message, msg_scope) { return $modal.open({ - templateUrl: './parts/t_alert_dialog', + templateUrl: './share/t_alert_dialog', controller: ['$scope', '$modalInstance', function($scope, $modalInstance) { $scope.message = $interpolate(message)(msg_scope); @@ -119,7 +119,7 @@ function($modal, $interpolate) { service.open = function(title, message, msg_scope) { return $modal.open({ - templateUrl: './parts/t_confirm_dialog', + templateUrl: './share/t_confirm_dialog', controller: ['$scope', '$modalInstance', function($scope, $modalInstance) { $scope.title = $interpolate(title)(msg_scope); -- 2.11.0