create an embedded view of the vandelay match-set admin ui inside of vandelay (as...

diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
index 26d73c7..6ce390f 100644 (file)
--- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js
+++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
@@ -258,6 +258,10 @@ function displayGlobalDiv(id) {
     openils.Util.removeCSSClass(dojo.byId('vl-menu-queue-select'), 'toolbar_selected');
     openils.Util.removeCSSClass(dojo.byId('vl-menu-attr-editor'), 'toolbar_selected');
     openils.Util.removeCSSClass(dojo.byId('vl-menu-profile-editor'), 'toolbar_selected');
+    openils.Util.removeCSSClass(dojo.byId('vl-menu-match-set-editor'), 'toolbar_selected');
+
+    if(dojo.byId('vl-match-set-iframe'))
+        dojo.byId('vl-match-set-editor-div').removeChild(dojo.byId('vl-match-set-iframe'));
 
     switch(id) {
         case 'vl-marc-export-div':
@@ -278,6 +282,9 @@ function displayGlobalDiv(id) {
         case 'vl-item-attr-editor-div':
             openils.Util.addCSSClass(dojo.byId('vl-menu-import-item-attr-editor'), 'toolbar_selected');
             break;
+        case 'vl-match-set-editor-div':
+            openils.Util.addCSSClass(dojo.byId('vl-menu-match-set-editor'), 'toolbar_selected');
+            break;
     }
 }
 
@@ -1165,6 +1172,17 @@ function vlShowQueueSelect() {
     vlFleshQueueSelect(vlQueueSelectQueueList, vlQueueSelectType.getValue());
 }
 
+function vlShowMatchSetEditor() {
+    displayGlobalDiv('vl-match-set-editor-div');
+    dojo.byId('vl-match-set-editor-div').appendChild(
+        dojo.create('iframe', {
+            id : 'vl-match-set-iframe',
+            src : oilsBasePath + '/eg/conify/global/vandelay/match_set',
+            style : 'width:100%; height:500px; border:none; margin:0px;'
+        })
+    );
+}
+
 function vlFetchQueueFromForm() {
     currentType = vlQueueSelectType.getValue();
     currentQueueId = vlQueueSelectQueueList.getValue();
@@ -1321,7 +1339,6 @@ function onAttrEditorClick() {
     var parsed_xpath = xpathParser.parse(this.store.getValue(row, 'xpath'));
     dijit.byId('attr-editor-tags').attr('value', parsed_xpath.tags);
     dijit.byId('attr-editor-subfields').attr('value', parsed_xpath.subfields);
-    dijit.byId('attr-editor-identifier').attr('value', this.store.getValue(row, 'ident'));
     dijit.byId('attr-editor-xpath').attr('value', this.store.getValue(row, 'xpath'));
     dijit.byId('attr-editor-remove').attr('value', this.store.getValue(row, 'remove'));
 

diff --git a/Open-ILS/web/opac/locale/en-US/vandelay.dtd b/Open-ILS/web/opac/locale/en-US/vandelay.dtd
index e94f8c7..f8fa799 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/vandelay.dtd
+++ b/Open-ILS/web/opac/locale/en-US/vandelay.dtd
@@ -24,10 +24,11 @@
 <!ENTITY vandelay.dest.match.point "Destination Match Point">
 <!ENTITY vandelay.display "Display">
 <!ENTITY vandelay.done "Done">
-<!ENTITY vandelay.edit.attributes "Edit Attributes">
-<!ENTITY vandelay.edit.attrs "Edit Attributes">
+<!ENTITY vandelay.edit.attributes "Record Display Attributes">
+<!ENTITY vandelay.edit.attrs "Record Display Attributes">
 <!ENTITY vandelay.edit.profiles "Edit Merge / Overlay Profiles">
-<!ENTITY vandelay.edit.import_item_attrs "Edit Import Item Attributes">
+<!ENTITY vandelay.edit.match_set "Record Match Sets">
+<!ENTITY vandelay.edit.import_item_attrs "Import Item Attributes">
 <!ENTITY vandelay.false "False">
 <!ENTITY vandelay.file.to.upload "File to Upload:">
 <!ENTITY vandelay.for.example "Example">

diff --git a/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2 b/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2
index d06b176..1a09b0b 100644 (file)
--- a/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2
+++ b/Open-ILS/web/templates/default/vandelay/inc/attrs.tt2
@@ -38,15 +38,6 @@
                 </td>
             </tr>
             <tr>
-                <td><label for="ident">&vandelay.id.field;: </label></td>
-                <td>
-                    <select dojoType="dijit.form.FilteringSelect" name="ident" id="attr-editor-identifier">
-                        <option value='f' selected='selected'>&vandelay.false;</option>
-                        <option value='t'>&vandelay.true;</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
                 <td><label for="attr-editor-xpath">&vandelay.xpath.advanced;: </label></td>
 
                 <td><input dojoType="dijit.form.TextBox" id="attr-editor-xpath" name="xpath"></input></td>
@@ -90,7 +81,6 @@
                 <th field='description' width='auto'>&vandelay.descrip;</th>
                 <th field='tag' get='attrGridGetTag'>&vandelay.tag;</th>
                 <th field='subfield' get='attrGridGetSubfield'>&vandelay.subfield;</th>
-                <th field='ident'>&vandelay.identifier;</th>
                 <th field='xpath' width='auto'>&vandelay.xpath;</th>
                 <th field='remove' width='auto'>&vandelay.remove;</th>
             </tr>

diff --git a/Open-ILS/web/templates/default/vandelay/inc/toolbar.tt2 b/Open-ILS/web/templates/default/vandelay/inc/toolbar.tt2
index 69c2190..144cd45 100644 (file)
--- a/Open-ILS/web/templates/default/vandelay/inc/toolbar.tt2
+++ b/Open-ILS/web/templates/default/vandelay/inc/toolbar.tt2
@@ -9,6 +9,8 @@
         onclick="vlShowAttrEditor();" showLabel="true">&vandelay.edit.attributes;</div>
     <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-profile-editor'
         onclick="vlShowProfileEditor();" showLabel="true">&vandelay.edit.profiles;</div>
+    <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-match-set-editor'
+        onclick="vlShowMatchSetEditor();" showLabel="true">&vandelay.edit.match_set;</div>
     <div dojoType="dijit.form.Button" iconClass="dijitEditorIcon dijitEditorIconCopy"  id='vl-menu-import-item-attr-editor'
         onclick="vlShowImportItemAttrEditor();" showLabel="true">&vandelay.edit.import_item_attrs;</div>
 </div>

diff --git a/Open-ILS/web/templates/default/vandelay/vandelay.tt2 b/Open-ILS/web/templates/default/vandelay/vandelay.tt2
index 4ca2f37..78f23a8 100644 (file)
--- a/Open-ILS/web/templates/default/vandelay/vandelay.tt2
+++ b/Open-ILS/web/templates/default/vandelay/vandelay.tt2
@@ -37,6 +37,8 @@
 <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-profile-editor-div' class='hidden content'>
     [% INCLUDE 'default/vandelay/inc/profiles.tt2' %]
 </div>
+<div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-match-set-editor-div' class='hidden content'>
+</div>
 <div dojoType="dijit.layout.ContentPane" layoutAlign='client' id='vl-item-attr-editor-div' class='hidden content'>
     [% INCLUDE 'default/vandelay/inc/item_attrs.tt2' %]
 </div>