From d2bbab2bb0e7f708825f8b044177b9fdb8434d31 Mon Sep 17 00:00:00 2001 From: fBrignoli Date: Tue, 10 Jan 2012 10:39:00 +0000 Subject: [PATCH] // Help Access "New" button --- admin-dev/themes/default/css/admin.css | 4 +++- .../default/img/process-icon-help-new.png | Bin 0 -> 3472 bytes .../template/helper/help_access/button.tpl | 2 +- classes/helper/HelperHelpAccess.php | 6 ++++++ js/admin.js | 18 ++---------------- js/helpAccess.js | 17 +++++++++++++++++ 6 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 admin-dev/themes/default/img/process-icon-help-new.png diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index fa7cfdd3c..b28bc3ba2 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -204,6 +204,7 @@ a.module_toggle_all{color: #268CCD;} .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');} +.toolbarBox .process-icon-help-new{ background-image: url('../img/process-icon-help-new.png');} div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;} @@ -433,4 +434,5 @@ ul.listForm li {padding-bottom:3px;} #footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666} #footer .footerLeft { float:left; margin-left:10px;} #footer .footerRight {float:right; margin-right:10px;} -#footer .footer_link, #footer .footer_link:hover { color:#268CCD;} \ No newline at end of file +#footer .footer_link, #footer .footer_link:hover { color:#268CCD;} + diff --git a/admin-dev/themes/default/img/process-icon-help-new.png b/admin-dev/themes/default/img/process-icon-help-new.png new file mode 100644 index 0000000000000000000000000000000000000000..d17f18ff06d7acf54f9a97fd0b5f78ead5eaa936 GIT binary patch literal 3472 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 - +
{l s='Help'}
diff --git a/classes/helper/HelperHelpAccess.php b/classes/helper/HelperHelpAccess.php index b1ddbd060..bdc53035f 100644 --- a/classes/helper/HelperHelpAccess.php +++ b/classes/helper/HelperHelpAccess.php @@ -58,6 +58,12 @@ class HelperHelpAccess extends Helper if (array_key_exists('version', $info) && $info['version'] != '') { + $last_version = HelpAccess::getVersion($this->label); + + $tpl_vars['button_class'] = 'process-icon-help'; + if ($last_version < $info['version']) + $tpl_vars['button_class'] = 'process-icon-help-new'; + $tpl_vars['label'] = $this->label; $tpl_vars['iso_lang'] = $this->iso_lang; $tpl_vars['country'] = $this->country; diff --git a/js/admin.js b/js/admin.js index 70e7f73cd..f1ca31a0b 100644 --- a/js/admin.js +++ b/js/admin.js @@ -879,23 +879,8 @@ function submitAddcmsAndPreview() $('#cms').submit(); } -function showHelp(url, label, iso_lang, ps_version, doc_version, country) -{ - trackClickOnHelp(label, doc_version); - $('#help-'+label).attr('src','../img/admin/help2.png'); - window.open(url +'/'+iso_lang+'/doc/'+label+'?version='+ps_version+'&country='+country+'#', '_blank', 'scrollbars=yes,menubar=no,toolbar=no,location=no,width=517,height=600'); - return false; -} -function trackClickOnHelp(label, doc_version) -{ - $.ajax({ - url: 'ajax.php', - data: 'submitTrackClickOnHelp&label='+ label +'&version='+doc_version - }); -} - function checkMultishopDefaultValue(obj, key) { if ($(obj).attr('checked') || $('#'+key).hasClass('isInvisible')) @@ -1072,4 +1057,5 @@ function showAjaxOverlay() { $('#ajax_running').slideDown('fast'); clearTimeout(ajax_running_timeout); -} \ No newline at end of file +} + diff --git a/js/helpAccess.js b/js/helpAccess.js index 0f6ec3561..62666e3af 100644 --- a/js/helpAccess.js +++ b/js/helpAccess.js @@ -29,4 +29,21 @@ function displayHelpButton(label, iso_user, country_iso_code, _PS_VERSION_){ } } }); +} + +function showHelp(url, label, iso_lang, ps_version, doc_version, country) +{ + trackClickOnHelp(label, doc_version); + $('.help-context-'+label+' span').removeClass().addClass('process-icon-help'); + window.open(url +'/'+iso_lang+'/doc/'+label+'?version='+ps_version+'&country='+country+'#', '_blank', 'scrollbars=yes,menubar=no,toolbar=no,location=no,width=517,height=600'); + return false; +} + + +function trackClickOnHelp(label, doc_version) +{ + $.ajax({ + url: 'ajax.php', + data: 'submitTrackClickOnHelp&label='+ label +'&version='+doc_version + }); } \ No newline at end of file