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

// tweak on switch + admin import

Browse Source
This commit is contained in:
Kevin Granger
2013-11-25 17:16:59 +01:00
parent 652c370a1d
commit fae1fd58a9
23 changed files with 338 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
+2 -2
View File
@@ -10,7 +10,7 @@
<label class="t radio" for="free_shipping_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
@@ -123,7 +123,7 @@
<label class="t radio" for="free_gift_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
+3 -3
View File
@@ -73,7 +73,7 @@
<label class="t radio" for="highlight_on"><i class="icon-check-sign color_success"></i> {l s='Yes'}</label>
<input type="radio" name="highlight" id="highlight_off" value="0" {if !$currentTab->getFieldValue($currentObject, 'highlight')|intval}checked="checked"{/if} />
<label class="t radio" for="highlight_off"><i class="icon-ban-circle color_danger"></i> {l s='No'}</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
@@ -92,7 +92,7 @@
<label class="t radio" for="partial_use_on"><i class="icon-check-sign color_success"></i> {l s='Yes'}</label>
<input type="radio" name="partial_use" id="partial_use_off" value="0" {if !$currentTab->getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} />
<label class="t radio" for="partial_use_off"><i class="icon-ban-circle color_danger"></i> {l s='No'}</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
@@ -117,7 +117,7 @@
<label class="t radio" for="active_on"><i class="icon-check-sign color_success"></i> {l s='Yes'}</label>
<input type="radio" name="active" id="active_off" value="0" {if !$currentTab->getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} />
<label class="t radio" for="active_off"><i class="icon-ban-circle color_danger"></i> {l s='No'}</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
+1 -1
View File
@@ -70,7 +70,7 @@
<label class="radio" for="{$input.name}_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+1 -1
View File
@@ -140,7 +140,7 @@
<label class="radioCheck" for="PS_DASHBOARD_SIMULATION_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</section>
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+2 -2
View File
@@ -189,7 +189,7 @@
<label class="radio" for="{$module->name}_on"><i class="icon-check-sign color_success"></i> Yes</label>
<input type="radio" name="{$module->name}" id="{$module->name}_off" value="0">
<label class="radio" for="{$module->name}_off"><i class="icon-ban-circle color_danger"></i> No</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
<input type="hidden" name="modulesBoxAuth[]" value="{$module->id}">
</div>
@@ -204,7 +204,7 @@
<label class="radio" for="{$module->name}_on"><i class="icon-check-sign color_success"></i> Yes</label>
<input type="radio" name="{$module->name}" id="{$module->name}_off" value="0" checked="checked">
<label class="radio" for="{$module->name}_off"><i class="icon-ban-circle color_danger"></i> No</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
<input type="hidden" name="modulesBoxUnauth[]" value="{$module->id}">
</div>
admin-dev/themes/default/template/controllers/images/content.tpl
+1 -1
View File
@@ -113,7 +113,7 @@
<label for="erase_off" class="radioCheck">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+90 -41
View File
@@ -30,10 +30,9 @@
</div>
{/if}
<div id="upload_file_import" style="display: none">
<div class="alert alert-info">{l s='Only UTF-8 and ISO-8859-1 encoding are allowed'}</div>
<div>{l s='Only UTF-8 and ISO-8859-1 encoding are allowed'}</div>
<form action="{$current}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
<div class="panel">
<div class="clearfix">&nbsp;</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Select your CSV file'}</label>
<div class="col-lg-9">
@@ -92,9 +91,7 @@
<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename|escape:'html':'UTF-8'}</option>
{/foreach}
</select>
<div class="clearfix">&nbsp;</div>
{/if}
<a href="#upload_file_import" id="upload_file_import_link" class="btn btn-default">
<i class="icon-plus-sign-alt"></i>
{l s='Upload'}
@@ -102,31 +99,60 @@
</div>
</div>
<div class="form-group">
<div class="col-lg-6">
<p class="alert alert-info">
<p class="panel">
<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">
{l s='Click to view our sample import csv files.'}
</a>
</p>
<div id="sample_files_import" style="display:none" class="list-group">
<a class="list-group-item" href="../docs/csv_import/categories_import.csv" target="_blank">{l s='Sample Categories file'}</a>
<a class="list-group-item" href="../docs/csv_import/products_import.csv" target="_blank">{l s='Sample Products file'}</a>
<a class="list-group-item" href="../docs/csv_import/combinations_import.csv" target="_blank">{l s='Sample Combinations file'}</a>
<a class="list-group-item" href="../docs/csv_import/customers_import.csv" target="_blank">{l s='Sample Customers file'}</a>
<a class="list-group-item" href="../docs/csv_import/addresses_import.csv" target="_blank">{l s='Sample Addresses file'}</a>
<a class="list-group-item" href="../docs/csv_import/manufacturers_import.csv" target="_blank">{l s='Sample Manufacturers file'}</a>
<a class="list-group-item" href="../docs/csv_import/suppliers_import.csv" target="_blank">{l s='Sample Suppliers file'}</a>
<a class="list-group-item" href="../docs/csv_import/alias_import.csv" target="_blank">{l s='Sample Alias file'}</a>
<a class="list-group-item" href="../docs/csv_import/categories_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Categories file'}
</a>
<a class="list-group-item" href="../docs/csv_import/products_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Products file'}
</a>
<a class="list-group-item" href="../docs/csv_import/combinations_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Combinations file'}
</a>
<a class="list-group-item" href="../docs/csv_import/customers_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Customers file'}
</a>
<a class="list-group-item" href="../docs/csv_import/addresses_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Addresses file'}
</a>
<a class="list-group-item" href="../docs/csv_import/manufacturers_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Manufacturers file'}
</a>
<a class="list-group-item" href="../docs/csv_import/suppliers_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Suppliers file'}
</a>
<a class="list-group-item" href="../docs/csv_import/alias_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Alias file'}
</a>
{if $PS_ADVANCED_STOCK_MANAGEMENT}
<a class="list-group-item" href="../docs/csv_import/supply_orders_import.csv" target="_blank">{l s='Supply Orders sample file'}</a>
<a class="list-group-item" href="../docs/csv_import/supply_orders_details_import.csv" target="_blank">{l s='Supply Orders Details sample file'}</a>
<a class="list-group-item" href="../docs/csv_import/supply_orders_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Supply Orders sample file'}
</a>
<a class="list-group-item" href="../docs/csv_import/supply_orders_details_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Supply Orders Details sample file'}
</a>
{/if}
</div>
</div>
<div class="col-lg-6">
<p class="alert alert-info">
<p class="panel">
<a href="#" onclick="$('#csv_files_import').slideToggle(); return false;">
{l s='Click to view your csv files.'}
</a>
@@ -147,7 +173,7 @@
<div class="form-group">
<label class="control-label col-lg-3">{l s='What kind of entity would you like to import?'} </label>
<div class="col-lg-6">
<div class="col-lg-9">
<select name="entity" id="entity">
{foreach $entities AS $entity => $i}
<option value="{$i}"{if $entity_selected == $i} selected="selected"{/if}>
@@ -163,50 +189,65 @@
{l s='Language of the file'}
</span>
</label>
<div class="col-lg-6">
<div class="col-lg-9">
<select name="iso_lang">
{foreach $languages AS $lang}
<option value="{$lang.iso_code}" {if $lang.id_lang == $id_language} selected="selected"{/if}>{$lang.name}</option>
{/foreach}
</select>
</div>
</div>
</div>
<div class="form-group">
<label for="convert" class="control-label col-lg-3">{l s='ISO-8859-1 encoded file?'} </label>
<div class="col-lg-6">
<p class="checkbox">
<div class="col-lg-9">
<label class="switch-light prestashop-switch fixed-width-lg">
<input name="convert" id="convert" type="checkbox" />
</p>
<span>
<span>{l s='Yes'}</span>
<span>{l s='No'}</span>
</span>
<a class="slide-button btn btn-default"></a>
</label>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Field separator'} </label>
<div class="col-lg-6 input-group">
<span class="input-group-addon">{l s='e.g. '}"1; Ipod; 129.90; 5"</span>
<input type="text" size="2" value="{if isset($separator_selected)}{$separator_selected|escape:'html':'UTF-8'}{else};{/if}" name="separator"/>
<div class="col-lg-9">
<input type="text" value="{if isset($separator_selected)}{$separator_selected|escape:'html':'UTF-8'}{else};{/if}" name="separator"/>
<div class="help-block">{l s='e.g. '} 1; Ipod; 129.90; 5</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Multiple value separator'} </label>
<div class="col-lg-6 input-group">
<span class="input-group-addon">{l s='e.g. '}"Ipod; red.jpg, blue.jpg, green.jpg; 129.90"</span>
<input type="text" size="2" value="{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected|escape:'html':'UTF-8'}{else},{/if}" name="multiple_value_separator"/>
<div class="col-lg-9">
<input type="text" value="{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected|escape:'html':'UTF-8'}{else},{/if}" name="multiple_value_separator"/>
<div class="help-block">{l s='e.g. '} Ipod; red.jpg, blue.jpg, green.jpg; 129.90</div>
</div>
</div>
<div class="form-group">
<label for="truncate" class="control-label col-lg-3">{l s='Delete all'} <span id="entitie">{l s='categories'}</span> {l s='before import?'} </label>
<div class="col-lg-6">
<p class="checkbox">
<div class="col-lg-9">
<label class="switch-light prestashop-switch fixed-width-lg">
<input name="truncate" id="truncate" type="checkbox"/>
</p>
<span>
<span>{l s='Yes'}</span>
<span>{l s='No'}</span>
</span>
<a class="slide-button btn btn-default"></a>
</label>
</div>
</div>
<div class="form-group" style="display: none">
<label for="match_ref" class="control-label col-lg-3">{l s='Use product reference as key?'}</label>
<div class="col-lg-6">
<p class="checkbox">
<div class="col-lg-9">
<label class="switch-light prestashop-switch fixed-width-lg">
<input name="match_ref" id="match_ref" type="checkbox" />
</p>
<span>
<span>{l s='Yes'}</span>
<span>{l s='No'}</span>
</span>
<a class="slide-button btn btn-default"></a>
</label>
</div>
</div>
<div class="form-group">
@@ -221,15 +262,23 @@
{l s='Force all ID\'s during import?'}
</span>
</label>
<div class="col-lg-6">
<p class="checkbox">
<input name="forceIDs" id="forceIDs" type="checkbox"/>
</p>
<div class="col-lg-9">
<label class="switch-light prestashop-switch fixed-width-lg">
<input name="forceIDs" id="forceIDs" type="checkbox"/>
<span>
<span>{l s='Yes'}</span>
<span>{l s='No'}</span>
</span>
<a class="slide-button btn btn-default"></a>
</label>
</div>
</div>
<div class="form-group">
<div class="col-lg-6 col-lg-push-3">
<input type="submit" name="submitImportFile" id="submitImportFile" value="{l s='Next step'}" class="btn btn-default" {if empty($files_to_import)}disabled{/if}/>
<button type="submit" name="submitImportFile" id="submitImportFile" class="btn btn-default" {if empty($files_to_import)}disabled{/if}>
<i class="icon-circle-arrow-right"></i>
{l s='Next step'}
</button>
</div>
</div>
@@ -247,7 +296,7 @@
{if !count($files_to_import)}
<div class="alert alert-warning">
<p>{l s='There is no CSV file available. Please upload one using the \'Upload\' button above.'}</p>
<ul class="nav">
<ul>
<li>{l s='You can read information on CSV import at:'} <a href="http://doc.prestashop.com/display/PS14/Troubleshooting#Troubleshooting-HowtocorrectlyimportaccentuatedcontentusingaCSVfile%3F" target="_blank">http://doc.prestashop.com/display/PS14/Troubleshooting</a>
<li>{l s='Read more about CSV format at:'} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a>
</ul>
admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
+18 -20
View File
@@ -83,7 +83,7 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Save your mapping configuration'}</label>
<label class="control-label col-lg-3" for="newImportMatchs">{l s='Save your mapping configuration'}</label>
<div class="col-lg-7">
<input type="text" name="newImportMatchs" id="newImportMatchs" />
</div>
@@ -116,35 +116,33 @@
<input type="hidden" name="separator" value="{$fields_value.separator}" />
<input type="hidden" name="multiple_value_separator" value="{$fields_value.multiple_value_separator}" />
<div class="form-group">
<label class="control-label col-lg-3">{l s='Lines to skip'}</label>
<label class="control-label col-lg-3" for="skip">{l s='Lines to skip'}</label>
<div class="col-lg-7">
<input type="text" size="2" name="skip" value="1" />
<input type="text" name="skip" id="skip" value="1" />
<p class="help-block">{l s='This number indicates how many of the first lines of your CSV file should be skipped when importing the data. For instance set it to 1 if the first row of your file contains headers.'}</p>
</div>
</div>
<div class="form-group">
<div class="col-lg-12">
<table class="table">
<tr>
<td valign="top" align="center">
<button id="btn_left" type="button" class="btn btn-default" onclick="showTable(current - 1);">{l s='<<'}</button>
</td>
<td align="left">
{section name=nb_i start=0 loop=$nb_table step=1}
{assign var=i value=$smarty.section.nb_i.index}
{$data.$i}
{/section}
</td>
<td valign="top" align="center">
<button id="btn_right" type="button" class="btn btn-default" onclick="showTable(current + 1);">{l s='>>'}</button>
</td>
</tr>
</table>
{section name=nb_i start=0 loop=$nb_table step=1}
{assign var=i value=$smarty.section.nb_i.index}
{$data.$i}
{/section}
<button id="btn_left" type="button" class="btn btn-default pull-left" onclick="showTable(current - 1);">
<i class="icon-chevron-sign-left"></i>
</button>
<button id="btn_right" type="button" class="btn btn-default pull-right" onclick="showTable(current + 1);">
<i class="icon-chevron-sign-right"></i>
</button>
</div>
</div>
<hr>
<div class="form-group">
<div class="col-lg-12">
<button name="import" type="submit" onclick="return (validateImportation(new Array({$res})));" id="import" class="btn btn-default pull-right"><i class="icon-cloud-upload"></i> {l s='Import .CSV data'}</button>
<button name="import" type="submit" onclick="return (validateImportation(new Array({$res})));" id="import" class="btn btn-default pull-right">
<i class="icon-ok text-success"></i>
{l s='Import .CSV data'}
</button>
</div>
</div>
</form>
admin-dev/themes/default/template/controllers/orders/form.tpl
+1 -1
View File
@@ -1394,7 +1394,7 @@
<i class="icon-ban-circle text-danger"></i>
{l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+1 -1
View File
@@ -556,7 +556,7 @@
<i class="icon-ban-circle text-danger"></i>
{l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
admin-dev/themes/default/template/controllers/products/informations.tpl
+1 -1
View File
@@ -194,7 +194,7 @@
<i class="icon-ban-circle text-danger"></i>
{l s='Disabled'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
admin-dev/themes/default/template/controllers/products/multishop/check_fields.tpl
+1 -1
View File
@@ -40,7 +40,7 @@
<label class="radio" for="multishop_{$product_tab}_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
<div class="col-lg-7">
admin-dev/themes/default/template/controllers/products/seo.tpl
+2 -2
View File
@@ -63,8 +63,8 @@
}
</div>
</div>
<div class="form-group">
{* Removed for simplicity *}
<div class="form-group hide">
<label class="control-label col-lg-3" for="meta_keywords_{$id_lang}">
{include file="controllers/products/multishop/checkbox.tpl" field="meta_keywords" type="default" multilang="true"}
<span class="label-tooltip" data-toggle="tooltip"
admin-dev/themes/default/template/controllers/referrers/form_settings.tpl
+1 -1
View File
@@ -47,7 +47,7 @@
<label class="t radio" for="tracking_dt_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl
+1 -1
View File
@@ -86,7 +86,7 @@
<label class="radio" for="{$field.name}_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
{elseif $key == 'select'}
admin-dev/themes/default/template/helpers/form/form.tpl
+1 -1
View File
@@ -399,7 +399,7 @@
{/if}
</label>
{/foreach}
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
admin-dev/themes/default/template/helpers/options/options.tpl
+2 -2
View File
@@ -72,7 +72,7 @@
<label class="radio" for="{$table}_multishop_{$category}_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
<div class="col-lg-7">
@@ -148,7 +148,7 @@
<label for="{$key}_off" class="radioCheck">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>