+
+
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
index d58678f19..57ac8bf24 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
@@ -8,13 +8,13 @@
@@ -25,15 +25,15 @@
{if $currentObject->id}
{/if}
diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
index 5e8d4e00d..22a33fd40 100755
--- a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
@@ -25,112 +25,127 @@
{extends file="helpers/form/form.tpl"}
{block name="other_fieldsets"}
-
-
+
{if !$is_multishop}
{/if}
+
{/block}
{block name="script"}
@@ -140,8 +155,10 @@ var conditions = new Array();
function toggle_condition_group(id_condition_group)
{
- $('.condition_group > table').css('border', 'none');
- $('#condition_group_'+id_condition_group+' > table').css('border', '2px solid');
+ $('.condition_group').removeClass('alert-info');
+ $('.condition_group > table').removeClass('alert-info');
+ $('#condition_group_'+id_condition_group+' > table').addClass('alert-info');
+ $('#condition_group_'+id_condition_group).addClass('alert-info');
current_id_condition_group = id_condition_group;
}
@@ -175,9 +192,9 @@ function delete_condition(condition)
function new_condition_group()
{
last_condition_group++;
- var html = '
{l s='Condition group'} '+last_condition_group+'
';
- html += '
| {l s='Type'} | {l s='Value'} | |
|---|
';
- html += '
{l s='OR'}
';
+ var html = '
{l s='OR'}
';
$('#condition_group_list').append(html);
toggle_condition_group(last_condition_group);
}
@@ -219,7 +236,7 @@ $(document).ready(function() {
if (!id_condition)
return false;
- var html = '
| {l s='Category'} | '+$('#id_category option:selected').html()+' |  |
';
+ var html = '
| {l s='Category'} | '+$('#id_category option:selected').html()+' | {l s='Delete'} |
';
appendConditionToGroup(html);
return false;
@@ -230,7 +247,7 @@ $(document).ready(function() {
if (!id_condition)
return false;
- var html = '
| {l s='Manufacturer'} | '+$('#id_manufacturer option:selected').html()+' | |
';
+ var html = '
| {l s='Manufacturer'} | '+$('#id_manufacturer option:selected').html()+' | {l s='Delete'} |
';
appendConditionToGroup(html);
return false;
@@ -241,7 +258,7 @@ $(document).ready(function() {
if (!id_condition)
return false;
- var html = '
| {l s='Supplier'} | '+$('#id_supplier option:selected').html()+' | |
';
+ var html = '
| {l s='Supplier'} | '+$('#id_supplier option:selected').html()+' | {l s='Delete'} |
';
appendConditionToGroup(html);
return false;
@@ -252,7 +269,7 @@ $(document).ready(function() {
if (!id_condition)
return false;
- var html = '
| {l s='Attribute'} | '+$('#id_attribute_group option:selected').html()+': '+$('#id_attribute_'+$('#id_attribute_group option:selected').val()+' option:selected').html()+' | |
';
+ var html = '
| {l s='Attribute'} | '+$('#id_attribute_group option:selected').html()+': '+$('#id_attribute_'+$('#id_attribute_group option:selected').val()+' option:selected').html()+' | {l s='Delete'} |
';
appendConditionToGroup(html);
return false;
@@ -263,7 +280,7 @@ $(document).ready(function() {
if (!id_condition)
return false;
- var html = '
| {l s='Feature'} | '+$('#id_feature option:selected').html()+': '+$('#id_feature_'+$('#id_feature option:selected').val()+' option:selected').html()+' | |
';
+ var html = '
| {l s='Feature'} | '+$('#id_feature option:selected').html()+': '+$('#id_feature_'+$('#id_feature option:selected').val()+' option:selected').html()+' | {l s='Delete'} |
';
appendConditionToGroup(html);
return false;
diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php
index 6163996e9..ac9aada0c 100644
--- a/controllers/admin/AdminCartRulesController.php
+++ b/controllers/admin/AdminCartRulesController.php
@@ -38,12 +38,12 @@ class AdminCartRulesControllerCore extends AdminController
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->fields_list = array(
- 'id_cart_rule' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 40),
+ 'id_cart_rule' => array('title' => $this->l('ID'), 'align' => 'center', 'class' => 'fixed-width-xs'),
'name' => array('title' => $this->l('Name')),
- 'priority' => array('title' => $this->l('Priority'), 'width' => 40),
- 'code' => array('title' => $this->l('Code')),
- 'quantity' => array('title' => $this->l('Quantity'), 'width' => 40),
- 'date_to' => array('title' => $this->l('Until')),
+ 'priority' => array('title' => $this->l('Priority'), 'align' => 'center', 'class' => 'fixed-width-xs'),
+ 'code' => array('title' => $this->l('Code'), 'class' => 'fixed-width-sm'),
+ 'quantity' => array('title' => $this->l('Quantity'), 'align' => 'center', 'class' => 'fixed-width-xs'),
+ 'date_to' => array('title' => $this->l('Until'), 'class' => 'fixed-width-lg'),
'active' => array('title' => $this->l('Status'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false),
);
diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php
index fb46ebdc9..9e8312ff1 100755
--- a/controllers/admin/AdminSpecificPriceRuleController.php
+++ b/controllers/admin/AdminSpecificPriceRuleController.php
@@ -148,6 +148,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Specific price rules'),
+ 'icon' => 'icon-dollar'
),
'input' => array(
array(
- {l s='Add a new condition group'}
-
-