dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Cart rules bootstrap design

Browse Source
This commit is contained in:
Jerome Nadaud committed 2013-09-26 14:55:28 +02:00
1 parent b6d3bf1bc3
commit 2d65f5a8c0
5 files changed
+128 -107
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+6 -3
View File
@@ -272,8 +272,9 @@
<input type="checkbox" id="shop_restriction" name="shop_restriction" value="1" {if $shops.unselected|@count}checked="checked"{/if} /> <input type="checkbox" id="shop_restriction" name="shop_restriction" value="1" {if $shops.unselected|@count}checked="checked"{/if} />
{l s='Shop selection'} {l s='Shop selection'}
</label> </label>
<div id="shop_restriction_div" > <div id="shop_restriction_div">
<table class="col-lg-12"> <br/>
<table class="col-lg-9">
<tr> <tr>
<td> <td>
<p>{l s='Unselected shops'}</p> <p>{l s='Unselected shops'}</p>
@@ -282,6 +283,7 @@
<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option> <option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option>
{/foreach} {/foreach}
</select> </select>
<br/>
<a id="shop_select_add" class="btn btn-default" >{l s='Add'} &gt;&gt; </a> <a id="shop_select_add" class="btn btn-default" >{l s='Add'} &gt;&gt; </a>
</td> </td>
<td> <td>
@@ -291,7 +293,8 @@
<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option> <option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option>
{/foreach} {/foreach}
</select> </select>
<a id="shop_select_remove" class="btn" > &lt;&lt; {l s='Remove'} </a> <br/>
<a id="shop_select_remove" class="btn btn-default" > &lt;&lt; {l s='Remove'} </a>
</td> </td>
</tr> </tr>
</table> </table>
admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+6 -6
View File
@@ -8,13 +8,13 @@
<div class="productTabs"> <div class="productTabs">
<ul class="tab nav nav-tabs"> <ul class="tab nav nav-tabs">
<li class="tab-row"> <li class="tab-row">
<a class="tab-page" id="cart_rule_link_informations" href="javascript:displayCartRuleTab('informations');">{l s='Information'}</a> <a class="tab-page" id="cart_rule_link_informations" href="javascript:displayCartRuleTab('informations');"><i class="icon-info"></i> {l s='Information'}</a>
</li> </li>
<li class="tab-row"> <li class="tab-row">
<a class="tab-page" id="cart_rule_link_conditions" href="javascript:displayCartRuleTab('conditions');">{l s='Conditions'}</a> <a class="tab-page" id="cart_rule_link_conditions" href="javascript:displayCartRuleTab('conditions');"><i class="icon-random"></i> {l s='Conditions'}</a>
</li> </li>
<li class="tab-row"> <li class="tab-row">
<a class="tab-page" id="cart_rule_link_actions" href="javascript:displayCartRuleTab('actions');">{l s='Actions'}</a> <a class="tab-page" id="cart_rule_link_actions" href="javascript:displayCartRuleTab('actions');"><i class="icon-wrench"></i> {l s='Actions'}</a>
</li> </li>
</ul> </ul>
</div> </div>
@@ -25,15 +25,15 @@
{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if} {if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" /> <input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
<fieldset id="cart_rule_informations" class="cart_rule_tab"> <fieldset id="cart_rule_informations" class="cart_rule_tab">
<h3>{l s='Cart rule information'}</h3> <h3><i class="icon-info"></i> {l s='Cart rule information'}</h3>
{include file='controllers/cart_rules/informations.tpl'} {include file='controllers/cart_rules/informations.tpl'}
</fieldset> </fieldset>
<fieldset id="cart_rule_conditions" class="cart_rule_tab"> <fieldset id="cart_rule_conditions" class="cart_rule_tab">
<h3>{l s='Cart rule conditions'}</h3> <h3><i class="icon-random"></i> {l s='Cart rule conditions'}</h3>
{include file='controllers/cart_rules/conditions.tpl'} {include file='controllers/cart_rules/conditions.tpl'}
</fieldset> </fieldset>
<fieldset id="cart_rule_actions" class="cart_rule_tab"> <fieldset id="cart_rule_actions" class="cart_rule_tab">
<h3>{l s='Cart rule actions'}</h3> <h3><i class="icon-wrench"></i> {l s='Cart rule actions'}</h3>
{include file='controllers/cart_rules/actions.tpl'} {include file='controllers/cart_rules/actions.tpl'}
</fieldset> </fieldset>
<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn"><i class="icon-save"></i> {l s='Save'}</button> <button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn"><i class="icon-save"></i> {l s='Save'}</button>
admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
+110 -93
View File
@@ -25,112 +25,127 @@
{extends file="helpers/form/form.tpl"} {extends file="helpers/form/form.tpl"}
{block name="other_fieldsets"} {block name="other_fieldsets"}
<div class="clear">&nbsp;</div>
<div id="conditions" class="Bloc"> <div id="conditions" class="Bloc">
<div id="condition_group_list"> <div id="condition_group_list">
</div> </div>
<a class="button bt-icon" href="#" id="add_condition_group">
<img src="../img/admin/add.gif" /> <a class="btn btn-default" href="#" id="add_condition_group">
{l s='Add a new condition group'} <i class="icon-plus-sign"></i> {l s='Add a new condition group'}
</a> </a>
<div id="condition_list"> <div class="clearfix">&nbsp;</div>
<h3>{l s='Conditions'}</h3> <fieldset>
<h3><i class="icon-tasks"></i> {l s='Conditions'}</h3>
<form class="form-horizontal">
<div class="row"> <div class="row">
<label for="id_category">{l s='Category'}</label> <label for="id_category" class="control-label col-lg-3">{l s='Category'}</label>
<div class="margin-form"> <div class="col-lg-9">
<div class="col-lg-8">
<select id="id_category" name="id_category"> <select id="id_category" name="id_category">
{foreach from=$categories item='category'} {foreach from=$categories item='category'}
<option value="{$category.id_category}">{$category.name}</option> <option value="{$category.id_category}">{$category.name}</option>
{/foreach} {/foreach}
</select> </select>
<a class="button bt-icon" href="#" id="add_condition_category">
<img src="../img/admin/add.gif" />
{l s='Add condition'}
</a>
</div> </div>
<div class="col-lg-1">
<a class="btn btn-default" href="#" id="add_condition_category">
<i class="icon-plus-sign"></i> {l s='Add condition'}
</a>
</div>
</div>
</div> </div>
<div class="row"> <div class="row">
<label for="id_manufacturer">{l s='Manufacturer'}</label> <label for="id_manufacturer" class="control-label col-lg-3">{l s='Manufacturer'}</label>
<div class="margin-form"> <div class="col-lg-9">
<select id="id_manufacturer" name="id_manufacturer"> <div class="col-lg-8">
{foreach from=$manufacturers item='manufacturer'} <select id="id_manufacturer" name="id_manufacturer">
<option value="{$manufacturer.id_manufacturer}">{$manufacturer.name}</option> {foreach from=$manufacturers item='manufacturer'}
{/foreach} <option value="{$manufacturer.id_manufacturer}">{$manufacturer.name}</option>
</select> {/foreach}
<a class="button bt-icon" href="#" id="add_condition_manufacturer"> </select>
<img src="../img/admin/add.gif" /> </div>
{l s='Add condition'} <div class="col-lg-1">
</a> <a class="btn btn-default" href="#" id="add_condition_manufacturer">
<i class="icon-plus-sign"></i> {l s='Add condition'}
</a>
</div>
</div>
</div> </div>
</div>
<div class="row"> <div class="row">
<label for="id_supplier">{l s='Supplier'}</label> <label for="id_supplier" class="control-label col-lg-3">{l s='Supplier'}</label>
<div class="margin-form"> <div class="col-lg-9">
<select id="id_supplier" name="id_supplier"> <div class="col-lg-8">
{foreach from=$suppliers item='supplier'} <select id="id_supplier" name="id_supplier">
<option value="{$supplier.id_supplier}">{$supplier.name}</option> {foreach from=$suppliers item='supplier'}
{/foreach} <option value="{$supplier.id_supplier}">{$supplier.name}</option>
</select> {/foreach}
<a class="button bt-icon" href="#" id="add_condition_supplier"> </select>
<img src="../img/admin/add.gif" /> </div>
{l s='Add condition'} <div class="col-lg-1">
</a> <a class="btn btn-default" href="#" id="add_condition_supplier">
<i class="icon-plus-sign"></i> {l s='Add condition'}
</a>
</div>
</div>
</div> </div>
</div>
<div class="row"> <div class="row">
<label for="id_attribute">{l s='Attributes'}</label> <label for="id_attribute" class="control-label col-lg-3">{l s='Attributes'}</label>
<div class="margin-form"> <div class="col-lg-9">
<select id="id_attribute_group"> <div class="col-lg-4">
{foreach from=$attributes_group item='attribute_group'} <select id="id_attribute_group">
<option value="{$attribute_group.id_attribute_group}">{$attribute_group.name}</option> {foreach from=$attributes_group item='attribute_group'}
{/foreach} <option value="{$attribute_group.id_attribute_group}">{$attribute_group.name}</option>
</select> {/foreach}
{foreach from=$attributes_group item='attribute_group'} </select>
<select class="id_attribute" style="display:none;" id="id_attribute_{$attribute_group.id_attribute_group}"> </div>
{foreach from=$attribute_group.attributes item='attribute'} <div class="col-lg-4">
<option value="{$attribute.id_attribute}">{$attribute.name}</option> {foreach from=$attributes_group item='attribute_group'}
<select class="id_attribute" style="display:none;" id="id_attribute_{$attribute_group.id_attribute_group}">
{foreach from=$attribute_group.attributes item='attribute'}
<option value="{$attribute.id_attribute}">{$attribute.name}</option>
{/foreach}
</select>
{/foreach} {/foreach}
</select> </select>
{/foreach} </div>
</select> <div class="col-lg-1">
<a rel="" class="button bt-icon" href="#" id="add_condition_attribute"> <a class="btn btn-default" href="#" id="add_condition_attribute">
<img src="../img/admin/add.gif" /> <i class="icon-plus-sign"></i> {l s='Add condition'}
{l s='Add condition'} </a>
</a> </div>
</div>
</div> </div>
</div>
<div class="row"> <div class="row">
<label for="id_attribute">{l s='Features'}</label> <label for="id_attribute" class="control-label col-lg-3">{l s='Features'}</label>
<div class="margin-form"> <div class="col-lg-9">
<select id="id_feature"> <div class="col-lg-4">
{foreach from=$features item='feature'} <select id="id_feature">
<option value="{$feature.id_feature}">{$feature.name}</option> {foreach from=$features item='feature'}
{/foreach} <option value="{$feature.id_feature}">{$feature.name}</option>
</select> {/foreach}
{foreach from=$features item='feature'} </select>
<select class="id_feature_value" style="display:none;" id="id_feature_{$feature.id_feature}"> </div>
{foreach from=$feature.values item='value'} <div class="col-lg-4">
<option value="{$value.id_feature_value}">{$value.value}</option> {foreach from=$features item='feature'}
<select class="id_feature_value" style="display:none;" id="id_feature_{$feature.id_feature}">
{foreach from=$feature.values item='value'}
<option value="{$value.id_feature_value}">{$value.value}</option>
{/foreach}
</select>
{/foreach} {/foreach}
</select> </select>
{/foreach} </div>
</select> <div class="col-lg-1">
<a class="button bt-icon" href="#" id="add_condition_feature"> <a class="btn btn-default" href="#" id="add_condition_feature">
<img src="../img/admin/add.gif" /> <i class="icon-plus-sign"></i> {l s='Add condition'}
{l s='Add condition'} </a>
</a> </div>
</div>
</div> </div>
</div> </form>
</div>
</div>
{if !$is_multishop} {if !$is_multishop}
<input type="hidden" name="id_shop" value=1 /> <input type="hidden" name="id_shop" value=1 />
{/if} {/if}
</fieldset>
{/block} {/block}
{block name="script"} {block name="script"}
@@ -140,8 +155,10 @@ var conditions = new Array();
function toggle_condition_group(id_condition_group) function toggle_condition_group(id_condition_group)
{ {
$('.condition_group > table').css('border', 'none'); $('.condition_group').removeClass('alert-info');
$('#condition_group_'+id_condition_group+' > table').css('border', '2px solid'); $('.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; current_id_condition_group = id_condition_group;
} }
@@ -175,9 +192,9 @@ function delete_condition(condition)
function new_condition_group() function new_condition_group()
{ {
last_condition_group++; last_condition_group++;
var html = '<div class="condition_group" id="condition_group_'+last_condition_group+'"><h3>{l s='Condition group'} '+last_condition_group+'</h3>'; var html = '<fieldset id="condition_group_'+last_condition_group+'" class="condition_group alert-info"><h3><i class="icon-tasks"></i> {l s='Condition group'} '+last_condition_group+'</h3>';
html += '<table cellspacing="0" cellpadding="0" class="table width3"><thead><tr><th width="196px" height="39">{l s='Type'}</th><th width="300px">{l s='Value'}</th><th></th></tr></thead><tbody></tbody></table>'; html += '<table class="table alert-info"><thead><tr><th class="fixed-width-md"><span class="title_box">{l s='Type'}</span></th><th><span class="title_box">{l s='Value'}</span></th><th></th></tr></thead><tbody></tbody></table>';
html += '</div><div class="condition_separator">{l s='OR'}</div><div class="separation"></div>'; html += '</fieldset><div class="row condition_separator text-center">{l s='OR'}</div><div class="clearfix">&nbsp;</div>';
$('#condition_group_list').append(html); $('#condition_group_list').append(html);
toggle_condition_group(last_condition_group); toggle_condition_group(last_condition_group);
} }
@@ -219,7 +236,7 @@ $(document).ready(function() {
if (!id_condition) if (!id_condition)
return false; return false;
var html = '<tr id="'+id_condition+'"><td>{l s='Category'}</td><td>'+$('#id_category option:selected').html()+'</td><td><a href="#" onclick="delete_condition(\''+id_condition+'\');"><img src="../img/admin/delete.gif" /></a></td></tr>'; var html = '<tr id="'+id_condition+'"><td>{l s='Category'}</td><td>'+$('#id_category option:selected').html()+'</td><td><a href="#" onclick="delete_condition(\''+id_condition+'\');" class="btn btn-default"><i class="icon-remove"></i> {l s='Delete'}</a></td></tr>';
appendConditionToGroup(html); appendConditionToGroup(html);
return false; return false;
@@ -230,7 +247,7 @@ $(document).ready(function() {
if (!id_condition) if (!id_condition)
return false; return false;
var html = '<tr id="'+id_condition+'"><td>{l s='Manufacturer'}</td><td>'+$('#id_manufacturer option:selected').html()+'</td><td><a href="#" onclick="delete_condition(\''+id_condition+'\');"><img src="../img/admin/delete.gif" /></a></td></tr>'; var html = '<tr id="'+id_condition+'"><td>{l s='Manufacturer'}</td><td>'+$('#id_manufacturer option:selected').html()+'</td><td><a href="#" onclick="delete_condition(\''+id_condition+'\');" class="btn btn-default"><i class="icon-remove"></i> {l s='Delete'}</a></td></tr>';
appendConditionToGroup(html); appendConditionToGroup(html);
return false; return false;
@@ -241,7 +258,7 @@ $(document).ready(function() {
if (!id_condition) if (!id_condition)
return false; return false;
var html = '<tr id="'+id_condition+'"><td>{l s='Supplier'}</td><td>'+$('#id_supplier option:selected').html()+'</td><td><a href="#" onclick="delete_condition(\''+id_condition+'\');"><img src="../img/admin/delete.gif" /></a></td></tr>'; var html = '<tr id="'+id_condition+'"><td>{l s='Supplier'}</td><td>'+$('#id_supplier option:selected').html()+'</td><td><a href="#" onclick="delete_condition(\''+id_condition+'\');" class="btn btn-default"><i class="icon-remove"></i> {l s='Delete'}</a></td></tr>';
appendConditionToGroup(html); appendConditionToGroup(html);
return false; return false;
@@ -252,7 +269,7 @@ $(document).ready(function() {
if (!id_condition) if (!id_condition)
return false; return false;
var html = '<tr id="'+id_condition+'"><td>{l s='Attribute'}</td><td>'+$('#id_attribute_group option:selected').html()+': '+$('#id_attribute_'+$('#id_attribute_group option:selected').val()+' option:selected').html()+'</td><td><a href="#" onclick="delete_condition(\''+id_condition+'\');"><img src="../img/admin/delete.gif" /></a></td></tr>'; var html = '<tr id="'+id_condition+'"><td>{l s='Attribute'}</td><td>'+$('#id_attribute_group option:selected').html()+': '+$('#id_attribute_'+$('#id_attribute_group option:selected').val()+' option:selected').html()+'</td><td><a href="#" onclick="delete_condition(\''+id_condition+'\');" class="btn btn-default"><i class="icon-remove"></i> {l s='Delete'}</a></td></tr>';
appendConditionToGroup(html); appendConditionToGroup(html);
return false; return false;
@@ -263,7 +280,7 @@ $(document).ready(function() {
if (!id_condition) if (!id_condition)
return false; return false;
var html = '<tr id="'+id_condition+'"><td>{l s='Feature'}</td><td>'+$('#id_feature option:selected').html()+': '+$('#id_feature_'+$('#id_feature option:selected').val()+' option:selected').html()+'</td><td><a href="#" onclick="delete_condition(\''+id_condition+'\');"><img src="../img/admin/delete.gif" /></a></td></tr>'; var html = '<tr id="'+id_condition+'"><td>{l s='Feature'}</td><td>'+$('#id_feature option:selected').html()+': '+$('#id_feature_'+$('#id_feature option:selected').val()+' option:selected').html()+'</td><td><a href="#" onclick="delete_condition(\''+id_condition+'\');" class="btn btn-default"><i class="icon-remove"></i> {l s='Delete'}</a></td></tr>';
appendConditionToGroup(html); appendConditionToGroup(html);
return false; return false;
controllers/admin/AdminCartRulesController.php
+5 -5
View File
@@ -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->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->fields_list = array( $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')), 'name' => array('title' => $this->l('Name')),
'priority' => array('title' => $this->l('Priority'), 'width' => 40), 'priority' => array('title' => $this->l('Priority'), 'align' => 'center', 'class' => 'fixed-width-xs'),
'code' => array('title' => $this->l('Code')), 'code' => array('title' => $this->l('Code'), 'class' => 'fixed-width-sm'),
'quantity' => array('title' => $this->l('Quantity'), 'width' => 40), 'quantity' => array('title' => $this->l('Quantity'), 'align' => 'center', 'class' => 'fixed-width-xs'),
'date_to' => array('title' => $this->l('Until')), '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), 'active' => array('title' => $this->l('Status'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false),
); );
controllers/admin/AdminSpecificPriceRuleController.php
+1
View File
@@ -148,6 +148,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
$this->fields_form = array( $this->fields_form = array(
'legend' => array( 'legend' => array(
'title' => $this->l('Specific price rules'), 'title' => $this->l('Specific price rules'),
'icon' => 'icon-dollar'
), ),
'input' => array( 'input' => array(
array( array(