X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=views%2Ffaq_view.xml;h=a920ddebcc9ab4916592403b45b848108c3314c8;hb=f3f238c6778f4cd9e4f2f96759c4775c7157609a;hp=ae41c49bc53edeec0d89186a82fc1956812e5c8c;hpb=64f50eab75180f6c4d95c93d2e43e1a4adb823a2;p=OpenERP%2Ffaq.git

diff --git a/views/faq_view.xml b/views/faq_view.xml
index ae41c49..a920dde 100644
--- 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>
@@ -27,7 +33,7 @@
                         <field name="questions" invisible="1" />
                         <field name="question_items" invisible="1" />
                         <t t-name="kanban-box">
-                            <div class="oe_kanban_card oe_semantic_html_override oe_resource_details oe_kanban_global_click_edit faq_question_panel">
+                            <div class="oe_kanban_card oe_semantic_html_override oe_resource_details faq_question_panel">
                                 <div class="oe_dropdown_kanban">
 
                                     <div class="oe_dropdown_toggle">
@@ -40,14 +46,15 @@
                                 </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>
 
-                                    <ul t-if="record.question_items.value">
-                                        <li t-foreach="record.question_items.value" t-as="question" t-att-class="question_parity">
+                                    <ul t-if="record.question_items.value" t-att-class="question_parity">
+                                        <li t-foreach="record.question_items.value" t-as="question" class="question_frame">
                                             <t t-call="question_template.sub">
                                                 <t t-set="title" t-value="question.name"/>
                                                 <t t-set="id" t-value="question.id"/>
@@ -62,8 +69,10 @@
                             </div>
                         </t>
                         <t t-name="question_template.sub">
-                            <p><t t-esc="title"/> (ID : <t t-esc="id"/>)</p>
-                            <ul t-if="answers">
+                            <a t-att-href="'#id='+id+'&amp;view_type=form&amp;model=faq.question'" >
+                                <t t-esc="title"/>
+                            </a>
+                            <ul t-if="answers!=''">
                                 <li t-foreach="answers" t-as="answer" class="bullet">
                                     <t t-call="answer_template.sub">
                                         <t t-set="title" t-value="answer.name"/>
@@ -74,7 +83,9 @@
                             <ul t-if="answers == ''"><li>Pas de réponse pour cette question.</li></ul>
                         </t>
                         <t t-name="answer_template.sub">
-                            <t t-esc="title"/>
+                            <a t-att-href="'#id='+id+'&amp;view_type=form&amp;model=faq.answer'" >
+                                <t t-esc="title"/>
+                            </a>
                         </t>
 
 
@@ -103,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>
@@ -118,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">
@@ -131,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>
@@ -150,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>
@@ -165,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>
@@ -202,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" />