[MERGE] proto61

bzr revid: al@openerp.com-20110407234130-hyt5nxg5pqh2iyes

1 files changed, 97 insertions, 25 deletions

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 4fb208c6088..f93a38c96fc 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -156,14 +156,19 @@
     <!--
     <h3><t t-esc="fields_view.arch['@string']"/></h3>
     -->
-    <div class="oe_list_pager">
-        <button type="button" data-pager-action="first">First</button>
-        <button type="button" data-pager-action="previous">&lt;&lt;</button>
+    <div class="oe_list_header">
+        <div class="oe_list_buttons">
+            <!--<button type="button" class="oe_list_button_new">New</button>-->
+        </div>
+        <div class="oe_list_pager">
+            <button type="button" data-pager-action="first">First</button>
+            <button type="button" data-pager-action="previous">&lt;&lt;</button>
 
-        <span class="oe_pager_index">0</span> / <span class="oe_pager_count">0</span>
+            <span class="oe_pager_index">0</span> / <span class="oe_pager_count">0</span>
 
-        <button type="button" data-pager-action="next">&gt;&gt;</button>
-        <button type="button" data-pager-action="last">Last</button>
+            <button type="button" data-pager-action="next">&gt;&gt;</button>
+            <button type="button" data-pager-action="last">Last</button>
+        </div>
     </div>
     <table>
         <t t-call="ListView.header"/>
@@ -221,9 +226,10 @@
     <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2>
     <div class="oe_form_header">
         <div class="oe_form_buttons">
-            <button type="button" class="oe_form_button_save">Save</button>
+            <!--<button type="button" class="oe_form_button_save">Save</button>-->
             <button type="button" class="oe_form_button_save_edit">Save &amp; Edit</button>
-            <button type="button" class="oe_form_button_cancel">Cancel</button>
+            <!--<button type="button" class="oe_form_button_cancel">Cancel</button>-->
+            <button type="button" class="oe_form_button_new">New</button>
         </div>
         <div class="oe_form_pager">
             <button type="button" data-pager-action="first">First</button>
@@ -236,18 +242,13 @@
         </div>
     </div>
     <t t-raw="frame.render()"/>
-    <div style="text-align:right;">
-        <button type="button" class="form_save">
-            Save
-        </button>
-    </div>
 </t>
 <t t-name="Widget">
     Unhandled widget
     <t t-raw="console.log('Unhandled widget', widget)"/>
 </t>
 <t t-name="WidgetFrame">
-    <table border="0" width="100%" cellpadding="2" cellspacing="2">
+    <table border="0" width="100%" cellpadding="2" cellspacing="2" class="oe_frame">
     <tr t-foreach="widget.table" t-as="row">
         <t t-foreach="row" t-as="td">
             <td t-att-colspan="td.colspan gt 1 ? td.colspan : undefined"
@@ -255,6 +256,7 @@
                 t-att-nowrap="td.is_field_label ? 'true' : undefined"
                 t-att-valign="td.table ? 'top' : undefined"
                 t-att-id="td.element_id"
+                t-att-class="'oe_form_' + (td.is_field_label ? 'label' : (td.field ? 'field_' + td.type : td.type))"
             >
                 <t t-raw="td.render()"/>
             </td>
@@ -282,7 +284,7 @@
     </div>
 </t>
 <t t-name="WidgetLabel">
-    <label t-att-for="widget.element_id" t-att-title="widget.help" style="display: block; text-align: right;"
+    <label t-att-for="widget.element_id + '_field'" t-att-title="widget.help" style="display: block; text-align: right;"
            t-att-ondblclick="'console.log(\'' + widget.element_id + '\', openerp.screen.' + widget.element_id + ')'">
         <t t-esc="widget.string"/>
         <span t-if="widget.help">?</span>
@@ -292,38 +294,50 @@
 <t t-name="FieldChar">
     <input type="text"
         t-att-name="widget.name"
+        t-att-id="widget.element_id + '_field'"
         t-att-class="'field_' + widget.type" style="width: 100%"
     />
 </t>
 <t t-name="FieldText">
     <textarea rows="6" style="width: 100%;"
         t-att-name="widget.name"
+        t-att-id="widget.element_id + '_field'"
         t-att-class="'field_' + widget.type"
     ></textarea>
 </t>
 <t t-name="FieldDate">
     <input type="text" style="width: 100%"
         t-att-name="widget.name"
+        t-att-id="widget.element_id + '_field'"
         t-att-class="'field_' + widget.type"
     />
 </t>
 <t t-name="FieldDatetime">
     <input type="text" style="width: 100%"
         t-att-name="widget.name"
+        t-att-id="widget.element_id + '_field'"
         t-att-class="'field_' + widget.type"
     />
 </t>
 <t t-name="FieldSelection">
-    <select t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%">
-        <t t-foreach="widget.field.selection" t-as="options">
-        <option t-att-value="options[0]">
-            <t t-esc="options[1]"/>
-        </option>
-        </t>
+    <select
+        t-att-name="widget.name"
+        t-att-id="widget.element_id + '_field'"
+        t-att-class="'field_' + widget.type"
+        style="width: 100%">
+            <t t-foreach="widget.field.selection" t-as="options">
+                <option t-att-value="options[0]">
+                    <t t-esc="options[1]"/>
+                </option>
+            </t>
     </select>
 </t>
 <t t-name="FieldMany2One">
-    <input type="text" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%;"/>
+    <input type="text"
+        t-att-name="widget.name"
+        t-att-id="widget.element_id + '_field'"
+        t-att-class="'field_' + widget.type"
+        style="width: 100%;"/>
 </t>
 <t t-name="FieldOne2Many">
     <div t-att-id="widget.element_id">
@@ -339,12 +353,18 @@
     <input type="text" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%" placeholder="Widget Reference"/>
 </t>
 <t t-name="FieldBoolean">
-    <input type="checkbox" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type"/>
+    <input type="checkbox"
+        t-att-name="widget.name"
+        t-att-id="widget.element_id + '_field'"
+        t-att-class="'field_' + widget.type"/>
 </t>
 <t t-name="WidgetButton">
-    <button type="button" t-att-id="widget.element_id" t-att-title="widget.help" style="width: 100%" class="button">
+    <button type="button"
+        t-att-id="widget.element_id + '_button'"
+        t-att-title="widget.help"
+        style="width: 100%" class="button">
         <img t-if="widget.node.attrs.icon" t-att-src="'/base/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
-        <t t-esc="widget.string"/>
+        <span t-if="widget.string"><t t-esc="widget.string"/></span>
     </button>
 </t>
 <t t-name="SearchView">
@@ -523,4 +543,56 @@
     </div>
     </t>
 </t>
+<t t-name="DialogWarning">
+    <div id="dialog-message" t-att-title="title">
+        <p>
+            <span class="ui-icon ui-icon-circle-check" style="float:left; margin:0 7px 50px 0;"></span>
+            <t t-esc="message"/>
+        </p>
+    </div>
+</t>
+<t t-name="CalendarView">
+	<h3 class="title"><t t-esc="view.fields_view.arch.attrs.string"/></h3>
+	<table class="calendar-view" width="100%" height="100%" cellspacing="0" cellpadding="0">
+		<tr>
+			<td>
+				<div style="height: 1000px;width: 100%;">
+					<div id="calendar-sidebar">
+					</div>
+				</div>
+			</td>
+			<td style="width:85%;" align="left">
+				<div id="openerp_scheduler" class="dhx_cal_container" style="height: 1000px;width: 100%;">
+					<div class="dhx_cal_navline">
+						<div class="dhx_cal_prev_button"></div>
+						<div class="dhx_cal_next_button"></div>
+						<div class="dhx_cal_today_button"></div>
+						<div class="dhx_cal_date"></div>
+						<div class="dhx_minical_icon" id="dhx_minical_icon"></div>
+						<div class="dhx_cal_tab" name="day_tab" style="right:204px;"></div>
+						<div class="dhx_cal_tab" name="week_tab" style="right:140px;"></div>
+						<div class="dhx_cal_tab" name="month_tab" style="right:76px;"></div>
+					</div>
+					<div class="dhx_cal_header">
+					</div>
+					<div class="dhx_cal_data">
+					</div>		
+				</div>
+			</td>
+		</tr>
+	</table>
+</t>
+<t t-name="GanttView">
+	<h3 class="title"><t t-esc="view.fields_view.arch.attrs.string"/></h3>
+	<table class="gantt-view" width="100%" height="100%" cellspacing="0" cellpadding="0">
+		<tr>
+			<td style="width:85%">
+				<div style="width:100%;height:300px;position:relative" id="GanttDiv"></div>
+			</td>
+			<td valign = "top">
+				<div id="gantt-sidebar"></div>
+			</td>
+		</tr>
+	</table>
+</t>
 </templates>