From bf7e2b0e762601f5aa2c54323158585649c3d7ac Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Fri, 20 Jul 2012 18:54:14 +0530
Subject: [PATCH 1/4] Modifying diagram view to set label in diagram header

bzr revid: dhr@tinyerp.com-20120720132414-pdftmig39m3ro93b
---
 addons/web_diagram/static/src/js/diagram.js        | 13 +++++++++++++
 addons/web_diagram/static/src/xml/base_diagram.xml |  1 +
 2 files changed, 14 insertions(+)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index f06e757f7f1..e7e85eea96a 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -51,6 +51,9 @@ instance.web.DiagramView = instance.web.View.extend({
             var action = $(this).data('pager-action');
             self.on_pager_action(action);
         });
+        this.labels = _.filter(this.fields_view.arch.children, function(label){ 
+        	return label.tag == "label" ;
+          });
 
         this.do_update_pager();
 
@@ -104,11 +107,21 @@ instance.web.DiagramView = instance.web.View.extend({
         );
     },
 
+    get_label : function(){
+    	var self = this
+    	var html_label = _.each(self.labels,function(label){
+    		html_label = "<span>" + label.attrs.string + "</span>"
+    		self.$element.find('.oe_diagram_diagram_header').append(html_label)
+    	})
+    	
+    },
+
     on_diagram_loaded: function(record) {
         var id_record = record['id'];
         if(id_record) {
             this.id = id_record;
             this.get_diagram_info();
+            this.get_label();
         }
     },
 
diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml
index 96e32f59648..40a98a59413 100644
--- a/addons/web_diagram/static/src/xml/base_diagram.xml
+++ b/addons/web_diagram/static/src/xml/base_diagram.xml
@@ -14,6 +14,7 @@
     </div>
     
     <div class="diagram-container">
+        <div class="oe_diagram_diagram_header"/>
         <div class="oe_diagram_diagram"/>
     </div>
 </t>

From f78dfd6c26830ce066894a8644ec07b661bc8206 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 23 Jul 2012 13:11:11 +0530
Subject: [PATCH 2/4] [IMP]changing span to p and applying css

bzr revid: dhr@tinyerp.com-20120723074111-43n05o11ixpb5kkk
---
 addons/web_diagram/static/src/js/diagram.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index e7e85eea96a..ad3e5e68411 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -110,8 +110,9 @@ instance.web.DiagramView = instance.web.View.extend({
     get_label : function(){
     	var self = this
     	var html_label = _.each(self.labels,function(label){
-    		html_label = "<span>" + label.attrs.string + "</span>"
+    		html_label = "<p>" + label.attrs.string + "</p>"
     		self.$element.find('.oe_diagram_diagram_header').append(html_label)
+    		self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px')
     	})
     	
     },

From 629d1041661e72361d0f34cc9477e37ae66536c0 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 30 Jul 2012 17:59:44 +0530
Subject: [PATCH 3/4] [IMP]improving code to add label only once on load

bzr revid: dhr@tinyerp.com-20120730122944-tlgjzovqbulbff1x
---
 addons/web_diagram/static/src/js/diagram.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index ad3e5e68411..b3c2a7dcee1 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -109,12 +109,13 @@ instance.web.DiagramView = instance.web.View.extend({
 
     get_label : function(){
     	var self = this
-    	var html_label = _.each(self.labels,function(label){
-    		html_label = "<p>" + label.attrs.string + "</p>"
-    		self.$element.find('.oe_diagram_diagram_header').append(html_label)
-    		self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px')
-    	})
-    	
+    	if(self.$element.find('.oe_diagram_diagram_header').text() == ""){
+	    	_.each(self.labels,function(label){
+	    		html_label = "<p>" + label.attrs.string + "</p>"
+		    	self.$element.find('.oe_diagram_diagram_header').append(html_label)
+		    	self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px')
+	    	})
+    	}
     },
 
     on_diagram_loaded: function(record) {

From 23c2f1fd40c4bbe9e9c9fc21c323e0cee327ffa1 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 30 Jul 2012 18:50:49 +0530
Subject: [PATCH 4/4] [IMP]

bzr revid: dhr@tinyerp.com-20120730132049-539qb9l5c4g50864
---
 addons/web_diagram/static/src/js/diagram.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index b3c2a7dcee1..54f02f3cd44 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -109,13 +109,12 @@ instance.web.DiagramView = instance.web.View.extend({
 
     get_label : function(){
     	var self = this
-    	if(self.$element.find('.oe_diagram_diagram_header').text() == ""){
-	    	_.each(self.labels,function(label){
-	    		html_label = "<p>" + label.attrs.string + "</p>"
-		    	self.$element.find('.oe_diagram_diagram_header').append(html_label)
+    	this.$element.find('.oe_diagram_diagram_header > p').remove();
+	    _.each(self.labels,function(label){
+	    	html_label = "<p>" + label.attrs.string + "</p>"
+	    	self.$element.find('.oe_diagram_diagram_header').append(html_label)
 		    	self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px')
-	    	})
-    	}
+	    })
     },
 
     on_diagram_loaded: function(record) {