uniformity of structure

templates/backOffice/default/coupon-update.html

@@ -6,25 +6,22 @@
 {block name="page-title"}{intl l='Update coupon'}{/block}
 
 {block name="main-content"}
-<section id="wrapper" class="container">
+<div class="coupon edit-coupon">
+    <div id="wrapper" class="container">
 
         <nav>
             <ul class="breadcrumb">
                 <li><a href="{url path='admin/home'}">{intl l='Home'}</a></li>
                 <li><a href="{url path='admin/coupon'}">{intl l='Coupon'}</a></li>
-            <li>{intl l='Update'} {$couponCode}</li>
+                <li>{intl l="Editing %title" title="$couponCode"}</li>
             </ul>
         </nav>
 
-    <div class="page-header">
-        <h1>{intl l='Coupons : '}<small>{intl l='Update'} {$couponCode}</small></h1>
-    </div>
-
         {form name="thelia.admin.coupon.creation"}
             {include file='coupon/form.html' formAction={url path={$formAction}} form=$form noConditions=false}
         {/form}
-
+    </div> <!-- #wrapper -->
-</section> <!-- #wrapper -->
+</div>
 {/block}
 
 {block name="javascript-initialization"}

templates/backOffice/default/coupon/form.html

@@ -1,10 +1,17 @@
 {$thelia_page_css_file = "assets/bootstrap-editable/css/bootstrap-editable.css"}
 {include file='includes/notifications.html' message=$general_error}
 
-<section class="row">
+<div class="row">
-    <form action="{$formAction}" {form_enctype form=$form} method="POST" >
-
     <div class="col-md-12 general-block-decorator">
+        <div class="row">
+            <div class="col-md-7 title">
+                {intl l='Edit %title' title=$couponCode}
+            </div>
+        </div>
+
+        <div class="form-container">
+
+            <form action="{$formAction}" {form_enctype form=$form} method="POST" >
 
                 {form_hidden_fields form=$form}
 
@@ -16,8 +23,6 @@
                     <input type="hidden" name="{$name}" value="{url path='/admin/coupon/update/{id}'}" />
                 {/form_field}
 
-            <div class="span4">
-                <div class="control-group">
                 {if !$noConditions}
                     {include
                     file = "includes/inner-form-toolbar.html"
@@ -26,6 +31,8 @@
                     page_url  = "{url path="{$formAction}"}"
                     }
                 {/if}
+
+                <div class="row">
                     <div class="col-md-4">
                         {form_field form=$form field='code'}
                             <div class="form-group {if $error}has-error{/if}">
@@ -145,8 +152,8 @@
                     </div>
             
                     <div class="clearfix"></div>
-            <div class="col-md-12">
 
+                    <div class="col-md-12">
                         {form_field form=$form field='description'}
                             <div class="form-group {if $error}has-error{/if}">
                                 <label for="description" class="control-label">{intl l='Long description :'}</label>
@@ -159,17 +166,20 @@
                             <button id="save-coupon-btn" type="submit" class="btn btn-default btn-primary">{intl l='Save your modifications'}</button>
                         {/if}
                     </div>
-
                 </div>
             </form>
-</section>
+        </div>
+    </div>
+</div>
 
 {if $noConditions}
     {include file='includes/notifications.html' message={intl l='Please save your Coupon in oder to affect it some conditions'}}
 {else}
-    <section class="row">
+<div class="row">
     <div class="col-md-12 general-block-decorator">
-            <table class="table table-striped">
+
+        <div class="table-responsive">
+            <table class="table table-striped table-condensed" id="folder_list">
                 <caption class="clearfix">
                     {intl l='Conditions'}
                 </caption>
@@ -184,25 +194,20 @@
                 </tbody>
             </table>
         </div>
-    </section>
 
-    <section class="row">
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12 general-block-decorator">
+
+        <div class="form-container">
             <form id="condition-form" action="{$urlAjaxSaveConditions}" {form_enctype form=$form} method="POST" >
-            <div class="col-md-12 general-block-decorator clearfix">
+                <div class="well clearfix">
                     <a id="condition-save-btn" title="{intl l='Save this condition'}" class="btn btn-default btn-primary pull-right" data-toggle="confirm" data-script="">
                         <span class="glyphicon glyphicon-plus-sign"></span> {intl l='Save this condition'}
                     </a>
 
-                <div id="condition-add-organizer" class="form-group col-md-2">
-                    {*<label for="type">{intl l='Condition type :'}</label>*}
-                    {*<label class="radio">*}
-                        {*<input type="radio" name="type" class="form-control" id="type" value="1" checked> {intl l='And'}*}
-                    {*</label>*}
-                    {*<label class="radio">*}
-                        {*<input type="radio" name="type" class="form-control" value="2"> {intl l='Or'}*}
-                    {*</label>*}
-                </div>
-
                     <div id="condition-add-type" class="form-group col-md-4">
                         <label for="categoryCondition">{intl l='Condition\'s category :'}</label>
                         <select name="categoryCondition" id="category-condition" class="form-control">
@@ -217,6 +222,9 @@
                     <div id="condition-add-operators-values" class="form-group col-md-6"></div>
                 </div>
             </form>
-    </section>
+        </div>
+
+    </div>
+</div>
 {/if}