diff options
| author | Antony Lesuisse <al@openerp.com> | 2011-04-13 04:01:50 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2011-04-13 04:01:50 +0200 |
| commit | 2981f7f27f2d224a9c06a80c00a1ee608bb2c2a3 (patch) | |
| tree | 17a4a327eb88dde98fa27bbdc4001a18b09c9cf3 /addons/base | |
| parent | 3ac70cbecfda63682f4667994d64cd9526a8e1a3 (diff) | |
| parent | 70d622c151562d97ffaa3f4c061e9c79aace725a (diff) | |
[MERGE] vda disagram
bzr revid: al@openerp.com-20110413020150-ccf0vzuxlx4kro3r
Diffstat (limited to 'addons/base')
| -rw-r--r-- | addons/base/static/src/base.html | 6 | ||||
| -rw-r--r-- | addons/base/static/src/js/base.js | 1 | ||||
| -rw-r--r-- | addons/base/static/src/xml/base.xml | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html index bd717d32f34..619178f4cff 100644 --- a/addons/base/static/src/base.html +++ b/addons/base/static/src/base.html @@ -23,6 +23,12 @@ <script type="text/javascript" src="/base/static/src/js/list.js"></script> <script type="text/javascript" src="/base/static/src/js/search.js"></script> <script type="text/javascript" src="/base/static/src/js/views.js"></script> + + <script type="text/javascript" src="/base_diagram/static/src/js/diagram.js"></script> + <script type="text/javascript" src="/base_diagram/static/lib/js/raphael-min.js"></script> + <script type="text/javascript" src="/base_diagram/static/lib/js/dracula_graffle.js"></script> + <script type="text/javascript" src="/base_diagram/static/lib/js/dracula_graph.js"></script> + <script type="text/javascript" src="/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxcommon.js"></script> diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js index 675476879cf..3a5bd2a2915 100644 --- a/addons/base/static/src/js/base.js +++ b/addons/base/static/src/js/base.js @@ -128,6 +128,7 @@ openerp.base = function(instance) { openerp.base.form(instance); openerp.base.calendar(instance); openerp.base.gantt(instance); + openerp.base.diagram(instance); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 129198f0ea4..9f7ddc49a7b 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -205,8 +205,7 @@ </t-if> </t> </t> -<tr t-name="ListView.row" t-att-style="style" - t-att-class="row_parity"> +<tr t-name="ListView.row" t-att-style="style" t-att-class="row_parity"> <th t-if="options.selectable" class="oe-record-selector"> <input type="checkbox"/> </th> @@ -232,6 +231,10 @@ <button type="button" name="delete">♻</button> </td> </tr> +<t t-name="DiagramView"> + <h2 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h2> + <div id="dia-canvas" style="overflow: auto;"></div> +</t> <t t-name="FormView"> <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2> <div class="oe_form_header" t-att-id="view.element_id + '_header'"> |