From 62d202d2599da47d1934ad8d190cee825f20ebe3 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 9 Jan 2013 13:33:57 +0100
Subject: [FIX] linkedin: display a button to connect on linkedin if there are
 an error of connected linkedin module

bzr revid: chm@openerp.com-20130109123357-2e2ogcy510ctqk8q
---
 addons/web_linkedin/static/src/xml/linkedin.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'addons/web_linkedin/static/src/xml')

diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 4956fd7df5a..6230ef894fd 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -8,12 +8,16 @@
     </t>
     <t t-name="Linkedin.popup">
         <div>
-            <script type="in/Login">
-            </script>
-            <h2 style="margin-top: -10px;">People</h2>
-            <div class="oe_linkedin_pop_p" style='display: table;width:100%'/>
+            <div class="oe_social_network_login">
+                <script type="in/Login">
+                    &lt;b&gt;&lt;?js= firstName ?&gt; &lt;?js= lastName ?&gt;&lt;/b&gt;, is your account on LinkedIn.
+                </script>
+                <img src="http://developer.linkedin.com/sites/default/files/js-signin.png" class="oe_error"/>
+            </div>
+            <h2>People</h2>
+            <div class="oe_linkedin_pop_p"></div>
             <h2>Companies</h2>
-            <div class="oe_linkedin_pop_c" style='display: table;width:100%'/>
+            <div class="oe_linkedin_pop_c"></div>
         </div>
     </t>
     <t t-name="Linkedin.EntityWidget">
-- 
cgit v1.2.3


From 60d2a36fed2aec1c876efca6bba3fab65ec136c2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 9 Jan 2013 16:51:25 +0100
Subject: [IMP] linkedin: search for user company and location

bzr revid: chm@openerp.com-20130109155125-ikx26yyo5gro9p22
---
 addons/web_linkedin/static/src/xml/linkedin.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'addons/web_linkedin/static/src/xml')

diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 6230ef894fd..1fa1a8edcd2 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -9,9 +9,7 @@
     <t t-name="Linkedin.popup">
         <div>
             <div class="oe_social_network_login">
-                <script type="in/Login">
-                    &lt;b&gt;&lt;?js= firstName ?&gt; &lt;?js= lastName ?&gt;&lt;/b&gt;, is your account on LinkedIn.
-                </script>
+                <script type="in/Login"></script>
                 <img src="http://developer.linkedin.com/sites/default/files/js-signin.png" class="oe_error"/>
             </div>
             <h2>People</h2>
@@ -37,4 +35,7 @@
             Please ask your administrator to configure it in Settings > Configuration > Sales > Social Network Integration.
         </div>
     </t>
+    <t t-name="LinkedIn.loginInformation">
+        <span class="oe_linkedin_login">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account on Linkedin, <a class="oe_linkedin_logout">please click here to logout this account on LinkedIn</a>.</span>
+    </t>
 </templates>
\ No newline at end of file
-- 
cgit v1.2.3


From 00cdc2227cecf88400b6654b73435b82cb30e66f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 10 Jan 2013 15:03:45 +0100
Subject: [IMP] linkedin: fix bug off connection and improve LinkedinTester
 widget

bzr revid: chm@openerp.com-20130110140345-79hv4urkv9zkgw77
---
 addons/web_linkedin/static/src/xml/linkedin.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'addons/web_linkedin/static/src/xml')

diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 1fa1a8edcd2..4460c6de752 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -8,11 +8,7 @@
     </t>
     <t t-name="Linkedin.popup">
         <div>
-            <div class="oe_social_network_login">
-                <script type="in/Login"></script>
-                <img src="http://developer.linkedin.com/sites/default/files/js-signin.png" class="oe_error"/>
-            </div>
-            <h2>People</h2>
+            <h2 style="margin-top:-10px;">People</h2>
             <div class="oe_linkedin_pop_p"></div>
             <h2>Companies</h2>
             <div class="oe_linkedin_pop_c"></div>
@@ -36,6 +32,6 @@
         </div>
     </t>
     <t t-name="LinkedIn.loginInformation">
-        <span class="oe_linkedin_login">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account on Linkedin, <a class="oe_linkedin_logout">please click here to logout this account on LinkedIn</a>.</span>
+        <div class="oe_linkedin_authentified">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account on LinkedIn, <a class="oe_linkedin_logout">please click here to logout LinkedIn</a>.</div>
     </t>
 </templates>
\ No newline at end of file
-- 
cgit v1.2.3


From 09b2527ddb1a9ee30779a382f550ac3440cdae29 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 11 Jan 2013 14:24:38 +0100
Subject: [IMP] linkedin: improve the popup of linkedin search

bzr revid: chm@openerp.com-20130111132438-cvoomovagqcvukvq
---
 addons/web_linkedin/static/src/xml/linkedin.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/web_linkedin/static/src/xml')

diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 4460c6de752..364208005d1 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -34,4 +34,9 @@
     <t t-name="LinkedIn.loginInformation">
         <div class="oe_linkedin_authentified">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account on LinkedIn, <a class="oe_linkedin_logout">please click here to logout LinkedIn</a>.</div>
     </t>
+    <t t-name="LinkedIn.AdvancedSearch">
+        <div class="oe_linkedin_advanced_search">
+            No results found.<br/>
+        </div>
+    </t>
 </templates>
\ No newline at end of file
-- 
cgit v1.2.3


From 762a3635ebbdd7d0017dee237090a82193748088 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 21 Jan 2013 09:43:19 +0100
Subject: [IMP] linkedin

bzr revid: chm@openerp.com-20130121084319-aa0tdiz2vgbql726
---
 addons/web_linkedin/static/src/xml/linkedin.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'addons/web_linkedin/static/src/xml')

diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 364208005d1..92104c2b400 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -32,11 +32,13 @@
         </div>
     </t>
     <t t-name="LinkedIn.loginInformation">
-        <div class="oe_linkedin_authentified">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account on LinkedIn, <a class="oe_linkedin_logout">please click here to logout LinkedIn</a>.</div>
+        <div class="oe_linkedin_authentified">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account, <a class="oe_linkedin_logout">please click here to logout</a>.</div>
     </t>
     <t t-name="LinkedIn.AdvancedSearch">
-        <div class="oe_linkedin_advanced_search">
-            No results found.<br/>
+        <t t-raw="title"/>
+        <div class="oe_network_advanced_search">
+            Search by url or keywords : <input name="search"/> <button>Search</button>
         </div>
     </t>
+
 </templates>
\ No newline at end of file
-- 
cgit v1.2.3


From 0742601e749cdf4f6892fbbc90b236190f685c66 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 21 Jan 2013 14:41:57 +0100
Subject: [IMP] linkedin: don't overwrite informations

bzr revid: chm@openerp.com-20130121134157-2kksdmtfirlue0o0
---
 addons/web_linkedin/static/src/xml/linkedin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web_linkedin/static/src/xml')

diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 92104c2b400..95f2b4e26a0 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -36,7 +36,7 @@
     </t>
     <t t-name="LinkedIn.AdvancedSearch">
         <t t-raw="title"/>
-        <div class="oe_network_advanced_search">
+        <div class="oe_linkedin_advanced_search">
             Search by url or keywords : <input name="search"/> <button>Search</button>
         </div>
     </t>
-- 
cgit v1.2.3


From 0e860b795431b8c90977cdb907f5078d1cf4f297 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 31 Jan 2013 14:25:29 +0100
Subject: [IMP] web_linkedin: error catcher with better message and popup

bzr revid: chm@openerp.com-20130131132529-oglfd4csbzs03k5r
---
 addons/web_linkedin/static/src/xml/linkedin.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'addons/web_linkedin/static/src/xml')

diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 95f2b4e26a0..628cdc400a2 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -27,8 +27,10 @@
     </t>
     <t t-name="LinkedIn.DisabledWarning">
         <div>
-            LinkedIn access was not enabled on this server.
-            Please ask your administrator to configure it in Settings > Configuration > Sales > Social Network Integration.
+            <img t-att-src='_s + "/web/static/src/img/warning.png"' style="float: left; margin: 5px"/>
+            <p>LinkedIn access was not enabled on this server.</p>
+            <p>Please ask your administrator to configure it in Settings > Configuration > Sales > Social Network Integration.</p>
+            <p>LinkedIn: <t t-raw="error.name"/></p>
         </div>
     </t>
     <t t-name="LinkedIn.loginInformation">
-- 
cgit v1.2.3


From 8f2466155f8141fb4edd6adde69ade0d1bb60d0c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 5 Feb 2013 11:14:45 +0100
Subject: [IMP] web_linkedin: url with linkedin image

bzr revid: chm@openerp.com-20130205101445-9ffl4r64j11lkvv9
---
 addons/web_linkedin/static/src/xml/linkedin.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/web_linkedin/static/src/xml')

diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 628cdc400a2..15265b77523 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -2,10 +2,14 @@
 <!-- vim:fdl=1:
 -->
 <templates xml:space="preserve">
-    <t t-name="FieldChar.linkedin">
-        <img class="oe_linkedin_img" t-att-src='_s + "/web_linkedin/static/src/img/Linkedin_blue.png"'/>
+    <t t-name="FieldChar.linkedin.form">
+        <img class="oe_linkedin_form_img" t-att-src='_s + "/web_linkedin/static/src/img/Linkedin_blue.png"'/>
         <div class="oe_linkedin_input"/>
     </t>
+    <t t-name="FieldChar.linkedin">
+        <div class="oe_linkedin_span"/>
+        <a class="oe_linkedin_url" href="#" target="_blank"><img class="oe_linkedin_img" t-att-src='_s + "/web_linkedin/static/src/img/Linkedin_blue.png"'/></a>
+    </t>
     <t t-name="Linkedin.popup">
         <div>
             <h2 style="margin-top:-10px;">People</h2>
-- 
cgit v1.2.3