diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css index 30a037d61de..48c168eeb4d 100644 --- a/addons/web_linkedin/static/src/css/linkedin.css +++ b/addons/web_linkedin/static/src/css/linkedin.css @@ -1,12 +1,18 @@ -.openerp .oe_linkedin_img { +.openerp .oe_linkedin_form_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/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index 423b7d5aade..637ae0e7cd8 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -148,13 +148,24 @@ openerp.web_linkedin = function(instance) { this.display_dm = new instance.web.DropMisordered(true); }, initialize_content: function() { - var $ht = $(QWeb.render("FieldChar.linkedin")); + var $ht = $(QWeb.render("FieldChar.linkedin.form")); var $in = this.$("input"); $in.replaceWith($ht); this.$(".oe_linkedin_input").append($in); - this.$(".oe_linkedin_img").click(_.bind(this.search_linkedin, this)); + 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() { 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 @@ - - + +
+ +
+ +

People

diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml index a0cbdc3f381..4cc3063ffd7 100644 --- a/addons/web_linkedin/web_linkedin_view.xml +++ b/addons/web_linkedin/web_linkedin_view.xml @@ -7,12 +7,9 @@ - - - - +