// delete stylesheet label information add list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12131 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vKham
@@ -418,6 +418,13 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
|
||||
|
||||
select#show_modules { font-size:12px;}
|
||||
|
||||
label.text { padding:1px 12px 0 0;}
|
||||
label.radioCheck {font-weight:normal; padding:0; float:none; margin:0 1em 0 0.25em}
|
||||
.listForm {}
|
||||
ul.listForm {}
|
||||
ul.listForm li {padding-bottom:3px;}
|
||||
|
||||
|
||||
/*FOOTER*/
|
||||
#footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666}
|
||||
#footer .footerLeft { float:left; margin-left:10px;}
|
||||
|
||||
@@ -48,18 +48,28 @@
|
||||
</tr>
|
||||
</table>
|
||||
<br />
|
||||
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:900px;">
|
||||
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
|
||||
<colgroup>
|
||||
<col width="300"></col>
|
||||
<col width=""></col>
|
||||
<col width="300"></col>
|
||||
</colgroup>
|
||||
<tr>
|
||||
<th height="30px">{l s='Feature'}</td>
|
||||
<th style="width:30%">{l s='Pre-defined value'}</td>
|
||||
<th style="width:40%"><u>{l s='or'}</u> {l s='Customized value'}</td>
|
||||
<th height="39px">{l s='Feature'}</td>
|
||||
<th>{l s='Pre-defined value'}</td>
|
||||
<th><u>{l s='or'}</u> {l s='Customized value'}</td>
|
||||
</tr>
|
||||
</table>
|
||||
{foreach from=$available_features item=available_feature}
|
||||
<table cellpadding="5" style="background-color:#fff; width: 900px; padding:10px 5px; border:1px solid #ccc; border-top:none;">
|
||||
<table cellpadding="5" style="background-color:#fff; width: 100%;border:1px solid #ccc; border-top:none; padding:4px 6px;">
|
||||
<colgroup>
|
||||
<col width="300"></col>
|
||||
<col width=""></col>
|
||||
<col width="300"></col>
|
||||
</colgroup>
|
||||
<tr>
|
||||
<td>{$available_feature.name}</td>
|
||||
<td style="width: 30%">
|
||||
<td>
|
||||
{if sizeof($available_feature.featureValues)}
|
||||
<select id="feature_{$available_feature.id_feature}_value" name="feature_{$available_feature.id_feature}_value"
|
||||
onchange="$('.custom_{$available_feature.id_feature}_').val('');">
|
||||
@@ -73,13 +83,13 @@
|
||||
</select>
|
||||
{else}
|
||||
<input type="hidden" name="feature_{$available_feature.id_feature}_value" value="0" />
|
||||
<span style="font-size: 10px; color: #666;">{l s='N/A'} -
|
||||
<span>{l s='N/A'} -
|
||||
<a href="{$link->getAdminLink('AdminFeatures')}&addfeature_value&id_feature={$available_feature.id_feature}"
|
||||
style="color: #666; text-decoration: underline;" class="confirm_leave">{l s='Add pre-defined values first'}</a>
|
||||
class="confirm_leave button">{l s='Add pre-defined values first'}</a>
|
||||
</span>
|
||||
{/if}
|
||||
</td>
|
||||
<td style="width:40%" class="translatable">
|
||||
<td class="translatable">
|
||||
{foreach from=$languages key=k item=language}
|
||||
<div class="lang_{$language.id_lang}" style="{if $language.id_lang != $default_form_language}display:none;{/if}float: left;">
|
||||
<textarea class="custom_{$available_feature.id_feature}_" name="custom_{$available_feature.id_feature}_{$language.id_lang}" cols="40" rows="1"
|
||||
|
||||
@@ -65,21 +65,20 @@
|
||||
<div class="separation"></div>
|
||||
|
||||
<div>
|
||||
<label>{l s='Type:'}</label>
|
||||
<label style="font-weight:normal;width:100px;text-align:center;">
|
||||
<label class="text">{l s='Type:'}</label>
|
||||
|
||||
<input type="radio" name="type_product" id="simple_product" value="{Product::PTYPE_SIMPLE}" />
|
||||
{l s='Product'}
|
||||
</label>
|
||||
<label style="font-weight:normal;width:100px;text-align:center;">
|
||||
<label class="radioCheck">{l s='Product'}</label>
|
||||
|
||||
|
||||
<input type="radio" name="type_product" id="pack_product" value="{Product::PTYPE_PACK}" {if $is_pack}checked="checked"{/if} />
|
||||
{l s='Pack'}
|
||||
</label>
|
||||
<label style="font-weight:normal;width:500px;text-align:center;">
|
||||
<label class="radioCheck">{l s='Pack'}</label>
|
||||
|
||||
|
||||
<input type="radio" name="type_product" id="virtual_product" value="{Product::PTYPE_VIRTUAL}" />
|
||||
{l s='Virtual Product (services, booking and downloadable products)'}
|
||||
</label>
|
||||
<label class="radioCheck">{l s='Virtual Product (services, booking and downloadable products)'}</label>
|
||||
|
||||
</div>
|
||||
<br />
|
||||
|
||||
<div class="separation"></div>
|
||||
<br />
|
||||
@@ -123,20 +122,30 @@
|
||||
{* status informations *}
|
||||
<table cellpadding="5" style="width: 40%; float: left; margin-left: 10px;">
|
||||
<tr>
|
||||
<td class="col-left"><label>{l s='Status:'}</label></td>
|
||||
<td class="col-left">
|
||||
|
||||
|
||||
<label class="text">{l s='Status:'}</label></td>
|
||||
<td style="padding-bottom:5px;">
|
||||
<input style="float:left;" onclick="toggleDraftWarning(false);showOptions(true);" type="radio" name="active" id="active_on" value="1" {if $product->active}checked="checked" {/if} />
|
||||
<label for="active_on" class="t">
|
||||
<ul class="listForm">
|
||||
<li>
|
||||
<input onclick="toggleDraftWarning(false);showOptions(true);" type="radio" name="active" id="active_on" value="1" {if $product->active}checked="checked" {/if} />
|
||||
<label for="active_on" class="radioCheck">
|
||||
{l s='Enabled'}</label>
|
||||
<br class="clear" />
|
||||
<input style="float:left;" onclick="toggleDraftWarning(true);showOptions(false);" type="radio" name="active" id="active_off" value="0" {if !$product->active}checked="checked"{/if} />
|
||||
<label for="active_off" class="t">{l s='Disabled'} </label>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<input onclick="toggleDraftWarning(true);showOptions(false);" type="radio" name="active" id="active_off" value="0" {if !$product->active}checked="checked"{/if} />
|
||||
<label for="active_off" class="radioCheck">{l s='Disabled'} </label>
|
||||
</li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id="product_options" {if !$product->active}style="display:none"{/if} >
|
||||
<td class="col-left"><label>{l s='Options:'}</label></td>
|
||||
<td style="padding-bottom:5px;">
|
||||
<input style="float: left;" type="checkbox" name="available_for_order" id="available_for_order" value="1" {if $product->available_for_order}checked="checked"{/if} />
|
||||
<ul class="listForm">
|
||||
<li><input type="checkbox" name="available_for_order" id="available_for_order" value="1" {if $product->available_for_order}checked="checked"{/if} />
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function()
|
||||
{
|
||||
@@ -153,13 +162,15 @@
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<label for="available_for_order" class="t">{l s='available for order'}</label>
|
||||
<br class="clear" />
|
||||
<input style="float: left;" type="checkbox" name="show_price" id="show_price" value="1" {if $product->show_price}checked="checked"{/if} {if $product->available_for_order}disabled="disabled"{/if}/>
|
||||
<label for="available_for_order" class="t">{l s='available for order'}</label></li>
|
||||
<li>
|
||||
<input type="checkbox" name="show_price" id="show_price" value="1" {if $product->show_price}checked="checked"{/if} {if $product->available_for_order}disabled="disabled"{/if}/>
|
||||
<label for="show_price" class="t">{l s='show price'}</label>
|
||||
<br class="clear" />
|
||||
<input style="float: left;" type="checkbox" name="online_only" id="online_only" value="1" {if $product->online_only}checked="checked"{/if} />
|
||||
</li>
|
||||
<li>
|
||||
<input type="checkbox" name="online_only" id="online_only" value="1" {if $product->online_only}checked="checked"{/if} />
|
||||
<label for="online_only" class="t">{l s='online only (not sold in store)'}</label>
|
||||
</li>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -172,6 +183,7 @@
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
</ul>
|
||||
</table>
|
||||
|
||||
<table cellpadding="5" cellspacing="0" border="0" style="width: 100%;"><tr><td><div class="separation"></div></td></tr></table>
|
||||
|
||||
@@ -161,7 +161,7 @@ jQuery(document).ready(Customer.init);
|
||||
</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
<a href="{$link->getAdminLink('AdminTaxRulesGroup')}&addtax_rules_group&id_product={$product->id}" class="confirm_leave">
|
||||
<a class="button" href="{$link->getAdminLink('AdminTaxRulesGroup')}&addtax_rules_group&id_product={$product->id}" class="confirm_leave">
|
||||
<img src="../img/admin/add.gif" alt="{l s='Create'}" title="{l s='Create'}" /> <b>{l s='Create'}</b>
|
||||
</a>
|
||||
</span>
|
||||
|
||||
@@ -134,15 +134,15 @@ class AdminGroupsControllerCore extends AdminController
|
||||
$genders[$gender->id] = $gender->name;
|
||||
}
|
||||
$customer_fields_display = (array(
|
||||
'id_customer' => array('title' => $this->l('ID'), 'align' => 'center'),
|
||||
'id_gender' => array('title' => $this->l('Gender'), 'align' => 'center', 'icon' => $genders_icon, 'list' => $genders),
|
||||
'id_customer' => array('title' => $this->l('ID'), 'width' => 15, 'align' => 'center'),
|
||||
'id_gender' => array('title' => $this->l('Gender'), 'align' => 'center', 'width' => 50,'icon' => $genders_icon, 'list' => $genders),
|
||||
'firstname' => array('title' => $this->l('Name'), 'align' => 'center'),
|
||||
'lastname' => array('title' => $this->l('Name'), 'align' => 'center'),
|
||||
'email' => array('title' => $this->l('E-mail address'), 'align' => 'center'),
|
||||
'birthday' => array('title' => $this->l('Birth date'), 'align' => 'center', 'type' => 'date'),
|
||||
'date_add' => array('title' => $this->l('Register date'), 'align' => 'center', 'type' => 'date'),
|
||||
'email' => array('title' => $this->l('E-mail address'), 'width' => 150, 'align' => 'center'),
|
||||
'birthday' => array('title' => $this->l('Birth date'), 'width' => 150, 'align' => 'right', 'type' => 'date'),
|
||||
'date_add' => array('title' => $this->l('Register date'), 'width' => 150, 'align' => 'right', 'type' => 'date'),
|
||||
'orders' => array('title' => $this->l('Orders'), 'align' => 'center'),
|
||||
'active' => array('title' => $this->l('Enabled'),'align' => 'center','active' => 'status','type' => 'bool')
|
||||
'active' => array('title' => $this->l('Enabled'),'align' => 'center','width' => 20, 'active' => 'status','type' => 'bool')
|
||||
));
|
||||
|
||||
$customer_list = $group->getCustomers(false);
|
||||
|
||||
@@ -3344,7 +3344,7 @@ class AdminProductsControllerCore extends AdminController
|
||||
$color_by_default = '#BDE5F8';
|
||||
|
||||
$this->fieldsDisplay = array(
|
||||
'attributes' => array('title' => $this->l('Attributes'), 'align' => 'left', 'width' => 70),
|
||||
'attributes' => array('title' => $this->l('Attributes'), 'align' => 'left'),
|
||||
'price' => array('title' => $this->l('Impact'), 'type' => 'price', 'align' => 'left', 'width' => 70),
|
||||
'weight' => array('title' => $this->l('Weight'), 'align' => 'left', 'width' => 70),
|
||||
'reference' => array('title' => $this->l('Reference'), 'align' => 'left', 'width' => 70),
|
||||
|
||||
Reference in New Issue
Block a user