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

// Modules page + Warning

Browse Source
This commit is contained in:
Kevin Granger
2013-08-26 11:38:10 +02:00
parent b2f0a8aea9
commit f8f2c99d28
36 changed files with 159 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin-dev/themes/default/template/controllers/backup/download/view.tpl
View File

@@ -32,7 +32,7 @@
<i class="icon-download"></i>
{l s='Download'}
</h3>
<div class="alert alert-block">
<div class="alert alert-warning">
<p><a href="{$backup_url}"><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /></a></p>
<p><a href="{$backup_url}">{l s='Download the backup file'} ({$backup_weight}{l s='MB'})</a></p>
<p>{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}</p>

2
admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
View File

@@ -33,7 +33,7 @@
<i class="icon-download"></i>
{l s='Download'}
</h3>
<div class="alert alert-block">
<div class="alert alert-warning">
<p><a href="{$backup_url}"><img src="../img/admin/AdminBackup.gif" alt="" class="icon" /></a></p>
<p><a href="{$backup_url}">{l s='Download the backup file'} ({$backup_weight}{l s='MB'})</a></p>
<p>{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}</p>

2
admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
View File

@@ -150,4 +150,4 @@
</div>
</div>
</div>
<div id="gift_products_err" class="alert alert-block" style="display:none"></div>
<div id="gift_products_err" class="alert alert-warning" style="display:none"></div>

2
admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
View File

@@ -32,7 +32,7 @@
{$fields_value.image}
<p align="center">{l s='File size'} {$fields_value.size}kb</p>
{if $shared_category}
<p class="alert alert-block">{l s='If you delete this picture, it will be deleted in all of your shared shops!'}</p>
<p class="alert alert-warning">{l s='If you delete this picture, it will be deleted in all of your shared shops!'}</p>
{/if}
<a class="btn btn-default" href="{$current}&{$identifier}={$form_id}&token={$token}&{if $shared_category}forcedeleteImage=1{else}deleteImage=1{/if}">
<i class="icon-trash"></i> {l s='Delete'}

2
admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
View File

@@ -69,7 +69,7 @@
{block name="leadin"}
<div style="{if $active}display:none{/if}">
<p class="alert alert-block">
<p class="alert alert-warning">
{l s='Your CMS page will be saved as a draft'}
</p>
</div>

2
admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
View File

@@ -36,7 +36,7 @@
{block name=leadin}
{if isset($delete_customer) && $delete_customer}
<form action="{$REQUEST_URI|escape:'htmlall':'UTF-8'}" method="post">
<div class="alert alert-block">
<div class="alert alert-warning">
<h2>{l s='How do you want to delete these customer(s)?'}</h2>
<p>{l s='There are two ways of deleting a customer. Please choose your preferred method.'}</p>
<ul class="listForm">

2
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
View File

@@ -185,7 +185,7 @@
{l s='Caution: The discount applied to a category does not stack with the overall reduction but instead replaces it.'}
</div>
{$categoryTreeView}
<div class="alert alert-block">{l s='Only products that have this category as the default category will be affected.'}</div>
<div class="alert alert-warning">{l s='Only products that have this category as the default category will be affected.'}</div>
<label>{l s='Discount (%):'}</label>
<input type="text" name="category_reduction_fancybox" id="category_reduction_fancybox" value="0.00">

4
admin-dev/themes/default/template/controllers/images/content.tpl
View File

@@ -98,7 +98,7 @@
{if isset($display_move) && $display_move}
{if $safe_mode}
<div class="alert alert-block">
<div class="alert alert-warning">
<p>{l s='PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should therefore continue to use the existing system.'}</p>
</div>
{else}
@@ -108,7 +108,7 @@
<i class="icon-picture"></i>
{l s='Move images'}
</h3>
<div class="alert alert-block">
<div class="alert alert-warning">
<p>{l s='You can choose to keep your images stored in the previous system. There\'s nothing wrong with that.'}</p>
<p>{l s='You can also decide to move your images to the new storage system. In this case, click on the "Move images" button below. Please be patient. This can take several minutes.'}</p>
</div>

8
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
View File

@@ -232,15 +232,15 @@
</div>
{/if}
</div>
<div class="alert alert-block import_products_categories">
<div class="alert alert-warning import_products_categories">
<p>{l s='Note that the category import does not support categories of the same name.'}</p>
<p>{l s='Note that you can have several products with the same reference.'}</p>
</div>
<div class="alert alert-block import_supply_orders_details">
<div class="alert alert-warning import_supply_orders_details">
<p>{l s='Importing Supply Order Details will reset products ordered, if there are any.'}</p>
</div>
{if !count($files_to_import)}
<div class="alert alert-block">
<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">
<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>
@@ -256,7 +256,7 @@
<i class="icon-download"></i>
{l s='Available fields'}
</h3>
<div id="availableFields" class="alert alert-block">
<div id="availableFields" class="alert alert-warning">
{$available_fields}
</div>
<p>{l s='* Required field'}</p>

2
admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
View File

@@ -46,7 +46,7 @@
};
if (json.missing.length || json.updated.length)
$('#changedFiles').html('<div class="alert alert-block">{l s='Changed/missing files have been detected.'}</div>');
$('#changedFiles').html('<div class="alert alert-warning">{l s='Changed/missing files have been detected.'}</div>');
else
$('#changedFiles').html('<div class="alert">{l s='No change has been detected in your files'}</div>');

2
admin-dev/themes/default/template/controllers/login/content.tpl
View File

@@ -41,7 +41,7 @@
</div>
<br />
{if isset($warningSslMessage)}
<div class="alert alert-block">{$warningSslMessage}</div>
<div class="alert alert-warning">{$warningSslMessage}</div>
{/if}
<div id="login">
<h1>{$shop_name}</h1>

118
admin-dev/themes/default/template/controllers/modules/filters.tpl
View File

@@ -24,78 +24,52 @@
*}
<!--start filter module-->
<div class="well">
<div class="row">
<div class="col-lg-6">
<form id="filternameForm" method="post" class="form-horizontal">
<div class="input-group col-lg-12">
<input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
<span class="input-group-btn">
<button class="btn btn-default" type="submit">
<i class="icon-search"></i> {l s='Search'}
</button>
</span>
</div>
</form>
</div>
<div class="col-lg-6">
<form method="post" class="form-inline pull-right">
<label>{l s='Sort by'}</label>
<form method="post" class="form-inline pull-right">
<!-- <span>
<select class="filter fixed-width-L" name="module_type" id="module_type_filter" {if $showTypeModules ne 'allModules' && $showTypeModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="allModules" {if $showTypeModules eq 'allModules'}selected="selected"{/if}>{l s='All Modules'}</option>
<option value="nativeModules" {if $showTypeModules eq 'nativeModules'}selected="selected"{/if}>{l s='Free Modules'}</option>
<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partner Modules (Free)'}</option>
<option value="mustHaveModules" {if $showTypeModules eq 'mustHaveModules'}selected="selected"{/if}>{l s='Must Have'}</option>
{if isset($logged_on_addons)}<option value="addonsModules" {if $showTypeModules eq 'addonsModules'}selected="selected"{/if}>{l s='Modules purchased on Addons'}</option>{/if}
<optgroup label="{l s='Authors'}">
{foreach from=$list_modules_authors key=module_author item=status}
<option value="authorModules[{$module_author}]" {if $status eq "selected"}selected{/if}>{$module_author|truncate:20:'...'}</option>
{/foreach}
</optgroup>
<option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Other Modules'}</option>
</select>
</span> -->
<span>
<select class="filter fixed-width-L" name="module_install" id="module_install_filter" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</option>
<option value="installed" {if $showInstalledModules eq 'installed'}selected="selected"{/if}>{l s='Installed Modules'}</option>
<option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Modules Not Installed '}</option>
</select>
</span>
<span>
<select class="filter fixed-width-L" name="module_status" id="module_status_filter" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="enabledDisabled" {if $showEnabledModules eq 'enabledDisabled'}selected="selected"{/if}>{l s='Enabled & Disabled'}</option>
<option value="enabled" {if $showEnabledModules eq 'enabled'}selected="selected"{/if}>{l s='Enabled Modules'}</option>
<option value="disabled" {if $showEnabledModules eq 'disabled'}selected="selected"{/if}>{l s='Disabled Modules'}</option>
</select>
</span>
<!-- <span>
<select class="filter fixed-width-XL" name="country_module_value" id="country_module_value_filter" {if $showCountryModules eq 1}style="background-color:#49B2FF;color:white;"{/if}>
<option value="0" >{l s='All countries'}</option>
<option value="1" {if $showCountryModules eq 1}selected="selected"{/if}>{l s='Current country:'} {$nameCountryDefault}</option>
</select>
</span> -->
<!-- <span class="pull-right">
<button class="btn btn-default btn-small" type="submit" name="resetFilterModules">
<i class="icon-eraser"></i>
{l s='Reset'}
</button>
<button class="btn btn-default btn-small" name="filterModules" id="filterModulesButton" type="submit">
<i class="icon-filter"></i>
{l s='Filter'}
</button>
</span> -->
</form>
</div>
<select class="filter fixed-width-L" name="module_type" id="module_type_filter" {if $showTypeModules ne 'allModules' && $showTypeModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="allModules" {if $showTypeModules eq 'allModules'}selected="selected"{/if}>{l s='All Modules'}</option>
<option value="nativeModules" {if $showTypeModules eq 'nativeModules'}selected="selected"{/if}>{l s='Free Modules'}</option>
<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partner Modules (Free)'}</option>
<option value="mustHaveModules" {if $showTypeModules eq 'mustHaveModules'}selected="selected"{/if}>{l s='Must Have'}</option>
{if isset($logged_on_addons)}<option value="addonsModules" {if $showTypeModules eq 'addonsModules'}selected="selected"{/if}>{l s='Modules purchased on Addons'}</option>{/if}
<optgroup label="{l s='Authors'}">
{foreach from=$list_modules_authors key=module_author item=status}
<option value="authorModules[{$module_author}]" {if $status eq "selected"}selected{/if}>{$module_author|truncate:20:'...'}</option>
{/foreach}
</optgroup>
<option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Other Modules'}</option>
</select>
</span> -->
<label>{l s='Sort by'}</label>
<div class="form-group">
<select name="module_install" id="module_install_filter" class="form-control" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</option>
<option value="installed" {if $showInstalledModules eq 'installed'}selected="selected"{/if}>{l s='Installed Modules'}</option>
<option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Modules Not Installed '}</option>
</select>
</div>
</div>
<div class="form-group">
<select name="module_status" id="module_status_filter" class="form-control" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="enabledDisabled" {if $showEnabledModules eq 'enabledDisabled'}selected="selected"{/if}>{l s='Enabled & Disabled'}</option>
<option value="enabled" {if $showEnabledModules eq 'enabled'}selected="selected"{/if}>{l s='Enabled Modules'}</option>
<option value="disabled" {if $showEnabledModules eq 'disabled'}selected="selected"{/if}>{l s='Disabled Modules'}</option>
</select>
</div>
<!-- <span>
<select class="filter fixed-width-XL" name="country_module_value" id="country_module_value_filter" {if $showCountryModules eq 1}style="background-color:#49B2FF;color:white;"{/if}>
<option value="0" >{l s='All countries'}</option>
<option value="1" {if $showCountryModules eq 1}selected="selected"{/if}>{l s='Current country:'} {$nameCountryDefault}</option>
</select>
</span> -->
<!-- <span class="pull-right">
<button class="btn btn-default btn-small" type="submit" name="resetFilterModules">
<i class="icon-eraser"></i>
{l s='Reset'}
</button>
<button class="btn btn-default btn-small" name="filterModules" id="filterModulesButton" type="submit">
<i class="icon-filter"></i>
{l s='Filter'}
</button>
</span> -->
</form>
<!--end filter module-->

31
admin-dev/themes/default/template/controllers/modules/header.tpl
View File

@@ -45,25 +45,28 @@
{if $add_permission eq '1'}
<div id="module_install" class="row" style="{if !isset($smarty.post.downloadflag)}display: none;{/if}">
<div class="col-lg-12">
<div class="panel col-lg-12">
<form action="{$currentIndex}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
<legend>{l s='Add a new module'}</legend>
<p>{l s='The module must either be a zip file or a tarball.'}</p>
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Upload a module from your computer.'}">
{l s='Module file'}
</span>
</label>
<div class="col-lg-9">
<p>
<input type="file" name="file" />
</p>
<p>
<h3>{l s='Add a new module'}</h3>
<p class="alert alert-info">{l s='The module must either be a zip file or a tarball.'}</p>
<div class="form-group">
<label for="file" class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Upload a module from your computer.'}">
{l s='Module file'}
</span>
</label>
<div class="col-lg-3">
<input type="file" name="file" class="form-control" />
</div>
</div>
<div class="form-group">
<div class="col-lg-9 col-lg-push-3">
<button class="btn btn-default" type="submit" name="download">
<i class="icon-upload-alt" ></i>
{l s='Upload this module'}
</button>
</p>
</div>
</div>
</form>
</div>

17
admin-dev/themes/default/template/controllers/modules/list.tpl
View File

@@ -28,9 +28,12 @@
<thead>
<tr>
<th width="1%">
<input type="checkbox" rel="false" class="noborder" id="checkme">
<!-- <input type="checkbox" rel="false" class="noborder" id="checkme"> -->
</th>
<th colspan="3">
<div class="pull-left">
{include file='controllers/modules/filters.tpl'}
</div>
<div class="btn-group pull-right">
<a class="btn btn-default {if !isset($smarty.get.select)} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
<i class="icon-list"></i>
@@ -68,10 +71,10 @@
{elseif $module->active == 1}
<span class="label label-info">{l s='Active'}</span>
{elseif $module->active == 0}
<span class="label label-disabled">{l s='Inactive'}</span>
<span class="label label-warning">{l s='Inactive'}</span>
{/if}
{else}
<span class="label label-disabled">{l s='Not installed'}</span>
<span class="label label-warning">{l s='Not installed'}</span>
{/if}
<!-- {if isset($module->id) && $module->id gt 0}
<span class="label label-success{if isset($module->active) && $module->active eq 0} off{/if}">{l s='Installed'}</span>
@@ -79,9 +82,9 @@
<span class="label label-warning">{l s='Not installed'}</span>
{/if} -->
</h3>
<div class="row-fluid">
<div class="row">
<p class="module-infos">
<span>{$module->categoryName}</span> -
<strong>{$module->categoryName}</strong> -
{if isset($module->author) && !empty($module->author)}
{l s='Developed by'} {$module->author|truncate:20:'...'}
{/if}
@@ -92,14 +95,14 @@
</p>
<p class="module-description">
{if isset($module->description) && $module->description ne ''}
{l s='Description'} : {$module->description}
{$module->description}
{/if}
</p>
</div>
{if isset($module->message) && (!isset($module->type) || ($module->type != 'addonsMustHave' || $module->type !== 'addonsNative'))}<div class="alert alert-success">{$module->message}</div>{/if}
</div>
</td>
<td width="180px">
<td>
<div id="list-action-button" class="btn-group">
{if isset($module->type) && $module->type == 'addonsMustHave'}
<a class="btn btn-default" href="{$module->addons_buy_url}" target="_blank">

34
admin-dev/themes/default/template/controllers/modules/login_addons.tpl
View File

@@ -40,7 +40,7 @@
<!--end addons login-->
{else}
{if $check_url_fopen eq 'ko' OR $check_openssl eq 'ko'}
<div class="alert alert-block">
<div class="alert alert-warning">
{l s='If you want to be able to fully use the AdminModules panel and have free modules available, you should enable the following configuration on your server:'}
<br />
{if $check_url_fopen eq 'ko'}- {l s='Enable allow_url_fopen'}<br />{/if}
@@ -50,31 +50,29 @@
<!--start addons login-->
<div class="panel-heading">
<i class="icon-user"></i>
{l s='Do you have a %s account?' sprintf='<a target="_blank" href="http://addons.prestashop.com/">PrestaShop Addons</a>'}
<a target="_blank" href="http://addons.prestashop.com/">PrestaShop Addons</a>
</div>
<form id="addons_login_form" method="post" class="form-horizontal">
<div class="row">
<label class="control-label col-lg-3">{l s='Addons Login'} :</label>
<div class="input-group col-lg-4">
<form id="addons_login_form" method="post" >
<div class="form-group">
<label for="username_addons">{l s='Addons Login'} :</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-user"></i></span>
<input type="text" value="" id="username_addons" autocomplete="off" class="form-control ac_input">
<input id="username_addons" class="form-control" name="username_addons" type="text" value="" autocomplete="off" class="form-control ac_input">
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s= 'Password Addons'} :</label>
<div class="input-group col-lg-4">
<div class="form-group">
<label for="password_addons">{l s= 'Password Addons'} :</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-key"></i></span>
<input type="password" value="" id="password_addons" autocomplete="off" class="form-control ac_input">
<input id="password_addons" class="form-control" name="password_addons" type="password" value="" autocomplete="off" class="form-control ac_input">
</div>
</div>
<div class="row">
<div class="col-lg-9 col-offset-3">
<button class="btn btn-default" id="addons_login_button" type="submit">
<i class="icon-unlock"></i> {l s='Log in'}
</button>
<div id="addons_loading" class="help-block"></div>
</div>
<div class="form-group">
<button id="addons_login_button" class="btn btn-default" type="submit">
<i class="icon-unlock"></i> {l s='Log in'}
</button>
</div>
<div id="addons_loading" class="help-block"></div>
</form>
<!--end addons login-->
{/if}

24
admin-dev/themes/default/template/controllers/modules/page.tpl
View File

@@ -26,9 +26,6 @@
{include file='controllers/modules/header.tpl'}
{include file='controllers/modules/login_addons.tpl'}
{if $upgrade_available|@count}
<div class="alert alert-info">
{l s='An upgrade is available for some of your modules!'}
@@ -44,16 +41,23 @@
<i class="icon-list-ul"></i>
{l s='Modules list'}
</div>
{include file='controllers/modules/filters.tpl'}
<!--start sidebar module-->
<div class="row">
<div class="categorieTitle col col-lg-3">
<div class="categorieTitle col-lg-3">
<div class="list-group">
<form id="filternameForm" method="post" class="list-group-item form-horizontal">
<div class="input-group col-lg-12">
<input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
<span class="input-group-btn">
<button class="btn btn-default" type="submit">
<i class="icon-search"></i> {l s='Search'}
</button>
</span>
</div>
</form>
<a class="list-group-item {if isset($categoryFiltered.favorites)}active{/if}" href="{$currentIndex}&token={$token}&filterCategory=favorites">
<i class="icon-star"></i> {l s='Favorites'} <span class="badge pull-right">{$nb_modules_favorites}</span>
{l s='Favorites'} <span class="badge pull-right">{$nb_modules_favorites}</span>
</a>
<a class="list-group-item {if count($categoryFiltered) lte 0}active{/if}" href="{$currentIndex}&token={$token}&unfilterCategory=yes">
{l s='All'} <span class="badge pull-right">{$nb_modules}</span>
</a>
@@ -63,9 +67,9 @@
</a>
{/foreach}
</div>
{include file='controllers/modules/login_addons.tpl'}
</div>
<div id="moduleContainer" class="col col-lg-9">
<div id="moduleContainer" class="col-lg-9">
{include file='controllers/modules/list.tpl'}
</div>
</div>

2
admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
View File

@@ -66,6 +66,6 @@
</div>
</div>
{/if}
<div class="alert alert-block">
<div class="alert alert-warning">
<a href="{$admin_module_favorites_view}">{l s='More options'}</a>
</div>

2
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
View File

@@ -59,7 +59,7 @@
<div class="row">
<label class="control-label col-lg-3">{l s='Exceptions'} :</label>
<div class="col-lg-6">
<div class="alert alert-block">
<div class="alert alert-warning">
<p>
{l s='Please specify the files for which you do not want the module to be displayed.'}<br />
{l s='Please input each filename, separated by a comma.'}<br />

12
admin-dev/themes/default/template/controllers/orders/form.tpl
View File

@@ -448,7 +448,7 @@
html += '</ul>';
}
else
html = '<div class="alert alert-block">{l s='No customers found'}</div>';
html = '<div class="alert alert-warning">{l s='No customers found'}</div>';
$('#customers').html(html);
resetBind();
}
@@ -1067,7 +1067,7 @@
<input type="submit" onclick="addProduct();return false;" class="btn btn-default" id="submitAddProduct" value="{l s='Add to cart'}"/></p>
</div>
</div>
<div id="products_err" class="alert alert-block" style="display:none;"></div>
<div id="products_err" class="alert alert-warning" style="display:none;"></div>
<div class="row">
<div class="col-lg-12">
<table class="table" id="customer_cart">
@@ -1092,7 +1092,7 @@
<tbody>
</tbody>
</table>
<p class="alert alert-block">{l s='The prices are without taxes.'}</p>
<p class="alert alert-warning">{l s='The prices are without taxes.'}</p>
</div>
</div>
<div class="row">
@@ -1222,14 +1222,14 @@
</tbody>
</table>
</div>
<div id="vouchers_err" class="alert alert-block" style="display:none;"></div>
<div id="vouchers_err" class="alert alert-warning" style="display:none;"></div>
</fieldset>
<fieldset id="address_part" style="display:none;">
<h3>
<i class="icon-envelope"></i>
{l s='Addresses'}
</h3>
<div id="addresses_err" class="alert alert-block" style="display:none;"></div>
<div id="addresses_err" class="alert alert-warning" style="display:none;"></div>
<div class="row">
<div class="col-lg-12">
@@ -1265,7 +1265,7 @@
<i class="icon-truck"></i>
{l s='Shipping'}
</h3>
<div id="carriers_err" style="display:none;" class="alert alert-block"></div>
<div id="carriers_err" style="display:none;" class="alert alert-warning"></div>
<div id="carrier_form">
<div class="row">
<label class="control-label col-lg-3">

6
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
View File

@@ -484,7 +484,7 @@
{if (!$order->valid && sizeof($currencies) > 1)}
<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<p class="alert alert-block">{l s='Don\'t forget to update your conversion rate before making this change.'}</p>
<p class="alert alert-warning">{l s='Don\'t forget to update your conversion rate before making this change.'}</p>
<div class="col-lg-10">
<select name="new_currency">
{foreach from=$currencies item=currency_change}
@@ -500,7 +500,7 @@
{/if}
{if count($order->getOrderPayments()) > 0}
<p class="alert alert-block " style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if} clear: both;">
<p class="alert alert-warning " style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if} clear: both;">
{l s='Warning'} {displayPrice price=$total_paid currency=$currency->id} {l s='paid instead of'} <strong>{displayPrice price=$orders_total_paid_tax_incl currency=$currency->id}</strong>
{foreach $order->getBrother() as $brother_order}
{if $brother_order@first}
@@ -683,7 +683,7 @@
{l s='Gift wrapping'}
</span>
{if $order->gift_message}
<div class="alert alert-block">
<div class="alert alert-warning">
<p>
<strong>{l s='Message'}</strong>
</p>

4
admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
View File

@@ -26,7 +26,7 @@
{extends file="helpers/view/view.tpl"}
{block name="override_tpl"}
{if !$shop_context}
<div class="alert alert-block">{l s='You have more than one shop and must select one to configure payment.'}</div>
<div class="alert alert-warning">{l s='You have more than one shop and must select one to configure payment.'}</div>
{else}
{if isset($modules_list)}
{$modules_list}
@@ -36,7 +36,7 @@
{include file='controllers/payment/restrictions.tpl'}
{/foreach}
{else}
<div class="alert alert-block">{l s='No payment module installed'}</div>
<div class="alert alert-warning">{l s='No payment module installed'}</div>
{/if}
{/if}
{/block}

4
admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
View File

@@ -27,7 +27,7 @@
{block name="label"}
{if $input.type == 'text' && $input.name == 'ps_cache_fs_directory_depth'}
<div id="directory_depth">
<div class="alert alert-block">{l s='The CacheFS system should be used only when the infrastructure contains one front-end server. If you are not sure, ask your hosting company.'}</div>
<div class="alert alert-warning">{l s='The CacheFS system should be used only when the infrastructure contains one front-end server. If you are not sure, ask your hosting company.'}</div>
{else}
{$smarty.block.parent}
{/if}
@@ -35,7 +35,7 @@
{block name="input"}
{if $input.type == 'radio' && $input.name == 'combination' && $input.disabled}
<div class="alert alert-block">
<div class="alert alert-warning">
{l s='This feature cannot be disabled because it is currently in use.'}
</div>
{/if}

4
admin-dev/themes/default/template/controllers/products/informations.tpl
View File

@@ -87,12 +87,12 @@
</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>
<div class="alert alert-warning" 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>
<div id="warn_virtual_combinations" class="alert alert-warning" style="display:none">{l s='You cannot use combinations with a virtual product.'}</div>
<div class="row">
<label class="control-label col-lg-3" for="simple_product">{$bullet_common_field} {l s='Type:'}</label>

2
admin-dev/themes/default/template/controllers/products/prices.tpl
View File

@@ -81,7 +81,7 @@ $(document).ready(function () {
html += '</ul>';
}
else
html = '<div class="alert alert-block">{l s='No customers found'}</div>';
html = '<div class="alert alert-warning">{l s='No customers found'}</div>';
Customer.hideLoader();
Customer.container.html(html);
jQuery('.fancybox', Customer.container).fancybox();

4
admin-dev/themes/default/template/controllers/products/quantities.tpl
View File

@@ -41,7 +41,7 @@
</div>
{if $show_quantities == true}
<div class="alert alert-block" id="available_quantity_ajax_msg" style="display: none;"></div>
<div class="alert alert-warning" id="available_quantity_ajax_msg" style="display: none;"></div>
<div class="error" id="available_quantity_ajax_error_msg" style="display: none;"></div>
<div class="alert" id="available_quantity_ajax_success_msg" style="display: none;"></div>
@@ -164,7 +164,7 @@
</div>
{else}
<div class="alert alert-block">
<div class="alert alert-warning">
<p>{l s='It is not possible to manage quantities when:'}</p>
<ul>
<li>{l s='You are currently managing all of your shops.'}</li>

2
admin-dev/themes/default/template/controllers/products/seo.tpl
View File

@@ -111,7 +111,7 @@
<div class="row">
<div class="col-lg-9 col-offset-3">
{foreach from=$languages item=language}
<div class="alert alert-block translatable-field lang-{$language.id_lang}">
<div class="alert alert-warning translatable-field lang-{$language.id_lang}">
<i class="icon-link"></i> {l s='The product link will look like this:'}
{$curent_shop_url|escape:'htmlall':'UTF-8'}lang/{if isset($product->id)}{$product->id}{else}<b>id_product</b>{/if}-<span id="friendly-url_{$language.id_lang}">{$product->link_rewrite[$default_language]}</span>.html
</div>

10
admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
View File

@@ -66,7 +66,7 @@
<i class="icon-file-text"></i>
{l s='Modify translations'}
</h3>
<p class="alert alert-block">
<p class="alert alert-warning">
{l s='Here you can modify translations for every line of code inside PrestaShop.'}<br />
{l s='First, select a section (such as Back Office or Installed modules), and then click the flag representing the language you want to edit.'}
</p>
@@ -133,7 +133,7 @@
</h3>
<div id="submitAddLangContent" class="row">
<div class="col-lg-12">
<p class="alert alert-block">
<p class="alert alert-warning">
{l s='You can add or update a language directly from the PrestaShop website here:'}<br/>
{l s='If you choose to update an existing language pack, all of your previous customization\'s in the theme named "Default" will be lost. This includes Front Office expressions and default email templates.'}
</p>
@@ -170,7 +170,7 @@
</h3>
<div id="submitImportContent" class="row">
<div class="col-lg-12">
<p class="alert alert-block">
<p class="alert alert-warning">
{l s='If the language file format is: isocode.gzip (e.g. us.gzip), and the language corresponding to this package does not exist, it will automatically be created.'}
{l s='Warning: This will replace all of the existing data inside the destination language.'}
</p>
@@ -206,7 +206,7 @@
<i class="icon-upload"></i>
{l s='Export a language'}
</h3>
<p class="alert alert-block">
<p class="alert alert-warning">
{l s='Export data from one language to a file (language pack).'}<br />
{l s='Choose which theme you\'d like to export your translations to. '}
</p>
@@ -244,7 +244,7 @@
<i class="icon-copy"></i>
{l s='Copy'}
</h3>
<p class="alert alert-block">
<p class="alert alert-warning">
{l s='Copies data from one language to another.'}<br />
{l s='Warning: This will replace all of the existing data inside the destination language.'}<br />
{l s='If necessary'}, <b><a href="{$url_create_language}">{l s='you must first create a new language.'}</a></b>.

4
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl
View File

@@ -28,7 +28,7 @@
{block name="override_tpl"}
{if !empty($limit_warning)}
<div class="alert alert-block">
<div class="alert alert-warning">
{if $limit_warning['error_type'] == 'suhosin'}
{l s='Warning: Your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields allowed in a form:'}
@@ -66,7 +66,7 @@
</script>
<div id="BoxUseSpecialSyntax">
<div class="alert alert-block">
<div class="alert alert-warning">
<p>
{l s='This expression uses this special syntax:'} <span>%d.</span><br />
{l s='You must use this syntax in your translations. Here are several examples:'}

4
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl
View File

@@ -28,7 +28,7 @@
{block name="override_tpl"}
{if !empty($limit_warning)}
<div class="alert alert-block">
<div class="alert alert-warning">
{if $limit_warning['error_type'] == 'suhosin'}
{l s='Warning: Your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields allowed in a form:'}
@@ -77,7 +77,7 @@
</script>
<div id="BoxUseSpecialSyntax">
<div class="alert alert-block">
<div class="alert alert-warning">
<p>
{l s='This expression uses this special syntax:'} <strong>%d.</strong>
{l s='You must use this syntax in your translations. Here are several examples:'}

4
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl
View File

@@ -30,7 +30,7 @@
{$tinyMCE}
{if !empty($limit_warning)}
<div class="alert alert-block">
<div class="alert alert-warning">
{if $limit_warning['error_type'] == 'suhosin'}
{l s='Warning: Your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields allowed in a form:'}
@@ -75,7 +75,7 @@
</script>
<div id="BoxUseSpecialSyntax">
<div class="alert alert-block">
<div class="alert alert-warning">
<p>
{l s='This expression uses this special syntax:'} <span>%d.</span><br />
{l s='You must use this syntax in your translations. Here are several examples:'}

4
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
View File

@@ -28,7 +28,7 @@
{block name="override_tpl"}
{if !empty($limit_warning)}
<div class="alert alert-block">
<div class="alert alert-warning">
{if $limit_warning['error_type'] == 'suhosin'}
{l s='Warning: Your hosting provider is using the suhosin patch for PHP, which limits the maximum number of fields allowed in a form:'}
@@ -69,7 +69,7 @@
</script>
<div id="BoxUseSpecialSyntax">
<div class="alert alert-block">
<div class="alert alert-warning">
<p>
{l s='This expression uses this special syntax:'} <span>%d.</span><br />
{l s='You must use this syntax in your translations. Here are several examples:'}

2
admin-dev/themes/default/template/header.tpl
View File

@@ -347,7 +347,7 @@
<div id="content" class="page-content">
{if $display_header && $install_dir_exists}
<div class="alert alert-block">
<div class="alert alert-warning">
{l s='For security reasons, you must also:'}&nbsp;{l s='delete the /install folder'}
</div>
{/if}

2
admin-dev/themes/default/template/helpers/modules_list/list.tpl
View File

@@ -44,7 +44,7 @@
<table class="table">
<tr>
<td>
<div class="alert alert-block">{l s='No modules available in this section.'}</div>
<div class="alert alert-warning">{l s='No modules available in this section.'}</div>
</td>
</tr>
</table>

2
admin-dev/themes/default/template/helpers/options/options.tpl
View File

@@ -274,7 +274,7 @@
{/block}{* end block input *}
{if $field['is_invisible']}
<p class="alert alert-block">
<p class="alert alert-warning">
{l s='You can\'t change the value of this configuration field in the context of this shop.'}
</p>
{/if}

2
admin-dev/themes/default/template/layout-ajax.tpl
View File

@@ -75,7 +75,7 @@
{/if}
{if count($warnings)}
<div class="alert alert-block">
<div class="alert alert-warning">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{if count($warnings) > 1}
{l s='There are %d warnings.' sprintf=count($warnings)}

6
admin-dev/themes/default/template/layout.tpl
View File

@@ -66,7 +66,7 @@
</div>
{/if}
{if count($warnings)}
<div class="alert alert-block">
<div class="alert alert-warning">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{if count($warnings) > 1}
{l s='There are %d warnings.' sprintf=count($warnings)}
@@ -74,13 +74,13 @@
<a id="linkSeeMore" href="#" style="text-decoration:underline">{l s='Click here to see more'}</a>
<a id="linkHide" href="#" style="text-decoration:underline;display:none">{l s='Hide warning'}</a>
</span>
<ul {if count($warnings) > 1}style="display:none;"{/if} id="seeMore">
<ul {if count($warnings) > 1}style="display:none;"{/if} id="seeMore" class="list-unstyled">
{foreach $warnings as $warning}
<li>{$warning}</li>
{/foreach}
</ul>
{else}
<ul >
<ul class="list-unstyled">
{foreach $warnings as $warning}
<li>{$warning}</li>
{/foreach}