Working : Update to bootstrap3 + Delete js filter for the moment

templates/admin/default/admin-layout.tpl

@@ -214,15 +214,15 @@
 	    <script src="{$asset_url}"></script>
 	{/javascripts}
 
-	{block name="after-javascript-include"}{/block}
+	{block name="after-javascript-include"}{/block}	
-
-	{javascripts file='assets/js/bootstrap/bootstrap.js'}
-	    <script src="{$asset_url}"></script>
-	{/javascripts}
 
     {block name="javascript-initialization"}{/block}
 
 	{* Modules scripts are included now *}
 	{module_include location='footer_js'}
+
+    {javascripts file='assets/js/bootstrap/bootstrap.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
 </body>
 </html>

templates/admin/default/assets/js/main.js

@@ -4,16 +4,16 @@
 
         // -- Init datepicker --
         if($('.date').length){
-            $('.date').datepicker();
+            //$('.date').datepicker();
         }
 
         // -- Init tablesorter --
-        if($('.tablesorter').length){
+        /*if($('.tablesorter').length){
             $('.tablesorter').tablesorter({                
                 widgets: ["filter", "stickyHeaders"],
                 widthFixed : false,
                 widgetOptions : {
-                    filter_cssFilter : 'input-medium',
+                    filter_cssFilter : 'input-medium form-control',
                     filter_formatter : {
                         
                         2 : function($cell, indx){                            
@@ -38,7 +38,7 @@
                     }
                 }
             });
-        }
+        }*/
 
         // -- Effect description
         if($('[name=effect]').length){

templates/admin/default/coupon-list.html

@@ -15,8 +15,8 @@
         <h1>Coupons : <small>List of coupons</small></h1>
     </div>
 
-    <section class="row-fluid">
+    <section class="row">
-		<div class="span12 general-block-decorator">
+		<div class="col-md-12 general-block-decorator">
 	    	<table class="table table-striped tablesorter">
 	    		<caption>
 	    			List of enabled coupons
@@ -37,8 +37,8 @@
 	    				<td>18/10/2013</td>
 	    				<td>49</td>
 	    				<td>
-	    					<a href="#url" class="btn btn-primary btn-medium"><span class="icon-edit icon-white"></span> Edit</a>
+	    					<a href="#url" class="btn btn-default btn-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</a>
-	    					<a href="#url" class="btn btn-danger btn-medium" data-toggle="confirm" data-target="#disable"><span class="icon-off icon-white"></span> Disable</a>
+	    					<a href="#url" class="btn btn-default btn-danger btn-medium" data-toggle="confirm" data-target="#disable"><span class="glyphicon glyphicon-off"></span> Disable</a>
 	    				</td>
 	    			</tr>
 	    			<tr>
@@ -47,8 +47,8 @@
 	    				<td>05/09/2013</td>
 	    				<td>20</td>
 	    				<td>
-	    					<a href="#url" class="btn btn-primary btn-medium"><span class="icon-edit icon-white"></span> Edit</a>
+	    					<a href="#url" class="btn btn-default btn-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</a>
-	    					<a href="#url" class="btn btn-danger btn-medium" data-toggle="confirm" data-target="#disable"><span class="icon-off icon-white"></span> Disable</a>
+	    					<a href="#url" class="btn btn-default btn-danger btn-medium" data-toggle="confirm" data-target="#disable"><span class="glyphicon glyphicon-off"></span> Disable</a>
 	    				</td>
 	    			</tr>
 	    			<tr>
@@ -57,8 +57,8 @@
 	    				<td>03/12/2013</td>
 	    				<td>9</td>
 	    				<td>
-	    					<a href="#url" class="btn btn-primary btn-medium"><span class="icon-edit icon-white"></span> Edit</a>
+	    					<a href="#url" class="btn btn-default btn-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</a>
-	    					<a href="#url" class="btn btn-danger btn-medium" data-toggle="confirm" data-target="#disable"><span class="icon-off icon-white"></span> Disable</a>
+	    					<a href="#url" class="btn btn-default btn-danger btn-medium" data-toggle="confirm" data-target="#disable"><span class="glyphicon glyphicon-off"></span> Disable</a>
 	    				</td>
 	    			</tr>
 	    			<tr>
@@ -67,8 +67,8 @@
 	    				<td>25/01/2013</td>
 	    				<td>4</td>
 	    				<td>
-	    					<a href="#url" class="btn btn-primary btn-medium"><span class="icon-edit icon-white"></span> Edit</a>
+	    					<a href="#url" class="btn btn-default btn-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</a>
-	    					<a href="#url" class="btn btn-danger btn-medium" data-toggle="confirm" data-target="#disable"><span class="icon-off icon-white"></span> Disable</a>
+	    					<a href="#url" class="btn btn-default btn-danger btn-medium" data-toggle="confirm" data-target="#disable"><span class="glyphicon glyphicon-off"></span> Disable</a>
 	    				</td>
 	    			</tr>
 	    		</tbody>
@@ -76,8 +76,8 @@
 		</div>
     </section>
 
-    <section class="row-fluid">
+    <section class="row">
-		<div class="span12 general-block-decorator">
+		<div class="col-md-12 general-block-decorator">
 	    	<table class="table table-striped tablesorter">
 	    		<caption>
 	    			List of disabled coupons
@@ -98,8 +98,8 @@
 	    				<td>18/10/2013</td>
 	    				<td>49</td>
 	    				<td>
-	    					<a href="#url" class="btn btn-primary btn-medium"><span class="icon-edit icon-white"></span> Edit</a>
+	    					<a href="#url" class="btn btn-default btn-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</a>
-	    					<a href="#url" class="btn btn-success btn-medium" data-toggle="confirm" data-target="#enable"><span class="icon-ok icon-white"></span> Enabled</a>
+	    					<a href="#url" class="btn btn-default btn-success btn-medium" data-toggle="confirm" data-target="#enable"><span class="glyphicon glyphicon-ok"></span> Enabled</a>
 	    				</td>
 	    			</tr>
 	    			<tr>
@@ -108,8 +108,8 @@
 	    				<td>05/09/2013</td>
 	    				<td>49</td>
 	    				<td>
-	    					<a href="#url" class="btn btn-primary btn-medium"><span class="icon-edit icon-white"></span> Edit</a>
+	    					<a href="#url" class="btn btn-default btn-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</a>
-	    					<a href="#url" class="btn btn-success btn-medium" data-toggle="confirm" data-target="#enable"><span class="icon-ok icon-white"></span> Enabled</a>
+	    					<a href="#url" class="btn btn-default btn-success btn-medium" data-toggle="confirm" data-target="#enable"><span class="glyphicon glyphicon-ok"></span> Enabled</a>
 	    				</td>
 	    			</tr>
 	    			<tr>
@@ -118,8 +118,8 @@
 	    				<td>03/12/2013</td>
 	    				<td>49</td>
 	    				<td>
-	    					<a href="#url" class="btn btn-primary btn-medium"><span class="icon-edit icon-white"></span> Edit</a>
+	    					<a href="#url" class="btn btn-default btn-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</a>
-	    					<a href="#url" class="btn btn-success btn-medium" data-toggle="confirm" data-target="#enable"><span class="icon-ok icon-white"></span> Enabled</a>
+	    					<a href="#url" class="btn btn-default btn-success btn-medium" data-toggle="confirm" data-target="#enable"><span class="glyphicon glyphicon-ok"></span> Enabled</a>
 	    				</td>
 	    			</tr>
 	    			<tr>
@@ -128,8 +128,8 @@
 	    				<td>25/01/2013</td>
 	    				<td>49</td>
 	    				<td>
-	    					<a href="#url" class="btn btn-primary btn-medium"><span class="icon-edit icon-white"></span> Edit</a>
+	    					<a href="#url" class="btn btn-default btn-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</a>
-	    					<a href="#url" class="btn btn-success btn-medium" data-toggle="confirm" data-target="#enable"><span class="icon-ok icon-white"></span> Enabled</a>
+	    					<a href="#url" class="btn btn-default btn-success btn-medium" data-toggle="confirm" data-target="#enable"><span class="glyphicon glyphicon-ok"></span> Enabled</a>
 	    				</td>
 	    			</tr>
 	    		</tbody>
@@ -138,41 +138,36 @@
     </section>
 
 </section> <!-- #wrapper -->
-{/block}
 
 {include file='includes/confirmation-modal.html' id="disable" message="{intl l='Do you really want to disable this element ?'}"}
 {include file='includes/confirmation-modal.html' id="enable" message="{intl l='Do you really want to enable this element ?'}"}
 
+{/block}
+
+
 {block name="javascript-initialization"}
-    {include file='includes/js.inc.html'}
+	
-
+    {javascripts file='assets/bootstrap-editable/js/bootstrap-editable.js'}
-    {stylesheets file='../assets/css/jqueryui/custom-theme/*' filters='less,cssembed'}
-        <link rel="stylesheet" href="{$asset_url}">
-    {/stylesheets}
-
-    <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.0/jquery-ui.min.js"></script>
-
-    {javascripts file='../assets/bootstrap-editable/js/bootstrap-editable.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
 
-    {javascripts file='../assets/js/tablesorter/jquery.tablesorter.min.js'}
+    {javascripts file='assets/js/tablesorter/jquery.tablesorter.min.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
 
-    {javascripts file='../assets/js/tablesorter/jquery.metadata.js'}
+    {javascripts file='assets/js/tablesorter/jquery.metadata.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
 
-    {javascripts file='../assets/js/tablesorter/jquery.tablesorter.widgets.js'}
+    {javascripts file='assets/js/tablesorter/jquery.tablesorter.widgets.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
 
-    {javascripts file='../assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js'}
+    {javascripts file='assets/js/tablesorter/jquery.tablesorter.widgets-filter-formatter.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
 
-    {javascripts file='../assets/js/main.js'}
+    {javascripts file='assets/js/main.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
 {/block}

templates/admin/default/includes/confirmation-modal.html

@@ -5,28 +5,32 @@
     - message : modal message (default Do you really want to delete this element ?)
 *}
 {block name="confirmation-modal"}
-<aside id="{if $id}$id{else}delete{/if}" class="modal hide fade" role="dialog">
+<aside id="{if $id}{$id}{else}delete{/if}" class="modal fade" role="dialog">
-    <div class="modal-header">
+    <div class="modal-dialog">
-        <h3>
+        <div class="modal-content">
-            {if $title}
+            <div class="modal-header">
-                $title
+                <h3>
-            {else}
+                    {if $title}
-                {intl l='Confirmation'}
+                        {$title}
-            {/if}
+                    {else}
-        </h3>
+                        {intl l='Confirmation'}
-    </div>
+                    {/if}
-    <div class="modal-body">
+                </h3>
-        <p>
+            </div>
-        {if $message}
+            <div class="modal-body">
-            $message
+                <p>
-        {else}
+                {if $message}
-            {intl l='Do you really want to delete this element ?'}
+                    {$message}
-        {/if}
+                {else}
-        </p>
+                    {intl l='Do you really want to delete this element ?'}
-    </div>
+                {/if}
-    <div class="modal-footer">
+                </p>
-        <button class="btn btn-inverse" data-dismiss="modal">{intl l='Cancel'}</button>
+            </div>
-        <a href="#" class="btn btn-success" data-confirm="confirm">{intl l='Confirm'}</a>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal">{intl l='Cancel'}</button>
+                <a href="#" class="btn btn-default btn-success" data-confirm="confirm">{intl l='Confirm'}</a>
+            </div>
+        </div>
     </div>
 </aside> <!-- #delete / Delete confirmation -->
 {/block}

templates/admin/default/includes/coupon_breadcrumb.html

@@ -1,8 +1,5 @@
 {* Breadcrumb for coupon browsing and editing *}
 
-<li><a href="{url path='admin/home'}">Home</a> <span class="divider">/</span></li>
+<li><a href="{url path='admin/home'}">Home</a></li>
 <li><a href="{url path='admin/coupon'}">Coupon</a></li>
-
+<li><a href="{url path="admin/coupon/browse/$ID"}">Browse</a></li>
-<li><span class="divider">/</span></li>
-<li><a href="{url path="admin/coupon/browse/$ID"}">Browse</a> <span class="divider">/</span></li>
-