[ljcom] r12673: LJSUP-12963: Implement Shop UI for Dengi...

U   trunk/htdocs/stc/shop/shop.css
U   trunk/templates/Shop/CartTable.tmpl

Modified: trunk/htdocs/stc/shop/shop.css
===================================================================
--- trunk/htdocs/stc/shop/shop.css	2012-09-20 15:00:19 UTC (rev 12672)
+++ trunk/htdocs/stc/shop/shop.css	2012-09-21 08:34:05 UTC (rev 12673)
@@ -1638,9 +1638,9 @@
         .b-cart-table-tfoot {
 
         }
-        .bcart-table-tr:nth-of-type(even) {
+        /*.b-cart-table tr:nth-of-type(odd) td {
             background-color: #eee;
-        }
+        }*/
         .b-cart-table TD {
             padding: 9px 13px 11px 13px;
             /*border-bottom: 1px solid #D1D1D1;*/

Modified: trunk/templates/Shop/CartTable.tmpl
===================================================================
--- trunk/templates/Shop/CartTable.tmpl	2012-09-20 15:00:19 UTC (rev 12672)
+++ trunk/templates/Shop/CartTable.tmpl	2012-09-21 08:34:05 UTC (rev 12673)
@@ -1,45 +1,47 @@
-<div class="b-cart-table-outer">
-	<table class="b-cart-table">
-		<tr class="b-cart-thead">
-			<th><TMPL_VAR expr="ml('pay.cart.item')"></th>
-			<th><TMPL_VAR expr="ml('pay.cart.type')"></th>
-			<th><TMPL_VAR expr="ml('pay.cart.recipient')"></th>
-			<th><TMPL_VAR expr="ml('pay.cart.amount')"></th>
-		</tr>
+<table class="b-cart-table">
+	<tr class="b-cart-thead">
+		<th><TMPL_VAR expr="ml('pay.cart.item')"></th>
+		<th><TMPL_VAR expr="ml('pay.cart.type')"></th>
+		<th><TMPL_VAR expr="ml('pay.cart.recipient')"></th>
+		<th><TMPL_VAR expr="ml('pay.cart.amount')"></th>
+	</tr>
 
-	<TMPL_LOOP name="items">
-		<tr class="b-cart-table-tr">
-			<td class="b-cart-table-item">
-				<TMPL_UNLESS name="cart_locked">
-					<input type="checkbox" name="delete" value="<TMPL_VAR id>" id="delete-<TMPL_VAR id>" />
-					<label for="delete-<TMPL_VAR id>"><TMPL_VAR name></label>
-				<TMPL_ELSE>
-	                <TMPL_IF name="image_url"><img src="<TMPL_VAR image_url>"></TMPL_IF>
-					<TMPL_VAR name>
-				</TMPL_UNLESS>
-			</td>
-			<td class="b-cart-table-type"><TMPL_VAR type></td>
-			<td class="b-cart-table-user">
-				<TMPL_IF name="rcpt_username">
-					<TMPL_VAR expr="ljuser(rcpt_username)">
-				</TMPL_IF>
-				<TMPL_IF name="rcpt_additional">
-					<TMPL_VAR rcpt_additional>
-				</TMPL_IF>
-			</td>
-			<td class="b-cart-table-price"><TMPL_VAR price></td>
-		</tr>
-	</TMPL_LOOP>
-	</table>
-</div>
-<div class="b-payment-window-checkout b-payment-cart-checkout">
-    <button class="b-btn"><TMPL_VAR expr="ml('shop.cart.btn.confirm')"></button>
-    <div class="b-cart-delete">
-    	<TMPL_UNLESS name="cart_locked">
-    		<button type="submit"><TMPL_VAR expr="ml('shop.cart.btn.delete')"></button>
-    	</TMPL_UNLESS>
-    	<p class="b-cart-nonrefundable"><TMPL_VAR expr="ml('shop.cart.nonrefundable')"></p>
-    </div>
-    <span class="b-payment-window-sum"><TMPL_VAR expr="ml('pay.cart.total')"><br><span class="b-payment-window-sumbig"><TMPL_VAR total_price></span></span>
-</div>
+<TMPL_LOOP name="items">
+	<tr>
+		<td class="b-cart-table-item">
+			<TMPL_UNLESS name="cart_locked">
+				<input type="checkbox" name="delete" value="<TMPL_VAR id>" id="delete-<TMPL_VAR id>" />
+				<label for="delete-<TMPL_VAR id>"><TMPL_VAR name></label>
+			<TMPL_ELSE>
+                <TMPL_IF name="image_url"><img src="<TMPL_VAR image_url>"></TMPL_IF>
+				<TMPL_VAR name>
+			</TMPL_UNLESS>
+		</td>
+		<td class="b-cart-table-type"><TMPL_VAR type></td>
+		<td class="b-cart-table-user">
+			<TMPL_IF name="rcpt_username">
+				<TMPL_VAR expr="ljuser(rcpt_username)">
+			</TMPL_IF>
+			<TMPL_IF name="rcpt_additional">
+				<TMPL_VAR rcpt_additional>
+			</TMPL_IF>
+		</td>
+		<td class="b-cart-table-price"><TMPL_VAR price></td>
+	</tr>
+</TMPL_LOOP>
 
+	<tr class="b-cart-tfoot">
+		<td>
+			<TMPL_UNLESS name="cart_locked">
+				<button type="submit"><TMPL_VAR expr="ml('shop.cart.btn.delete')"></button>
+			</TMPL_UNLESS>
+		</td>
+		<td colspan="2">&nbsp;</td>
+		<td class="b-cart-table-total"><TMPL_VAR expr="ml('pay.cart.total')"></td>
+	</tr>
+
+	<tr>
+		<td colspan="3">&nbsp;</td>
+		<td><TMPL_VAR total_price></td>
+	</tr>
+</table>