From 40cda6042054f0a876630c5fb4ce0e4e0184d554 Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Wed, 24 Aug 2011 10:20:04 +0530 Subject: [PATCH] [ADD] pager style. bzr revid: vda@tinyerp.com-20110824045004-pz77r96v49zoxcjo --- addons/base_diagram/__openerp__.py | 4 ++- .../static/src/css/base_diagram.css | 14 ++++++++++ addons/base_diagram/static/src/js/diagram.js | 14 +++++++--- .../static/src/xml/base_diagram.xml | 27 +++++++++++-------- 4 files changed, 44 insertions(+), 15 deletions(-) create mode 100644 addons/base_diagram/static/src/css/base_diagram.css diff --git a/addons/base_diagram/__openerp__.py b/addons/base_diagram/__openerp__.py index ba8f5ad0055..0e449206228 100644 --- a/addons/base_diagram/__openerp__.py +++ b/addons/base_diagram/__openerp__.py @@ -8,6 +8,8 @@ 'static/lib/js/dracula_graph.js', 'static/src/js/diagram.js' ], - "css": [], + 'css' : [ + "static/src/css/base_diagram.css", + ], 'active': True, } diff --git a/addons/base_diagram/static/src/css/base_diagram.css b/addons/base_diagram/static/src/css/base_diagram.css new file mode 100644 index 00000000000..6610666d335 --- /dev/null +++ b/addons/base_diagram/static/src/css/base_diagram.css @@ -0,0 +1,14 @@ +.openerp .diagram { + border: 1px solid #999; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; +} + +.openerp .oe_diagram_pager { + text-align: right; + white-space: nowrap; +} + +.openerp .oe_diagram_buttons { + float: left; +} diff --git a/addons/base_diagram/static/src/js/diagram.js b/addons/base_diagram/static/src/js/diagram.js index 57ef5e31cea..e2e9ce316d4 100644 --- a/addons/base_diagram/static/src/js/diagram.js +++ b/addons/base_diagram/static/src/js/diagram.js @@ -95,20 +95,27 @@ openerp.base_diagram.DiagramView = openerp.base.View.extend({ } } - this.$element.html(QWeb.render("DiagramView", {"fields_view": this.fields_view})); + this.$element.html(QWeb.render("DiagramView", this)); this.$element.find('div.oe_diagram_pager button[data-pager-action]').click(function() { var action = $(this).data('pager-action'); self.on_pager_action(action); }); - this.do_update_pager() + this.do_update_pager(); + + this.$element.find('.oe_diagram_button_new').click(function(){self.add_node()}) if(this.id) { - self.get_diagram_info() + self.get_diagram_info(); } }, + add_node: function() { + var self = this; + console.log('self>>', self) + }, + get_diagram_info: function() { var self = this; this.rpc( @@ -248,6 +255,7 @@ openerp.base_diagram.DiagramView = openerp.base.View.extend({ }, popup_activity: function(result) { + var self = this; var action_manager = new openerp.base.ActionManager(this); var dialog = new openerp.base.Dialog(this, { title : 'Activity', diff --git a/addons/base_diagram/static/src/xml/base_diagram.xml b/addons/base_diagram/static/src/xml/base_diagram.xml index 56e516e9414..247eba2c301 100644 --- a/addons/base_diagram/static/src/xml/base_diagram.xml +++ b/addons/base_diagram/static/src/xml/base_diagram.xml @@ -1,15 +1,20 @@ \ No newline at end of file