[ljcom] r9609: LJSUP-7051: fix markup of error's and al...

U   trunk/templates/Identity/TwitterInterstitial.tmpl

Modified: trunk/templates/Identity/TwitterInterstitial.tmpl
===================================================================
--- trunk/templates/Identity/TwitterInterstitial.tmpl	2010-10-11 07:05:42 UTC (rev 9608)
+++ trunk/templates/Identity/TwitterInterstitial.tmpl	2010-10-11 08:23:17 UTC (rev 9609)
@@ -1,36 +1,47 @@
-<TMPL_IF errors>
-    <TMPL_LOOP errors>
-        <?errorbar <TMPL_VAR error> errorbar?>
-    </TMPL_LOOP>
-</TMPL_IF>
 <form action="" method="post" class="b-twinterstitial-form">
 <TMPL_VAR form_intro>
 <TMPL_IF step2>
-    <p><TMPL_VAR ml_validation></p>
-    <p class="b-twinterstitial-submit"><input type="submit" name="next" value="<TMPL_VAR expr="ml('.btn.next')">"></p>
+	<div class="warningbar">
+		<p><TMPL_VAR ml_validation></p>
+	</div>
+	<p class="b-twinterstitial-submit"><input type="submit" name="next" value="<TMPL_VAR expr="ml('.btn.next')">"></p>
 <TMPL_ELSE>
-    <h4><TMPL_VAR ml_congrats></h4>
-    <p><TMPL_VAR expr="ml('.desc')"></p>
-    <h4><TMPL_VAR expr="ml('.heading.subscribe')"></h4>
-    <ul>
-        <li>
-            <input type="radio" name="subscribe" value="1" id="subscribe_yes" checked="checked">
-            <label for="subscribe_yes"><TMPL_VAR expr="ml('.label.subscribe.yes')"></label>
-        </li>
-        <li>
-            <input type="radio" name="subscribe" value="0" id="subscribe_no">
-            <label for="subscribe_no"><TMPL_VAR expr="ml('.label.subscribe.no')"></label>
-        </li>
-    </ul>
-    <h4><TMPL_VAR expr="ml('.tip.email')"></h4>
-    <ul>
-        <li>
-            <label for="email"><strong><TMPL_VAR expr="ml('.label.email')"></strong></label>
-            <input type="text" name="email" id="email" value="<TMPL_VAR form_email>">
-        </li>
-    </ul>
-    <p class="b-twinterstitial-submit">
-        <button type="submit"><TMPL_VAR expr="ml('.btn.proceed')"></button>
-    </p>
+	<h4><TMPL_VAR ml_congrats></h4>
+	<p><TMPL_VAR expr="ml('.desc')"></p>
+	<h4><TMPL_VAR expr="ml('.heading.subscribe')"></h4>
+	<ul>
+		<li>
+			<input type="radio" name="subscribe" value="1" id="subscribe_yes" checked="checked">
+			<label for="subscribe_yes"><TMPL_VAR expr="ml('.label.subscribe.yes')"></label>
+		</li>
+		<li>
+			<input type="radio" name="subscribe" value="0" id="subscribe_no">
+			<label for="subscribe_no"><TMPL_VAR expr="ml('.label.subscribe.no')"></label>
+		</li>
+		<li>
+			<label for="email"><strong><TMPL_VAR expr="ml('.label.email')"></strong></label>
+			<input type="text" name="email" id="email" value="<TMPL_VAR form_email>">
+		<TMPL_IF errors>
+			<TMPL_LOOP errors>
+			<span class="i-bubble b-bubble-warning">
+				<i class="i-bubble-arrow-border"></i>
+				<i class="i-bubble-arrow"></i>
+				<TMPL_VAR error>
+			</span>
+			</TMPL_LOOP>
+		<TMPL_ELSE>
+			<span class="i-bubble b-bubble-alert">
+				<i class="i-bubble-arrow-border"></i>
+				<i class="i-bubble-arrow"></i>
+				<TMPL_VAR expr="ml('.tip.email')">
+			</span>
+		</TMPL_IF>
+
+		</li>
+	</ul>
+	<p class="b-twinterstitial-submit">
+		<button type="submit"><TMPL_VAR expr="ml('.btn.proceed')"></button>
+	</p>
 </TMPL_IF>
 </form>
+