Changeset 29214 for main

Timestamp:

2014-08-18T14:13:26+12:00 (10 years ago)

Author:

kjdon

Message:

style the remove link separately; metadata element input cna now be a select element, or an input element, which can optionally have autocomplete data. based on availableMetadataElements var, and new_metadata_field_input_type var. addMetaSetToList function changed name to addOptionTolist, as it can be used for adding any options. Added new param so can have different value and display text for the options.

File:

• main/trunk/greenstone3/web/interfaces/default/js/documentmaker_scripts_util.js (modified) (9 diffs)

main/trunk/greenstone3/web/interfaces/default/js/documentmaker_scripts_util.js

@@ -633 +633 @@
     var selectedOption = options[index];
     
-    var selectedSet = selectedOption.innerHTML;
+    var selectedSet = selectedOption.value;
     changeVisibleMetadata(selectedSet);
 }
@@ -686 +686 @@
 }
 
-function addMetaSetToList(list, set, selected) {
+function addOptionToList(list, optionvalue, optiontext, selected) {
   var newOption = $("<option>");
-  newOption.html(set);
+  if (optiontext) {
+    newOption.html(optiontext);
+    newOption.attr("value", optionvalue);
+  } else {
+    newOption.html(optionvalue);
+  }
   if (selected) {
     newOption.attr("selected", true);
@@ -695 +700 @@
 }
 
+/* returns either an input or a select element. Data based on 
+   availableMetadataElements var. */
+function createMetadataElementSelector() {
+  var metaNameField;
+  if (new_metadata_field_input_type == "fixedlist") {
+    metaNameField =  $("<select>", {"class": "ui-state-default"});
+    for(var i=0; i<availableMetadataElements.length; i++) {
+      addOptionToList(metaNameField, availableMetadataElements[i]);
+    }
+    return metaNameField;
+  }
+  metaNameField = $("<input>", {"type": "text","style":"margin: 5px; border: 1px solid #000;"}); 
+  if (new_metadata_field_input_type == "autocomplete") {
+    metaNameField.autocomplete({
+    minLength: 0,
+      source: availableMetadataElements
+      });
+    metaNameField.attr("title", "Enter a metadata name, or use the down arrow to select one, then click 'Add New Metadata'");
+  } else {
+metaNameField.attr("title", "Enter a metadata name, then click 'Add New Metadata'");
+  }
+  
+  return metaNameField;
+}
+
+
+
 function addFunctionalityToTable(table)
 {
@@ -702 +734 @@
         var metadataName = $(cells[0]).html();
         
-        if(dynamic_metadata_list == true && metadataName.indexOf(".") != -1)
+        if(dynamic_metadata_set_list == true && metadataName.indexOf(".") != -1)
         {
             var metadataSetName = metadataName.substring(0, metadataName.lastIndexOf("."));
@@ -719 +751 @@
             {
                 _metadataSetList.push(metadataSetName);
-                addMetaSetToList( $("#metadataSetList"), metadataSetName);
+                addOptionToList( $("#metadataSetList"), metadataSetName);
             }
         }
@@ -727 +759 @@
     });
 
-    
-    var metaNameField = $("<input>", {"type": "text","style":"margin: 5px; border: 1px solid #000;"});
+    var metaNameField = createMetadataElementSelector();    
     table.after(metaNameField);
     table.metaNameField = metaNameField;
@@ -736 +767 @@
     addRowButton.click(function() 
     { 
-        var name = metaNameField.val();
+            var name = metaNameField.val();
         if(!name || name == "")
         {
@@ -764 +795 @@
     table.addRowButton = addRowButton;
     metaNameField.after(addRowButton);
+
 }
 
@@ -783 +815 @@
     });
     newCell.append(removeLink);
-    newCell.attr({"class": "metaTableCell", "style": "font-size:0.6em; padding-left: 3px; padding-right: 3px;"});
+    newCell.attr({"class": "metaTableCellRemove", "style": "font-size:0.6em; padding-left: 3px; padding-right: 3px;"});
     $(row).append(newCell);
 }