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

// page edit product smallImage, fix page translation, stats

Browse Source
This commit is contained in:
vKham
2012-01-05 17:41:36 +00:00
parent 1e6512252a
commit 0de03b7bb3
13 changed files with 81 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin.css
+2 -1
View File
@@ -280,7 +280,8 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
.sidebar ul.categorieList {}
.sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;}
.sidebar ul.categorieList li:first-child { border-top:none;}
.sidebar ul.categorieList li a {color:#3a6ea7; padding-left:5px;}
.sidebar ul.categorieList li a {color:#3a6ea7; display:block; padding-left:5px;}
.sidebar ul.categorieList li a:hover { background-color: #EBEDF4;}
.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;}
.sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
.sidebar .categorieStatus { display:none;}
admin-dev/themes/default/template/customer_threads/message.tpl
+1 -1
View File
@@ -176,7 +176,7 @@
<div style="width: 450px; margin-top: 0px;">
<input type="file" name="joinFile"/>
<div>
<div style="width: 450px; text-align: center;">
<div>
<input type="submit" class="button" name="submitReply" value="{l s='Send my reply'}" style="margin-top:20px;" />
<input type="hidden" name="id_customer_thread" value="{$message.id_customer_thread}" />
<input type="hidden" name="msg_email" value="{$message.email}" />
admin-dev/themes/default/template/import/form.tpl
+8 -6
View File
@@ -155,8 +155,8 @@
{/foreach}
</select>
{/if}
&nbsp;&nbsp;<img src="../img/admin/add.gif" alt="Uplaod" title="Upload" />
<b><a href="#upload_file_import" id="upload_file_import_link">{l s='Upload'}</a></b>
&nbsp;&nbsp;
<a href="#upload_file_import" id="upload_file_import_link" class="button"><img src="../img/admin/add.gif" alt="Uplaod" title="Upload" />{l s='Upload'}</a>
</div>
<br />
@@ -203,10 +203,12 @@
</div>
{if !count($files_to_import)}
<div class="warn" style="margin-top: 20px;">
{l s='There is no CSV file available, please upload one using the form above.'}
<br /><br />
{l s='You can read informations on CSV import at:'} <a href="http://www.prestashop.com/wiki/Troubleshooting_6/" target="_blank">http://www.prestashop.com/wiki/Troubleshooting_6/</a><br /><br />
{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>
<p>{l s='There is no CSV file available, please upload one using the form above.'}</p>
<ul>
<li>{l s='You can read informations on CSV import at:'} <a href="http://www.prestashop.com/wiki/Troubleshooting_6/" target="_blank">http://www.prestashop.com/wiki/Troubleshooting_6/</a></li>
<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></li>
</ul>
</div>
{/if}
</fieldset>
admin-dev/themes/default/template/import/view.tpl
+2
View File
@@ -30,6 +30,7 @@
<script type="text/javascript">
var errorEmpty = "{l s='Please enter a name to save.'}"
</script>
<div id="container-customer">
<h2>{l s='View your data'}</h2>
<div>
<b>{l s='Save and load your matching configuration'} : </b><br><br>
@@ -134,5 +135,6 @@
</table>
<script type="text/javascript">showTable(current);</script>
</form>
</div>
{/block}
admin-dev/themes/default/template/products/informations.tpl
+31 -14
View File
@@ -221,14 +221,21 @@
<div style="display:block;width:620px;" class="hint clear">
{l s='Do you want an image associated with the product in your description?'}
<span class="addImageDescription" style="cursor:pointer">{l s='Click here'}</span>.
<table id="createImageDescription" style="display:none;">
</div>
<p class="clear"></p>
</td>
</tr>
</table>
<table id="createImageDescription" style="display:none;width:100%">
<tr>
<td colspan="2" height="10"></td>
</tr>
<tr>
<td class="col-left"><label>{l s='Select your image:'}</label></td>
<td style="padding-bottom:5px;">
<ul>
<ul class="smallImage">
{foreach from=$images item=image key=key}
<li>
<input type="radio" name="smallImage" id="smallImage_{$key}" value="{$image.id_image}" {if $key == 0}checked="checked"{/if} >
@@ -244,23 +251,27 @@
<tr>
<td class="col-left"><label>{l s='Where to place it?'}</label></td>
<td style="padding-bottom:5px;">
<input type="radio" name="leftRight" id="leftRight_1" value="left" checked>
<ul class="listForm">
<li><input type="radio" name="leftRight" id="leftRight_1" value="left" checked>
<label for="leftRight_1" class="t">{l s='left'}</label>
<br />
</li>
<li>
<input type="radio" name="leftRight" id="leftRight_2" value="right">
<label for="leftRight_2" class="t">{l s='right'}</label>
<p class="clear"></p>
</li>
</ul>
</td>
</tr>
<tr>
<td class="col-left"><label>{l s='Select the type of picture:'}</label></td>
<td style="padding-bottom:5px;">
<ul class="listForm">
{foreach from=$imagesTypes key=key item=type}
<input type="radio" name="imageTypes" id="imageTypes_{$key}" value="{$type.name}" {if $key == 0}checked="checked"{/if}>
<li><input type="radio" name="imageTypes" id="imageTypes_{$key}" value="{$type.name}" {if $key == 0}checked="checked"{/if}>
<label for="imageTypes_{$key}" class="t">{$type.name} <span>({$type.width}px par {$type.height}px)</span></label>
<br />
</li>
{/foreach}
</ul>
<p class="clear"></p>
</td>
</tr>
@@ -269,14 +280,19 @@
<td class="col-left"><label>{l s='Image tag to insert:'}</label></td>
<td style="padding-bottom:5px;">
<input type="text" id="resultImage" name="resultImage" />
<p>{l s='The tag is to copy / paste in the description.'}</p>
<p class="preference_description">{l s='The tag is to copy / paste in the description.'}</p>
</td>
</tr>
<tr>
<td colspan="2">
<div class="separation"></div>
</td>
</tr>
</table>
</div>
<p class="clear"></p>
</td>
</tr>
<script type="text/javascript">
$(function() {
@@ -310,7 +326,7 @@
}
</script>
{/if}
<table>
<tr>
<td class="col-left"><label>{l s='Tags:'}</label></td>
<td style="padding-bottom:5px;" class="translatable">
@@ -324,6 +340,7 @@
<p class="preference_description clear">{l s='Tags separated by commas (e.g., dvd, dvd player, hifi)'}</p>
</td>
</tr>
</table>
</table>
<br />
</div>
admin-dev/themes/default/template/translations/translation_form.tpl
+2 -1
View File
@@ -29,7 +29,8 @@
{block name="override_tpl"}
<h2>{l s='Language'} : {$lang} - {$translation_type}</h2>
{l s='Expressions to translate'} : <b>{$count}</b>. {l s='Click on the titles to open fieldsets'}.<br /><br />
{l s='Expressions to translate'} : <b>{$count}</b>.
<div class="hint" style="display:block;">{l s='Click on the titles to open fieldsets'}.</div><br /><br />
<p>{l s='total missing expresssions:'} {$missing_translations|array_sum} </p>
{$limit_warning}
{if !$suoshin_exceeded}
admin-dev/themes/default/template/translations/translation_mails.tpl
+6 -7
View File
@@ -31,7 +31,7 @@
{$tinyMCE}
<h2>{l s='Language'} : {$lang} - {$translation_type}</h2>
{l s='Click on the titles to open fieldsets'}.<br /><br />
<div class="hint" style="display:block;">{l s='Click on the titles to open fieldsets'}.</div><br />
{if !$suoshin_exceeded}
<form method="post" id="{$table}_form" action="{$url_submit}" class="form">
{$toggle_button}
@@ -39,23 +39,22 @@
<input type="hidden" name="type" value="{$type}" />
<input type="submit" id="{$table}_form_submit_btn" name="submitTranslations{$type|ucfirst}" value="{l s='Update translations'}" class="button" />
{*<input type="submit" name="submitTranslations{$type|ucfirst}AndStay" value="{l s='Update and stay'}" class="button" />*}
<br /><br />
{l s='Core e-mails:'}
<h2>{l s='Core e-mails:'}</h2>
{$mail_content}
{l s='Modules e-mails:'}
<h2>{l s='Modules e-mails:'}</h2>
{foreach $module_mails as $module_name => $mails}
{$mails['display']}
{/foreach}
{if !empty($theme_mails)}
{l s='Themes e-mails:'}
<h2>{l s='Themes e-mails:'}</h2>
{$bool_title = false}
{foreach $theme_mails as $theme_or_module_name => $mails}
{if $theme_or_module_name != 'theme_mail' && !$bool_title}
{$bool_title = true}
{l s='E-mails modules in theme:'}
<h2>{l s='E-mails modules in theme:'}</h2>
{/if}
{$mails['display']}
{/foreach}
admin-dev/themes/default/template/translations/translation_modules.tpl
+4 -3
View File
@@ -29,7 +29,8 @@
{block name="override_tpl"}
<h2>{l s='Language'} : {$lang} - {$translation_type}</h2>
{l s='Expressions to translate'} : <b>{$count}</b>. {l s='Click on the titles to open fieldsets'}.<br /><br />
{l s='Expressions to translate'} : <b>{$count}</b>.
<div class="hint" style="display:block;">{l s='Click on the titles to open fieldsets'}.</div><br />
{$limit_warning}
{if !$suoshin_exceeded}
<form method="post" id="{$table}_form" action="{$url_submit}" class="form">
@@ -37,7 +38,7 @@
{*{include file="translations/auto_translate.tpl"}*}
<input type="hidden" name="lang" value="{$lang}" />
<input type="submit" id="{$table}_form_submit_btn" name="submitTranslations{$type|ucfirst}" value="{l s='Update translations'}" class="button" />
<br /><br />
<br />
{if count($modules_translations) > 1}
<h3 style="padding:0;margin:0;">{l s='List of Themes - Click to access theme translation:'}</h3>
@@ -51,7 +52,7 @@
{foreach $modules_translations as $theme_name => $theme}
<h2>&gt;{l s='Theme:'} <a name="{$theme_name}">{if $theme_name === $default_theme_name}{l s='default'}{else}{$theme_name}{/if} </h2>
{foreach $theme as $module_name => $module}
{l s='Module:'} <a name="{$module_name}" style="font-style:italic">{$module_name}</a>
<h3>{l s='Module:'} <a name="{$module_name}" style="font-style:italic">{$module_name}</a></h3>
{foreach $module as $template_name => $newLang}
{if !empty($newLang)}
{$occurrences = $newLang|array_count_values}
css/admin.css
+15 -13
View File
@@ -150,23 +150,26 @@ form .simulate-disable-input{
}
.mails_field {
margin:0;
background: none repeat scroll 0 0 #FFFFF0;
border: 1px solid #DFD5C3;
background: none repeat scroll 0 0 #FFF;
border: 1px solid #CCCCCC;
font-size: 1.1em;
margin: 20px 0 20px 0;
padding: 2em 1em 1em 1em;
padding:0;
position:relative;
border-radius:3px;
}
.mails_field h3{
position:absolute;
background: -moz-linear-gradient(center top , #F9F9F9, #ECECEC) repeat-x scroll left top #ECECEC;
color: #333333;
font-size: 13px;
padding: 4px 6px;
text-align: left;
text-shadow: 0 1px 0 #FFFFFF;
margin:0;
top:-10px;
font-size:1em;
background-color:#FFF6D3;
border:1px solid #DFD5C3;
padding: 2px 5px 2px 5px;
display:inline-block;
padding: 10px 5px;
display:block;
}
.style-themeModuleMail {
@@ -425,7 +428,6 @@ select optgroup option {
}
#content .warning {
width: 400px;
margin: 0 0 15px 0;
line-height: 20px;
padding: 10px 20px 10px 20px;
@@ -512,7 +514,7 @@ select optgroup option {
min-height:32px;
}
#content .warn a {
#content .warn ul li, #content .warn p, #content .warn a {
color:#9e6014;
}
@@ -1844,13 +1846,13 @@ div.progressBarImage
height: 100%;
}
#createImageDescription ul li{
#createImageDescription ul.smallImage li{
list-style-type: none;
display: block;
width: 90px;
text-align: center;
float: left;
margin-bottom:15px;
margin-right:20px;
}
#menu .submenu_size .submenu { display: none; position:absolute}
#menu .submenu_size:hover > .submenu { display: block; }
modules/pagesnotfound/pagesnotfound.php
+1 -1
View File
@@ -109,7 +109,7 @@ class Pagesnotfound extends Module
$this->_html .= '<div class="blocStats"><h2 class="icon-'.$this->name.'"><span></span>'.$this->displayName.'</h2>';
if (!file_exists(dirname(__FILE__).'/../../.htaccess'))
$this->_html .= '<div class="warning warn">'.$this->l('You <b>must</b> use a .htaccess file to redirect 404 errors to the page "404.php"').'</div>';
$this->_html .= '<br/><div class="warning warn">'.$this->l('You <b>must</b> use a .htaccess file to redirect 404 errors to the page "404.php"').'</div>';
$pages = $this->getPages();
if (count($pages))
modules/sekeywords/sekeywords.php
+2 -1
View File
@@ -106,7 +106,8 @@ class SEKeywords extends ModuleGraph
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.ModuleGraph::getDateBetween().$this->_query2);
$total = count($result);
$this->html = '<div class="blocStats"><h2 class="icon-'.$this->name.'"><span></span>'.$this->displayName.'</h2>
'.$total.' '.($total == 1 ? $this->l('keyword matches your query.') : $this->l('keywords match your query.')).'';
<p>
'.$total.' '.($total == 1 ? $this->l('keyword matches your query.') : $this->l('keywords match your query.')).'</p>';
if ($result && $total)
{
$table = '
modules/statsnewsletter/statsnewsletter.php
+4 -3
View File
@@ -62,13 +62,14 @@ class StatsNewsletter extends ModuleGraph
if (Tools::getValue('export'))
$this->csvExport(array('type' => 'line', 'layers' => 3));
$this->_html = '
<fieldset><legend><img src="../modules/'.$this->name.'/logo.gif" /> '.$this->displayName.'</legend>
<div class="blocStats">
<h2><img src="../modules/'.$this->name.'/logo.gif" /> '.$this->displayName.'</h2>
<p>'.$this->l('Registrations from customers:').' '.(int)$totals['customers'].'</p>
<p>'.$this->l('Registrations from visitors:').' '.(int)$totals['visitors'].'</p>
<p>'.$this->l('Both:').' '.(int)$totals['both'].'</p>
<div>'.$this->engine(array('type' => 'line', 'layers' => 3)).'</div>
<p><a href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&export=1"><img src="../img/admin/asterisk.gif" />'.$this->l('CSV Export').'</a></p>
</fieldset>';
<p><a class="button export-csv" href="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'&export=1"><span>'.$this->l('CSV Export').'</span></a></p>
</div>';
}
else
$this->_html = '<p>'.$this->l('Module Newsletter Block must be installed').'</p>';
modules/statsproduct/statsproduct.php
+3 -2
View File
@@ -242,7 +242,7 @@ class StatsProduct extends ModuleGraph
$this->html .= '
<div class="margin-form">
<form action="" method="post" id="categoriesForm">
<label>'.$this->l('Choose a category').'</label>
<label class="t">'.$this->l('Choose a category').'</label>
<select name="id_category" onchange="$(\'#categoriesForm\').submit();">
<option value="0">'.$this->l('All').'</option>';
foreach ($categories as $category)
@@ -251,7 +251,8 @@ class StatsProduct extends ModuleGraph
</select>
</form>
</div>
'.$this->l('Click on a product to access its statistics.').'
<p>'.$this->l('Click on a product to access its statistics.').'</p>
<h2>'.$this->l('Products available').'</h2>
<div>
<table class="table" border="0" cellspacing="0" cellspacing="0">