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

[*] BO : HelpAccess helper

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12179 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2012-01-05 10:54:42 +00:00
parent e5535f61c0
commit 7a655974d8
12 changed files with 179 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/ajax.php
+3 -14
View File
@@ -543,18 +543,6 @@ if (Tools::isSubmit('toggleScreencast'))
}
}
if (Tools::isSubmit('helpAccess'))
{
$item = Tools::getValue('item');
$isoUser = Tools::getValue('isoUser');
$country = Tools::getValue('country');
$version = Tools::getValue('version');
if (isset($item) AND isset($isoUser) AND isset($country))
die(HelpAccess::displayHelp($item, $isoUser, $country, $version));
die('{nohelp}');
}
if (Tools::isSubmit('getHookableList'))
{
/* PrestaShop demo mode */
@@ -654,8 +642,8 @@ if (Tools::isSubmit('saveHook'))
$i++;
}
$value = rtrim($value, ',');
$res &= Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'hook_module`
(id_module, id_shop, id_hook, position)
$res &= Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'hook_module`
(id_module, id_shop, id_hook, position)
VALUES '.$value);
}
@@ -1014,3 +1002,4 @@ if (Tools::isSubmit('getZones'))
$array = array('hasError' => false, 'errors' => '', 'data' => $html);
die(Tools::jsonEncode($html));
}
admin-dev/themes/default/css/admin.css
+2 -1
View File
@@ -26,7 +26,7 @@ select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disab
/*BUTTON*/
.button{
background: #e3e3e3 url('../img/bg-button-degrade.png') repeat-x scroll left top;
background: #e3e3e3 url('../img/bg-button-degrade.png') repeat-x scroll left top;
background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;}
@@ -203,6 +203,7 @@ a.module_toggle_all{color: #268CCD;}
.toolbarBox .process-icon-new.add_product{ background-image: url('../img/process-icon-addProduct.png');}
.toolbarBox .process-icon-partialRefund{ background-image: url('../img/process-icon-partial-refund.png');}
.toolbarBox .process-icon-standardRefund{ background-image: url('../img/process-icon-standard-refund.png');}
.toolbarBox .process-icon-help{ background-image: url('../img/process-icon-help.png');}
div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
admin-dev/themes/default/img/process-icon-help.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

admin-dev/themes/default/template/header.tpl
+1 -1
View File
@@ -31,7 +31,7 @@
<title>{$meta_title} - PrestaShop&trade;</title>
{if $display_header}
<script type="text/javascript">
var class_name = '{$class_name}';
var help_class_name = '{$controller_name}';
var iso_user = '{$iso_user}';
var country_iso_code = '{$country_iso_code}';
var _PS_VERSION_ = '{$smarty.const._PS_VERSION_}';
admin-dev/themes/default/template/helper/help_access/button.tpl
+15
View File
@@ -0,0 +1,15 @@
<li class="help-context-{$label|escape:'htmlall':'UTF-8'}" style="display:none">
<a id="desc-{$label|escape:'htmlall':'UTF-8'}-help"
class="toolbar_btn"
href="#"
onclick="showHelp('{$help_base_url|escape:'htmlall':'UTF-8'}',
'{$label|escape:'htmlall':'UTF-8'}',
'{$iso_lang|escape:'htmlall':'UTF-8'}',
'{$version|escape:'htmlall':'UTF-8'}',
'{$doc_version|escape:'htmlall':'UTF-8'}',
'{$country|escape:'htmlall':'UTF-8'}');"
title="{$tooltip|escape:'htmlall':'UTF-8'}">
<span class="process-icon-help"></span>
<div>{l s='Help'}</div>
</a>
</li>
admin-dev/themes/default/template/toolbar.tpl
+13 -9
View File
@@ -23,7 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{block name=toolbarBox}
<ul class="cc_button">
{foreach from=$toolbar_btn item=btn key=k}
@@ -34,17 +33,22 @@
</a>
</li>
{/foreach}
{if isset($ps_help_context) && $ps_help_context}
<li class="help-context" style="display:none">
<a id="desc-{$table}-help" class="toolbar_btn" href="#" title="{l s='Help'}">
<span class="process-icon-help"></span>
<div>{l s='Help'}</div>
</a>
</li>
{/if}
</ul>
<script language="javascript">
if (helpboxes > 0)
{
$(document).ready(function (){
button = getHelpButton(help_class_name);
if (button != '')
{
$('ul.cc_button').append(button);
$('.help-context-'+help_class_name).fadeIn("fast").show();
}
});
}
$(function() {
//get reference on save link
btn_save = $('span[class~="process-icon-save"]').parent();