From e881cbb4731884f5eb7572a43a8ff7cda5de6f0f Mon Sep 17 00:00:00 2001
From: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Date: Wed, 22 Jun 2011 16:49:35 -0400
Subject: [PATCH] Move the authority control set config interfaces back into
 conify

Really, that's where they make sense.  And they're done.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
---
 .../{ => conify/global}/cat/authority/common.js    |  6 ++--
 .../global/authority/authority_field.tt2.old       | 40 ----------------------
 .../conify/global/authority/bib_field.tt2.old      | 40 ----------------------
 .../conify/global/authority/control_set.tt2.old    | 34 ------------------
 .../conify/global/authority/thesaurus.tt2.old      | 38 --------------------
 .../global}/cat/authority/browse_axis.tt2          |  0
 .../authority/browse_axis_authority_field_map.tt2  |  2 +-
 .../global}/cat/authority/control_set.tt2          |  4 +--
 .../cat/authority/control_set_authority_field.tt2  |  2 +-
 .../cat/authority/control_set_bib_field.tt2        |  2 +-
 .../global}/cat/authority/thesaurus.tt2            |  2 +-
 .../xul/staff_client/chrome/content/main/menu.js   |  4 +--
 12 files changed, 11 insertions(+), 163 deletions(-)
 rename Open-ILS/web/js/ui/default/{ => conify/global}/cat/authority/common.js (87%)
 delete mode 100644 Open-ILS/web/templates/default/conify/global/authority/authority_field.tt2.old
 delete mode 100644 Open-ILS/web/templates/default/conify/global/authority/bib_field.tt2.old
 delete mode 100644 Open-ILS/web/templates/default/conify/global/authority/control_set.tt2.old
 delete mode 100644 Open-ILS/web/templates/default/conify/global/authority/thesaurus.tt2.old
 rename Open-ILS/web/templates/default/{ => conify/global}/cat/authority/browse_axis.tt2 (100%)
 rename Open-ILS/web/templates/default/{ => conify/global}/cat/authority/browse_axis_authority_field_map.tt2 (96%)
 rename Open-ILS/web/templates/default/{ => conify/global}/cat/authority/control_set.tt2 (95%)
 rename Open-ILS/web/templates/default/{ => conify/global}/cat/authority/control_set_authority_field.tt2 (98%)
 rename Open-ILS/web/templates/default/{ => conify/global}/cat/authority/control_set_bib_field.tt2 (96%)
 rename Open-ILS/web/templates/default/{ => conify/global}/cat/authority/thesaurus.tt2 (95%)

diff --git a/Open-ILS/web/js/ui/default/cat/authority/common.js b/Open-ILS/web/js/ui/default/conify/global/cat/authority/common.js
similarity index 87%
rename from Open-ILS/web/js/ui/default/cat/authority/common.js
rename to Open-ILS/web/js/ui/default/conify/global/cat/authority/common.js
index bb30b4800f..13fdfdbdf4 100644
--- a/Open-ILS/web/js/ui/default/cat/authority/common.js
+++ b/Open-ILS/web/js/ui/default/conify/global/cat/authority/common.js
@@ -1,8 +1,8 @@
 /* To be used by interfaces for editing child tables of acs. */
 function render_control_set_metadata(control_set) {
     var anchor = dojo.byId("control-set-metadata");
-    anchor.href = oilsBasePath + "/cat/authority/control_set?focus=" +
-        control_set.id();
+    anchor.href = oilsBasePath +
+        "/conify/global/cat/authority/control_set?focus=" + control_set.id();
     anchor.innerHTML = dojo.string.substitute(
         localeStrings.CONTROL_SET_METADATA, [
             control_set.id(), control_set.name(), control_set.description()
@@ -19,7 +19,7 @@ function render_control_set_metadata(control_set) {
 function render_authority_field_metadata(authority_field, control_set_id) {
     var anchor = dojo.byId("authority-field-metadata");
     var href = oilsBasePath +
-        "/cat/authority/control_set_authority_field?focus=" +
+        "/conify/global/cat/authority/control_set_authority_field?focus=" +
         authority_field.id();
     if (control_set_id) href += "&acs=" + control_set_id;
 
diff --git a/Open-ILS/web/templates/default/conify/global/authority/authority_field.tt2.old b/Open-ILS/web/templates/default/conify/global/authority/authority_field.tt2.old
deleted file mode 100644
index 2ae8cc8a24..0000000000
--- a/Open-ILS/web/templates/default/conify/global/authority/authority_field.tt2.old
+++ /dev/null
@@ -1,40 +0,0 @@
-[% WRAPPER default/base.tt2 %]
-[% ctx.page_title = 'Configure Control Set Authority Fields' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
-        <div>Thesauri</div>
-        <div>
-            <button dojoType='dijit.form.Button' onClick='acsafGrid.showCreateDialog()'>New Control Set Authority Field</button>
-            <button dojoType='dijit.form.Button' onClick='acsafGrid.deleteSelected()'>Delete Selected</button>
-        </div>
-    </div>
-    <div>
-    <table  jsId="acsafGrid"
-            dojoType="openils.widget.AutoGrid"
-            autoHeight='true'
-            fieldOrder="['control_set','name','tag','sf_list','description','main_entry']"
-            suppressFields="['id']"
-            suppressEditFields="['id']"
-            query="{id: '*'}"
-            fmClass='acsaf'
-            editOnEnter='true'/>
-</div>
-
-<script type="text/javascript">
-    dojo.require("openils.widget.PCrudAutocompleteBox");
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            acsafGrid.overrideEditWidgets.control_set =
-                new openils.widget.PCrudAutocompleteBox({
-                    "fmclass": "acs", "searchAttr": "name"
-                });
-            acsafGrid.overrideEditWidgets.control_set.shove = {"create": ""};
-            acsafGrid.loadAll({order_by:{acsaf : 'name'}}, {"id": {"!=": null}});
-        }
-    );
-</script>
-[% END %]
-
-
diff --git a/Open-ILS/web/templates/default/conify/global/authority/bib_field.tt2.old b/Open-ILS/web/templates/default/conify/global/authority/bib_field.tt2.old
deleted file mode 100644
index 4023d73782..0000000000
--- a/Open-ILS/web/templates/default/conify/global/authority/bib_field.tt2.old
+++ /dev/null
@@ -1,40 +0,0 @@
-[% WRAPPER default/base.tt2 %]
-[% ctx.page_title = 'Configure Control Set Bibliographic Fields' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
-        <div>Thesauri</div>
-        <div>
-            <button dojoType='dijit.form.Button' onClick='acsbfGrid.showCreateDialog()'>New Control Set Bibliographic Field</button>
-            <button dojoType='dijit.form.Button' onClick='acsbfGrid.deleteSelected()'>Delete Selected</button>
-        </div>
-    </div>
-    <div>
-    <table  jsId="acsbfGrid"
-            dojoType="openils.widget.AutoGrid"
-            autoHeight='true'
-            fieldOrder="['tag','authority_field']"
-            suppressFields="['id']"
-            suppressEditFields="['id']"
-            query="{id: '*'}"
-            fmClass='acsbf'
-            editOnEnter='true'/>
-</div>
-
-<script type="text/javascript">
-    dojo.require("openils.widget.PCrudAutocompleteBox");
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            acsbfGrid.overrideEditWidgets.authority_field =
-                new openils.widget.PCrudAutocompleteBox({
-                    "fmclass": "acsaf", "searchAttr": "name"
-                });
-            acsbfGrid.overrideEditWidgets.authority_field.shove = {"create": ""};
-            acsbfGrid.loadAll({order_by:{acsbf : 'tag'}}, {"id": {"!=": null}});
-        }
-    );
-</script>
-[% END %]
-
-
diff --git a/Open-ILS/web/templates/default/conify/global/authority/control_set.tt2.old b/Open-ILS/web/templates/default/conify/global/authority/control_set.tt2.old
deleted file mode 100644
index c072d1c6c3..0000000000
--- a/Open-ILS/web/templates/default/conify/global/authority/control_set.tt2.old
+++ /dev/null
@@ -1,34 +0,0 @@
-[% WRAPPER default/base.tt2 %]
-[% ctx.page_title = 'Configure Authority Control Sets' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
-        <div>Control Sets</div>
-        <div>
-            <button dojoType='dijit.form.Button' onClick='ctlSetGrid.showCreateDialog()'>New Control Set</button>
-            <button dojoType='dijit.form.Button' onClick='ctlSetGrid.deleteSelected()'>Delete Selected</button>
-        </div>
-    </div>
-    <div>
-    <table  jsId="ctlSetGrid"
-            dojoType="openils.widget.AutoGrid"
-            autoHeight='true'
-            fieldOrder="['name','description']"
-            suppressFields="['id']"
-            suppressEditFields="['id']"
-            query="{id: '*'}"
-            fmClass='acs'
-            editOnEnter='true'/>
-</div>
-
-<script type="text/javascript">
-    dojo.require('openils.widget.AutoGrid');
-    openils.Util.addOnLoad(
-        function() {
-            ctlSetGrid.loadAll({order_by:{acs : 'name'}}, {"id": {"!=": null}});
-        }
-    );
-
-</script>
-[% END %]
-
-
diff --git a/Open-ILS/web/templates/default/conify/global/authority/thesaurus.tt2.old b/Open-ILS/web/templates/default/conify/global/authority/thesaurus.tt2.old
deleted file mode 100644
index 8061f924ae..0000000000
--- a/Open-ILS/web/templates/default/conify/global/authority/thesaurus.tt2.old
+++ /dev/null
@@ -1,38 +0,0 @@
-[% WRAPPER default/base.tt2 %]
-[% ctx.page_title = 'Configure Authority Thesaurus' %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
-        <div>Thesauri</div>
-        <div>
-            <button dojoType='dijit.form.Button' onClick='thesGrid.showCreateDialog()'>New Thesaurus</button>
-            <button dojoType='dijit.form.Button' onClick='thesGrid.deleteSelected()'>Delete Selected</button>
-        </div>
-    </div>
-    <div>
-    <table  jsId="thesGrid"
-            dojoType="openils.widget.AutoGrid"
-            autoHeight='true'
-            fieldOrder="['code','name','description','control_set]"
-            query="{code:'*'}"
-            fmClass='at'
-            editOnEnter='true'/>
-</div>
-
-<script type="text/javascript">
-    dojo.require("openils.widget.PCrudAutocompleteBox");
-    dojo.require('openils.widget.AutoGrid');
-
-    openils.Util.addOnLoad(
-        function() {
-            thesGrid.overrideEditWidgets.control_set =
-                new openils.widget.PCrudAutocompleteBox({
-                    "fmclass": "acs", "searchAttr": "name"
-                });
-            thesGrid.overrideEditWidgets.control_set.shove = {"create": ""};
-            thesGrid.loadAll({order_by:{at : 'name'}}, {"id": {"!=": null}});
-        }
-    );
-</script>
-[% END %]
-
-
diff --git a/Open-ILS/web/templates/default/cat/authority/browse_axis.tt2 b/Open-ILS/web/templates/default/conify/global/cat/authority/browse_axis.tt2
similarity index 100%
rename from Open-ILS/web/templates/default/cat/authority/browse_axis.tt2
rename to Open-ILS/web/templates/default/conify/global/cat/authority/browse_axis.tt2
diff --git a/Open-ILS/web/templates/default/cat/authority/browse_axis_authority_field_map.tt2 b/Open-ILS/web/templates/default/conify/global/cat/authority/browse_axis_authority_field_map.tt2
similarity index 96%
rename from Open-ILS/web/templates/default/cat/authority/browse_axis_authority_field_map.tt2
rename to Open-ILS/web/templates/default/conify/global/cat/authority/browse_axis_authority_field_map.tt2
index c12dfa87ae..8bb1af1c08 100644
--- a/Open-ILS/web/templates/default/cat/authority/browse_axis_authority_field_map.tt2
+++ b/Open-ILS/web/templates/default/conify/global/cat/authority/browse_axis_authority_field_map.tt2
@@ -26,7 +26,7 @@
     </div>
 </div>
 <script type="text/javascript"
-    src="[% ctx.media_prefix %]/js/ui/default/cat/authority/common.js"></script>
+    src="[% ctx.media_prefix %]/js/ui/default/conify/global/cat/authority/common.js"></script>
 <script type="text/javascript">
     dojo.require("openils.widget.AutoGrid");
     dojo.require("openils.CGI");
diff --git a/Open-ILS/web/templates/default/cat/authority/control_set.tt2 b/Open-ILS/web/templates/default/conify/global/cat/authority/control_set.tt2
similarity index 95%
rename from Open-ILS/web/templates/default/cat/authority/control_set.tt2
rename to Open-ILS/web/templates/default/conify/global/cat/authority/control_set.tt2
index 4d1e97d7ff..69ba1d2d66 100644
--- a/Open-ILS/web/templates/default/cat/authority/control_set.tt2
+++ b/Open-ILS/web/templates/default/conify/global/cat/authority/control_set.tt2
@@ -44,10 +44,10 @@
                 acs_cache[id].authority_fields().length : 0;
 
             return "<a href='" + oilsBasePath +
-                "/cat/authority/thesaurus?acs=" + id + "'>" +
+                "/conify/global/cat/authority/thesaurus?acs=" + id + "'>" +
                 dojo.string.substitute(localeStrings.THESAURI, [tlen]) +
                 "</a> &nbsp;" + " <a href='" + oilsBasePath +
-                "/cat/authority/control_set_authority_field?acs=" +
+                "/conify/global/cat/authority/control_set_authority_field?acs=" +
                 id + "'>" +
                 dojo.string.substitute(localeStrings.AUTHORITY_FIELDS, [alen]) +
                 "</a>";
diff --git a/Open-ILS/web/templates/default/cat/authority/control_set_authority_field.tt2 b/Open-ILS/web/templates/default/conify/global/cat/authority/control_set_authority_field.tt2
similarity index 98%
rename from Open-ILS/web/templates/default/cat/authority/control_set_authority_field.tt2
rename to Open-ILS/web/templates/default/conify/global/cat/authority/control_set_authority_field.tt2
index b4c88cf063..2f60bcc13a 100644
--- a/Open-ILS/web/templates/default/cat/authority/control_set_authority_field.tt2
+++ b/Open-ILS/web/templates/default/conify/global/cat/authority/control_set_authority_field.tt2
@@ -34,7 +34,7 @@
     </div>
 </div>
 <script type="text/javascript"
-    src="[% ctx.media_prefix %]/js/ui/default/cat/authority/common.js"></script>
+    src="[% ctx.media_prefix %]/js/ui/default/conify/global/cat/authority/common.js"></script>
 <script type="text/javascript">
     dojo.require("openils.widget.AutoGrid");
     dojo.require("openils.CGI");
diff --git a/Open-ILS/web/templates/default/cat/authority/control_set_bib_field.tt2 b/Open-ILS/web/templates/default/conify/global/cat/authority/control_set_bib_field.tt2
similarity index 96%
rename from Open-ILS/web/templates/default/cat/authority/control_set_bib_field.tt2
rename to Open-ILS/web/templates/default/conify/global/cat/authority/control_set_bib_field.tt2
index 6cca21b9ff..28b9916de0 100644
--- a/Open-ILS/web/templates/default/cat/authority/control_set_bib_field.tt2
+++ b/Open-ILS/web/templates/default/conify/global/cat/authority/control_set_bib_field.tt2
@@ -26,7 +26,7 @@
     </div>
 </div>
 <script type="text/javascript"
-    src="[% ctx.media_prefix %]/js/ui/default/cat/authority/common.js"></script>
+    src="[% ctx.media_prefix %]/js/ui/default/conify/global/cat/authority/common.js"></script>
 <script type="text/javascript">
     dojo.require("openils.widget.AutoGrid");
     dojo.require("openils.CGI");
diff --git a/Open-ILS/web/templates/default/cat/authority/thesaurus.tt2 b/Open-ILS/web/templates/default/conify/global/cat/authority/thesaurus.tt2
similarity index 95%
rename from Open-ILS/web/templates/default/cat/authority/thesaurus.tt2
rename to Open-ILS/web/templates/default/conify/global/cat/authority/thesaurus.tt2
index 5e4c2bde3c..b8f80f712d 100644
--- a/Open-ILS/web/templates/default/cat/authority/thesaurus.tt2
+++ b/Open-ILS/web/templates/default/conify/global/cat/authority/thesaurus.tt2
@@ -26,7 +26,7 @@
     </div>
 </div>
 <script type="text/javascript"
-    src="[% ctx.media_prefix %]/js/ui/default/cat/authority/common.js"></script>
+    src="[% ctx.media_prefix %]/js/ui/default/conify/global/cat/authority/common.js"></script>
 <script type="text/javascript">
     dojo.require("openils.widget.AutoGrid");
     dojo.require("openils.CGI");
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
index de70805516..e0e1453768 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -961,11 +961,11 @@ main.menu.prototype = {
             ],
             'cmd_server_admin_authority_control_set': [
                 ['oncommand'],
-                function(event) { open_eg_web_page('cat/authority/control_set', null, event); }
+                function(event) { open_eg_web_page('conify/global/cat/authority/control_set', null, event); }
             ],
             'cmd_server_admin_authority_browse_axis': [
                 ['oncommand'],
-                function(event) { open_eg_web_page('cat/authority/browse_axis', null, event); }
+                function(event) { open_eg_web_page('conify/global/cat/authority/browse_axis', null, event); }
             ],
             'cmd_server_admin_booking_resource': [
                 ['oncommand'],
-- 
2.11.0