From: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Date: Tue, 21 Jun 2011 16:43:52 +0000 (-0400)
Subject: moving stuff where it goes
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ade9dc1af909b8a31e98b1c6df2a63af3b4aeba8;p=Evergreen.git

moving stuff where it goes
---

diff --git a/Open-ILS/web/templates/default/authority/control_set.tt2 b/Open-ILS/web/templates/default/authority/control_set.tt2
deleted file mode 100644
index 3c408da6b7..0000000000
--- a/Open-ILS/web/templates/default/authority/control_set.tt2
+++ /dev/null
@@ -1,85 +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="acs_grid.showCreateDialog()">New Control Set</button>
-            <button dojoType="dijit.form.Button" onClick="acs_grid.deleteSelected()">Delete Selected</button>
-        </div>
-    </div>
-    <div>
-    <table  jsId="acs_grid"
-            dojoType="openils.widget.AutoGrid"
-            autoHeight="true"
-            defaultCellWidth="'auto'"
-            fieldOrder="['name','description','id']"
-            suppressEditFields="['id']"
-            query="{id: '*'}"
-            fmClass="acs"
-            editOnEnter="true">
-            <thead>
-                <tr>
-                    <th name="Other properties"
-                        field="id" formatter="format_acs_id"></th>
-                </tr>
-            </thead>
-    </table>
-</div>
-
-<script type="text/javascript">
-    dojo.require("openils.widget.AutoGrid");
-    dojo.requireLocalization('openils.authority', 'authority');
-    var localeStrings =
-        dojo.i18n.getLocalization('openils.authority', 'authority');
-    var acs_cache = {};
-
-    function format_acs_id(id) {
-        if (id) {
-            var tlen = acs_cache[id].thesauri() ?
-                acs_cache[id].thesauri().length : 0;
-            var alen = acs_cache[id].authority_fields() ?
-                acs_cache[id].authority_fields().length : 0;
-
-            return "<a href='" + oilsBasePath +
-                "/conify/global/authority/thesaurus?id=" + id + "'>" +
-                dojo.string.substitute(localeStrings.THESAURI, [tlen]) +
-                "</a> &nbsp;" + " <a href='" + oilsBasePath +
-                "/conify/global/authority/control_set_authority_field?id=" +
-                id + "'>" +
-                dojo.string.substitute(localeStrings.AUTHORITY_FIELDS, [alen]) +
-                "</a>";
-        }
-    }
-
-    function acs_grid_loader() {
-        acs_cache = {};
-        acs_grid.resetStore();
-        acs_grid.showLoadProgressIndicator();
-        fieldmapper.standardRequest(
-            ["open-ils.cat", "open-ils.cat.authority.control_set.retrieve"], {
-                "async": true,
-                "params": [acs_grid.displayLimit, acs_grid.displayOffset],
-                "onresponse": function(r) {
-                    if (r = openils.Util.readResponse(r)) {
-                        acs_cache[r.id()] = r;
-                        acs_grid.store.newItem(r.toStoreItem());
-                    }
-                },
-                "oncomplete": function() {
-                    acs_grid.hideLoadProgressIndicator();
-                }
-            }
-        );
-    }
-
-    openils.Util.addOnLoad(
-        function() {
-            acs_grid.onPostCreate = function(obj) {acs_cache[obj.id()] = obj;};
-            acs_grid.dataLoader = acs_grid_loader;
-            acs_grid_loader();
-            //acs_grid.loadAll({order_by:{acs : "name"}}, {"id": {"!=": null}});
-        }
-    );
-</script>
-[% END %]
diff --git a/Open-ILS/web/templates/default/cat/authority/control_set.tt2 b/Open-ILS/web/templates/default/cat/authority/control_set.tt2
new file mode 100644
index 0000000000..095578d69b
--- /dev/null
+++ b/Open-ILS/web/templates/default/cat/authority/control_set.tt2
@@ -0,0 +1,84 @@
+[% 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="acs_grid.showCreateDialog()">New Control Set</button>
+            <button dojoType="dijit.form.Button" onClick="acs_grid.deleteSelected()">Delete Selected</button>
+        </div>
+    </div>
+    <div>
+    <table  jsId="acs_grid"
+            dojoType="openils.widget.AutoGrid"
+            autoHeight="true"
+            defaultCellWidth="'auto'"
+            fieldOrder="['name','description','id']"
+            suppressEditFields="['id']"
+            query="{id: '*'}"
+            fmClass="acs"
+            editOnEnter="true">
+            <thead>
+                <tr>
+                    <th name="Other properties"
+                        field="id" formatter="format_acs_id"></th>
+                </tr>
+            </thead>
+    </table>
+</div>
+
+<script type="text/javascript">
+    dojo.require("openils.widget.AutoGrid");
+    dojo.requireLocalization("openils.authority", "authority");
+    var localeStrings =
+        dojo.i18n.getLocalization("openils.authority", "authority");
+    var acs_cache = {};
+
+    function format_acs_id(id) {
+        if (id) {
+            var tlen = acs_cache[id].thesauri() ?
+                acs_cache[id].thesauri().length : 0;
+            var alen = acs_cache[id].authority_fields() ?
+                acs_cache[id].authority_fields().length : 0;
+
+            return "<a href='" + oilsBasePath +
+                "/conify/global/authority/thesaurus?id=" + id + "'>" +
+                dojo.string.substitute(localeStrings.THESAURI, [tlen]) +
+                "</a> &nbsp;" + " <a href='" + oilsBasePath +
+                "/conify/global/authority/control_set_authority_field?id=" +
+                id + "'>" +
+                dojo.string.substitute(localeStrings.AUTHORITY_FIELDS, [alen]) +
+                "</a>";
+        }
+    }
+
+    function acs_grid_loader() {
+        acs_cache = {};
+        acs_grid.resetStore();
+        acs_grid.showLoadProgressIndicator();
+        fieldmapper.standardRequest(
+            ["open-ils.cat", "open-ils.cat.authority.control_set.retrieve"], {
+                "async": true,
+                "params": [acs_grid.displayLimit, acs_grid.displayOffset],
+                "onresponse": function(r) {
+                    if (r = openils.Util.readResponse(r)) {
+                        acs_cache[r.id()] = r;
+                        acs_grid.store.newItem(r.toStoreItem());
+                    }
+                },
+                "oncomplete": function() {
+                    acs_grid.hideLoadProgressIndicator();
+                }
+            }
+        );
+    }
+
+    openils.Util.addOnLoad(
+        function() {
+            acs_grid.onPostCreate = function(obj) {acs_cache[obj.id()] = obj;};
+            acs_grid.dataLoader = acs_grid_loader;
+            acs_grid_loader();
+        }
+    );
+</script>
+[% END %]
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 3caf9d61b5..728c7d54f3 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -961,7 +961,7 @@ main.menu.prototype = {
             ],
             'cmd_server_admin_authority_control_set': [
                 ['oncommand'],
-                function(event) { open_eg_web_page('authority/control_set', null, event); }
+                function(event) { open_eg_web_page('cat/authority/control_set', null, event); }
             ],
             'cmd_server_admin_booking_resource': [
                 ['oncommand'],