Changeset 1683

Timestamp:

29-03-11 15:22:58 (4 years ago)

Author:

robert@…

Message:

Small improvements in simple wizard

Location:

trunk

Files:

• grails-app/views/simpleWizard/simpleWizard/samples.gsp (modified) (7 diffs)
• web-app/css/simplewizard.css (modified) (1 diff)

trunk/grails-app/views/simpleWizard/simpleWizard/samples.gsp

@@ -13 +13 @@
                 <h1>Study data</h1>
 
+        <span class="info"> 
+                        <span class="title">Import study data</span> 
+                        You can import your study data to the server by choosing an excel file from your local harddisk in the form below. The excel sheet should contain
+                        data on the first sheet, and the sheet should contain one row with headers. Each line can contain sample, subject and event data.
+                </span> 
+                                
                 <g:if test="${flash.error}">
                         <div class="errormessage">
@@ -22 +28 @@
                                 ${flash.message.toString().encodeAsHTML()}
                         </div>
-                </g:if> 
+                </g:if>                 
                 
                 <g:form class="simpleWizard" name="samples" action="simpleWizard">
@@ -28 +34 @@
 
                         <div id="samplesDialog">
-                        <span class="info"> 
-                                        <span class="title">Import study data</span> 
-                                        You can import your Excel data to the server by choosing a file from your local harddisk in the form below. The excel sheet should contain
-                                        data on the first sheet, and the sheet should contain one row with headers.
-                                </span> 
                     
                                 <table border="0">
                                 <tr>
-                                            <td width="30%">
-                                                        Choose your Excel file to import:
+                                            <td width="15%" class="required">
+                                                        Excel file to import:
                                             </td>
                                             <td width="25%">
@@ -45 +46 @@
                                         </tr>
                                         <tr>
-                                            <td>
-                                                <div id="datatemplate">Choose type of sample template:</div>
+                                            <td class="required">
+                                                        <div id="datatemplate">Sample template:</div>
                                             </td>
                                             <td>
@@ -72 +73 @@
                                         <tr>
                                             <td>
-                                                <div id="datatemplate">Choose type of subject template:</div>
+                                                <div id="datatemplate">Subject template:</div>
                                             </td>
                                             <td>
@@ -98 +99 @@
                                         <tr>
                                             <td>
-                                                <div id="datatemplate">Choose type of event template:</div>
+                                                <div id="datatemplate">Event template:</div>
                                             </td>
                                             <td>
@@ -124 +125 @@
                                         <tr>
                                             <td>
-                                                <div id="datatemplate">Choose type of sampling event template:</div>
+                                                <div id="datatemplate">Sampling event template:</div>
                                             </td>
                                             <td>

trunk/web-app/css/simplewizard.css

@@ -10 +10 @@
 div .simpleWizard .description { width: 170px; }
 .simpleWizard .error, .simpleWizard .required { background-position: 150px 2px; }
+.samplespage td.required { background-position: 160px 6px; }
 
 /** Meta boxes **/