[IMP] web_linkedin: url with linkedin image on bottom of website

bzr revid: chm@openerp.com-20130205105915-zikvtunnjv8ao4s2

4 files changed, 19 insertions, 25 deletions

diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css
index 48c168eeb4d..30a037d61de 100644
--- a/addons/web_linkedin/static/src/css/linkedin.css
+++ b/addons/web_linkedin/static/src/css/linkedin.css
@@ -1,18 +1,12 @@
 
 
-.openerp .oe_linkedin_form_img {
+.openerp .oe_linkedin_img {
     float: right;
     width: 1.5em;
     margin-top: -1px;
     cursor: pointer;
 }
 
-.openerp .oe_linkedin_img {
-    width: 1em;
-    margin-top: -2px;
-    cursor: pointer;
-}
-
 .openerp .oe_linkedin_input {
     margin-right:1.5em;
 }
diff --git a/addons/web_linkedin/static/src/img/linkedin-profile.jpeg b/addons/web_linkedin/static/src/img/linkedin-profile.jpeg
new file mode 100644
index 00000000000..14ab4fa27ae
--- /dev/null
+++ b/addons/web_linkedin/static/src/img/linkedin-profile.jpeg
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 637ae0e7cd8..a2471000c91 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -148,24 +148,13 @@ openerp.web_linkedin = function(instance) {
             this.display_dm = new instance.web.DropMisordered(true);
         },
         initialize_content: function() {
-            var $ht = $(QWeb.render("FieldChar.linkedin.form"));
+            var $ht = $(QWeb.render("FieldChar.linkedin"));
             var $in = this.$("input");
             $in.replaceWith($ht);
             this.$(".oe_linkedin_input").append($in);
             this.$(".oe_linkedin_form_img").click(_.bind(this.search_linkedin, this));
-
-            var $ht = $(QWeb.render("FieldChar.linkedin"));
-            var $span = this.$("span");
-            $span.replaceWith($ht);
-            this.$(".oe_linkedin_span").replaceWith($span);
-
             this._super();
         },
-        render_value: function() {
-            var result = this._super();
-            this.$(".oe_linkedin_url").attr("href", this.field_manager.datarecord.linkedin_url || "#").toggle(!!this.field_manager.datarecord.linkedin_url);
-            return result;
-        },
         search_linkedin: function() {
             var self = this;
             this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).done(function() {
@@ -342,9 +331,21 @@ openerp.web_linkedin = function(instance) {
             });
         },
     });
-    
     instance.web.form.widgets.add('linkedin', 'instance.web_linkedin.Linkedin');
     
+    instance.web_linkedin.Linkedin_url = instance.web.form.FieldChar.extend({
+        initialize_content: function() {
+            this.$("input,span").replaceWith($(QWeb.render("FieldChar.linkedin_url")));
+            this._super();
+        },
+        render_value: function() {
+            this._super();
+            this.$(".oe_linkedin_url").attr("href", this.field_manager.datarecord.linkedin_url || "#").toggle(!!this.field_manager.datarecord.linkedin_url);
+        },
+    });
+    instance.web.form.widgets.add('linkedin_url', 'instance.web_linkedin.Linkedin_url');
+    
+
     var commonPeopleFields = ["id", "picture-url", "public-profile-url", "first-name", "last-name",
                             "formatted-name", "location", "phone-numbers", "im-accounts",
                             "main-address", "headline", "positions", "summary", "specialties"];
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 15265b77523..75c4c934268 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -2,13 +2,12 @@
 <!-- vim:fdl=1:
 -->
 <templates xml:space="preserve">
-    <t t-name="FieldChar.linkedin.form">
-        <img class="oe_linkedin_form_img" t-att-src='_s + "/web_linkedin/static/src/img/Linkedin_blue.png"'/>
+    <t t-name="FieldChar.linkedin">
+        <img class="oe_linkedin_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-name="FieldChar.linkedin_url">
+        <a class="oe_linkedin_url" href="#" target="_blank"><img t-att-src='_s + "/web_linkedin/static/src/img/linkedin-profile.jpeg"'/></a>
     </t>
     <t t-name="Linkedin.popup">
         <div>