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

// some work on style sheets

Browse Source
This commit is contained in:
Kevin Granger
2013-07-18 18:51:24 +02:00
parent 02921dc9d0
commit 0b4512dbcb
1654 changed files with 171753 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+18 -19
View File
@@ -65,13 +65,11 @@
{block name="defaultForm"}
<div class="row-fluid">
<div class="productTabs col-lg-2">
<ul class="tab nav nav-pills nav-stacked">
<div class="list-group">
{foreach $product_tabs key=numStep item=tab}
<li class="tab-row {if $tab.selected}active{/if}">
<a class="tab-page" id="link-{$tab.id}" href="{$tab.href}&amp;updateproduct">{$tab.name}</a>
</li>
<a class="list-group-item {if $tab.selected}active{/if}" id="link-{$tab.id}" href="{$tab.href}&amp;updateproduct">{$tab.name}</a>
{/foreach}
</ul>
</div>
</div>
<script type="text/javascript">
@@ -111,17 +109,17 @@
if (product_type == product_type_pack)
{
$('li.tab-row a[id*="VirtualProduct"]').hide();
$('a[id*="VirtualProduct"]').hide();
}
else if (product_type == product_type_virtual)
{
$('li.tab-row a[id*="Pack"]').hide();
$('li.tab-row a[id*="Shipping"]').hide();
$('a[id*="Pack"]').hide();
$('a[id*="Shipping"]').hide();
}
else
{
$('li.tab-row a[id*="Pack"]').hide();
$('li.tab-row a[id*="VirtualProduct"]').hide();
$('a[id*="Pack"]').hide();
$('a[id*="VirtualProduct"]').hide();
}
$('#desc-product-newCombination').hide();
@@ -131,7 +129,7 @@
e.preventDefault();
// currentId is the current product tab id
currentId = $(".productTabs .tab-row.active a").attr('id').substr(5);
currentId = $(".productTabs a.active").attr('id').substr(5);
//console.log(currentId);
// id is the wanted producttab id
id = $(this).attr('id').substr(5);
@@ -142,9 +140,9 @@
$('#key_tab').val(btn_name);
if ($(this).attr("id") != $(".productTabs .tab-row.active a").attr('id'))
if ($(this).attr("id") != $(".productTabs a.active ").attr('id'))
{
$(".productTabs .tab-row").removeClass('active');
$(".productTabs a").removeClass('active');
$("#product-tab-content-"+currentId).hide();
}
@@ -156,7 +154,7 @@
$(this).trigger('displayed');
//console.log('show tab'+id);
});
$("#link-"+id).parent().addClass('active');
$("#link-"+id).addClass('active');
});
var languages = new Array();
@@ -180,7 +178,7 @@
$('.label-tooltip').tooltip();
});
$(".productTabs .tab-row.active").click();
$(".productTabs a.active").click();
// disable save if Associations tab is not loaded
if ($('#product-tab-content-Associations').hasClass('not-loaded'))
@@ -244,23 +242,24 @@
{if !$product->active && $product->isAssociatedToShop()}
<div class="alert draft" >
<p>
<span style="float: left">
<span >
{l s='Your product will be saved as a draft.'}</span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >{l s='Save and preview.'}</a></span>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
<br />
</p>
</div>
{/if}
{* all input are here *}
<div class="row">
{foreach $product_tabs key=numStep item=tab}
<div id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content" {if !$tab.selected}style="display:none"{/if}>
<fieldset id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content col-lg-12" {if !$tab.selected}style="display:none"{/if}>
{if $tab.selected}
{$custom_form}
{/if}
</div>
</fieldset>
{/foreach}
</div>
<input type="hidden" name="id_product_attribute" id="id_product_attribute" value="0" />
<input type="hidden" name="key_tab" id="key_tab" value="Informations" />
admin-dev/themes/default/template/controllers/products/images.tpl
+1 -1
View File
@@ -31,7 +31,7 @@
<span class="badge" id="countImage">{$countImages}</span>
</legend>
<div class="row panel">
<div class="row">
<label class="control-label col-lg-5 file_upload_label">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}">
admin-dev/themes/default/template/controllers/products/informations.tpl
+60 -64
View File
@@ -27,68 +27,69 @@
{else}
{assign var=class_input_ajax value=''}
{/if}
<input type="hidden" name="submitted_tabs[]" value="Informations" />
<legend class="tab">{l s='Info.'}</legend>
<div class="alert alert-info">{l s='Product global information'}</div>
<script type="text/javascript">
{if isset($PS_ALLOW_ACCENTED_CHARS_URL) && $PS_ALLOW_ACCENTED_CHARS_URL}
var PS_ALLOW_ACCENTED_CHARS_URL = 1;
{else}
var PS_ALLOW_ACCENTED_CHARS_URL = 0;
{/if}
{$combinationImagesJs}
{if $check_product_association_ajax}
var search_term = '';
$('document').ready( function() {
$(".check_product_name")
.autocomplete(
'{$link->getAdminLink('AdminProducts', true)|escape:'html'}', {
minChars: 3,
max: 10,
width: $(".check_product_name").width(),
selectFirst: false,
scroll: false,
dataType: "json",
formatItem: function(data, i, max, value, term) {
search_term = term;
// adding the little
if ($('.ac_results').find('.separation').length == 0)
$('.ac_results').css('background-color', '#EFEFEF')
.prepend('<div style="color:#585A69; padding:2px 5px">{l s='Use a product from the list'}<div class="separation"></div></div>');
return value;
},
parse: function(data) {
var mytab = new Array();
for (var i = 0; i < data.length; i++)
mytab[mytab.length] = { data: data[i], value: data[i].name };
return mytab;
},
extraParams: {
ajax: 1,
action: 'checkProductName',
id_lang: {$id_lang}
}
}
)
.result(function(event, data, formatted) {
// keep the searched term in the input
$('#name_{$id_lang}').val(search_term);
jConfirm('{l s='Do you want to use this product?'}&nbsp;<strong>'+data.name+'</strong>', '{l s='Confirmation'}', function(confirm){
if (confirm == true)
document.location.href = '{$link->getAdminLink('AdminProducts', true)}&updateproduct&id_product='+data.id_product;
else
return false;
});
});
});
{/if}
</script>
{if isset($display_common_field) && $display_common_field}
<div class="alert alert-block" style="display: block">{l s='Warning, if you change the value of fields with an orange bullet %s, the value will be changed for all other shops for this product' sprintf=$bullet_common_field}</div>
<input type="hidden" name="submitted_tabs[]" value="Informations" />
<legend class="tab">{l s='Info.'}</legend>
<div class="alert alert-info">{l s='Product global information'}</div>
<script type="text/javascript">
{if isset($PS_ALLOW_ACCENTED_CHARS_URL) && $PS_ALLOW_ACCENTED_CHARS_URL}
var PS_ALLOW_ACCENTED_CHARS_URL = 1;
{else}
var PS_ALLOW_ACCENTED_CHARS_URL = 0;
{/if}
{$combinationImagesJs}
{if $check_product_association_ajax}
var search_term = '';
$('document').ready( function() {
$(".check_product_name")
.autocomplete(
'{$link->getAdminLink('AdminProducts', true)|escape:'html'}', {
minChars: 3,
max: 10,
width: $(".check_product_name").width(),
selectFirst: false,
scroll: false,
dataType: "json",
formatItem: function(data, i, max, value, term) {
search_term = term;
// adding the little
if ($('.ac_results').find('.separation').length == 0)
$('.ac_results').css('background-color', '#EFEFEF')
.prepend('<div style="color:#585A69; padding:2px 5px">{l s='Use a product from the list'}<div class="separation"></div></div>');
return value;
},
parse: function(data) {
var mytab = new Array();
for (var i = 0; i < data.length; i++)
mytab[mytab.length] = { data: data[i], value: data[i].name };
return mytab;
},
extraParams: {
ajax: 1,
action: 'checkProductName',
id_lang: {$id_lang}
}
}
)
.result(function(event, data, formatted) {
// keep the searched term in the input
$('#name_{$id_lang}').val(search_term);
jConfirm('{l s='Do you want to use this product?'}&nbsp;<strong>'+data.name+'</strong>', '{l s='Confirmation'}', function(confirm){
if (confirm == true)
document.location.href = '{$link->getAdminLink('AdminProducts', true)}&updateproduct&id_product='+data.id_product;
else
return false;
});
});
});
{/if}
</script>
{include file="controllers/products/multishop/check_fields.tpl" product_tab="Informations"}
{if isset($display_common_field) && $display_common_field}
<div class="alert alert-block" style="display: block">{l s='Warning, if you change the value of fields with an orange bullet %s, the value will be changed for all other shops for this product' sprintf=$bullet_common_field}</div>
{/if}
{include file="controllers/products/multishop/check_fields.tpl" product_tab="Informations"}
<div id="warn_virtual_combinations" class="alert alert-block" style="display:none">{l s='You cannot use combinations with a virtual product.'}</div>
@@ -194,7 +195,6 @@
</div>
</div>
<div class="row redirect_product_options" style="display:none">
{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
<label class="control-label col-lg-3">{l s='Redirect:'}</label>
@@ -341,7 +341,6 @@
</div>
<div id="createImageDescription" class="panel" style="display:none">
<div class="row">
<label class="control-label col-lg-3">{l s='Select your image:'}</label>
<div class="col-lg-9">
@@ -357,7 +356,6 @@
</ul>
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Position:'}</label>
<div class="col-lg-5">
@@ -371,7 +369,6 @@
</p>
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Select the type of picture:'}</label>
<div class="col-lg-5">
@@ -385,7 +382,6 @@
{/foreach}
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip"
admin-dev/themes/default/template/header.tpl
+3 -3
View File
@@ -193,11 +193,11 @@
<div id="header_search">
<form class="navbar-form" method="post" action="index.php?controller=AdminSearch&amp;token={getAdminToken tab='AdminSearch'}">
<div class="input-group col-lg-3">
<div class="input-group col-lg-2">
<input type="text" name="bo_query" id="bo_query" value="{$bo_query}" class="input-medium" palceholder="{l s='Search'}"/>
<span class="input-group-btn">
<button type="submit" id="bo_search_submit" class="btn btn-default">
<i class="icon-search"></i>&nbsp;{l s='Search'}
<i class="icon-search"></i>
</button>
</span>
</div>
@@ -219,7 +219,7 @@
{if count($quick_access) > 0}
<div id="header_quick" class="btn-group navbar-nav">
<a href="#" id="quick_select" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="icon-bolt"></i> {l s='Quick Access'} <b class="caret"></b></a>
<a href="#" id="quick_select" class="btn btn-default dropdown-toggle" data-toggle="dropdown">{l s='Quick Access'} <b class="caret"></b></a>
<ul class="dropdown-menu">
{foreach $quick_access as $quick}
<li><a href="{$quick.link|escape:'htmlall':'UTF-8'}{if $quick.new_window}_blank{/if}"><i class="icon-chevron-right"></i> {$quick.name}</a></li>
admin-dev/themes/default/template/helpers/form/form.tpl
+82 -42
View File
@@ -28,14 +28,14 @@
<div class="leadin">{block name="leadin"}{/block}</div>
{/if}
{if isset($fields.title)}<h2>{$fields.title}</h2>{/if}
{if isset($fields.title)}<legend>{$fields.title}</legend>{/if}
{block name="defaultForm"}
<form id="{$table}_form" class="form-horizontal defaultForm {$name_controller}" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
{if $form_id}
<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
{/if}
{foreach $fields as $f => $fieldset}
<fieldset id="fieldset_{$f}">
<fieldset id="fieldset_{$f}" class="col-lg-12">
{foreach $fieldset.form as $key => $field}
{if $key == 'legend'}
<legend>
@@ -67,15 +67,50 @@
{/if}
</label>{/if}
{/block}
{block name="field"}
<div class="col-lg-9">
{block name="input"}
{if $input.type == 'text' || $input.type == 'tags'}
{if isset($input.lang) AND $input.lang}
<div class="translatable">
<div class="row">
{foreach $languages as $language}
{assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
<div class="input-group col-lg-12 translatable-field lang-{$language.id_lang}" style="{if $language.id_lang != $defaultFormLanguage}display:none{/if}">
{if $input.type == 'tags'}
tags
{/if}
<input type="text"
id="{$input_name}_{$language.id_lang}"
class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
name="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"
{if isset($input.size)}size="{$input.size}"{/if}
{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
{$language.iso_code}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach from=$languages item=language}
<li><a href="javascript:hideOtherLanguage({$language.id_lang});"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.iso_code}</a></li>
{/foreach}
</ul>
</div>
</div>
{/foreach}
</div>
<!-- <div class="translatable">
{foreach $languages as $language}
<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
{if $input.type == 'tags'}
<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}">
{if $input.type == 'tags'}
{literal}
<script type="text/javascript">
$().ready(function () {
@@ -101,7 +136,8 @@
{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
</div>
{/foreach}
</div>
</div> -->
{else}
{if $input.type == 'tags'}
{literal}
@@ -199,7 +235,7 @@
{/foreach}
{/if}
</select>
{if !empty($input.hint)}<span class="alert alert-info" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
{if !empty($input.hint)}<div class="alert alert-info" name="help_box">{$input.hint}</div>{/if}
{/if}
{elseif $input.type == 'radio'}
{foreach $input.values as $value}
@@ -221,44 +257,46 @@
{if isset($value.p) && $value.p}<p>{$value.p}</p>{/if}
{/foreach}
{elseif $input.type == 'switch'}
<div class="input-group col-lg-2">
<span class="switch prestashop-switch">
{foreach $input.values as $value}
<input
type="radio"
name="{$input.name}"
{if $value.value == 1}
id="{$input.name}_on"
{else}
id="{$input.name}_off"
{/if}
value="$value.value"
{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
/>
<label
class="t radio"
{if $value.value == 1}
for="{$input.name}_on"
{else}
for="{$input.name}_off"
{/if}
>
{if $value.value == 1}
<i class="icon-check-sign"></i> {l s='Yes'}
{else}
<i class="icon-ban-circle"></i> {l s='No'}
{/if}
</label>
{/foreach}
<span class="slide-button btn btn-default"></span>
</span>
<div class="row">
<div class="input-group col-lg-2">
<span class="switch prestashop-switch">
{foreach $input.values as $value}
<input
type="radio"
name="{$input.name}"
{if $value.value == 1}
id="{$input.name}_on"
{else}
id="{$input.name}_off"
{/if}
value="$value.value"
{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
/>
<label
class="t radio"
{if $value.value == 1}
for="{$input.name}_on"
{else}
for="{$input.name}_off"
{/if}
>
{if $value.value == 1}
<i class="icon-check-sign"></i> {l s='Yes'}
{else}
<i class="icon-ban-circle"></i> {l s='No'}
{/if}
</label>
{/foreach}
<span class="slide-button btn btn-default"></span>
</span>
</div>
</div>
{elseif $input.type == 'textarea'}
{if isset($input.lang) AND $input.lang}
<div class="translatable">
{foreach $languages as $language}
<div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
<div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if};">
<textarea cols="{$input.cols}" rows="{$input.rows}" name="{$input.name}_{$language.id_lang}" {if isset($input.autoload_rte) && $input.autoload_rte}class="rte autoload_rte {if isset($input.class)}{$input.class}{/if}"{/if} >{$fields_value[$input.name][$language.id_lang]|escape:'htmlall':'UTF-8'}</textarea>
</div>
{/foreach}
@@ -283,9 +321,11 @@
<div id="image">
{$fields_value.image}
<p align="center">{l s='File size'} {$fields_value.size}kb</p>
<a href="{$current}&{$identifier}={$form_id}&token={$token}&deleteImage=1">
<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
<a class="btn btn-default" href="{$current}&{$identifier}={$form_id}&token={$token}&deleteImage=1">
<i class="icon-trash"></i> {l s='Delete'}
</a>
</div><br />
{/if}
{/if}
admin-dev/themes/default/template/helpers/form/form_category.tpl
+9 -7
View File
@@ -35,15 +35,16 @@
buildTreeView(use_context);
});
</script>
<div class="category-filter">
<span><a href="#" id="collapse_all">{$categories.trads['Collapse All']}</a>|&nbsp;</span>
<span><a href="#" id="expand_all">{$categories.trads['Expand All']}</a>|&nbsp;</span>
<div class="panel">
<div class="category-filter panel-heading">
<a href="#" id="collapse_all" class="btn btn-link"><i class="icon-collapse-alt icon-large"></i> {$categories.trads['Collapse All']}</a>
<a href="#" id="expand_all" class="btn btn-link"><i class="icon-expand-alt icon-large"></i> {$categories.trads['Expand All']}</a>
{if !$categories.use_radio}
<span><a href="#" id="check_all">{$categories.trads['Check All']}</a>|&nbsp;</span>
<span><a href="#" id="uncheck_all">{$categories.trads['Uncheck All']}</a>|&nbsp;</span>
<a href="#" id="check_all" class="btn btn-link"><i class="icon-check-sign"></i> {$categories.trads['Check All']}</a>
<a href="#" id="uncheck_all" class="btn btn-link"><i class="icon-check-empty"></i> {$categories.trads['Uncheck All']}</a>
{/if}
{if $categories.use_search}
<span style="margin-left:20px">
<span>
{$categories.trads.search}:&nbsp;
<form method="post" id="filternameForm">
<input type="text" name="search_cat" id="search_cat"/>
@@ -91,4 +92,5 @@
searchCategory();
</script>
{/if}
{/if}
</div>
{/if}
admin-dev/themes/default/template/helpers/list/list_header.tpl
+1 -1
View File
@@ -127,7 +127,7 @@
{/if}
<table
class="table table-striped table-hover"
class="table table-hover"
name="list_table"
{if $table_id} id={$table_id}{/if}
class="table {if $table_dnd}tableDnD{/if} {$table}"
admin-dev/themes/default/template/layout-ajax.tpl
+7 -5
View File
@@ -40,7 +40,7 @@
{/if}
{if count($errors)} {* @todo what is ??? AND $this->_includeContainer *}
<div class="alert alert-error">
<div class="alert alert-danger">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{if count($errors) == 1}
{$errors[0]}
@@ -58,18 +58,20 @@
{if isset($informations) && count($informations) && $informations}
<div class="alert alert-info" style="display:block;">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{foreach $informations as $info}
{$info}<br />
{$info}<br/>
{/foreach}
</div><br />
</div>
{/if}
{if isset($confirmations) && count($confirmations) && $confirmations}
<div class="alert" style="display:block;">
<div class="alert alert-success" style="display:block;">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{foreach $confirmations as $confirm}
{$confirm}<br />
{/foreach}
</div><br />
</div>
{/if}
{if count($warnings)}
admin-dev/themes/default/template/layout.tpl
+2 -2
View File
@@ -29,7 +29,7 @@
</div>
{/if}
{if count($errors) && (!isset($disableDefaultErrorOutPut) || $disableDefaultErrorOutPut == false)}
<div class="alert alert-error">
<div class="alert alert-danger">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{if count($errors) == 1}
@@ -48,7 +48,7 @@
{if isset($informations) && count($informations) && $informations}
<div class="alert alert-info">
<span id="see_more_infos">
<b><a href="#" style="color:#00529B;" onclick="$('#see_more_infos').hide(); $('#infos_block').show();return false;">{l s='Click here to see more informations'}</a></b>
<b><a href="#" onclick="$('#see_more_infos').hide(); $('#infos_block').show();return false;">{l s='Click here to see more informations'}</a></b>
</span>
<div id="infos_block" style="display:none;">
{foreach $informations as $info}