Changeset 341

Timestamp:

Apr 14, 2010, 11:36:53 AM (13 years ago)

Author:

duh

Message:

• refactored wizard start page so that the big green buttons actually work
• added a new page to load and modify a study, however this page is not yet functional
• removed obsolete images

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (1 diff)
• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (1 diff)
• grails-app/views/wizard/common/_navigation.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_modify.gsp (added)
• grails-app/views/wizard/pages/_start.gsp (modified) (1 diff)
• web-app/css/wizard.css (modified) (1 diff)
• web-app/images/wizard/add-hover.png (deleted)
• web-app/images/wizard/add.png (deleted)
• web-app/images/wizard/big-button.jpg (added)
• web-app/images/wizard/remove-hover.png (deleted)
• web-app/images/wizard/remove.png (deleted)

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

@@ -77 +77 @@
                                 flow.page = 1
                         }
+                        on("next").to "study"
+                        on("modify").to "modify"
+                }
+
+                // load a study to modify
+                modify {
+                        render(view: "_modify")
+                        onRender {
+                                flow.page = 1
+                                flash.cancel = true
+                        }
+                        on("cancel").to "start"
                         on("next") {
-                                // NOTE: this action is called by an Ajax
-                                //       request rendered in the _start
-                                //       template. So for the end user the
-                                //       webflow actually starts in the
-                                //       study logic...
-                                //       This ajax call is required to make
-                                //       the ajax flow work correctly
-                        }.to "study"
+                                // TODO: loading a study is not yet implemented
+                                //       create a error stating this feature is
+                                //       not yet implemented
+                                flash.errors = [:]
+                                this.appendErrorMap(
+                                        ['study': 'Loading a study and modifying it has not yet been implemented. Please press \'cancel\' to go back to the initial page...'],
+                                        flash.errors
+                                )
+                        }.to "modify"
                 }
 

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

@@ -434 +434 @@
 
                 out << select(attrs)
+        }
+
+
+        /**
+         * Study form element
+         * @param Map attributes
+         * @param Closure help content
+         */
+        def studyElement = { attrs, body ->
+                // render study element
+                baseElement.call(
+                        'studySelect',
+                        attrs,
+                        body
+                )
+        }
+
+
+        /**
+         * render a study select element
+         * @param Map attrs
+         */
+        def studySelect = { attrs ->
+                // for now, just fetch all studies
+                attrs.from = Study.findAll()
+
+                // got a name?
+                if (!attrs.name) {
+                        attrs.name = "study"
+                }
+
+                // got result?
+                if (attrs.from.size() > 0) {
+                        out << select(attrs)
+                } else {
+                        // no, return false to make sure this element
+                        // is not rendered in the template
+                        return false
+                }
         }
 

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

@@ -16 +16 @@
     <div class="navigation">
       <g:if test="${page>1 && page<pages.size}"><wizard:ajaxButton name="previous" value="&laquo; prev" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" class="prevnext" /></g:if>
-      <g:if test="${page>1 && page<pages.size}"> | </g:if>
-      <g:if test="${page<pages.size}"><wizard:ajaxButton name="next" value="next &raquo;" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" class="prevnext" /></g:if>
+          <g:if test="${cancel}">
+                [ <wizard:ajaxButton name="cancel" value="cancel" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" class="prevnext" /> ]
+          </g:if>
+      <g:elseif test="${page>1 && page<pages.size}">
+                  |               
+          </g:elseif>
+          <g:if test="${page<pages.size}"><wizard:ajaxButton name="next" value="next &raquo;" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" class="prevnext" /></g:if>
     </div>

trunk/grails-app/views/wizard/pages/_start.gsp

@@ -17 +17 @@
 <wizard:pageContent>
 
-        <img src="../images/wizard/wizard-chooser.png" />
+        <span class="bigtext">What would you like to do?</span>
 
-        <span class="info">
-                <span class="todo">TODO</span>
-                <ul>
-                        <li>the buttons above actually do not yet work, it's just a mockup. In this prototype you can only create
-                            a study; modifying a study will be implemented later. Click 'next' to continue...</li>
-                </ul>
-        </span>
+        <wizard:ajaxButton name="next" class="bigbutton" value="Create a new study" alt="Create a new study" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
+
+        <wizard:ajaxButton name="modify" class="bigbutton" value="Modify an existing study" alt="Modify an existing study" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
 
         <span class="info">

trunk/web-app/css/wizard.css

@@ -262 +262 @@
 }
 /* END :: TABLE */
+
+/* START :: BIG BUTTONS and BIG TEXT */
+.wizard .bigbutton {
+    background: url(../images/wizard/big-button.jpg) no-repeat left top;
+    border: 0px;
+    width: 454px;
+    height: 53px;
+    color: #fff;
+    font-size: 18pt;
+}
+.wizard .bigbutton:hover {
+    color: #000;
+}
+.wizard .bigtext {
+    color: #006dba;
+    font-weight: normal;
+    font-size: 24px;
+    margin: .8em 0 .3em 0;
+    display: block;
+    width: 100%;
+    text-align: center;
+}
+/* END :: BIG BUTTONS and BIG TEXT */