Changeset 372

Timestamp:

Apr 22, 2010, 3:45:22 PM (13 years ago)

Author:

duh

Message:

• css changes
• termEditor changes
• templateEditor changes
• etc

Location:

trunk

Files:

• application.properties (modified) (1 diff)
• grails-app/controllers/dbnp/studycapturing/TemplateEditorController.groovy (modified) (3 diffs)
• grails-app/controllers/dbnp/studycapturing/TermEditorController.groovy (modified) (1 diff)
• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (1 diff)
• grails-app/views/layouts/dialog.gsp (modified) (1 diff)
• grails-app/views/templateEditor/templates.gsp (modified) (2 diffs)
• grails-app/views/termEditor/terms.gsp (modified) (1 diff)
• web-app/css/dialog.css (added)
• web-app/js/SelectAddMore.js (modified) (1 diff)
• web-app/js/wizard.js (modified) (1 diff)

trunk/application.properties

@@ -9 +9 @@
 plugins.jquery=1.4.1.1
 plugins.mail=0.9
-#plugins.nadd-neutralizer=0.1
+plugins.nadd-neutralizer=0.1
 plugins.nimble=0.3-SNAPSHOT
 plugins.searchable=0.5.5

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

@@ -14 +14 @@
  */
 package dbnp.studycapturing
+import dbnp.data.*
+import dbnp.studycapturing.*
 
 class TemplateEditorController {
@@ -20 +22 @@
          */
     def index = {
-                // got a template get parameter?
-                def template = (params.template) ? params.template : null
+                // got a entity get parameter?
+                def entity = null
+                if (params.entity) {
+                        // decode entity get parameter
+                        entity = new String(params.entity.toString().decodeBase64())
+                }
 
-                // enter the flow!
-        redirect(action: 'pages', params:["template":template])
+                // got with the flow!
+        redirect(action: 'pages', params:["entity":entity])
     }
 
@@ -33 +39 @@
                 // start the flow
                 onStart {
-                        println "start template editor flow"
+                        println params
+                        if (params.entity) {
+                                //def name = params.entity
+                                //def name = "java.lang.Integer"
+                                //println name.class
+                                //def S = new dbnp.studycapturing.Study()
 
-                        if (params.template) {
-                                flow.template = template
+                                //def name = "dbnp.studycapturing.Study" as Class
+                                //println name.newInstance()
+                                println Class.forName(new GString("dbnp.studycapturing.Study"))
+                                //flow.entity = (name as Class).newInstance()
+                                //flow.templates = Template.findAllByEntity(flow.entity)
+                        } else {
+                                // all templates for all entities; note that normally
+                                // this shouldn't happen as this flow is designed to
+                                // launch in a jquery dialog, passing an encoded entity
+                                flow.templates = Template.findAll()
                         }
+                        flow.templates = Template.findAll()
                 }
 
                 // main template editor page
                 templates {
-                        render(view: "/templateEditor/templates", collection:[templates: Template.findAll()])
+                        render(view: "/templateEditor/templates")
                         onRender {
                                 println "render templates"
-                                println Template.findAll()
                         }
                         on("next").to "start"

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

@@ -53 +53 @@
                 }
 
-                // main template editor page
-                templates {
+                // main term editor page
+                terms {
                         render(view: "/termEditor/terms")
                         onRender {

trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

@@ -563 +563 @@
         def templateSelect = {attrs ->
                 def entity = attrs.remove('entity')
+
+                // add the entity class name to the element as
+                // a base64 encoded string.
+                // TODO: encrypt this, instead of using base64!
+                //       As this class is instantiated elsewhere
+                //       this is a security hazard!
+                //               @see TemplateEditorController
+                attrs['entity'] = entity.toString().replaceAll(/^class /,'').bytes.encodeBase64()
 
                 // fetch templates

trunk/grails-app/views/layouts/dialog.gsp

@@ -5 +5 @@
  <head>
   <title><g:layoutTitle default="Grails"/></title>
+  <link rel="stylesheet" href="${resource(dir: 'css', file: 'dialog.css')}"/>
   <g:javascript library="jquery"/>
   <script src="${createLinkTo(dir: 'js', file: 'jquery-ui-1.8rc3.custom.min.js')}" type="text/javascript"></script>

trunk/grails-app/views/templateEditor/templates.gsp

@@ +1 @@
+<%
+        /**
+         * Template Editor overview template
+         *
+         * @author Jeroen Wesbeek
+         * @since 20100422
+         * @package wizard
+         * @see dbnp.studycapturing.TemplateEditorController
+         *
+         * Revision information:
+         * $Rev$
+         * $Author$
+         * $Date$
+         */
+%>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <html>
@@ -6 +21 @@
  </head>
  <body>
- hoi
+ templates for entity: ${entity}<br/>
+
+ <g:if test="${templates}">
+  <g:each in="${templates}">
+     ${it}<br/>
+  </g:each>
+ </g:if>
  
- <g:each in="${templates}">
-     ${it}<br/>
- </g:each>
-
  </body>
 </html>

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

@@ +1 @@
+<%
+        /**
+         * Term Editor overview template
+         *
+         * @author Jeroen Wesbeek
+         * @since 20100422
+         * @package wizard
+         * @see dbnp.studycapturing.TermEditorController
+         *
+         * Revision information:
+         * $Rev$
+         * $Author$
+         * $Date$
+         */
+%>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <html>
  <head>
-  <meta name="layout" content="dialog"/>
-  <title>my bla</title>
+  <meta name="layout" content="dialog"/><g:if env="production"></g:if>
+  <script type="text/javascript" src="${resource(dir: 'js', file: 'ontology-chooser.min.js')}"></script>
+</g:if><g:else>
+  <script type="text/javascript" src="${resource(dir: 'js', file: 'ontology-chooser.js')}"></script>
+</g:else>
  </head>
  <body>

trunk/web-app/js/SelectAddMore.js

@@ -104 +104 @@
                     height  : height,
                     modal   : true,
+                    buttons : {
+                                Ok  : function() { $(this).dialog('close'); }
+                              },
                     close   : function() {
                         onClose(this);

trunk/web-app/js/wizard.js

@@ -63 +63 @@
         rel     : 'template',
         url     : '/gscf/templateEditor',
+        vars    : 'entity',
         label   : 'add / modify..',
         class   : 'modify',