[MERGE] vda disagram
bzr revid: al@openerp.com-20110413020150-ccf0vzuxlx4kro3r
This commit is contained in:
@@ -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>
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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'">
|
||||
|
||||
Reference in New Issue
Block a user