From 6619386ebf1fcf9f2dfb039d324a665be9e64f69 Mon Sep 17 00:00:00 2001
From: fBrignoli <franck.brignoli@prestashop.com>
Date: Mon, 9 Jan 2012 16:22:38 +0000
Subject: [PATCH] // help access

---
 admin-dev/themes/default/template/toolbar.tpl | 13 -------------
 js/helpAccess.js                              | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/admin-dev/themes/default/template/toolbar.tpl b/admin-dev/themes/default/template/toolbar.tpl
index 51f797191..ff805259d 100644
--- a/admin-dev/themes/default/template/toolbar.tpl
+++ b/admin-dev/themes/default/template/toolbar.tpl
@@ -36,19 +36,6 @@
 	</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();
diff --git a/js/helpAccess.js b/js/helpAccess.js
index d65f1acbf..0f6ec3561 100644
--- a/js/helpAccess.js
+++ b/js/helpAccess.js
@@ -1,4 +1,13 @@
-function getHelpButton(label){
+$(document).ready(function (){
+    displayHelpButton(
+        help_class_name,
+        iso_user,
+        country_iso_code,
+        _PS_VERSION_
+    );
+});
+
+function displayHelpButton(label, iso_user, country_iso_code, _PS_VERSION_){
     var button = '';
     $.ajax({
         type: 'POST',
@@ -12,12 +21,12 @@ function getHelpButton(label){
             'version' : _PS_VERSION_
         },
         dataType: "json",
-        async : false,
         success: function(msg) {
             if(msg.content != 'none' && msg.content != '')
-                button = msg.content;
+            {
+                $('ul.cc_button').append(msg.content);
+                $('.help-context-'+help_class_name).fadeIn("fast").show();
+            }
         }
     });
-
-    return button;
 }
\ No newline at end of file