Changeset 1555


Ignore:
Timestamp:
Feb 24, 2011, 11:15:00 AM (6 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

    r1542 r1555  
    193193
    194194                        on("next") {
    195                                 if (propertiesPage(flow, flash, params)) {
     195                flow.importer_fuzzymatching="false"
     196                                if (propertiesPage(flow, flash, params)) {                   
    196197                                        success()
    197198                                } else {
  • trunk/grails-app/views/importer/common/_on_page.gsp

    r1525 r1555  
    9595
    9696          });
     97         
     98
     99          // Disable Enter key
     100          function stopRKey(evt) {
     101            var evt = (evt) ? evt : ((event) ? event : null);
     102            var node = (evt.target) ? evt.target : ((evt.srcElement) ? evt.srcElement : null);
     103            if ((evt.keyCode == 13) && (node.type=="text"))  {return false;}
     104          }
     105          document.onkeypress = stopRKey;
     106         
    97107
    98108          // attach function to clear button to reset all selects to "don't import"
  • trunk/grails-app/views/importer/common/_properties_horizontal.gsp

    r1552 r1555  
    2323                <tr>
    2424            <td class="header" width="55px">
    25               <input class="buttonsmall" id="clearselect" type="button" value="Clear" name="clearselect">
    26               <input class="buttonsmall" id="fuzzymatchselect" type="button" value="Match" name="fuzzymatchselect">
     25              <input class="buttonsmall" id="clearselect" type="button" value="Clear" name="clearselect" title="Clear all selections">
     26              <input class="buttonsmall" id="fuzzymatchselect" type="button" value="Match" name="fuzzymatchselect" title="Automatically match columns to properties">
    2727              <input type="hidden" name="fuzzymatching" id="fuzzymatching" value="false">
    28               <input class="buttonsmall" id="savepropertiesbutton" type="button" value="Save" name="savepropertiesbutton">
    29               <input class="buttonsmall" id="loadpropertiesbutton" type="button" value="Load" name="loadpropertiesbutton">
     28              <input class="buttonsmall" id="savepropertiesbutton" type="button" value="Save" name="savepropertiesbutton" title="Save the currently set mappings">
     29              <input class="buttonsmall" id="loadpropertiesbutton" type="button" value="Load" name="loadpropertiesbutton" title="Load previously saved mappings">
    3030              <div id="savemapping" style="display:none">
    3131                Give current mapping a name and press Save:
Note: See TracChangeset for help on using the changeset viewer.