From 5aa49d62fe3be15ea3943a3a1ae7175ca479870c Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 10 Sep 2013 16:14:49 +0200
Subject: [PATCH] replace smarty variable identifier by $

---
 templates/admin/default/categories.html    |  4 ++--
 templates/admin/default/category-edit.html |  4 ++--
 templates/admin/default/coupon-read.html   | 20 ++++++++++----------
 templates/admin/default/customers.html     | 20 ++++++++++----------
 templates/admin/default/login.html         |  2 +-
 templates/admin/default/message-edit.html  |  2 +-
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index f08721828..1d1cf53c2 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -93,7 +93,7 @@
 
 		                        <td>
 		                        {loop type="image" name="cat_image" source="category" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
-		                          <a href="{url path='admin/catalog' category_id=$ID}" title="{intl l='Browse this category'}"><img class="img-thumbnail" src="#IMAGE_URL" alt="#TITLE" /></a>
+		                          <a href="{url path='admin/catalog' category_id=$ID}" title="{intl l='Browse this category'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
 		                        {/loop}
 		                        </td>
 
@@ -258,7 +258,7 @@
 		                    	<td>
                                 {loop type="image" name="cat_image" source="product" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
                                   <a href="{url path='admin/product/edit' id=$ID}" title="{intl l='Edit this product'}">
-                                    <img src="#IMAGE_URL" alt="#TITLE" />
+                                    <img src="{$IMAGE_URL}" alt="{$TITLE}" />
                                   </a>
                                 {/loop}
 
diff --git a/templates/admin/default/category-edit.html b/templates/admin/default/category-edit.html
index 13327ca3d..7f59fd38e 100755
--- a/templates/admin/default/category-edit.html
+++ b/templates/admin/default/category-edit.html
@@ -146,7 +146,7 @@
                                                     </label>
 
                                                     <div class="controls">
-                                                        <input type="text" name="id" disabled="disabled" value="#ID" />
+                                                        <input type="text" name="id" disabled="disabled" value="{$ID}" />
                                                     </div>
                                                 </div>
                                             </div>
@@ -162,7 +162,7 @@
                                                             <option value="0">{intl l="Top level"}</option>
 
                                                             {loop name="cat-parent" type="category-tree" visible="*" category="0" exclude="{$current_category_id}"}
-                                                                 <option value="#ID" style="padding-left: {3 + $LEVEL * 20}px" {if $parent_category_id == $ID}selected="selected"{/if}>{$TITLE}</option>
+                                                                 <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $parent_category_id == $ID}selected="selected"{/if}>{$TITLE}</option>
                                                             {/loop}
 
                                                         </select>
diff --git a/templates/admin/default/coupon-read.html b/templates/admin/default/coupon-read.html
index f187df7a0..3055a8cb2 100755
--- a/templates/admin/default/coupon-read.html
+++ b/templates/admin/default/coupon-read.html
@@ -21,18 +21,18 @@
             {loop type="coupon" name="read_coupon" id=1 backend_context="true"}
 			<div class="alert alert-info">				
 				<span class="glyphicon glyphicon-question-sign"></span>
-                {if #IS_ENABLED}{else}This coupon is disabled, you can enable to the bottom of this form.{/if}
+                {if !$IS_ENABLED}This coupon is disabled, you can enable to the bottom of this form.{/if}
 			</div>
 
             <table class="table table-striped">
 				<tbody>
 					<tr>
 						<td>Code</td>
-						<td>#CODE</td>
+						<td>{$CODE}</td>
 					</tr>
 					<tr>
 						<td>Title</td>
-						<td>#TITLE</td>
+						<td>{$TITLE}</td>
 					</tr>
 					<tr>
 						<td>Expiration date</td>
@@ -41,9 +41,9 @@
 	    			<tr>
 	    				<td>Usage left</td>
 	    				<td>
-                            {if #USAGE_LEFT}
+                            {if $USAGE_LEFT}
                             <span class="label label-success">
-                                #USAGE_LEFT
+                                {$USAGE_LEFT}
                             </span>
                             {else}
                             <span class="label label-important">
@@ -53,14 +53,14 @@
                         </td>
 	    			</tr>
                     <tr>
-                        <td colspan="2">#SHORT_DESCRIPTION</td>
+                        <td colspan="2">{$SHORT_DESCRIPTION}</td>
                     </tr>
                     <tr>
-                        <td colspan="2">#DESCRIPTION</td>
+                        <td colspan="2">{$DESCRIPTION}</td>
                     </tr>
 	    			<tr>
                         <td colspan="2">
-                        {if #IS_CUMULATIVE}
+                        {if $IS_CUMULATIVE}
                             <span class="label label-success">
                                 {intl l="May be cumulative"}
                             </span>
@@ -73,7 +73,7 @@
 	    			</tr>
 	    			<tr>
 	    				<td colspan="2">
-                            {if #IS_REMOVING_POSTAGE}
+                            {if $IS_REMOVING_POSTAGE}
                                 <span class="label label-important">
                                     {intl l="Will remove postage"}
                                 </span>
@@ -86,7 +86,7 @@
 	    			</tr>
 	    			<tr>
 	    				<td>Amount</td>
-	    				<td>#AMOUNT</td>
+	    				<td>{$AMOUNT}</td>
 	    			</tr>
 	    			<tr>
 	    				<td>Conditions of application</td>
diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index ea498f72c..a8b248665 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -61,14 +61,14 @@
                         <tbody>
                         {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}}
                             <tr>
-                                <td>{#REF}</td>
+                                <td>{$REF}</td>
 
                                 <td>
-                                    {#COMPANY}
+                                    {$COMPANY}
                                 </td>
 
                                 <td class="object-title">
-                                    {#FIRSTNAME} {#LASTNAME}
+                                    {$FIRSTNAME} {$LASTNAME}
                                 </td>
 
                                 {module_include location='customer_list_row'}
@@ -87,7 +87,7 @@
                                             <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
                                         {/loop}
                                         {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
-                                            <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{#EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
+                                            <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{$EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
                                         {/loop}
                                         {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
                                             <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
@@ -110,21 +110,21 @@
         <div class="col-md-12 text-center">
 
             <ul class="pagination pagination-centered">
-                {if #customer_page != 1}
+                {if $customer_page != 1}
                     <li><a href="{url path="/admin/customers" page="1"}">&laquo;</a></li>
                 {else}
                     <li class="disabled"><a href="#">&laquo;</a></li>
                 {/if}
 
             {pageloop rel="customer_list"}
-                {if #PAGE != #CURRENT}
-                    <li><a href="{url path="/admin/customers" page="#PAGE"}">#PAGE</a></li>
+                {if $PAGE != $CURRENT}
+                    <li><a href="{url path="/admin/customers" page="$PAGE"}">{$PAGE}</a></li>
                 {else}
-                    <li class="active"><a href="#">#PAGE</a></li>
+                    <li class="active"><a href="#">{$PAGE}</a></li>
                 {/if}
 
-                {if #PAGE == #LAST && #LAST != #CURRENT}
-                    <li><a href="{url path="/admin/customers" page="#PAGE"}">&raquo;</a></li>
+                {if $PAGE == $LAST && $LAST != $CURRENT}
+                    <li><a href="{url path="/admin/customers" page="$PAGE"}">&raquo;</a></li>
                 {else}
                     <li class="disabled"><a href="#">&raquo;</a></li>
                 {/if}
diff --git a/templates/admin/default/login.html b/templates/admin/default/login.html
index 8815eb982..bddc9fb08 100755
--- a/templates/admin/default/login.html
+++ b/templates/admin/default/login.html
@@ -18,7 +18,7 @@
 				{form name="thelia.admin.login"}
 				<form action="{url path='/admin/checklogin'}" method="post" class="well form-inline" {form_enctype form=$form}>
 
-					{if #form_error}<div class="alert alert-error">#form_error_message</div>{/if}
+					{if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
 
 	                {form_hidden_fields form=$form}
 
diff --git a/templates/admin/default/message-edit.html b/templates/admin/default/message-edit.html
index a2c524c2e..4014940a5 100644
--- a/templates/admin/default/message-edit.html
+++ b/templates/admin/default/message-edit.html
@@ -50,7 +50,7 @@
 		                        <input type="hidden" name="{$name}" value="{{$edit_language_locale}}" />
 		                        {/form_field}
 
-					            {if #form_error}<div class="alert alert-danger">#form_error_message</div>{/if}
+					            {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
 								
 								{form_field form=$form field='name'}
 								<div class="form-group {if $error}has-error{/if}">