Changeset 535

Timestamp:

Jun 4, 2010, 5:06:07 PM (13 years ago)

Author:

duh

Message:

• removed obsolete templates
• added redirect functionality

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (1 diff)
• views/wizard/pages/_assays.gsp (deleted)
• views/wizard/pages/_eventDescriptions.gsp (deleted)
• views/wizard/pages/_redirect.gsp (moved) (moved from trunk/grails-app/views/wizard/pages/_protocols.gsp) (2 diffs)
• views/wizard/pages/_start.gsp (modified) (2 diffs)
• views/wizard/pages/_templates.gsp (deleted)

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

@@ -96 +96 @@
                         }.to "study"
                         on("modify").to "modify"
+                        on("import").to "redirectToImport"
+                }
+
+                // redirect to the import wizard
+                redirectToImport {
+                        render(view: "_redirect")
+                        onRender {
+                                flash.uri = "/importer/index"
+                        }
+                        on("next").to "start"
                 }
 

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

@@ -1 +1 @@
 <%
 /**
- * Protocols page
+ * Redirect page
  *
  * @author  Jeroen Wesbeek
@@ -16 +16 @@
 %>
 <wizard:pageContent>
-todo...
+        <script type="text/javascript">
+                $(document).ready(function() {
+                        window.location = "/${meta(name: 'app.name')}${uri}";
+                });
+        </script>
+        
 </wizard:pageContent>

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

@@ -23 +23 @@
         <wizard:ajaxButton name="modify" class="bigbutton" value="Edit an existing study" alt="Edit an existing study" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
 
+        <wizard:ajaxButton name="import" class="bigbutton" value="Import a study" alt="Import a study" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
+
         <span class="info">
                 <span class="title">Create a new study via the step-by-step interface</span>
@@ -40 +42 @@
         </span>
 
-        <g:if env="development">
-        <span class="info">
-                <span class="known">Known issues</span>
-                <ul>
-                        <li>navigating away from the wizard will result in loss of work. While you are currently warned when
-                            clicking links outside of the wizard, this problem still exists when clicking 'refresh' or the
-                                back / forward buttons</li>
-                </ul>
-        </span>
-        <!--g:render template="pages/demo"//-->
-        </g:if>
+        <g:if env="development"><!--g:render template="pages/demo"//--></g:if>
 
 </wizard:pageContent>