Menu : déplacement dans celui du module semantics

[OpenERP/faq.git] / views / faq_view.xml

diff --git a/views/faq_view.xml b/views/faq_view.xml
index acf489f..a920dde 100644 (file)
--- a/views/faq_view.xml
+++ b/views/faq_view.xml
@@ -9,9 +9,15 @@
             <field name="model">faq.theme</field>
             <field name="arch" type="xml">
                 <form string="Theme Form" version="7.0">
-                    <field name="name" />
-                    <field name="description"/>
-                    <field name="questions" />
+                    <sheet>
+                        <field name="name" />
+                        <field name="description"/>
+                        <field name="questions" />
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread" options="{'thread_level': 1}"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -40,8 +46,9 @@
                                 </div>
 
                                 <div t-attf-class="oe_kanban_content faq_question_content">
-                                    <h1><t t-esc="record.name.value" /></h1>
-
+                                    <h1><a t-att-href="'#id='+record.id.value+'&amp;view_type=form&amp;model=faq.theme'">
+                                        <t t-esc="record.name.value" />
+                                    </a></h1>
                                     <t t-esc="record.description.value" />
 
                                     <h2>Questions :</h2>
@@ -107,9 +114,16 @@
             <field name="model">faq.question</field>
             <field name="arch" type="xml">
                 <form string="Question Form" version="7.0">
-                    <field name="name" />
-                    <field name="description" />
-                    <field name="answers" />
+                    <sheet>
+                        <field name="name" />
+                        <field name="theme_id" />
+                        <field name="description" />
+                        <field name="answers" />
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread" options="{'thread_level': 1}"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -122,7 +136,7 @@
                 <kanban>
                     <templates>
                         <t t-name="kanban-box">
-                            <div class="oe_kanban_card oe_semantic_html_override oe_kanban_global_click_edit faq_question_panel">
+                            <div class="oe_kanban_card oe_semantic_html_override faq_question_panel">
                                 <div class="oe_dropdown_kanban">
 
                                     <div class="oe_dropdown_toggle">
@@ -135,7 +149,11 @@
                                 </div>
 
                                 <div t-attf-class="oe_kanban_content">
-                                    <h2><field name="name" /> (Thème : <field name="theme_id" />)</h2>
+                                    <h2>
+                                        <a t-att-href="'#id='+record.id.value+'&amp;view_type=form&amp;model=faq.question'" >
+                                            <field name="name" /> (Thème : <field name="theme_id" />)
+                                        </a>
+                                    </h2>
                                     <h3><field name="description" /></h3>
 
                                     <h4>Réponses :</h4>
@@ -154,7 +172,9 @@
                             </div>
                         </t>
                         <t t-name="answer_template.sub">
-                            <t t-esc="title"/> (ID : <t t-esc="id"/>)
+                            <a t-att-href="'#id='+id+'&amp;view_type=form&amp;model=faq.answer'" >
+                                <t t-esc="title"/>
+                            </a>
                         </t>
                     </templates>
                 </kanban>
@@ -169,13 +189,22 @@
             <field name="model">faq.answer</field>
             <field name="arch" type="xml">
                 <form string="Answer Form" version="7.0">
-                    <field name="name" />
-                    <field name="description" />
+                    <sheet>
+                        <field name="name" />
+                        <field name="description" />
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread" options="{'thread_level': 1}"/>
+                    </div>
                 </form>
             </field>
         </record>
 
 
+
+        <!-- ACTIONS & MENUS -->
+
         <record model="ir.actions.act_window" id="faq_themes_action">
             <field name="name">Thèmes</field>
             <field name="res_model">faq.theme</field>
@@ -206,11 +235,11 @@
         </record>-->
 
 
-        <menuitem id="main_faq_menu" name="FAQ" />
+        <menuitem id="main_faq_menu" name="Mini Tools 2" groups="group_faq_user"/>
 
-        <menuitem id="faq_menu" name="FAQ" parent="main_faq_menu" />
+        <menuitem id="faq_menu" name="FAQ" parent="semantics.main_semantics_menu" />
 
-        <menuitem id="faq_themes_menu" name="Themes" parent="faq_menu" action="faq_themes_action"/>
+        <menuitem id="faq_themes_menu" name="Themes" parent="faq_menu" action="faq_themes_action" />
 
         <menuitem id="faq_questions_menu" name="Questions" parent="faq_menu" action="faq_questions_action" />