[IMP] Merged pan branch to improved pop up message when api key not apply.

bzr revid: jra@tinyerp.com-20120614072347-mkc93iyj46lapkgc

4 files changed, 48 insertions, 10 deletions

diff --git a/addons/web_linkedin/static/src/img/apikey.png b/addons/web_linkedin/static/src/img/apikey.png
new file mode 100644
index 00000000000..cd17d071af2
--- /dev/null
+++ b/addons/web_linkedin/static/src/img/apikey.png
diff --git a/addons/web_linkedin/static/src/img/help_to_fill_form.png b/addons/web_linkedin/static/src/img/help_to_fill_form.png
new file mode 100644
index 00000000000..fe30fe4acbe
--- /dev/null
+++ b/addons/web_linkedin/static/src/img/help_to_fill_form.png
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index e48b7fa7a9a..6c8fc6c5147 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -107,17 +107,16 @@ openerp.web_linkedin = function(instance) {
             }
         },
         APIKeyWarning: function(e) {
-            e.message= "Linkedin API Key is not registerd/correct.\n  Go to Settings,  'General Settings'  menu and follow steps to register the LinkedIn API Key.";
-            instance.web.dialog($(QWeb.render("CrashManager.warning", _t(e))), {
-                title: _t("Linkedin API Key Warning"),
-                modal: true,
-                height: 200,
-                width: 500,
-                buttons: [
-                {
-                    text: _t("Ok"),
+            e.message="";            
+            instance.web.dialog($(QWeb.render("Register.Linkedin", _t(e))), {
+                title: _t("Configure your Linkedin Key API"),
+                modal: true,                
+                width : 825,        
+                buttons:[{
+                    text: _t("Close"),
                     click: function() { $(this).dialog("close"); }
-                }]
+                }
+                    ]
             });
         },
         setTemplate: function( URL, AccountName ) {
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 9321e54787d..4244fc38b98 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -31,6 +31,45 @@
         </a>
     </td>
 </t>
+<t t-name="Register.Linkedin" style="height:300px;overflow:auto;">
+    <table class="tablet">
+    <th><center><button name="submit">No Thanks</button></center></th>
+    <tr>
+        <td>1)Go To<a href="https://www.linkedin.com/secure/developer">https://www.linkedin.com/secure/developer</a>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <b>2) Log you in Linkedin if you did not yet</b>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <b>3)  Add a new Application</b>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <b>4)  Fill in the form</b>
+        </td>
+    </tr>
+    <tr>
+        <td>      
+            <img src='/web_linkedin/static/src/img/help_to_fill_form.png' />
+        </td>        
+    </tr>
+    <tr>
+        <td>
+            <b>5) Copy the API Key <input type="text"/><button class="buttonkey">Apply</button></b>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <img src='/web_linkedin/static/src/img/apikey.png' />
+        </td>
+    </tr>
+    </table>
+</t>
 
 <t t-name="TwitterURL">
     <td id="twitterid">