Closes #375. Significant reworking of Wizard and LiftScreen and suppo…

…rting code
lift · Jun 6, 2010 · 917eb09 · 917eb09
1 parent 1754077
commit 917eb09
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 6 deletions.
diff --git a/...asic/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html b/...asic/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html
@@ -16,6 +16,17 @@
   color: red;
 }
 
+.lift_error {
+  color: red;
+}
+
+.lift_warning {
+  color: yellow;
+}
+
+.lift_notice {
+}
+
 .sidebar ul {
 	margin:0;
 	padding:0;

diff --git a/...c/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/wizard-all.html b/...c/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/wizard-all.html
@@ -1,5 +1,5 @@
 <div>
-  <div>Page <wizard:screen_number/> of <wizard:total_screens/></div>
+  <wizard:screen_info><div>Page <wizard:screen_number/> of <wizard:total_screens/></div></wizard:screen_info>
   <wizard:wizard_top> <div> <wizard:bind/> </div> </wizard:wizard_top>
   <wizard:screen_top> <div> <wizard:bind/> </div> </wizard:screen_top>
   <wizard:errors> <div> <ul> <wizard:item> <li> <wizard:bind/> </li> </wizard:item> </ul> </div> </wizard:errors>
@@ -8,7 +8,9 @@
         <wizard:line>
           <tr>
             <td>
-          <wizard:label error_style="error"/> <wizard:help/> <wizard:field_errors> <ul> <wizard:error> <li> <wizard:bind/> </li> </wizard:error> </ul> </wizard:field_errors>
+              <wizard:label><label wizard:for=""><wizard:bind/></label></wizard:label>
+	      <wizard:help><span><wizard:bind/></span></wizard:help>
+	      <wizard:field_errors> <ul> <wizard:error> <li> <wizard:bind/> </li> </wizard:error> </ul> </wizard:field_errors>
           </td>
           <td> <wizard:form/> </td>
           </tr>
@@ -18,4 +20,4 @@
   <div> <table> <tr> <td> <wizard:prev/> </td> <td> <wizard:cancel/> </td> <td> <wizard:next/> </td> </tr> </table> </div>
   <wizard:screen_bottom> <div> <wizard:bind/> </div> </wizard:screen_bottom>
   <wizard:wizard_bottom> <div> <wizard:bind/> </div> </wizard:wizard_bottom>
-</div>
+</div>
diff --git a/.../src/main/resources/archetype-resources/web/src/main/webapp/templates-hidden/default.html b/.../src/main/resources/archetype-resources/web/src/main/webapp/templates-hidden/default.html
@@ -16,6 +16,17 @@
   color: red;
 }
 
+.lift_error {
+  color: red;
+}
+
+.lift_warning {
+  color: yellow;
+}
+
+.lift_notice {
+}
+
 .sidebar ul {
 	margin:0;
 	padding:0;

diff --git a/...ngle/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html b/...ngle/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html
@@ -16,6 +16,17 @@
   color: red;
 }
 
+.lift_error {
+  color: red;
+}
+
+.lift_warning {
+  color: yellow;
+}
+
+.lift_notice {
+}
+
 .sidebar ul {
 	margin:0;
 	padding:0;

diff --git a/.../src/main/resources/archetype-resources/web/src/main/webapp/templates-hidden/default.html b/.../src/main/resources/archetype-resources/web/src/main/webapp/templates-hidden/default.html
@@ -16,6 +16,17 @@
   color: red;
 }
 
+.lift_error {
+  color: red;
+}
+
+.lift_warning {
+  color: yellow;
+}
+
+.lift_notice {
+}
+
 .sidebar ul {
 	margin:0;
 	padding:0;

diff --git a/...-sbt/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html b/...-sbt/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html
@@ -16,6 +16,17 @@
   color: red;
 }
 
+.lift_error {
+  color: red;
+}
+
+.lift_warning {
+  color: yellow;
+}
+
+.lift_notice {
+}
+
 .sidebar ul {
 	margin:0;
 	padding:0;

diff --git a/...t/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/wizard-all.html b/...t/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/wizard-all.html
@@ -1,5 +1,5 @@
 <div>
-  <div>Page <wizard:screen_number/> of <wizard:total_screens/></div>
+  <wizard:screen_info><div>Page <wizard:screen_number/> of <wizard:total_screens/></div></wizard:screen_info>
   <wizard:wizard_top> <div> <wizard:bind/> </div> </wizard:wizard_top>
   <wizard:screen_top> <div> <wizard:bind/> </div> </wizard:screen_top>
   <wizard:errors> <div> <ul> <wizard:item> <li> <wizard:bind/> </li> </wizard:item> </ul> </div> </wizard:errors>
@@ -8,7 +8,9 @@
         <wizard:line>
           <tr>
             <td>
-          <wizard:label error_style="error"/> <wizard:help/> <wizard:field_errors> <ul> <wizard:error> <li> <wizard:bind/> </li> </wizard:error> </ul> </wizard:field_errors>
+              <wizard:label><label wizard:for=""><wizard:bind/></label></wizard:label>
+	      <wizard:help><span><wizard:bind/></span></wizard:help>
+	      <wizard:field_errors> <ul> <wizard:error> <li> <wizard:bind/> </li> </wizard:error> </ul> </wizard:field_errors>
           </td>
           <td> <wizard:form/> </td>
           </tr>
@@ -18,4 +20,4 @@
   <div> <table> <tr> <td> <wizard:prev/> </td> <td> <wizard:cancel/> </td> <td> <wizard:next/> </td> </tr> </table> </div>
   <wizard:screen_bottom> <div> <wizard:bind/> </div> </wizard:screen_bottom>
   <wizard:wizard_bottom> <div> <wizard:bind/> </div> </wizard:wizard_bottom>
-</div>
+</div>