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

Merge branch 'release' into development

Browse Source
This commit is contained in:
vAugagneur
2013-03-08 14:54:31 +01:00
parent 9c49b13299 a92ac11901
commit fd0e0618ab
14 changed files with 536 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/modules/content.tpl
-1
View File
@@ -23,7 +23,6 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
{if isset($module_content)} {if isset($module_content)}
{$module_content} {$module_content}
{else} {else}
admin-dev/themes/default/template/controllers/modules/filters.tpl
+49 -67
View File
@@ -25,36 +25,26 @@
{if $add_permission eq '1'} {if $add_permission eq '1'}
{if isset($logged_on_addons)} {if isset($logged_on_addons)}
<!--start addons login--> <!--start addons login-->
<div class="filter-module" id="addons_login_div"> <div class="filter-module" id="addons_login_div">
<p>{l s='You are logged into PrestaShop Addons.'}</p> <p>{l s='You are logged into PrestaShop Addons.'}</p>
<div style="float:right"> <div style="float:right">
<label><img src="themes/default/img/module-profile.png" /> {l s='Welcome'} {$username_addons}</label> <label><img src="themes/default/img/module-profile.png" /> {l s='Welcome'} {$username_addons}</label>
<label>|</label> <label>|</label>
<label><a href="#" id="addons_logout_button"><img src="themes/default/img/module-logout.png" /> {l s='Log out from PrestaShop Addons.'}</a></label> <label><a href="#" id="addons_logout_button"><img src="themes/default/img/module-logout.png" /> {l s='Log out from PrestaShop Addons.'}</a></label>
</div> </div>
</div> </div>
<!--end addons login--> <!--end addons login-->
{else} {else}
{if $check_url_fopen eq 'ko' OR $check_openssl eq 'ko'} {if $check_url_fopen eq 'ko' OR $check_openssl eq 'ko'}
<div class="warn"> <div class="warn">
<b>{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:'}</b><br /> <b>{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:'}</b><br />
{if $check_url_fopen eq 'ko'}- {l s='Enable allow_url_fopen'}<br />{/if} {if $check_url_fopen eq 'ko'}- {l s='Enable allow_url_fopen'}<br />{/if}
{if $check_openssl eq 'ko'}- {l s='Enable php openSSL extension'}<br />{/if} {if $check_openssl eq 'ko'}- {l s='Enable php openSSL extension'}<br />{/if}
</div> </div>
{else} {else}
<!--start addons login--> <!--start addons login-->
<div class="filter-module" id="addons_login_div"> <div class="filter-module" id="addons_login_div">
<p>{l s='Do you have a %s account?' sprintf='<a href="http://addons.prestashop.com/">PrestaShop Addons</a>'}</p> <p>{l s='Do you have a %s account?' sprintf='<a href="http://addons.prestashop.com/">PrestaShop Addons</a>'}</p>
<form id="addons_login_form" method="post"> <form id="addons_login_form" method="post">
<label>{l s='Login to Addons'} :</label> <input type="text" value="" id="username_addons" autocomplete="off" class="ac_input"> <label>{l s='Login to Addons'} :</label> <input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
@@ -62,67 +52,59 @@
<input type="submit" class="button" id="addons_login_button" value="{l s='Log in'}"> <input type="submit" class="button" id="addons_login_button" value="{l s='Log in'}">
<br /><span id="addons_loading" style="color:red"></span> <br /><span id="addons_loading" style="color:red"></span>
</form> </form>
</div> </div>
<!--end addons login--> <!--end addons login-->
{/if} {/if}
{/if} {/if}
<div class="clear">&nbsp;</div>
{/if} {/if}
<!--start filter module--> <!--start filter module-->
<style>.ac_results { border:1px solid #C2C4D9; }</style> <style>.ac_results { border:1px solid #C2C4D9; }</style>
<div class="filter-module"> <div class="filter-module">
<form id="filternameForm" method="post"> <form id="filternameForm" method="post">
<input type="text" value="" name="filtername" autocomplete="off" class="ac_input"> <input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
<input type="submit" class="button" value="{l s='Search:'}"> <input type="submit" class="button" value="{l s='Search:'}">
</form> </form>
<form method="post">
<div class="select-filter">
<label class="search-filter">{l s='Sort by'}:</label>
<form method="post"> <select 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>
<div class="select-filter"> <option value="nativeModules" {if $showTypeModules eq 'nativeModules'}selected="selected"{/if}>{l s='Free Modules'}</option>
<label class="search-filter">{l s='Sort by'}:</label> <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>
<select name="module_type" id="module_type_filter" {if $showTypeModules ne 'allModules' && $showTypeModules ne ''}style="background-color:#49B2FF;color:white;"{/if}> {if isset($logged_on_addons)}<option value="addonsModules" {if $showTypeModules eq 'addonsModules'}selected="selected"{/if}>{l s='Modules purchased on Addons'}</option>{/if}
<option value="allModules" {if $showTypeModules eq 'allModules'}selected="selected"{/if}>{l s='All Modules'}</option> <optgroup label="{l s='Authors'}">
<option value="nativeModules" {if $showTypeModules eq 'nativeModules'}selected="selected"{/if}>{l s='Free Modules'}</option> {foreach from=$list_modules_authors key=module_author item=status}
<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partner Modules (Free)'}</option> <option value="authorModules[{$module_author}]" {if $status eq "selected"}selected{/if}>{$module_author|truncate:20:'...'}</option>
<option value="mustHaveModules" {if $showTypeModules eq 'mustHaveModules'}selected="selected"{/if}>{l s='Must Have'}</option> {/foreach}
{if isset($logged_on_addons)}<option value="addonsModules" {if $showTypeModules eq 'addonsModules'}selected="selected"{/if}>{l s='Modules purchased on Addons'}</option>{/if} </optgroup>
<optgroup label="{l s='Authors'}"> <option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Other Modules'}</option>
{foreach from=$list_modules_authors key=module_author item=status} </select>
<option value="authorModules[{$module_author}]" {if $status eq "selected"}selected{/if}>{$module_author|truncate:20:'...'}</option> &nbsp;
{/foreach} <select name="module_install" id="module_install_filter" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
</optgroup> <option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</option>
<option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Other Modules'}</option> <option value="installed" {if $showInstalledModules eq 'installed'}selected="selected"{/if}>{l s='Installed Modules'}</option>
</select> <option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Modules Not Installed '}</option>
&nbsp; </select>
<select name="module_install" id="module_install_filter" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}> &nbsp;
<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</option> <select name="module_status" id="module_status_filter" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="installed" {if $showInstalledModules eq 'installed'}selected="selected"{/if}>{l s='Installed Modules'}</option> <option value="enabledDisabled" {if $showEnabledModules eq 'enabledDisabled'}selected="selected"{/if}>{l s='Enabled & Disabled'}</option>
<option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Modules Not Installed '}</option> <option value="enabled" {if $showEnabledModules eq 'enabled'}selected="selected"{/if}>{l s='Enabled Modules'}</option>
</select> <option value="disabled" {if $showEnabledModules eq 'disabled'}selected="selected"{/if}>{l s='Disabled Modules'}</option>
&nbsp; </select>
<select name="module_status" id="module_status_filter" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}> &nbsp;
<option value="enabledDisabled" {if $showEnabledModules eq 'enabledDisabled'}selected="selected"{/if}>{l s='Enabled & Disabled'}</option> <select name="country_module_value" id="country_module_value_filter" {if $showCountryModules eq 1}style="background-color:#49B2FF;color:white;"{/if}>
<option value="enabled" {if $showEnabledModules eq 'enabled'}selected="selected"{/if}>{l s='Enabled Modules'}</option> <option value="0" >{l s='All countries'}</option>
<option value="disabled" {if $showEnabledModules eq 'disabled'}selected="selected"{/if}>{l s='Disabled Modules'}</option> <option value="1" {if $showCountryModules eq 1}selected="selected"{/if}>{l s='Current country:'} {$nameCountryDefault}</option>
</select> </select>
&nbsp; </div>
<select name="country_module_value" id="country_module_value_filter" {if $showCountryModules eq 1}style="background-color:#49B2FF;color:white;"{/if}> <div class="button-filter">
<option value="0" >{l s='All countries'}</option> <input type="submit" value="{l s='Reset'}" name="resetFilterModules" class="button" />
<option value="1" {if $showCountryModules eq 1}selected="selected"{/if}>{l s='Current country:'} {$nameCountryDefault}</option> <input type="submit" value="{l s='Filter'}" id="filterModulesButton" name="filterModules" class="button" />
</select> </div>
</form>
</div> </div>
<!--end filter module-->
<div class="button-filter">
<input type="submit" value="{l s='Reset'}" name="resetFilterModules" class="button" />
<input type="submit" value="{l s='Filter'}" id="filterModulesButton" name="filterModules" class="button" />
</div>
</form>
</div>
<!--end filter module-->
admin-dev/themes/default/template/controllers/modules/header.tpl
+15 -19
View File
@@ -23,27 +23,23 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<div class="toolbar-placeholder"> <div class="toolbar-placeholder">
<div class="toolbarBox toolbarHead"> <div class="toolbarBox toolbarHead">
<ul class="cc_button">
<ul class="cc_button"> {if $add_permission eq '1'}
{if $add_permission eq '1'} <li>
<li> <a id="desc-module-new" class="toolbar_btn" href="#top_container" onclick="$('#module_install').slideToggle();" title="{l s='Add a new module'}">
<a id="desc-module-new" class="toolbar_btn" href="#top_container" onclick="$('#module_install').slideToggle();" title="{l s='Add a new module'}"> <span class="process-icon-new-module" ></span>
<span class="process-icon-new-module" ></span> <div>{l s='Add a new module'}</div>
<div>{l s='Add a new module'}</div> </a>
</a> </li>
</li> {/if}
{/if} </ul>
</ul> <div class="pageTitle">
<h3><span id="current_obj" style="font-weight: normal;"><span class="breadcrumb item-0">Module</span> : <span class="breadcrumb item-1">{l s='List of modules'}</span></span></h3>
<div class="pageTitle">
<h3><span id="current_obj" style="font-weight: normal;"><span class="breadcrumb item-0">Module</span> : <span class="breadcrumb item-1">{l s='List of modules'}</span></span></h3>
</div>
</div> </div>
</div> </div>
</div>
{if $add_permission eq '1'} {if $add_permission eq '1'}
<div id="module_install" style="width:500px;margin-top:5px;{if !isset($smarty.post.downloadflag)}display: none;{/if}"> <div id="module_install" style="width:500px;margin-top:5px;{if !isset($smarty.post.downloadflag)}display: none;{/if}">
admin-dev/themes/default/template/controllers/modules/js.tpl
+111 -157
View File
@@ -68,22 +68,22 @@
// AutoComplete Search // AutoComplete Search
$('input[name="filtername"]').autocomplete(moduleList, { $('input[name="filtername"]').autocomplete(moduleList, {
minChars: 0, minChars: 0,
width: 310, width: 310,
matchContains: true, matchContains: true,
highlightItem: true, highlightItem: true,
formatItem: function(row, i, max, term) { formatItem: function(row, i, max, term) {
var image = '../modules/'+row.name+'/logo.gif'; var image = '../modules/'+row.name+'/logo.gif';
if (row.image != '') if (row.image != '')
image = row.image; image = row.image;
return '<img src="'+image+'" style="float:left;margin:5px;width:16px;height:16px"><strong>'+row.displayName+'</strong>'+((row.author != '') ? ' ' + by + ' ' + truncate_author(row.author) : '') + '<br /><span style="font-size: 80%;">'+ row.desc +'</span><br/><div style="height:15px;padding-top:5px">'+ row.option +'</div>'; return '<img src="'+image+'" style="float:left;margin:5px;width:16px;height:16px"><strong>'+row.displayName+'</strong>'+((row.author != '') ? ' ' + by + ' ' + truncate_author(row.author) : '') + '<br /><span style="font-size: 80%;">'+ row.desc +'</span><br/><div style="height:15px;padding-top:5px">'+ row.option +'</div>';
}, },
formatResult: function(row) { formatResult: function(row) {
return row.displayName; return row.displayName;
} }
}); });
$('input[name="filtername"]').result(function(event, data, formatted) { $('input[name="filtername"]').result(function(event, data, formatted) {
$('#filternameForm').submit(); $('#filternameForm').submit();
}); });
// Method to check / uncheck all modules checkbox // Method to check / uncheck all modules checkbox
@@ -112,27 +112,21 @@
try try
{ {
resAjax = $.ajax({ resAjax = $.ajax({
type:"POST", type:"POST",
url : ajaxReloadCurrentIndex, url : ajaxReloadCurrentIndex,
async: true, async: true,
data : { data : {
ajax : "1", ajax : "1",
token : token, token : token,
controller : "AdminModules", controller : "AdminModules",
action : "reloadModulesList" action : "reloadModulesList"
}, },
beforeSend: function(xhr) beforeSend: function(xhr){
{ $('#moduleContainer').html('<img src="../img/loader.gif" alt="" border="0" />');
$('#moduleContainer').html('<img src="../img/loader.gif" alt="" border="0" />'); },
}, success: function(data){
success : function(data) $('#moduleContainer').html(data);
{ }
$('#moduleContainer').html(data);
},
error: function(res,textStatus,jqXHR)
{
//jAlert("TECHNICAL ERROR"+res);
}
}); });
} }
catch(e){} catch(e){}
@@ -143,25 +137,19 @@
try try
{ {
resAjax = $.ajax({ resAjax = $.ajax({
type:"POST", type:"POST",
url : ajaxCurrentIndex, url: ajaxCurrentIndex,
async: true, async: true,
data : { data: {
ajaxMode : "1", ajaxMode : "1",
ajax : "1", ajax : "1",
token : token, token : token,
controller : "AdminModules", controller : "AdminModules",
action : "refreshModuleList" action : "refreshModuleList"
}, },
success : function(data) success: function(data){
{
// res.status = cache or refresh
if (data == '{"status":"refresh"}') if (data == '{"status":"refresh"}')
window.location.href = window.location.href; window.location.href = window.location.href;
},
error: function(res,textStatus,jqXHR)
{
//jAlert("TECHNICAL ERROR"+res);
} }
}); });
} }
@@ -175,37 +163,30 @@
try try
{ {
resAjax = $.ajax({ resAjax = $.ajax({
type:"POST", type:"POST",
url : ajaxCurrentIndex, url : ajaxCurrentIndex,
async: true, async: true,
data : { data : {
ajax : "1", ajax : "1",
token : token, token : token,
controller : "AdminModules", controller : "AdminModules",
action : "logOnAddonsWebservices", action : "logOnAddonsWebservices",
username_addons : username_addons, username_addons : username_addons,
password_addons : password_addons password_addons : password_addons
}, },
beforeSend: function(xhr) beforeSend: function(xhr){
$('#addons_loading').html('<img src="../img/loader.gif" alt="" border="0" />');
},
success : function(data){
if (data == 'OK')
{ {
$('#addons_loading').html('<img src="../img/loader.gif" alt="" border="0" />'); $('#addons_loading').html('');
}, $('#addons_login_div').fadeOut();
success : function(data) window.location.href = currentIndexWithToken;
{
// res.status = cache or refresh
if (data == 'OK')
{
$('#addons_loading').html('');
$('#addons_login_div').fadeOut();
window.location.href = currentIndexWithToken;
}
else
$('#addons_loading').html(errorLogin);
},
error: function(res,textStatus,jqXHR)
{
//jAlert("TECHNICAL ERROR"+res);
} }
else
$('#addons_loading').html(errorLogin);
}
}); });
} }
catch(e){} catch(e){}
@@ -218,35 +199,28 @@
try try
{ {
resAjax = $.ajax({ resAjax = $.ajax({
type:"POST", type:"POST",
url : ajaxCurrentIndex, url : ajaxCurrentIndex,
async: true, async: true,
data : { data : {
ajax : "1", ajax : "1",
token : token, token : token,
controller : "AdminModules", controller : "AdminModules",
action : "logOutAddonsWebservices" action : "logOutAddonsWebservices"
}, },
beforeSend: function(xhr) beforeSend: function(xhr){
$('#addons_loading').html('<img src="../img/loader.gif" alt="" border="0" />');
},
success: function(data) {
if (data == 'OK')
{ {
$('#addons_loading').html('<img src="../img/loader.gif" alt="" border="0" />'); $('#addons_loading').html('');
}, $('#addons_login_div').fadeOut();
success : function(data) window.location.href = currentIndexWithToken;
{
// res.status = cache or refresh
if (data == 'OK')
{
$('#addons_loading').html('');
$('#addons_login_div').fadeOut();
window.location.href = currentIndexWithToken;
}
else
$('#addons_loading').html(errorLogin);
},
error: function(res,textStatus,jqXHR)
{
//jAlert("TECHNICAL ERROR"+res);
} }
else
$('#addons_loading').html(errorLogin);
}
}); });
} }
catch(e){} catch(e){}
@@ -263,30 +237,24 @@
try try
{ {
resAjax = $.ajax({ resAjax = $.ajax({
type:"POST", type:"POST",
url : ajaxCurrentIndex, url : ajaxCurrentIndex,
async: true, async: true,
data : { data : {
ajax : "1", ajax : "1",
token : token, token : token,
controller : "AdminModules", controller : "AdminModules",
action : "setFilter", action : "setFilter",
module_type : module_type, module_type : module_type,
module_install : module_install, module_install : module_install,
module_status : module_status, module_status : module_status,
country_module_value : country_module_value, country_module_value : country_module_value,
filterModules : 'Filter' filterModules : 'Filter'
}, },
success : function(data) success : function(data){
{ if (data == 'OK')
// res.status = cache or refresh window.location.href = currentIndexWithToken;
if (data == 'OK') }
window.location.href = currentIndexWithToken;
},
error: function(res,textStatus,jqXHR)
{
//jAlert("TECHNICAL ERROR"+res);
}
}); });
} }
catch(e){} catch(e){}
@@ -297,7 +265,6 @@
$('#module_status_filter').change(function() { setFilter(); }); $('#module_status_filter').change(function() { setFilter(); });
$('#country_module_value_filter').change(function() { setFilter(); }); $('#country_module_value_filter').change(function() { setFilter(); });
$('.moduleTabPreferencesChoise').change(function() $('.moduleTabPreferencesChoise').change(function()
{ {
var value_pref = $(this).val(); var value_pref = $(this).val();
@@ -316,17 +283,10 @@
module_pref : module_pref, module_pref : module_pref,
value_pref : value_pref value_pref : value_pref
}, },
success : function(data) success : function(data){
{
// res.status = cache or refresh
if (data == 'OK') if (data == 'OK')
$('#r_' + module_pref).html(confirmPreferencesSaved); $('#r_' + module_pref).html(confirmPreferencesSaved);
},
error: function(res,textStatus,jqXHR)
{
//jAlert("TECHNICAL ERROR"+res);
} }
}); });
}); });
@@ -340,28 +300,22 @@
try try
{ {
resAjax = $.ajax({ resAjax = $.ajax({
type:"POST", type:"POST",
url : ajaxCurrentIndex, url : ajaxCurrentIndex,
async: true, async: true,
data : { data : {
ajax : "1", ajax : "1",
token : token, token : token,
controller : "AdminModules", controller : "AdminModules",
action : "saveFavoritePreferences", action : "saveFavoritePreferences",
action_pref : action_pref, action_pref : action_pref,
module_pref : module_pref, module_pref : module_pref,
value_pref : value_pref value_pref : value_pref
}, },
success : function(data) success : function(data){
{ if (data == 'OK')
// res.status = cache or refresh $('#r_' + module_pref).html(confirmPreferencesSaved);
if (data == 'OK') }
$('#r_' + module_pref).html(confirmPreferencesSaved);
},
error: function(res,textStatus,jqXHR)
{
//jAlert("TECHNICAL ERROR"+res);
}
}); });
} }
catch(e){} catch(e){}
admin-dev/themes/default/template/controllers/modules/list.tpl
+88 -95
View File
@@ -23,100 +23,93 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
{if count($modules)} {if count($modules)}
<table cellspacing="0" cellpadding="0" style="width: 100%; margin-bottom:10px;" class="table" id="">
<table cellspacing="0" cellpadding="0" style="width: 100%; margin-bottom:10px;" class="table" id=""> <thead>
<col width="20px"> <tr class="nodrag nodrop">
<col width="40px"> <th class="center">
<col> <input type="checkbox" rel="false" class="noborder" id="checkme"><br>
<col width="150px"> </th>
</colgroup> <th class="center"></th>
<thead> <th>{l s='Module name'}</th>
<tr class="nodrag nodrop"> <th></th>
<th class="center"> </tr>
<input type="checkbox" rel="false" class="noborder" id="checkme"><br> <tbody>
</th> {foreach from=$modules item=module}
<th class="center"></th> <tr>
<th>{l s='Module name'}</th> <td>
<th></th> {if (isset($module->id) && $module->id > 0) || !isset($module->type) || $module->type != 'addonsMustHave'}
</tr> <input type="checkbox" name="modules" value="{$module->name}"
<tbody> {if !isset($module->confirmUninstall) OR empty($module->confirmUninstall)}rel="false"{else}rel="{$module->confirmUninstall|addslashes}"{/if}
{foreach from=$modules item=module} class="noborder">
<tr> {/if}
<td> </td>
{if (isset($module->id) && $module->id > 0) || !isset($module->type) || $module->type != 'addonsMustHave'} <td><img class="imgm" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}"></td>
<input type="checkbox" name="modules" value="{$module->name}" <td>
{if !isset($module->confirmUninstall) OR empty($module->confirmUninstall)}rel="false"{else}rel="{$module->confirmUninstall|addslashes}"{/if} <div class="moduleDesc" id="anchor{$module->name|ucfirst}">
class="noborder"> <h3>{$module->displayName}
{if isset($module->type) && $module->type == 'addonsMustHave'}
<span class="setup must-have">{l s='Must Have'}</span>
{else}
{if isset($module->id) && $module->id gt 0}
<span class="setup{if isset($module->active) && $module->active eq 0} off{/if}">{l s='Installed'}</span>
{else}
<span class="setup non-install">{l s='Not installed'}</span>
{/if} {/if}
</td> {/if}
<td><img class="imgm" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}"></td> </h3>
<td> <div class="metadata">
<div class="moduleDesc" id="anchor{$module->name|ucfirst}"> {if isset($module->author) && !empty($module->author)}
<h3>{$module->displayName} <dl class="">
{if isset($module->type) && $module->type == 'addonsMustHave'} <dt>{l s='Developed by'} :</dt>
<span class="setup must-have">{l s='Must Have'}</span> <dd>{$module->author|truncate:20:'...'}</dd>|
{else} </dl>
{if isset($module->id) && $module->id gt 0} {/if}
<span class="setup{if isset($module->active) && $module->active eq 0} off{/if}">{l s='Installed'}</span> <dl class="">
{else} <dt>{l s='Version'} :</dt>
<span class="setup non-install">{l s='Not installed'}</span> <dd>{$module->version}
{/if} {if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'}){/if}
{/if} </dd>|
</h3> </dl>
<div class="metadata"> <dl class="">
{if isset($module->author) && !empty($module->author)} <dt>{l s='Category'} :</dt>
<dl class=""> <dd>{$module->categoryName}</dd>
<dt>{l s='Developed by'} :</dt> </dl>
<dd>{$module->author|truncate:20:'...'}</dd>| </div>
</dl> <p class="desc">{if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else}&nbsp;{/if}</p>
{/if} {if isset($module->message)}<div class="conf">{$module->message}</div>{/if}
<dl class=""> <div class="row-actions-module">
<dt>{l s='Version'} :</dt> {if !isset($module->not_on_disk)}{$module->optionsHtml}{else}&nbsp;{/if}
<dd>{$module->version} </div>
{if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'}){/if} </div>
</dd>| </td>
</dl> <td>
<dl class=""> <ul id="list-action-button">
<dt>{l s='Category'} :</dt> {if isset($module->type) && $module->type == 'addonsMustHave'}
<dd>{$module->categoryName}</dd> <li>
</dl> <a href="{$module->addons_buy_url}" target="_blank" class="button updated"><span><img src="../img/admin/cart_addons.png">&nbsp;&nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}</span></a>
</div> </li>
<p class="desc">{if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else}&nbsp;{/if}</p> {else}
{if isset($module->message)}<div class="conf">{$module->message}</div>{/if} {if $module->id && isset($module->version_addons) && $module->version_addons}
<div class="row-actions-module"> <li><a href="{$module->options.update_url}" class="button updated"><span>{l s='Update it!'}</span></a></li>
{if !isset($module->not_on_disk)}{$module->optionsHtml}{else}&nbsp;{/if} {/if}
</div> <li>
</div> <a {if isset($module->id) && $module->id gt 0 && !empty($module->options.uninstall_onclick)}onclick="{$module->options.uninstall_onclick}"{/if} href="{if isset($module->id) && $module->id gt 0}{$module->options.uninstall_url}{else}{$module->options.install_url}{/if}" class="button installed">
</td> <span>{if isset($module->id) && $module->id gt 0}{l s='Uninstall'}{else}{l s='Install'}{/if}</span>
<td> </a>
<ul id="list-action-button"> </li>
{if isset($module->type) && $module->type == 'addonsMustHave'} {/if}
<li> </ul>
<a href="{$module->addons_buy_url}" target="_blank" class="button updated"><span><img src="../img/admin/cart_addons.png">&nbsp;&nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}</span></a> </td>
</li> </tr>
{else} {/foreach}
{if $module->id && isset($module->version_addons) && $module->version_addons} </tbody>
<li><a href="{$module->options.update_url}" class="button updated"><span>{l s='Update it!'}</span></a></li> </table>
{/if}
<li>
<a {if isset($module->id) && $module->id gt 0 && !empty($module->options.uninstall_onclick)}onclick="{$module->options.uninstall_onclick}"{/if} href="{if isset($module->id) && $module->id gt 0}{$module->options.uninstall_url}{else}{$module->options.install_url}{/if}" class="button installed">
<span>{if isset($module->id) && $module->id gt 0}{l s='Uninstall'}{else}{l s='Install'}{/if}</span>
</a>
</li>
{/if}
</ul>
</td>
</tr>
{/foreach}
</tbody>
</table>
<div style="margin-top: 12px;">
<input type="button" class="button big" value="{l s='Install the selection'}" onclick="modules_management('install')"/>
<input type="button" class="button big" value="{l s='Uninstall the selection'}" onclick="modules_management('uninstall')" />
</div>
{else}
<div style="margin-top: 12px;color: #585A69;font-size: 16px;"><p align="center">{l s='No modules available in this section.'}</p></div>
{/if}
<div style="margin-top: 12px;">
<input type="button" class="button big" value="{l s='Install the selection'}" onclick="modules_management('install')"/>
<input type="button" class="button big" value="{l s='Uninstall the selection'}" onclick="modules_management('uninstall')" />
</div>
{else}
<div style="margin-top: 12px;color: #585A69;font-size: 16px;"><p align="center">{l s='No modules available in this section.'}</p></div>
{/if}
admin-dev/themes/default/template/controllers/modules/page.tpl
-4
View File
@@ -24,14 +24,12 @@
*} *}
<div id="productBox"> <div id="productBox">
{include file='controllers/modules/header.tpl'} {include file='controllers/modules/header.tpl'}
{include file='controllers/modules/filters.tpl'} {include file='controllers/modules/filters.tpl'}
<ul class="view-modules"> <ul class="view-modules">
<li class="button normal-view-disabled"><img src="themes/default/img/modules_view_layout_sidebar.png" alt="{l s='Normal view'}" border="0" /><span>{l s='Normal view'}</span></li> <li class="button normal-view-disabled"><img src="themes/default/img/modules_view_layout_sidebar.png" alt="{l s='Normal view'}" border="0" /><span>{l s='Normal view'}</span></li>
<li class="button favorites-view"><a href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites"><img src="themes/default/img/modules_view_table_select_row.png" alt="{l s='Favorites view'}" border="0" /><span>{l s='Favorites view'}</span></a></li> <li class="button favorites-view"><a href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites"><img src="themes/default/img/modules_view_table_select_row.png" alt="{l s='Favorites view'}" border="0" /><span>{l s='Favorites view'}</span></a></li>
</ul> </ul>
<div id="container"> <div id="container">
@@ -58,10 +56,8 @@
</ul> </ul>
</div> </div>
</div> </div>
<div id="moduleContainer"> <div id="moduleContainer">
{include file='controllers/modules/list.tpl'} {include file='controllers/modules/list.tpl'}
</div> </div>
</div> </div>
</div> </div>
classes/Translate.php
+2
View File
@@ -51,6 +51,8 @@ class TranslateCore
if ($_LANGADM == null) if ($_LANGADM == null)
{ {
$iso = Context::getContext()->language->iso_code; $iso = Context::getContext()->language->iso_code;
if (empty($iso))
$iso = Language::getIsoById((int)(Configuration::get('PS_LANG_DEFAULT')));
include_once(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php'); include_once(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
} }
classes/module/Module.php
+8 -8
View File
@@ -1164,10 +1164,10 @@ abstract class ModuleCore
$item->active = 0; $item->active = 0;
if (isset($modaddons->img)) if (isset($modaddons->img))
{ {
if (!file_exists('../img/tmp/'.md5($modaddons->name).'.jpg')) if (!file_exists(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg'))
if (!@copy($modaddons->img, '../img/tmp/'.md5($modaddons->name).'.jpg')) if (!file_put_contents(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg', Tools::file_get_contents($modaddons->img)))
@copy('../img/404.gif', '../img/tmp/'.md5($modaddons->name).'.jpg'); copy(_PS_IMG_DIR_.'404.gif', _PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg');
if (file_exists('../img/tmp/'.md5($modaddons->name).'.jpg')) if (file_exists(_PS_TMP_IMG_DIR_.md5($modaddons->name).'.jpg'))
$item->image = '../img/tmp/'.md5($modaddons->name).'.jpg'; $item->image = '../img/tmp/'.md5($modaddons->name).'.jpg';
} }
if ($item->type == 'addonsMustHave') if ($item->type == 'addonsMustHave')
@@ -1178,10 +1178,10 @@ abstract class ModuleCore
foreach ($prices as $currency => $price) foreach ($prices as $currency => $price)
if ($id_currency = Currency::getIdByIsoCode($currency)) if ($id_currency = Currency::getIdByIsoCode($currency))
{ {
$item->price = (float)$price; $item->price = (float)$price;
$item->id_currency = (int)$id_currency; $item->id_currency = (int)$id_currency;
if ($id_default_currency == $id_currency) if ($id_default_currency == $id_currency)
break; break;
} }
} }
$module_list[] = $item; $module_list[] = $item;
controllers/admin/AdminModulesController.php
-1
View File
@@ -26,7 +26,6 @@
class AdminModulesControllerCore extends AdminController class AdminModulesControllerCore extends AdminController
{ {
/* /*
** @var array map with $_GET keywords and their callback ** @var array map with $_GET keywords and their callback
*/ */
install-dev/langs/br/install.php
+4 -3
View File
@@ -5,11 +5,12 @@ return array(
'support' => 'http://support.prestashop.com/en/', 'support' => 'http://support.prestashop.com/en/',
), ),
'translations' => array( 'translations' => array(
'menu_welcome' => 'Bem-vindo !', 'menu_welcome' => 'Escolha seu idioma',
'menu_license' => 'Acordo de licenciamento',
'menu_system' => 'Compatibilidade do Sistema', 'menu_system' => 'Compatibilidade do Sistema',
'menu_database' => 'Configuração do Sistema', 'menu_database' => 'Configuração do Sistema',
'menu_configure' => 'Configuração da loja', 'menu_configure' => 'Informação da Loja',
'menu_process' => 'Instalação', 'menu_process' => 'Instalação da Loja',
'Choose the installer language:' => 'Escolha a língua para instalação :', 'Choose the installer language:' => 'Escolha a língua para instalação :',
'Field required' => 'Campos requeridos', 'Field required' => 'Campos requeridos',
'Invalid shop name' => 'Nome da loja inválido', 'Invalid shop name' => 'Nome da loja inválido',
install-dev/langs/de/install.php
+5 -4
View File
@@ -4,11 +4,12 @@ return array(
'phone' => '+33 (0)1.40.18.30.04', 'phone' => '+33 (0)1.40.18.30.04',
), ),
'translations' => array( 'translations' => array(
'menu_welcome' => 'Willkommen!', 'menu_welcome' => 'Sprachauswahl',
'menu_license' => 'Annahme von Lizenzen',
'menu_system' => 'Systemkompatibilität', 'menu_system' => 'Systemkompatibilität',
'menu_database' => 'Datenbank Konfiguration', 'menu_database' => ' Systemkonfiguration',
'menu_configure' => 'Shop-Konfiguration', 'menu_configure' => 'Shopinstallation',
'menu_process' => 'Installation', 'menu_process' => 'Installation von Shop',
'Choose the installer language:' => 'Bitte wählen Sie Ihre Sprache', 'Choose the installer language:' => 'Bitte wählen Sie Ihre Sprache',
'Field required' => 'Pflichtfeld', 'Field required' => 'Pflichtfeld',
'Invalid shop name' => 'Ungültiger Shopname', 'Invalid shop name' => 'Ungültiger Shopname',
install-dev/langs/es/install.php
+6 -5
View File
@@ -4,11 +4,12 @@ return array(
'phone' => '+1 (888) 947-6543', 'phone' => '+1 (888) 947-6543',
), ),
'translations' => array( 'translations' => array(
'menu_welcome' => '¡Bienvenido!', 'menu_welcome' => 'Elegir el idioma',
'menu_system' => 'Compatibilidad sistema', 'menu_license' => 'Aceptar las licencias',
'menu_database' => 'Configuración de base de datos', 'menu_system' => 'Compatibilidad del sistema',
'menu_configure' => 'Configuración de la tienda', 'menu_database' => 'Configuración del sistema',
'menu_process' => 'Instalación', 'menu_configure' => 'Información de la tienda',
'menu_process' => 'Instalación de la tienda',
'Choose the installer language:' => '', 'Choose the installer language:' => '',
'Field required' => 'Campos requeridos', 'Field required' => 'Campos requeridos',
'Invalid shop name' => 'Nombre de la tienda no válido', 'Invalid shop name' => 'Nombre de la tienda no válido',
install-dev/langs/it/install.php
+5 -4
View File
@@ -4,11 +4,12 @@ return array(
'phone' => '+33 (0)1.40.18.30.04', 'phone' => '+33 (0)1.40.18.30.04',
), ),
'translations' => array( 'translations' => array(
'menu_welcome' => 'Benvenuto!', 'menu_welcome' => 'Scelta della lingua',
'menu_license' => 'Accettazione licenze',
'menu_system' => 'Compatibilità sistema', 'menu_system' => 'Compatibilità sistema',
'menu_database' => 'Database', 'menu_database' => 'Configurazione sistema',
'menu_configure' => 'Configurazione negozio', 'menu_configure' => 'Informazioni negozio',
'menu_process' => 'Installazione', 'menu_process' => 'Installazione del negozio',
'Choose the installer language:' => 'Scegli la lingua di installazione', 'Choose the installer language:' => 'Scegli la lingua di installazione',
'Field required' => 'Campo richiesto', 'Field required' => 'Campo richiesto',
'Invalid shop name' => 'nome negozio non valido', 'Invalid shop name' => 'nome negozio non valido',
themes/live_edit.tpl
+1 -1
View File
@@ -28,7 +28,7 @@
{/if} {/if}
var lastMove = ''; var lastMove = '';
var saveOK = '{l s='Module position saved' js=1}'; var saveOK = '{l s='Module position saved' js=1}';
var confirmClose = '{l s='Are you sure? If you close this window, its position won\'t be saved' js=1}'; var confirmClose = "{l s="Are you sure? If you close this window, its position won't be saved" js=1}";
var close = '{l s='Close' js=1}'; var close = '{l s='Close' js=1}';
var cancel = '{l s='Cancel' js=1}'; var cancel = '{l s='Cancel' js=1}';
var confirm = '{l s='Confirm' js=1}'; var confirm = '{l s='Confirm' js=1}';