Ignore:
Timestamp:
Feb 25, 2010, 4:18:22 PM (10 years ago)
Author:
duh
Message:
  • restructured wizard
  • added information boxes
  • improved error feedback (highlighted error fields)
  • added confirmation page
  • several smaller bugfixes and improvements
Location:
trunk/grails-app/views/wizard
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/views/wizard/common/_error.gsp

    r105 r213  
    2020                        <p>
    2121                                <g:if test="${!e}"><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 50px 0;"></span></g:if>
    22                                 ${error.key} &rarr; ${error.value}
     22                                ${error.value['key']} &rarr; ${error.value['value']}
    2323                        </p>
    2424                </g:each>
    2525        </div>
    2626        <script type="text/javascript">
     27                // mark error fields
     28                <g:each in="${errors}" var="error">
     29                <g:if test="${error.value['dynamic']}">
     30                $("input:[name='${error.key}']").addClass('error');
     31                </g:if><g:else>
     32                $("input:[name='${error.key}']").parent().parent().addClass('error');
     33                </g:else>
     34                </g:each>
     35
    2736                // show error dialog
    2837                $(function() {
  • trunk/grails-app/views/wizard/pages/_eventDescriptions.gsp

    r209 r213  
    1616%>
    1717<wizard:pageContent>
    18         <wizard:termElement name="classification" description="Classification" error="classification" value="${classification}">
     18        <span class="info">
     19                <span class="title">Describe all unique event types that occur in your study</span>
     20                These unique events are, for example, treatments, challenges and sampling events. Every event description
     21                should be unique. If your study, for example, samples both blood as well as tissue, then create two sample
     22                descriptions. One for 'sampling blood', and one for 'sampling tissue'.
     23        </span>
     24
     25        <wizard:termElement name="classification" description="Classification" error="classification" value="${values?.classification}">
    1926                The classification
    2027        </wizard:termElement>
    21         <wizard:textFieldElement name="name" description="Name" error="name" value="${name}">
     28        <wizard:textFieldElement name="name" description="Name" error="name" value="${values?.name}">
    2229                The name of the event description you are creating
    2330        </wizard:textFieldElement>
    24         <wizard:textFieldElement name="description" description="Description" error="description" value="${description}">
     31        <wizard:textFieldElement name="description" description="Description" error="description" value="${values?.description}">
    2532                A short description summarizing your event description
    2633        </wizard:textFieldElement>
    27         <wizard:checkBoxElement name="isSamplingEvent" description="Sampling event" error="isSamplingEvent" value="${isSamplingEvent}">
     34        <wizard:checkBoxElement name="isSamplingEvent" description="Sampling event" error="isSamplingEvent" value="${values?.isSamplingEvent}">
    2835                Is this a sampling event description?
    2936        </wizard:checkBoxElement>
  • trunk/grails-app/views/wizard/pages/_events.gsp

    r209 r213  
    1616%>
    1717<wizard:pageContent>
    18         <wizard:selectElement name="eventDescription" description="Event Description" error="eventDescription" from="${eventDescriptions}" value="${eventDescription}">
     18        <span class="info">
     19                <span class="title">Define all events and their duration that occur in your study</span>
     20                In the previous screen you defined the unique event types, in this screen you need to define
     21                all events of a specific event type that occur in time. Select the type of event, and the
     22                start and stop time of an event. As it is frequently the case that <i>sets</i> of events act
     23                upon (groups of) subjects, you can define event groups, and add events to a particular group.<br/>
     24                <i>Note that you can edit multiple events at once by selecting multpiple rows by either
     25                ctrl-clicking them or dragging a selection over them.</i>
     26        </span>
     27
     28        <wizard:selectElement name="eventDescription" description="Event Description" error="eventDescription" from="${eventDescriptions}" value="${values?.eventDescription}">
    1929                The event description for this event
    2030        </wizard:selectElement>
    21         <wizard:timeElement name="startTime" description="Start Time" error="startTime" value="${startTime}">
     31        <wizard:timeElement name="startTime" description="Start Time" error="startTime" value="${values?.startTime}">
    2232                The start time of the study
    2333        </wizard:timeElement>
    24         <wizard:timeElement name="endTime" description="End time" error="endTimee" value="${endTime}">
     34        <wizard:timeElement name="endTime" description="End time" error="endTimee" value="${values?.endTime}">
    2535                The end time of the study
    2636        </wizard:timeElement>
    2737        <wizard:buttonElement name="add" value="Add" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()"/>
    28 <g:if test="${events}">
     38<g:if test="${events}"> 
    2939        <div class="table">
    3040                <div class="header">
  • trunk/grails-app/views/wizard/pages/_study.gsp

    r195 r213  
    1616%>
    1717<wizard:pageContent>
     18        <span class="info">
     19                <span class="title">Define the basic properties of your study</span>
     20                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce laoreet leo nec leo vehicula quis scelerisque elit pulvinar. Vivamus arcu dui, adipiscing eu vestibulum id, consectetur et erat. Aenean risus mauris, placerat et lacinia vulputate, commodo eget ligula. Pellentesque ornare blandit metus ac dictum. Donec scelerisque feugiat quam, a congue ipsum malesuada nec. Donec vulputate, diam eget porta rhoncus, est mauris ullamcorper turpis, vitae dictum risus justo quis justo. Aenean blandit feugiat accumsan. Donec porttitor bibendum elementum.
     21        </span>
     22       
    1823        <wizard:textFieldElement name="title" description="Title" error="title" value="${study?.title}">
    1924                The title of the study you are creating
  • trunk/grails-app/views/wizard/pages/_subjects.gsp

    r209 r213  
    1616%>
    1717<wizard:pageContent>
     18        <span class="info">
     19                <span class="title">Add subjects to your study</span>
     20                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce laoreet leo nec leo vehicula quis scelerisque elit pulvinar. Vivamus arcu dui, adipiscing eu vestibulum id, consectetur et erat. Aenean risus mauris, placerat et lacinia vulputate, commodo eget ligula. Pellentesque ornare blandit metus ac dictum. Donec scelerisque feugiat quam, a congue ipsum malesuada nec. Donec vulputate, diam eget porta rhoncus, est mauris ullamcorper turpis, vitae dictum risus justo quis justo. Aenean blandit feugiat accumsan. Donec porttitor bibendum elementum.
     21        </span>
     22
    1823        <wizard:ajaxButton name="add" value="Add" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
    1924        <input name="addNumber" size="4" maxlength="4" value="1">
  • trunk/grails-app/views/wizard/pages/_templates.gsp

    r195 r213  
    1616%>
    1717<wizard:pageContent>
     18        <span class="info">
     19                <span class="title">Select the template you would like to use</span>
     20                A template is a predefined set of values to store with all elements of your study.
     21        </span>
     22
    1823        <wizard:templateElement name="template" description="Template" value="${study?.template}">
    1924                The meta data template to use for this study
Note: See TracChangeset for help on using the changeset viewer.