X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;ds=sidebyside;f=views%2Ftodolist.xml;h=be8125431b4d54351a687660c28470cf0541dd5c;hb=54f914e4dbd55bae9b8899388fa7aa70390d84ee;hp=caf8fa320d47dd0cf7c111761e9f9ab6293137c2;hpb=567272aa3112ddfd40e10ca7b0581396e4214b1b;p=OpenERP%2Ftodolist.git

diff --git a/views/todolist.xml b/views/todolist.xml
index caf8fa3..be81254 100644
--- a/views/todolist.xml
+++ b/views/todolist.xml
@@ -5,14 +5,13 @@
 
         <record model="ir.ui.view" id="todolist_form_view">
             <field name="name">todolist.form</field>
-            <field name="model">todolist.todolist</field>
+            <field name="model">todolist.container</field>
             <field name="arch" type="xml">
                 <form string="Todolist Form" version="7.0">
                     <header>
-                        <button string="Supprimer Description" type="object" name="vider_description" class="oe_highlight" />
-                        <button string="Commencer" type="object" name="action_start" states="draft" class="oe_highlight" />
-                        <button string="Terminer" type="object" name="action_stop" states="pending" class="oe_highlight" />
-                        <button string="Recommencer" type="object" name="action_restart" states="pending,done" class="oe_highlight" />
+                        <button string="Start" type="object" name="action_start" states="draft" class="oe_highlight" />
+                        <button string="Stop" type="object" name="action_stop" states="pending" class="oe_highlight" />
+                        <button string="Restart" type="object" name="action_restart" states="pending,done" class="oe_highlight" />
                         <field name="state" widget="statusbar" />
                     </header>
                     <sheet>
@@ -21,33 +20,32 @@
                             <field name="name" colspan="2" nolabel="1" />
                             <label for="description" colspan="1" />
                             <field name="description" colspan="2" nolabel="1" />
-                            <label for="assigned" colspan="1" />
-                            <field name="assigned" colspan="2" nolabel="1" />
+                            <label for="number_tasks" colspan="1" />
+                            <field name="number_tasks" colspan="2" nolabel="1" />
+                            <label for="number_tasks_done" colspan="1" />
+                            <field name="number_tasks_done" colspan="2" nolabel="1" />
+                            <field name="progress_tasks" colspan="3" widget="progressbar" />
                         </group>
                         <notebook colspan="4">
                             <page string="Dates">
                                 <group colspan="4" col="1">
-                                    <label for="date_cible" />
-                                    <field name="date_cible" nolabel="1" />
-                                    <label for="date_jalon" />
-                                    <field name="date_jalon" nolabel="1" />
+                                    <label for="target" />
+                                    <field name="target" nolabel="1" />
+                                    <label for="milestone" />
+                                    <field name="milestone" nolabel="1" />
+                                    <label for="manday" />
+                                    <field name="manday" nolabel="1" />
                                 </group>
                             </page>
-                            <page string="Paramétrages">
+                            <page string="Tasks">
                                 <group colspan="4" col="1">
-                                    <field name="manday" />
-                                    <field name="valide" />
-                                </group>
-                            </page>
-                            <page string="Actions">
-                                <group colspan="4" col="1">
-                                    <field name="actions" nolabel="1" mode="tree">
-                                        <tree string="Actions" editable="1" colors="red:priority=='indispensable';
+                                    <field name="tasks" nolabel="1" mode="tree">
+                                        <tree string="Tasks" editable="1" colors="red:priority=='essential';
                                                                                     #FF5800:priority=='necessary';
-                                                                                    black:priority=='utile'">
+                                                                                    black:priority=='useful'">
                                             <field name="name"/>
                                             <field name="description"/>
-                                            <field name="deadline"/>
+                                            <field name="milestone"/>
                                             <field name="planned"/>
                                             <field name="manday"/>
                                             <field name="priority"/>
@@ -55,9 +53,9 @@
                                     </field>
                                 </group>
                             </page>
-                            <page string="Thèmes">
+                            <page string="Topics">
                                 <group colspan="4" col="1">
-                                    <field name="themes_id"/>
+                                    <field name="topics_id"/>
                                 </group>
                             </page>
                         </notebook>
@@ -67,21 +65,24 @@
         </record>
 
 
-        <record model="ir.ui.view" id="theme_form_view">
-            <field name="name">theme.form</field>
-            <field name="model">todolist.theme</field>
+        <record model="ir.ui.view" id="topic_form_view">
+            <field name="name">topic.form</field>
+            <field name="model">todolist.topic</field>
             <field name="arch" type="xml">
-                <form string="Theme Form" version="7.0">
+                <form string="Topic Form" version="7.0">
                     <sheet>
                         <group colspan="4" col="4">
                             <label for="name" colspan="3"/>
-                            <label for="actif" colspan="1"/>
+                            <label for="activated" colspan="1"/>
                             <field name="name" nolabel="1" colspan="3"/>
-                            <field name="actif" nolabel="1" colspan="1"/>
+                            <field name="activated" nolabel="1" colspan="1"/>
                         </group>
                         <group col="1">
                             <label for="description"/>
                             <field name="description" nolabel="1"/>
+                            <label for="nb_lists" />
+                            <field name="nb_lists" nolabel="1" />
+                            <field name="progress_tasks" colspan="3" widget="progressbar" />
                         </group>
                     </sheet>
                 </form>
@@ -89,11 +90,11 @@
         </record>
 
 
-        <record model="ir.ui.view" id="theme_kanban_view">
-            <field name="name">theme.kanban</field>
-            <field name="model">todolist.theme</field>
+        <record model="ir.ui.view" id="topic_kanban_view">
+            <field name="name">topic.kanban</field>
+            <field name="model">todolist.topic</field>
             <field name="arch" type="xml">
-                <kanban default_group_by="actif">
+                <kanban default_group_by="activated">
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_kanban_card oe_semantic_html_override oe_kanban_global_click_edit">
@@ -119,28 +120,28 @@
         </record>
 
 
-        <record model="ir.ui.view" id="action_form_view">
-            <field name="name">todolist.form</field>
-            <field name="model">todolist.action</field>
+        <record model="ir.ui.view" id="task_form_view">
+            <field name="name">task.form</field>
+            <field name="model">todolist.task</field>
             <field name="arch" type="xml">
-                <form string="Todolist Form" version="7.0">
+                <form string="Task Form" version="7.0">
                     <header>
-                        <button string="Brouillon" type="object" name="action_draft" states="proposal,valid,begin" class="oe_highlight" />
-                        <button string="Proposition" type="object" name="action_propose" states="draft, valid, begin" class="oe_highlight" />
-                        <button string="Validé" type="object" name="action_validate" states="draft,proposal" class="oe_highlight" />
-                        <button string="Débute" type="object" name="action_begin" states="draft,valid" class="oe_highlight" />
-                        <button string="Terminé" type="object" name="action_done" states="begin" class="oe_highlight" />
+                        <button string="Reset" type="object" name="action_draft" states="proposal,approved,started" class="oe_highlight" />
+                        <button string="Propose" type="object" name="action_propose" states="draft,approved,started" class="oe_highlight" />
+                        <button string="Approve" type="object" name="action_approve" states="draft,proposal" class="oe_highlight" />
+                        <button string="Start" type="object" name="action_start" states="draft,approved" class="oe_highlight" />
+                        <button string="Stop" type="object" name="action_done" states="started" class="oe_highlight" />
                         <field name="state" widget="statusbar" />
                     </header>
                     <sheet>
                         <group>
                             <field name="name"/>
                             <field name="description" />
-                            <field name="deadline" />
+                            <field name="milestone" />
                             <field name="planned" />
                             <field name="manday" />
                             <field name="priority" />
-                            <field name="todolist_id" />
+                            <field name="container_id" />
                         </group>
                     </sheet>
                  </form>
@@ -149,44 +150,48 @@
 
 
         <record model="ir.actions.act_window" id="todolist_list_action">
-            <field name="name">Todolists</field>
-            <field name="res_model">todolist.todolist</field>
+            <field name="name">list of to do lists</field>
+            <field name="res_model">todolist.container</field>
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
-                <p class="oe_view_nocontent_create">Créer votre première todolist</p>
+                <p class="oe_view_nocontent_create">Create your first to do list</p>
             </field>
         </record>
 
 
-        <record model="ir.actions.act_window" id="theme_list_action">
-            <field name="name">Liste des thèmes</field>
-            <field name="res_model">todolist.theme</field>
-            <field name="view_mode">kanban,tree,form</field>
+        <record model="ir.actions.act_window" id="topic_list_action">
+            <field name="name">List of topics</field>
+            <field name="res_model">todolist.topic</field>
+            <field name="view_mode">kanban,form</field>
             <field name="help" type="html">
-                <p class="oe_view_nocontent_create">Créer votre premier thème</p>
+                <p class="oe_view_nocontent_create">Créer your first topic</p>
             </field>
         </record>
 
 
-        <record model="ir.actions.act_window" id="action_list_action">
-            <field name="name">Liste des actions</field>
-            <field name="res_model">todolist.action</field>
+        <record model="ir.actions.act_window" id="task_list_action">
+            <field name="name">List of tasks</field>
+            <field name="res_model">todolist.task</field>
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
-                <p class="oe_view_nocontent_create">Créer votre première action</p>
+                <p class="oe_view_nocontent_create">Create your first task</p>
             </field>
         </record>
 
 
-        <menuitem id="main_todolist_menu" name="TODO List" />
+        <menuitem id="main_minitools_menu" name="Mini Tools" />
+
+        <menuitem id="mt_todolist_menu" name="To do list" parent="main_minitools_menu" groups="group_todolist_user" />
+
+        <menuitem id="mt_todolist_container_menu" name="Lists" parent="mt_todolist_menu" action="todolist_list_action"/>
+
+        <menuitem id="mt_todolist_task_menu" name="Tasks" parent="mt_todolist_menu" action="task_list_action" />
 
-        <menuitem id="todolist_menu" name="TO DO List" parent="main_todolist_menu" groups="group_todolist_user" />
+        <menuitem id="mt_settings_menu" name="Settings" parent="main_minitools_menu" groups="group_todolist_manager" />
 
-        <menuitem id="todo_menu" name="TODO" parent="todolist_menu" action="todolist_list_action"/>
+        <menuitem id="mt_todolist_topic_menu" name="Topics" parent="mt_settings_menu" action="topic_list_action" />
 
-        <menuitem id="todo_theme_menu" name="Themes" parent="todolist_menu" action="theme_list_action" />
 
-        <menuitem id="todo_action_menu" name="Actions" parent="todolist_menu" action="action_list_action" />
 
     </data>
 </openerp>
\ No newline at end of file