Changeset 1555

Timestamp:

Feb 24, 2011, 11:15:00 AM (10 years ago)

Author:

t.w.abma@…

Message:

• disabled <Enter> key to prevent submission of form (JS)
• using matching, going to step 3 and back to 2 (next/prev) manually changed properties are now remembered instead of automatically being rematched
• added simple explanation to buttons via title attribute

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (1 diff)
• views/importer/common/_on_page.gsp (modified) (1 diff)
• views/importer/common/_properties_horizontal.gsp (modified) (1 diff)

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -193 +193 @@
 
                         on("next") {
-                                if (propertiesPage(flow, flash, params)) {
+                flow.importer_fuzzymatching="false"
+                                if (propertiesPage(flow, flash, params)) {                    
                                         success()
                                 } else {

trunk/grails-app/views/importer/common/_on_page.gsp

@@ -95 +95 @@
 
           });
+          
+
+          // Disable Enter key 
+          function stopRKey(evt) {
+            var evt = (evt) ? evt : ((event) ? event : null);
+            var node = (evt.target) ? evt.target : ((evt.srcElement) ? evt.srcElement : null);
+            if ((evt.keyCode == 13) && (node.type=="text"))  {return false;}
+          }
+          document.onkeypress = stopRKey;
+          
 
           // attach function to clear button to reset all selects to "don't import"

trunk/grails-app/views/importer/common/_properties_horizontal.gsp

@@ -23 +23 @@
                 <tr>
             <td class="header" width="55px">
-              <input class="buttonsmall" id="clearselect" type="button" value="Clear" name="clearselect">
-              <input class="buttonsmall" id="fuzzymatchselect" type="button" value="Match" name="fuzzymatchselect">
+              <input class="buttonsmall" id="clearselect" type="button" value="Clear" name="clearselect" title="Clear all selections">
+              <input class="buttonsmall" id="fuzzymatchselect" type="button" value="Match" name="fuzzymatchselect" title="Automatically match columns to properties">
               <input type="hidden" name="fuzzymatching" id="fuzzymatching" value="false">
-              <input class="buttonsmall" id="savepropertiesbutton" type="button" value="Save" name="savepropertiesbutton">
-              <input class="buttonsmall" id="loadpropertiesbutton" type="button" value="Load" name="loadpropertiesbutton">
+              <input class="buttonsmall" id="savepropertiesbutton" type="button" value="Save" name="savepropertiesbutton" title="Save the currently set mappings">
+              <input class="buttonsmall" id="loadpropertiesbutton" type="button" value="Load" name="loadpropertiesbutton" title="Load previously saved mappings">
               <div id="savemapping" style="display:none">
                 Give current mapping a name and press Save: