[IMP] Improved text for api key on partner form and general settings.

bzr revid: jra@tinyerp.com-20120629091519-w64wlnep01ooq8a9

2 files changed, 14 insertions, 11 deletions

diff --git a/addons/web_linkedin/res_config.py b/addons/web_linkedin/res_config.py
index 992599ceb5f..050badae498 100644
--- a/addons/web_linkedin/res_config.py
+++ b/addons/web_linkedin/res_config.py
@@ -25,7 +25,7 @@ class base_config_settings(osv.osv_memory):
     _inherit = 'base.config.settings'
     _name = 'base.config.settings'
     _columns = {
-        'default_linkedin_api_key': fields.char('LinkedIn API key', size=128, required=True, default_model='res.company',
+        'default_linkedin_api_key': fields.char('LinkedIn API key', size=128, default_model='res.company',
                 help="""Give API key of linkedin."""),
         'generate_key': fields.text('Go to URL', readonly=True,
                 help="""If you have not generate linkedin API Key yet than Go to URL to generate and enter it in above text field."""),
@@ -33,10 +33,10 @@ class base_config_settings(osv.osv_memory):
     _defaults = {
         'generate_key': "To find contact persons from LinkedIn "\
                         "\n====================================="\
-                        "\n* Go to this URL : www.linkedin.com/secure/developer "\
+                        "\n* Go to this URL : https://www.linkedin.com/secure/developer  "\
                         "\n* Add New Application and fill the form,"\
-                        "\n    - JavaScript API Domain is Your domain name (e.g. abc.com),"\
-                        "\n    - You can give multiple domain (e.g. abc.com, xyz.com)"\
+                        "\n    - JavaScript API Domain is Your domain name (e.g. https://yourcompany.my.openerp.com),"\
+                        "\n    - You can give multiple domain (e.g. yourcompany.my.openerp.com),"\
                         "\n    - programming tools is Javascript"\
                         '\n* Copy the "API Key" and paste it in the field "LinkedIn API Key" here above".'
     }
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index bbe077edc82..bf31693557b 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -39,17 +39,20 @@
             for all users of your system.
         </p>
         <br/>
-        <p>1) Go to : 
+        <p>1) Go to this URL: 
             <a href="https://www.linkedin.com/secure/developer" class="oe_secondary_menu_section" target="_blank">
                 https://www.linkedin.com/secure/developer
             </a>
         </p>
-        <p>2) Log into LinkedIn if not already done</p>
-        <p>3) Click on <b>"Add a new application"</b></p>
-        <p>4) Fill in the <b>"Application Info"</b> form with the following data:</p>
-        <p>   - Integration URL: <b>"https://yourcompany.my.openerp.com"</b></p>
-        <p>   - Javascript API domain: <b>"yourcompany.my.openerp.com"</b></p>
-        <p>5) Copy the API key here:
+        <p>2) Log you into LinkedIn if you din't yet</p>
+<pre>
+3) Add New Application and fill the form,
+    - JavaScript API Domain is Your domain name 
+        (e.g. https://yourcompany.my.openerp.com),
+    - You can give multiple domain (e.g. yourcompany.my.openerp.com),
+    - programming tools is Javascript
+</pre>
+        <p>4) Copy the API key here:
             <input type="text" id="apikey"/><button id="register" style="margin-left:10px; color:white;" class="btn_api" >Apply</button>
         </p>
     </div>