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

// add stylesheet page rules price catalogue

Browse Source
This commit is contained in:
vKham
2011-12-22 16:27:55 +00:00
parent 97f1ce57f6
commit f1c4d9a436
3 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/admin.css
+5 -1
View File
@@ -15,9 +15,10 @@ ul li {color:#585A69;}
/*FORM*/
label {color:#585a69;text-shadow:0 1px 0#fff;}
fieldset{background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
.Bloc {background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}
input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc;}
select { border:1px solid #ccc;}
select { border:1px solid #ccc; color: #666666; font-size: 12px; height: 22px;}
select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
.header_module{background:url(header_module.png);padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
.double_select select{width:300px;height:160px;}
@@ -150,6 +151,9 @@ a.module_toggle_all{color: #268CCD;}
/*UI ACCORDEON*/
.ui-accordion-header { background-color: #ccc; color:#000;}
/*BLOC*/
.Bloc { background: none repeat scroll 0 0 #EBEDF4;}
/*TABLE STATUS COMMANDE*/
.table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
admin-dev/themes/template/specific_price_rule/form.tpl
+35 -21
View File
@@ -28,27 +28,31 @@
{block name="other_fieldsets"}
<div class="clear">&nbsp;</div>
<fieldset id="conditions">
<div id="conditions" class="Bloc">
<div id="condition_group_list">
</div>
<a class="button bt-icon" href="#" id="add_condition_group">
<img src="../img/admin/add.gif" />
{l s='Add a new condition group'}
</a>
<div id="condition_list" class="clear">
<legend>{l s='Conditions'}</legend>
<label for="id_category">{l s='Category:'}</label>
<div class="margin-form">
<select id="id_category" name="id_category">
{foreach from=$categories item='category'}
<option value="{$category.id_category}">{$category.name}</option>
{/foreach}
</select>
<a class="button bt-icon" href="#" id="add_condition_category">
<img src="../img/admin/add.gif" />
{l s='Add condition'}
</a>
<div id="condition_list">
<h3>{l s='Conditions'}</h3>
<div class="row">
<label for="id_category">{l s='Category:'}</label>
<div class="margin-form">
<select id="id_category" name="id_category">
{foreach from=$categories item='category'}
<option value="{$category.id_category}">{$category.name}</option>
{/foreach}
</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="row">
<label for="id_manufacturer">{l s='Manufacturer:'}</label>
<div class="margin-form">
<select id="id_manufacturer" name="id_manufacturer">
@@ -61,7 +65,10 @@
{l s='Add condition'}
</a>
</div>
<label for="id_supplier">{l s='Supplier:'}
</div>
<div class="row">
<label for="id_supplier">{l s='Supplier:'}</label>
<div class="margin-form">
<select id="id_supplier" name="id_supplier">
{foreach from=$suppliers item='supplier'}
@@ -73,7 +80,10 @@
{l s='Add condition'}
</a>
</div>
<label for="id_attribute">{l s='Attributes:'}
</div>
<div class="row">
<label for="id_attribute">{l s='Attributes:'}</label>
<div class="margin-form">
<select id="id_attribute_group">
{foreach from=$attributes_group item='attribute_group'}
@@ -93,7 +103,10 @@
{l s='Add condition'}
</a>
</div>
<label for="id_attribute">{l s='Features:'}
</div>
<div class="row">
<label for="id_attribute">{l s='Features:'}</label>
<div class="margin-form">
<select id="id_feature">
{foreach from=$features item='feature'}
@@ -113,8 +126,9 @@
{l s='Add condition'}
</a>
</div>
</div>
</div>
</fieldset>
</div>
{if !$is_multishop}
<input type="hidden" name="id_shop" value=1 />
{/if}
@@ -141,9 +155,9 @@ function add_condition(id_condition_group, type, value)
function new_condition_group()
{
last_condition_group++;
var html = '<fieldset class="condition_group" id="condition_group_'+last_condition_group+'"><legend>{l s='Condition group'} '+last_condition_group+'</legend>';
html += '<table class="table"><thead><tr><th>{l s='Type'}</th><th>{l s='Value'}</th></tr></thead><tbody></tbody></table>';
html += '</fieldset><div style="font-weight:bold;">{l s='OR'}</div>';
var html = '<div class="condition_group" id="condition_group_'+last_condition_group+'"><h3>{l s='Condition group'} '+last_condition_group+'</h3>';
html += '<table cellspacing="0" cellpadding="0" class="table width2"><thead><tr><th height="39">{l s='Type'}</th><th>{l s='Value'}</th></tr></thead><tbody></tbody></table>';
html += '</div><div class="condition_separator">{l s='OR'}</div><div class="separation"></div>';
toggle_condition_group(last_condition_group);
$('#condition_group_list').append(html);
}
css/admin.css
+13 -1
View File
@@ -2056,4 +2056,16 @@ div#scrollTop a:hover{
.edit-note { width: 98%; height: 100px; }
.payment_information { background-color: #BDE5F8 }
.payment_information { background-color: #BDE5F8 }
/*conditions*/
#conditions .condition_group {}
#conditions .condition_separator { font-size:16px; margin:10px 0;}
#conditions .condition_group h3 { margin:0 0 10px 0;}
#conditions a#add_condition_group { font-size:16px;}
#conditions #condition_list {}
#conditions #condition_list .row { position:relative; height:25px; padding:10px 0; background-color:transparent;}
#conditions #condition_list h4 { margin:0 0 10px 0;}
#conditions #condition_list select { float:left; margin-right:10px; width: 200px;}
#conditions #condition_list a { float:left;}