X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=views%2Ffaq_view.xml;h=a0bdee21be0e494371762c88b3d2f9756cdf57d9;hb=9c000e7f440d4e339389b9654c96cf8906b74a90;hp=c9c6339b2174efd6579842497e9e9c2d74dadecd;hpb=ee9e11e8989f93b572047aee9f5df10016bda38c;p=OpenERP%2Ffaq.git

diff --git a/views/faq_view.xml b/views/faq_view.xml
index c9c6339..a0bdee2 100644
--- a/views/faq_view.xml
+++ b/views/faq_view.xml
@@ -25,8 +25,9 @@
                         <field name="name" invisible="1" />
                         <field name="description" invisible="1" />
                         <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">
@@ -39,30 +40,61 @@
                                 </div>
 
                                 <div t-attf-class="oe_kanban_content faq_question_content">
-                                    <h2><t t-esc="record.name.value" /></h2>
-
-                                    <h4>Description</h4>
+                                    <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" />
 
-                                    <h4>Questions</h4>
-                                    <field name="question_items" invisible="1" />
-                                    <ul t-if="record.question_items.value">
-                                        <li t-foreach="record.question_items.value" t-as="question" t-att-class="question_parity">
+                                    <h2>Questions :</h2>
+
+                                    <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"/>
+                                                <t t-set="answers" t-value="question.answer_items"/>
                                             </t>
                                         </li>
                                     </ul>
 
-                                    <p t-if="record.question_items.value == ''">Pas de question pour ce thèmes.</p>
+                                    <p t-if="record.question_items.value == ''">Pas de question pour ce thème.</p>
 
                                 </div>
                             </div>
                         </t>
                         <t t-name="question_template.sub">
-                            <p><t t-esc="title"/> (ID : <t t-esc="id"/>)</p>
+                            <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"/>
+                                        <t t-set="id" t-value="answer.id"/>
+                                    </t>
+                                </li>
+                            </ul>
+                            <ul t-if="answers == ''"><li>Pas de réponse pour cette question.</li></ul>
                         </t>
+                        <t t-name="answer_template.sub">
+                            <a t-att-href="'#id='+id+'&amp;view_type=form&amp;model=faq.answer'" >
+                                <t t-esc="title"/>
+                            </a>
+                        </t>
+
+
+                        <!-- Exemple sans le template
+                        <t t-name="question_template.sub">
+                            <h4><t t-esc="title"/> (ID : <t t-esc="id"/>)</h4>
+
+                            <ul t-if="answers">
+                                <li t-foreach="answers" t-as="answer" t-att-class="answer_parity">
+                                    <t t-esc="answer.name"/> (ID : <t t-esc="answer.id"/>)
+                                </li>
+                            </ul>
+
+                            <ul t-if="answers == ''"><li>Pas de réponse pour cette question.</li></ul>
+                        </t>-->
                     </templates>
                 </kanban>
             </field>
@@ -104,14 +136,13 @@
                                 </div>
 
                                 <div t-attf-class="oe_kanban_content">
-                                    <h2><field name="name" /></h2>
-                                    <h4>Question</h4>
-                                    <field name="description" />
+                                    <h2><field name="name" /> (Thème : <field name="theme_id" />)</h2>
+                                    <h3><field name="description" /></h3>
 
-                                    <h4>Réponses</h4>
+                                    <h4>Réponses :</h4>
                                     <field name="answer_items" invisible="1" />
                                     <ul t-if="record.answer_items.value">
-                                        <li t-foreach="record.answer_items.value" t-as="answer" t-att-class="answer_parity">
+                                        <li t-foreach="record.answer_items.value" t-as="answer"  class="bullet">
                                             <t t-call="answer_template.sub">
                                                 <t t-set="title" t-value="answer.name"/>
                                                 <t t-set="id" t-value="answer.id"/>
@@ -119,13 +150,12 @@
                                         </li>
                                     </ul>
 
-                                    <p t-if="record.answer_items.value == ''">Pas de réponse pour l'instant.</p>
-
+                                    <ul t-if="record.answer_items.value == ''"><li>Pas de réponse pour l'instant.</li></ul>
                                 </div>
                             </div>
                         </t>
                         <t t-name="answer_template.sub">
-                            <p><t t-esc="title"/> (ID : <t t-esc="id"/>)</p>
+                            <t t-esc="title"/> (ID : <t t-esc="id"/>)
                         </t>
                     </templates>
                 </kanban>