Changeset 376 for trunk


Ignore:
Timestamp:
Apr 23, 2010, 11:28:35 AM (14 years ago)
Author:
duh
Message:
  • refactored views
  • fixed bug in the termEditor
Location:
trunk/grails-app
Files:
3 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/grails-app/controllers/dbnp/studycapturing/TemplateEditorController.groovy

    r374 r376  
    4343                }
    4444
    45                 // got with the flow!
     45                // go with the flow!
    4646        redirect(action: 'pages', params:["entity":entity])
    4747    }
    … …  
    9292                }
    9393
    94                 // error dynamically loading entity
     94                // could not dynamically load entity, possible hack
     95                // or invalid entity specified in template field
    9596                errorInvalidEntity {
    96                         render(view: "_errorInvalidEntity")
     97                        render(view: "errorInvalidEntity")
    9798                }
    9899
    99100                // main template editor page
    100101                templates {
    101                         render(view: "/templateEditor/templates")
     102                        render(view: "templates")
    102103                        onRender {
    103104                                println "render templates"

  • trunk/grails-app/controllers/dbnp/studycapturing/TermEditorController.groovy

    r372 r376  
    5555                // main term editor page
    5656                terms {
    57                         render(view: "/termEditor/terms")
     57                        render(view: "terms")
    5858                        onRender {
    5959                                println "renderderender!"

  • trunk/grails-app/views/termEditor/pages/terms.gsp

    r372 r376  
    1717<html>
    1818 <head>
    19   <meta name="layout" content="dialog"/><g:if env="production"></g:if>
     19  <meta name="layout" content="dialog"/><g:if env="production">
    2020  <script type="text/javascript" src="${resource(dir: 'js', file: 'ontology-chooser.min.js')}"></script>
    2121</g:if><g:else>
    … …  
    2727
    2828 <ul>
    29  <g:each in="${ontologies}">
     29 <g:if test="${ontologies}">
     30  <g:each in="${ontologies}">
    3031     <li>${it}</li>
    31  </g:each>
     32  </g:each>
     33 </g:if>
    3234 </ul>
    3335

  • trunk/grails-app/views/wizard/common/_navigation.gsp

    r359 r376  
    2626
    2727<script type="text/javascript">
     28// scriptable webflow action
    2829function refreshWebFlow() {
    2930        <wizard:ajaxSubmitJs name="refresh" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" class="prevnext" />
Note: See TracChangeset for help on using the changeset viewer.