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

Merge remote-tracking branch 'origin/coupon' into coupon

Browse Source 
Conflicts:
	templates/admin/default/coupon/form.html
This commit is contained in:
gmorel
2013-09-04 19:25:57 +02:00
parent 23a4ff26c8 910477f371
commit a9b0f53334
26 changed files with 200 additions and 1362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,13 +216,13 @@
{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>

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

1
templates/admin/default/assets/less/main.less
View File

@@ -3,4 +3,3 @@
/* Thelia Admin */
@import "thelia/thelia.less";
// @import "thelia/responsive.less";

5
templates/admin/default/assets/less/thelia/variables.less
View File

@@ -45,3 +45,8 @@
// Try to avoid customizing these :)
@zindex-dropdown: 1005;
// Forms
// -------------------------
@input-border-focus: @brand-primary;

2
templates/admin/default/coupon-create.html
View File

@@ -20,9 +20,9 @@
{/form}
</section> <!-- #wrapper -->
{/block}
{include file='includes/confirmation-modal.html'}
{/block}
{block name="javascript-initialization"}
{javascripts file='assets/bootstrap-datepicker/js/bootstrap-datepicker.js'}

63
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}

17
templates/admin/default/coupon-read.html
View File

@@ -16,11 +16,11 @@
</div>
<section class="row-fluid">
<div class="span12 general-block-decorator">
<section class="row">
<div class="col-md-12 general-block-decorator">
{loop type="coupon" name="read_coupon" id=1 backend_context="true"}
<div class="alert alert-info">
<span class="icon-question-sign"></span>
<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}
</div>
@@ -91,7 +91,7 @@
<tr>
<td>Conditions of application</td>
<td>
<ul class="unstyled">
<ul class="list-unstyled">
<li>Total cart supperior to 400 &euro;</li>
<li><span class="label label-info">OR</span></li>
<li>At least 4 products</li>
@@ -101,8 +101,8 @@
<tr>
<td>Actions</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="icon-edit icon-white"></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>
@@ -111,9 +111,10 @@
</div>
</section>
</section> <!-- #wrapper -->
{/block}
{include file='includes/confirmation-modal.html'}
{include file='includes/confirmation-modal.html' id="enable" message="{intl l='Do you really want to enable this element ?'}"}
{/block}
{block name="javascript-initialization"}
{javascripts file='assets/js/main.js'}

144
templates/admin/default/coupon/form.html
View File

@@ -1,8 +1,8 @@
{$thelia_page_css_file = "assets/bootstrap-editable/css/bootstrap-editable.css"}
{include file='includes/notifications.html' message=$general_error}
<form action="{$formAction}" {form_enctype form=$form} method="POST" >
<section class="row-fluid">
<div class="span12 general-block-decorator">
<section class="row">
<div class="col-md-12 general-block-decorator">
{form_hidden_fields form=$form}
@@ -16,22 +16,24 @@
<div class="span4">
<div class="control-group">
<div class="col-md-4">
<div class="form-group">
<label for="code">Code :</label>
{form_field form=$form field='code'}
<input id="code" type="text" name="{$name}" value="{$value}" placeholder="code">
<input id="code" class="form-control" type="text" name="{$name}" value="{$value}" placeholder="code">
{if $error}{$message}{/if}
{/form_field}
</div>
<div class="control-group">
<div class="form-group">
<label for="title">Title :</label>
{form_field form=$form field='title'}
<input id="title" type="text" name="{$name}" value="{$value}" placeholder="title">
<input id="title" class="form-control" type="text" name="{$name}" value="{$value}" placeholder="title">
{if $error}{$message}{/if}
{/form_field}
</div>
<div class="control-group">
<div class="form-group">
<label for="enabled" class="checkbox">
{form_field form=$form field='isEnabled'}
<input id="enabled" type="checkbox" name="{$name}" {if $value}value="1" checked{else}value="0"{/if} >
@@ -41,7 +43,7 @@
</label>
</div>
<div class="control-group">
<div class="form-group">
<label for="available-on-special-offers" class="checkbox">
{form_field form=$form field='isAvailableOnSpecialOffers'}
<input id="available-on-special-offers" type="checkbox" name="{$name}" {if $value}value="1" checked{else}value="0"{/if} >
@@ -51,7 +53,7 @@
</label>
</div>
<div class="control-group">
<div class="form-group">
<label for="cumulative" class="checkbox">
{form_field form=$form field='isCumulative'}
<input id="cumulative" type="checkbox" name="{$name}" {if $value}value="1" checked{else}value="0"{/if} >
@@ -61,7 +63,7 @@
</label>
</div>
<div class="control-group">
<div class="form-group">
<label for="renoving-postage" class="checkbox">
{form_field form=$form field='isRemovingPostage'}
<input id="renoving-postage" type="checkbox" name="{$name}" {if $value}value="1" checked{else}value="0"{/if} >
@@ -71,7 +73,7 @@
</label>
</div>
<div class="control-group">
<div class="form-group">
<label for="expiration-date">Expiration date :</label>
<div class="input-append date" data-date="12/02/2012" data-date-format="dd/mm/yyyy">
{form_field form=$form field='expirationDate'}
@@ -82,26 +84,26 @@
</div>
</div>
<div class="control-group">
<div class="form-group">
<label for="max-usage">Max usage :</label>
<label for="is-unlimited" class="checkbox">
<input id="is-unlimited" type="checkbox" name="is-unlimited" checked >
Is unlimited ?
</label>
{form_field form=$form field='maxUsage'}
<input id="max-usage" type="text" name="{$name}" value="{$value}" placeholder="max usage">
<input id="max-usage" type="text" class="form-control" name="{$name}" value="{$value}" placeholder="max usage">
{if $error}{$message}{/if}
{/form_field}
</div>
</div>
<div class="span8">
<div class="col-md-8">
<div class="well clearfix">
<div class="span6">
<div class="control-group">
<div class="col-md-6">
<div class="form-group">
<label for="effect">Effect :</label>
{form_field form=$form field='effect'}
<select name="{$name}" value="{$value}" id="effect" class="span12">
<select name="{$name}" value="{$value}" id="effect" class="col-md-12 form-control">
<option value="1" data-description="More description n°1 about item">Remove x percents for category Y</option>
<option value="2" data-description="More description n°2 about item">Remove x percents</option>
<option value="3" data-description="More description n°3 about item">Remove x amount</option>
@@ -112,29 +114,29 @@
</div>
</div>
<div class="span6">
<div class="control-group">
<div class="col-md-6">
<div class="form-group">
<label for="amount">Amount :</label>
{form_field form=$form field='amount'}
<input id="amount" type="text" name="{$name}" value="{$value}" placeholder="amount">
<input id="amount" type="text" class="form-control" name="{$name}" value="{$value}" placeholder="amount">
{if $error}{$message}{/if}
{/form_field}
</div>
{*<div class="control-group">*}
{*<label for="category">Category :</label>*}
<div class="form-group">
<label for="category">Category :</label>
{*form_field form=$form field='category'*}
{*<select name="{$name}" value="{$value}" id="category">*}
{*<option value="1">Category 1</option>*}
{*<option value="1">Category 2</option>*}
{*<option value="1">Category 3</option>*}
{*</select>*}
<select name="{$name}" value="{$value}" id="category" class="form-control">
<option value="1">Category 1</option>
<option value="1">Category 2</option>
<option value="1">Category 3</option>
</select>
{*if $error}{$message}{/if}*}
{*/form_field*}
{*</div>*}
</div>
</div>
</div>
<div class="control-group">
<div class="form-group">
<label for="short-description">Short description :</label>
{form_field form=$form field='shortDescription'}
<textarea id="short-description" name="{$name}" placeholder="short description" class="span12" rows="5">{$value nofilter}</textarea>
@@ -144,27 +146,29 @@
</div>
<div class="clearfix"></div>
<div class="col-md-12">
<div class="control-group">
<div class="form-group">
<label for="description">Long description :</label>
{form_field form=$form field='description'}
<textarea id="description" name="{$name}" placeholder="long description" class="span12 wysiwyg" rows="10">{$value nofilter}</textarea>
<textarea id="description" name="{$name}" placeholder="long description" class="form-control wysiwyg" rows="10">{$value nofilter}</textarea>
{if $error}{$message}{/if}
{/form_field}
</div>
<button type="submit" class="btn btn-primary">Save</button>
<button type="submit" class="btn btn-default btn-primary">Save</button>
</div>
</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">
<caption class="clearfix">
Rules
<a class="btn btn-primary pull-right" title="Add a new rule">
<span class="icon-plus-sign icon-white"></span>
<a class="btn btn-default btn-primary pull-right" title="Add a new rule">
<span class="glyphicon glyphicon-plus-sign"></span>
</a>
</caption>
<thead>
@@ -181,8 +185,8 @@
<td><span class="label">is superior or equals to</span></td>
<td>300 &euro;</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="#delete"><span class="icon-remove icon-white"></span> Delete</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="#delete"><span class="glyphicon glyphicon-remove"></span> Delete</a>
</td>
</tr>
<tr>
@@ -190,8 +194,8 @@
<td><span class="label">is equals to</span></td>
<td>12 - <a href="#" target="_blank">Chaussettes rouges</a></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="#delete"><span class="icon-remove icon-white"></span> Delete</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="#delete"><span class="glyphicon glyphicon-remove"></span> Delete</a>
</td>
</tr>
<tr>
@@ -199,8 +203,8 @@
<td><span class="label">is inferior or equals to</span></td>
<td>12/02/2014</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="#delete"><span class="icon-remove icon-white"></span> Delete</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="#delete"><span class="glyphicon glyphicon-remove"></span> Delete</a>
</td>
</tr>
</tbody>
@@ -208,10 +212,10 @@
</div>
</section>
<section class="row-fluid">
<div class="span12 general-block-decorator">
<section class="row">
<div class="col-md-12 general-block-decorator clearfix">
<div class="control-group span2">
<div class="form-group col-md-2">
<label for="type">Condition type :</label>
<label class="radio">
<input type="radio" name="type" id="type" value="1" checked> And
@@ -221,73 +225,82 @@
</label>
</div>
<div class="control-group span4">
<div class="form-group col-md-4">
<label for="category-rule">Rule's category :</label>
<select name="categoryRule" id="category-rule">
<select name="categoryRule" id="category-rule" class="form-control">
<option value="1" selected>Total amount</option>
<option value="2">Date</option>
<option value="3">NbArtFromCategory</option>
</select>
<label for="category-rule">Rule's category :</label>
<select name="categoryRule" id="category-rule">
<select name="categoryRule" id="category-rule" class="form-control">
<option value="1">Total amount</option>
<option value="2" selected>Date</option>
<option value="3">NbArtFromCategory</option>
</select>
<label for="category-rule">Rule's category :</label>
<select name="categoryRule" id="category-rule">
<select name="categoryRule" id="category-rule" class="form-control">
<option value="1">Total amount</option>
<option value="2">Date</option>
<option value="3" selected>NbArtFromCategory</option>
</select>
</div>
<div class="control-group span6">
<div class="form-group col-md-6">
<label for="operator">Operator :</label>
<div class="controls">
<select name="operator" id="operator">
<div class="row">
<div class="col-lg-6">
<select name="operator" id="operator" class="form-control">
<option value="1">is superior to</option>
<option value="2">equals to</option>
<option value="3">is inferior to</option>
<option value="4">is inferior or equals to</option>
<option value="5">is superior or equals to</option>
</select>
<div class="input-append input-prepend">
<span class="add-on">&euro;</span>
<input type="text" name="value" class="input-mini">
<button class="add-on btn btn-primary"><span class="icon-plus icon-white"></span></button>
</div>
<div class="input-group col-lg-6">
<input type="text" name="value" class="form-control">
<span class="input-group-addon">&euro;</span>
</div>
</div>
<label for="operator">Operator :</label>
<div class="controls">
<select name="operator" id="operator">
<div class="row">
<div class="col-lg-6">
<select name="operator" id="operator" class="form-control">
<option value="1">is superior to</option>
<option value="2">equals to</option>
<option value="3">is inferior to</option>
<option value="4">is inferior or equals to</option>
<option value="5">is superior or equals to</option>
</select>
<div class="input-append input-prepend date" data-date="12/02/2012" data-date-format="dd/mm/yyyy">
<span class="add-on"><span class="icon-th"></span></span>
<input type="text" name="value" class="input-mini">
<button class="add-on btn btn-primary"><span class="icon-plus icon-white"></span></button>
</div>
<div class="input-group col-lg-6 date" data-date="12/02/2012" data-date-format="dd/mm/yyyy">
<input type="text" name="value" class="form-control">
<span class="input-group-addon"><span class="glyphicon glyphicon-th"></span></span>
</div>
</div>
<label for="operator">Operator :</label>
<div class="controls">
<select name="operator" id="operator">
<div class="row">
<div class="col-lg-6">
<select name="operator" id="operator" class="form-control">
<option value="1">is superior to</option>
<option value="2">equals to</option>
<option value="3">is inferior to</option>
<option value="4">is inferior or equals to</option>
<option value="5">is superior or equals to</option>
</select>
<input type="text" name="value" class="input-mini">
</div>
<div class="col-lg-6">
<input type="text" name="value" class="form-control">
</div>
</div>
<div class="row">
<div class="col-lg-12">
<table class="table table-bordered">
<tr>
<td id="minibrowser-breadcrumb"></td>
@@ -302,6 +315,7 @@
</div>
</div>
</div>
</div>
</section>
</form>

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

@@ -5,11 +5,13 @@
- 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-dialog">
<div class="modal-content">
<div class="modal-header">
<h3>
{if $title}
$title
{$title}
{else}
{intl l='Confirmation'}
{/if}
@@ -18,15 +20,17 @@
<div class="modal-body">
<p>
{if $message}
$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>
<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>