[MERGE] forward port of branch 8.0 up to ed92589

[odoo/odoo.git] / addons / website_forum / views / forum.xml

diff --git a/addons/website_forum/views/forum.xml b/addons/website_forum/views/forum.xml
index b19d701..3bf7f5c 100644 (file)
--- a/addons/website_forum/views/forum.xml
+++ b/addons/website_forum/views/forum.xml
@@ -29,54 +29,63 @@
                         <h1>
                             <field name="name"/>
                         </h1>
-                        <group>
-                            <group string="Post Types">
+                        </group>
+                        <notebook>
+                            <page string="Options">
+                              <group string="Post Types">
                                 <field name="allow_question"/>
                                 <field name="allow_link"/>
                                 <field name="allow_discussion"/>
                                 <field name="default_allow"/>
-                            </group>
-                            <group string="Orders">
+                              </group>
+                              <group string="Orders">
                                 <field name="default_order"/>
                                 <label for="relevancy_option_first" string="Relevancy Computation"/>
                                 <div>
                                     (votes - 1) ** <field name="relevancy_option_first" class="oe_inline"/> / (days + 2) ** <field name="relevancy_option_second" class="oe_inline"/>
                                 </div>
-                            </group>
-                        </group>
-                        <group>
-                            <group string="Earn Karma">
-                                <field name="karma_gen_question_new"/>
-                                <field name="karma_gen_question_upvote"/>
-                                <field name="karma_gen_question_downvote"/>
-                                <field name="karma_gen_answer_upvote"/>
-                                <field name="karma_gen_answer_downvote"/>
-                                <field name="karma_gen_answer_accept"/>
-                                <field name="karma_gen_answer_accepted"/>
-                                <field name="karma_gen_answer_flagged"/>
-                            </group>
-                            <group string="Karma Related Rights">
-                                <field name="karma_ask"/>
-                                <field name="karma_edit_own"/>
-                                <field name="karma_edit_all"/>
-                                <field name="karma_close_own"/>
-                                <field name="karma_close_all"/>
-                                <field name="karma_unlink_own"/>
-                                <field name="karma_unlink_all"/>
-                                <field name="karma_upvote"/>
-                                <field name="karma_downvote"/>
-                                <field name="karma_answer_accept_own"/>
-                                <field name="karma_answer_accept_all"/>
-                                <field name="karma_editor_link_files"/>
-                                <field name="karma_editor_clickable_link"/>
-                                <field name="karma_comment_own"/>
-                                <field name="karma_comment_all"/>
-                                <field name="karma_comment_convert_own"/>
-                                <field name="karma_comment_convert_all"/>
-                                <field name="karma_comment_unlink_own"/>
-                                <field name="karma_comment_unlink_all"/>
-                            </group>
-                        </group>
+                              </group>
+                            </page>
+                            <page string='Karma Gains'>
+                                <group>
+                                    <field name="karma_gen_question_new"/>
+                                    <field name="karma_gen_question_upvote"/>
+                                    <field name="karma_gen_question_downvote"/>
+                                    <field name="karma_gen_answer_upvote"/>
+                                    <field name="karma_gen_answer_downvote"/>
+                                    <field name="karma_gen_answer_accept"/>
+                                    <field name="karma_gen_answer_accepted"/>
+                                    <field name="karma_gen_answer_flagged"/>
+                                </group>
+                            </page>
+                            <page string='Karma Related Rights'>
+                                <group>
+                                    <group>
+                                        <field name="karma_ask"/>
+                                        <field name="karma_upvote"/>
+                                        <field name="karma_downvote"/>
+                                        <field name="karma_edit_own"/>
+                                        <field name="karma_edit_all"/>
+                                        <field name="karma_close_own"/>
+                                        <field name="karma_close_all"/>
+                                        <field name="karma_unlink_own"/>
+                                        <field name="karma_unlink_all"/>
+                                    </group>
+                                    <group>
+                                        <field name="karma_answer_accept_own"/>
+                                        <field name="karma_answer_accept_all"/>
+                                        <field name="karma_editor_link_files"/>
+                                        <field name="karma_editor_clickable_link"/>
+                                        <field name="karma_comment_own"/>
+                                        <field name="karma_comment_all"/>
+                                        <field name="karma_comment_convert_own"/>
+                                        <field name="karma_comment_convert_all"/>
+                                        <field name="karma_comment_unlink_own"/>
+                                        <field name="karma_comment_unlink_all"/>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>