Changeset 1305 for trunk/grails-app


Ignore:
Timestamp:
Dec 21, 2010, 2:22:33 PM (10 years ago)
Author:
t.w.abma@…
Message:
  • fixed minor bugs in the import wizard introduced by rewritten studywizard (JS/CSS code was still partly based on study wizard)
Location:
trunk/grails-app/views/importer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/views/importer/common/_missingproperties.gsp

    r1281 r1305  
    2626</g:else>
    2727
    28 <script>
    29   $(document).ready(function() {
    30 
    31 // handle term selects
    32     new SelectAddMore().init({
    33         rel     : 'term',
    34         url     : baseUrl + '/termEditor',
    35         vars    : 'ontologies',
    36         label   : 'add more...',
    37         style   : 'addMore',
    38         onClose : function(scope) {
    39             refreshFlow();           
    40              //location.reload();
    41              /*updatefield = '<input type = "hidden" name="updatefield" value="true" / >';
    42              $('#missingpropertiesform').append(updatefield);
    43              $('#missingpropertiesform').submit();*/
    44         }
    45     });
    46 
    47   });
    48 </script>
    49 
    5028<script type="text/javascript">
    51   $(document).ready(function() {
     29 $(document).ready(function() {
    5230        // mark error fields
    53         <g:each in="${failedcells}" var="record">
     31        <g:each in="${importer_failedcells}" var="record">
    5432          <g:each in="${record.importcells}" var="cell">
    5533          var element = $("select[name=entity_${cell.entityidentifier}_${cell.mappingcolumn.property}]");
     
    6846
    6947<div class="wizard" id="wizard">
    70     <div class="table">
     48    <div class="tableEditor">
    7149        <g:set var="showHeader" value="${true}"/>
    7250            <g:each status="index" var="table" in="${datamatrix}">
  • trunk/grails-app/views/importer/index.gsp

    r1296 r1305  
    1414<html>
    1515<head>
    16         <meta name="layout" content="main"/>
    17         <link rel="stylesheet" href="${resource(dir: 'css', file: 'ajaxflow.css')}"/>
     16    <meta name="layout" content="main"/>
     17    <link rel="stylesheet" href="${resource(dir: 'css', file: 'ajaxflow.css')}"/>
    1818    <link rel="stylesheet" href="${resource(dir: 'css', file: 'importer.css')}"/>
    1919    <link rel="stylesheet" href="${resource(dir: 'css', file: 'wizard.css')}"/>
     20    <link rel="stylesheet" href="${resource(dir: 'css', file: 'table-editor.css')}"/>
    2021
    2122    <g:if env="production">
     
    2324      <script type="text/javascript" src="${resource(dir: 'js', file: 'ajaxupload.3.6.js')}"></script>
    2425      <script type="text/javascript" src="${resource(dir: 'js', file: 'ontology-chooser.min.js')}"></script>
     26      <script type="text/javascript" src="${resource(dir: 'js', file: 'table-editor.js')}"></script>
     27      <script type="text/javascript" src="${resource(dir: 'js', file: 'importer.js')}"></script>
     28      <script type="text/javascript" src="${resource(dir: 'js', file: 'tooltips.js')}"></script>
    2529    </g:if><g:else>
    2630      <script type="text/javascript" src="${resource(dir: 'js', file: 'SelectAddMore.js')}"></script>
     
    2933      <script type="text/javascript" src="${resource(dir: 'js', file: 'table-editor.js')}"></script>
    3034      <script type="text/javascript" src="${resource(dir: 'js', file: 'importer.js')}"></script>
     35      <script type="text/javascript" src="${resource(dir: 'js', file: 'tooltips.js')}"></script>
    3136    </g:else>
    3237
Note: See TracChangeset for help on using the changeset viewer.