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

[+] BO : now Back-office has meta-title by controller

Browse Source 
// fix back office template, add missing override
This commit is contained in:
mMarinetti
2011-09-28 14:15:07 +00:00
parent 2f6dc0cc37
commit ef9f2d1c2f
12 changed files with 261 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/adminHome.tpl
+63 -71
View File
@@ -1,17 +1,14 @@
<div> <div>
<h1>{l s='Dashboard'}</h1> <h1>{l s='Dashboard'}</h1>
<hr style="background-color: #812143;color: #812143;" /> <hr style="background-color: #812143;color: #812143;" />
<br />
{if $upgrade} {if $upgrade}
<div class="warning warn" style="margin-bottom:30px;"><h3>{l s ='New PrestaShop version available'} : <a style="text-decoration: underline;" href="{$upgrade->link}" target="_blank">{l s ='Download'} {$upgrade->version_name}</a> !</h3></div> <div class="warning warn" style="margin-bottom:10px;"><h3>{l s ='New PrestaShop version available'} : <a style="text-decoration: underline;" href="{$upgrade->link}" target="_blank">{l s ='Download'} {$upgrade->version_name}</a> !</h3></div>
{else} {else}
<p>{l s ='Update notification unavailable'}</p> <p>{l s ='Update notification unavailable'}</p>
<p>&nbsp;</p> <p>&nbsp;</p>
<p>{l s ='To receive PrestaShop update warnings, you need to activate the <b>allow_url_fopen</b> command in your <b>php.ini</b> config file.'} [<a href="http://www.php.net/manual/'.$isoUser.'/ref.filesystem.php">{l s ='more info'}</a>]</p> <p>{l s ='To receive PrestaShop update warnings, you need to activate the <b>allow_url_fopen</b> command in your <b>php.ini</b> config file.'} [<a href="http://www.php.net/manual/'.$isoUser.'/ref.filesystem.php">{l s ='more info'}</a>]</p>
<p>{l s ='If you don\'t know how to do that, please contact your host administrator !'}</p><br /> <p>{l s ='If you don\'t know how to do that, please contact your host administrator !'}</p><br />
{/if} {/if}
</div>
{if $show_screencast} {if $show_screencast}
<div id="adminpresentation"> <div id="adminpresentation">
<iframe src="{$protocol}://screencasts.prestashop.com/screencast.php?iso_lang={$isoUser}" style="border:none;width:100%;height:420px;" scrolling="no"></iframe> <iframe src="{$protocol}://screencasts.prestashop.com/screencast.php?iso_lang={$isoUser}" style="border:none;width:100%;height:420px;" scrolling="no"></iframe>
@@ -21,7 +18,6 @@
<label for="screencast_dont_show_again">{l s='don\'t show again'}</label> <label for="screencast_dont_show_again">{l s='don\'t show again'}</label>
</div> </div>
</div> </div>
{/if}
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$('#screencast_dont_show_again').click(function() { $('#screencast_dont_show_again').click(function() {
@@ -39,76 +35,72 @@ $(document).ready(function() {
}); });
}); });
</script> </script>
<div class="clear"></div><br /> {/if}
<div id="column_left"> <div id="column_left">
<ul class="F_list clearfix"> <ul class="F_list clearfix">
{foreach from=$quick_links key=k item=link} {foreach from=$quick_links key=k item=link}
<li id="{$k}_block"> <li id="{$k}_block">
<h4><a href="{$link.href}">{$link.title}</a></h4> <h4><a href="{$link.href}">{$link.title}</a></h4>
<p>{$link.description}</p> <p>{$link.description}</p>
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
{$monthly_statistics} {$monthly_statistics}
{$customers_service} {$customers_service}
{$stats_sales}
{$last_orders}
</div>
{$stats_sales} <div id="column_right">
{$last_orders}
<div id="column_right">
{$tips_optimization} {$tips_optimization}
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$.ajax({ $.ajax({
url: "ajax-tab.php", url: "ajax-tab.php",
type: "POST", type: "POST",
data:{ data:{
token: "{$token}", token: "{$token}",
ajax: "1", ajax: "1",
controller : "AdminHome", controller : "AdminHome",
action: "getAdminHomeElement" action: "getAdminHomeElement"
}, },
dataType: "json", dataType: "json",
success: function(json) { success: function(json) {
if (json.screencast != 'NOK') if (json.screencast != 'NOK')
$('#adminpresentation').fadeIn('slow'); $('#adminpresentation').fadeIn('slow');
else else
$('#adminpresentation').fadeOut('slow'); $('#adminpresentation').fadeOut('slow');
$('#partner_preactivation').fadeOut('slow', function() { $('#partner_preactivation').fadeOut('slow', function() {
if (json.partner_preactivation != 'NOK') if (json.partner_preactivation != 'NOK')
$('#partner_preactivation').html(json.partner_preactivation); $('#partner_preactivation').html(json.partner_preactivation);
else else
$('#partner_preactivation').html(''); $('#partner_preactivation').html('');
$('#partner_preactivation').fadeIn('slow'); $('#partner_preactivation').fadeIn('slow');
});
$('#discover_prestashop').fadeOut('slow', function() {
if (json.discover_prestashop != 'NOK')
$('#discover_prestashop').html(json.discover_prestashop);
else
$('#discover_prestashop').html('');
$('#discover_prestashop').fadeIn('slow');
});
},
error: function(XMLHttpRequest, textStatus, errorThrown)
{
$('#adminpresentation').fadeOut('slow');
$('#partner_preactivation').fadeOut('slow');
$('#discover_prestashop').fadeOut('slow');
}
}); });
});
</script>
<div id="partner_preactivation">
<p class="center"><img src="../img/loader.gif" alt="" />{l s='Loading...'}</p>
</div>
$('#discover_prestashop').fadeOut('slow', function() {
if (json.discover_prestashop != 'NOK')
$('#discover_prestashop').html(json.discover_prestashop);
else
$('#discover_prestashop').html('');
$('#discover_prestashop').fadeIn('slow');
});
},
error: function(XMLHttpRequest, textStatus, errorThrown)
{
$('#adminpresentation').fadeOut('slow');
$('#partner_preactivation').fadeOut('slow');
$('#discover_prestashop').fadeOut('slow');
}
});
});
</script>
<div id="partner_preactivation">
<p class="center"><img src="../img/loader.gif" alt="" />{l s='Loading...'}</p>
</div>
{$discover_prestashop} {$discover_prestashop}
<div class="clear"></div> <div class="clear"></div>
{$HOOK_BACKOFFICEHOME}
{$HOOK_BACKOFFICEHOME} </div>
admin-dev/themes/template/header.tpl
+1 -1
View File
@@ -28,7 +28,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="robots" content="NOFOLLOW, NOINDEX" /> <meta name="robots" content="NOFOLLOW, NOINDEX" />
<title>PrestaShop&trade; - {l s='Administration panel'|escape:'htmlall':'UTF-8'}</title> <title>{$meta_title} - PrestaShop&trade;</title>
<script type="text/javascript"> <script type="text/javascript">
var helpboxes = {$help_box}; var helpboxes = {$help_box};
var roundMode = {$round_mode}; var roundMode = {$round_mode};
admin-dev/themes/template/home/optimizationTips.tpl
+61
View File
@@ -0,0 +1,61 @@
<div class="admin-box1">
<h5>{l s='A good beginning...'}
<span style="float:right">
<a id="optimizationTipsFold" href="#">
<img alt="v" style="padding-top:0px; padding-right: 5px;" src="../img/admin/{if $hide_tips}down-white.gif{else}close-white.png{/if}" />
</a>
</span>
</h5>
<ul id="list-optimization-tips" class="admin-home-box-list" {if $hide_tips}style="display:none"{/if} >
{foreach from=$opti_list item=i key=k}
<li style="background-color:{$i.color}">
<img src="../img/admin/{$i.image}" class="pico" />
<a href="{$i.href}">{$i.title}</a>
</li>
{/foreach}
</ul>
</div>
<script type="text/javascript">
$(document).ready(function(){
{if !$hide_tips}
$("#optimizationTipsFold").click(function(e){
e.preventDefault();
$.ajax({
url: "ajax-tab.php",
type: "POST",
data:{
token: "{$token}",
ajax: "1",
controller : "AdminHome",
action: "hideOptimizationTips"
},
dataType: "json",
success: function(json){
if(json.result == "ok")
showSuccessMessage(json.msg);
else
showErrorMessage(json.msg);
} ,
error: function(XMLHttpRequest, textStatus, errorThrown)
{
}
});
});
{/if}
$("#optimizationTipsFold").click(function(e){
e.preventDefault();
$("#list-optimization-tips").toggle(function(){
if($("#optimizationTipsFold").children("img").attr("src") == "../img/admin/down-white.gif")
$("#optimizationTipsFold").children("img").attr("src","../img/admin/close-white.png");
else
$("#optimizationTipsFold").children("img").attr("src","../img/admin/down-white.gif");
});
})
});
</script>
classes/AdminController.php
+5
View File
@@ -9,6 +9,8 @@ class AdminControllerCore extends Controller
public $content_only = false; public $content_only = false;
public $layout = 'layout.tpl'; public $layout = 'layout.tpl';
public $meta_title = 'Administration panel';
public $template = ''; public $template = '';
/** @var string Associated table name */ /** @var string Associated table name */
@@ -170,6 +172,9 @@ class AdminControllerCore extends Controller
{ {
if(!empty($this->content)) if(!empty($this->content))
$this->context->smarty->assign('content', $this->content); $this->context->smarty->assign('content', $this->content);
$this->context->smarty->assign('meta_title',$this->meta_title);
if (empty($this->template)) if (empty($this->template))
{ {
$class_name = get_class($this); $class_name = get_class($this);
controllers/admin/AdminHomeController.php
+82 -72
View File
@@ -31,6 +31,8 @@ class AdminHomeControllerCore extends AdminController
private function _displayOptimizationTips() private function _displayOptimizationTips()
{ {
$link = $this->context->link;
$content = ''; $content = '';
$rewrite = 0; $rewrite = 0;
if (Configuration::get('PS_REWRITING_SETTINGS')) if (Configuration::get('PS_REWRITING_SETTINGS'))
@@ -94,59 +96,59 @@ class AdminHomeControllerCore extends AdminController
if ($rewrite + $htaccessOptimized + $smartyOptimized + $cccOptimized + $shopEnabled + $htaccessAfterUpdate + $indexRebuiltAfterUpdate != 14) if ($rewrite + $htaccessOptimized + $smartyOptimized + $cccOptimized + $shopEnabled + $htaccessAfterUpdate + $indexRebuiltAfterUpdate != 14)
{ {
$content .= ' $this->context->smarty->assign('hide_tips',Configuration::get('PS_HIDE_OPTIMIZATION_TIPS'));
<div class="admin-box1"> $opti_list[] = array(
<h5>'.$this->l('A good beginning...') 'title' => $this->l('URL rewriting'),
.' 'href' => $link->getAdminLink('AdminGenerator'),
<span style="float:right"> 'color' => $lights[$rewrite]['color'],
<a id="optimizationTipsFold"'. 'image' => $lights[$rewrite]['image'],
(Configuration::get('PS_HIDE_OPTIMIZATION_TIPS') );
?'" href="#"><img alt="v" style="padding-top:0px; padding-right: 5px;" src="../img/admin/down-white.gif" /></a>':'href="?hideOptimizationTips" >
<img alt="X" style="padding-top:0px; padding-right: 5px;" src="../img/admin/close-white.png" /> $opti_list[] = array(
</a>').'</span></h5>'; 'title' => $this->l('Browser cache & compression'),
$content .= ' 'href' => $link->getAdminLink('AdminPerformance'),
<script type="text/javascript"> 'color' => $lights[$htaccessOptimized]['color'],
$(document).ready(function(){ 'image' => $lights[$htaccessOptimized]['image'],
$("#optimizationTipsFold").click(function(e){ );
$("#list-optimization-tips").toggle(function(){
if($("#optimizationTipsFold").children("img").attr("src") == "../img/admin/down-white.gif") $opti_list[] = array(
$("#optimizationTipsFold").children("img").attr("src","../img/admin/close-white.png"); 'title' => $this->l('Smarty optimization'),
else 'href' => $link->getAdminLink('AdminPerformance'),
$("#optimizationTipsFold").children("img").attr("src","../img/admin/down-white.gif"); 'color' => $lights[$smartyOptimized]['color'],
}); 'image' => $lights[$smartyOptimized]['image'],
}) );
});
</script> $opti_list[] = array(
'; 'title' => $this->l('Combine, Compress & Cache'),
$content .= '<ul id="list-optimization-tips" class="admin-home-box-list" ' 'href' => $link->getAdminLink('AdminPerformance'),
.(Configuration::get('PS_HIDE_OPTIMIZATION_TIPS')?'style="display:none"':'').'> 'color' => $lights[$cccOptimized]['color'],
<li style="background-color:'.$lights[$rewrite]['color'].'"> 'image' => $lights[$cccOptimized]['image'],
<img src="../img/admin/'.$lights[$rewrite]['image'].'" class="pico" /> );
<a href="index.php?tab=AdminGenerator&token='.Tools::getAdminTokenLite('AdminGenerator').'">'.$this->l('URL rewriting').'</a>
</li> $opti_list[] = array(
<li style="background-color:'.$lights[$htaccessOptimized]['color'].'"> 'title' => $this->l('Shop enabled'),
<img src="../img/admin/'.$lights[$htaccessOptimized]['image'].'" class="pico" /> 'href' => $link->getAdminLink('AdminPreferences'),
<a href="index.php?tab=AdminGenerator&token='.Tools::getAdminTokenLite('AdminGenerator').'">'.$this->l('Browser cache & compression').'</a> 'color' => $lights[$shopEnabled]['color'],
</li> 'image' => $lights[$shopEnabled]['image'],
<li style="background-color:'.$lights[$smartyOptimized]['color'].'"> );
<img src="../img/admin/'.$lights[$smartyOptimized]['image'].'" class="pico" />
<a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'">'.$this->l('Smarty optimization').'</a></li> $opti_list[] = array(
<li style="background-color:'.$lights[$cccOptimized]['color'].'"> 'title' => $this->l('index rebuilt after update'),
<img src="../img/admin/'.$lights[$cccOptimized]['image'].'" class="pico" /> 'href' => $link->getAdminLink('AdminSearchConf'),
<a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'">'.$this->l('Combine, Compress & Cache').'</a></li> 'color' => $lights[$indexRebuiltAfterUpdate]['color'],
<li style="background-color:'.$lights[$shopEnabled]['color'].'"> 'image' => $lights[$indexRebuiltAfterUpdate]['image'],
<img src="../img/admin/'.$lights[$shopEnabled]['image'].'" class="pico" /> );
<a href="index.php?tab=AdminPreferences&token='.Tools::getAdminTokenLite('AdminPreferences').'">'.$this->l('Shop enabled').'</a></li>
<li style="background-color:'.$lights[$indexRebuiltAfterUpdate]['color'].'"> $opti_list[] = array(
<img src="../img/admin/'.$lights[$indexRebuiltAfterUpdate]['image'].'" class="pico" /> 'title' => $this->l('.htaccess up-to-date'),
<a href="index.php?tab=AdminSearchConf&token='.Tools::getAdminTokenLite('AdminSearchConf').'">'.$this->l('index rebuilt after update').'</a></li> 'href' => $link->getAdminLink('AdminGenerator'),
<li style="background-color:'.$lights[$htaccessAfterUpdate]['color'].'"> 'color' => $lights[$htaccessAfterUpdate]['color'],
<img src="../img/admin/'.$lights[$htaccessAfterUpdate]['image'].'" class="pico" /> 'image' => $lights[$htaccessAfterUpdate]['image'],
<a href="index.php?tab=AdminGenerator&token='.Tools::getAdminTokenLite('AdminGenerator').'">'.$this->l('.htaccess up-to-date').'</a></li> );
</ul>
</div>';
} }
return $content; $this->context->smarty->assign('opti_list',$opti_list);
$this->context->smarty->assign('content',$content);
return $this->context->smarty->fetch('home/optimizationTips.tpl');
} }
public function setMedia() public function setMedia()
@@ -372,10 +374,27 @@ class AdminHomeControllerCore extends AdminController
return $content; return $content;
} }
public function ajaxProcess()
public function ajaxProcessHideOptimizationTips()
{ {
if (Configuration::updateValue('PS_HIDE_OPTIMIZATION_TIPS', 1))
{
$result['result'] = 'ok';
$result['msg'] = $this->l('Optimization Tips will be folded by default');
}
else
{
$result['result'] = 'error';
$result['msg'] = $this->l('an error occured a');
}
$this->content = Tools::jsonEncode($result);
} }
public function displayAjax()
{
echo $this->content;
}
public function ajaxProcessGetAdminHomeElement() public function ajaxProcessGetAdminHomeElement()
{ {
$result = array(); $result = array();
@@ -419,11 +438,12 @@ class AdminHomeControllerCore extends AdminController
if ($content[0] == 'OK' && Validate::isCleanHtml($content[1])) if ($content[0] == 'OK' && Validate::isCleanHtml($content[1]))
$result['discover_prestashop'] .= $content[1]; $result['discover_prestashop'] .= $content[1];
die(Tools::jsonEncode($result)); $this->content = Tools::jsonEncode($result);
} }
public function getBlockPartners() public function getBlockPartners()
{ {
$stream_context = @stream_context_create(array('http' => array('method'=> 'GET', 'timeout' => AdminHomeController::TIPS_TIMEOUT)));
$content = @file_get_contents($protocol.'://www.prestashop.com/partner/preactivation/preactivation-block.php?version=1.0&shop='.urlencode(Configuration::get('PS_SHOP_NAME')).'&protocol='.$protocol.'&url='.urlencode($_SERVER['HTTP_HOST']).'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&date_creation='._PS_CREATION_DATE_.'&v='._PS_VERSION_.'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context); $content = @file_get_contents($protocol.'://www.prestashop.com/partner/preactivation/preactivation-block.php?version=1.0&shop='.urlencode(Configuration::get('PS_SHOP_NAME')).'&protocol='.$protocol.'&url='.urlencode($_SERVER['HTTP_HOST']).'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&date_creation='._PS_CREATION_DATE_.'&v='._PS_VERSION_.'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context);
if (!$content) if (!$content)
$return = ''; // NOK $return = ''; // NOK
@@ -453,9 +473,9 @@ class AdminHomeControllerCore extends AdminController
public function getBlockDiscover() public function getBlockDiscover()
{ {
$stream_context = @stream_context_create(array('http' => array('method'=> 'GET', 'timeout' => AdminHomeController::TIPS_TIMEOUT)));
$content = ''; $content = '';
$stream_context = @stream_context_create(array('http' => array('method'=> 'GET', 'timeout' => AdminHomeController::TIPS_TIMEOUT)));
$protocol = Tools::usingSecureMode() ? 'https' : 'http'; $protocol = Tools::usingSecureMode() ? 'https' : 'http';
$isoUser = Context::getContext()->language->iso_code; $isoUser = Context::getContext()->language->iso_code;
$isoCountry = Context::getContext()->country->iso_code; $isoCountry = Context::getContext()->country->iso_code;
@@ -494,29 +514,19 @@ class AdminHomeControllerCore extends AdminController
} }
$smarty->assign('upgrade', $upgrade); $smarty->assign('upgrade', $upgrade);
$smarty->assign('show_screencast', $this->context->employee->show_screencast); $smarty->assign('show_screencast', $this->context->employee->show_screencast);
// quick link to add a products, category, attributes etc. $smarty->assign('quick_links', $this->getQuickLinks());
$quick_links = $this->getQuickLinks();
$smarty->assign('quick_links',$quick_links);
$monthly_statistics = $this->getMonthlyStatistics();
$smarty->assign('monthly_statistics', $monthly_statistics);
$customers_service = $this->getCustomersService(); $smarty->assign('monthly_statistics', $this->getMonthlyStatistics());
$smarty->assign('customers_service', $customers_service);
$stats_sales = $this->getStatsSales(); $smarty->assign('customers_service', $this->getCustomersService());
$smarty->assign('stats_sales', $stats_sales);
$last_orders = $this->getLastOrders(); $smarty->assign('stats_sales', $this->getStatsSales());
$smarty->assign('last_orders', $last_orders);
$smarty->assign('last_orders',$this->getLastOrders());
if (Tools::isSubmit('hideOptimizationTips')) $smarty->assign('tips_optimization', $this->_displayOptimizationTips());
Configuration::updateValue('PS_HIDE_OPTIMIZATION_TIPS', 1);
$tips_optimization = $this->_displayOptimizationTips();
$smarty->assign('tips_optimization', $tips_optimization);
$discover_prestashop = '<div id="discover_prestashop"> $discover_prestashop = '<div id="discover_prestashop">
<p class="center"><img src="../img/loader.gif" alt="" /> '.$this->l('Loading...').'</p> <p class="center"><img src="../img/loader.gif" alt="" /> '.$this->l('Loading...').'</p>
css/admin.css
+2 -2
View File
@@ -1094,13 +1094,13 @@ html[xmlns] .clearfix {
#column_left{ #column_left{
width: 610px; width: 610px;
float: left; float: left;
padding-top: 20px; padding-top: 5px;
} }
#column_right{ #column_right{
width: 315px; width: 315px;
float: right; float: right;
padding-top: 20px; padding-top: 5px;
} }
.F_list{ .F_list{
override/classes/AdminController.php
+7
View File
@@ -0,0 +1,7 @@
<?php
class AdminController extends AdminControllerCore
{
}
override/classes/RequestSql.php
+7
View File
@@ -0,0 +1,7 @@
<?php
class RequestSql extends RequestSqlCore
{
}
override/controllers/admin/AdminHomeController.php
+7
View File
@@ -0,0 +1,7 @@
<?php
class AdminHomeController extends AdminHomeControllerCore
{
}
override/controllers/admin/AdminToolsController.php
+7
View File
@@ -0,0 +1,7 @@
<?php
class AdminToolsController extends AdminToolsControllerCore
{
}
override/controllers/front/PdfOrderReturnController.php
+7
View File
@@ -0,0 +1,7 @@
<?php
class PdfOrderReturnController extends PdfOrderReturnControllerCore
{
}
override/controllers/front/PdfOrderSlipController.php
+7
View File
@@ -0,0 +1,7 @@
<?php
class PdfOrderSlipController extends PdfOrderSlipControllerCore
{
}