TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mespeche
2013-09-04 17:09:59 +02:00
parent b9577e87e3
commit 7362a5a93b
21 changed files with 67 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/admin/default/admin-layout.tpl
View File

@@ -214,15 +214,15 @@
<script src="{$asset_url}"></script>
{/javascripts}
{block name="after-javascript-include"}{/block}
{javascripts file='assets/js/bootstrap/bootstrap.js'}
<script src="{$asset_url}"></script>
{/javascripts}
{block name="after-javascript-include"}{/block}
{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>

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/animated-overlay.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 212 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_75_F9F9F9_40x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 230 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 335 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 332 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-hard_75_FFF_1x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 203 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_100_f39922_1x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 364 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_65_f39922_1x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 349 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_75_f39922_1x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 366 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_2e83ff_256x240.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_333333_256x240.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.8 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_454545_256x240.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.8 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_888888_256x240.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.8 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_FFF_256x240.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.2 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_cd0a0a_256x240.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

1177
templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css vendored
View File

File diff suppressed because it is too large Load Diff

8
templates/admin/default/assets/js/main.js
View File

@@ -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){

65
templates/admin/default/coupon-list.html
View File

@@ -15,8 +15,8 @@
<h1>Coupons : <small>List of coupons</small></h1>
</div>
<section class="row-fluid">
<div class="span12 general-block-decorator">
<section class="row">
<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-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-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</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-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-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</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-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-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</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-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-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</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">
<div class="span12 general-block-decorator">
<section class="row">
<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-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-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</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-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-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</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-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-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</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-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-primary btn-medium"><span class="glyphicon glyphicon-edit"></span> Edit</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'}
{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'}
{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}

48
templates/admin/default/includes/confirmation-modal.html
View File

@@ -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">
<div class="modal-header">
<h3>
{if $title}
$title
{else}
{intl l='Confirmation'}
{/if}
</h3>
</div>
<div class="modal-body">
<p>
{if $message}
$message
{else}
{intl l='Do you really want to delete this element ?'}
{/if}
</p>
</div>
<div class="modal-footer">
<button class="btn btn-inverse" data-dismiss="modal">{intl l='Cancel'}</button>
<a href="#" class="btn btn-success" data-confirm="confirm">{intl l='Confirm'}</a>
<aside id="{if $id}{$id}{else}delete{/if}" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h3>
{if $title}
{$title}
{else}
{intl l='Confirmation'}
{/if}
</h3>
</div>
<div class="modal-body">
<p>
{if $message}
{$message}
{else}
{intl l='Do you really want to delete this element ?'}
{/if}
</p>
</div>
<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}

7
templates/admin/default/includes/coupon_breadcrumb.html
View File

@@ -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><span class="divider">/</span></li>
<li><a href="{url path="admin/coupon/browse/$ID"}">Browse</a> <span class="divider">/</span></li>
<li><a href="{url path="admin/coupon/browse/$ID"}">Browse</a></li>