From f96b3cd9f97665ade831a198d1dfee252c25be09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Tue, 31 May 2016 10:53:37 +0200
Subject: [MOV] website_membership: module directory organization

---
 addons/website_membership/__openerp__.py           |   4 +-
 addons/website_membership/data/membership_demo.xml |  19 +++
 addons/website_membership/demo/membership.xml      |  19 ---
 .../views/website_membership.xml                   | 144 ---------------------
 .../views/website_membership_templates.xml         | 144 +++++++++++++++++++++
 5 files changed, 165 insertions(+), 165 deletions(-)
 create mode 100644 addons/website_membership/data/membership_demo.xml
 delete mode 100644 addons/website_membership/demo/membership.xml
 delete mode 100644 addons/website_membership/views/website_membership.xml
 create mode 100644 addons/website_membership/views/website_membership_templates.xml

(limited to 'addons')

diff --git a/addons/website_membership/__openerp__.py b/addons/website_membership/__openerp__.py
index bb56cd27961..787e3f026ca 100644
--- a/addons/website_membership/__openerp__.py
+++ b/addons/website_membership/__openerp__.py
@@ -10,11 +10,11 @@ Website for browsing Associations, Groups and Memberships
 """,
     'depends': ['website_partner', 'website_google_map', 'association', 'website_sale'],
     'data': [
-        'views/website_membership.xml',
+        'views/website_membership_templates.xml',
         'security/ir.model.access.csv',
         'security/website_membership.xml',
     ],
-    'demo': ['demo/membership.xml'],
+    'demo': ['data/membership_demo.xml'],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
 }
diff --git a/addons/website_membership/data/membership_demo.xml b/addons/website_membership/data/membership_demo.xml
new file mode 100644
index 00000000000..9b43983711a
--- /dev/null
+++ b/addons/website_membership/data/membership_demo.xml
@@ -0,0 +1,19 @@
+<openerp>
+    <data noupdate="1">
+        <record id="base.res_partner_12" model="res.partner">
+            <field name="website_published" eval="True"/>
+        </record>
+        <record id="base.res_partner_2" model="res.partner">
+            <field name="website_published" eval="True"/>
+        </record>
+        <record id="product.membership_0" model="product.product">
+            <field name="website_published" eval="True"/>
+        </record>
+        <record id="product.membership_1" model="product.product">
+            <field name="website_published" eval="True"/>
+        </record>
+        <record id="product.membership_2" model="product.product">
+            <field name="website_published" eval="True"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/website_membership/demo/membership.xml b/addons/website_membership/demo/membership.xml
deleted file mode 100644
index 9b43983711a..00000000000
--- a/addons/website_membership/demo/membership.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<openerp>
-    <data noupdate="1">
-        <record id="base.res_partner_12" model="res.partner">
-            <field name="website_published" eval="True"/>
-        </record>
-        <record id="base.res_partner_2" model="res.partner">
-            <field name="website_published" eval="True"/>
-        </record>
-        <record id="product.membership_0" model="product.product">
-            <field name="website_published" eval="True"/>
-        </record>
-        <record id="product.membership_1" model="product.product">
-            <field name="website_published" eval="True"/>
-        </record>
-        <record id="product.membership_2" model="product.product">
-            <field name="website_published" eval="True"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml
deleted file mode 100644
index 40e84628b2f..00000000000
--- a/addons/website_membership/views/website_membership.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
-<!-- Layout add nav and footer -->
-<template id="footer_custom" inherit_id="website.footer_default" name="Footer Associations Link">
-    <xpath expr="//div[@id='info']/ul" position="inside">
-        <li><a href="/members">Members</a></li>
-    </xpath>
-</template>
-
-<template id="index" name="Members">
-    <t t-call="website.layout">
-        <t t-set="additional_title">Members</t>
-        <div id="wrap">
-            <div class="oe_structure">
-                <section>
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12">
-                                <h1 class="text-center">Our Members Directory</h1>
-                                <h3 class="text-muted text-center">Find a business partner</h3>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-            </div>
-            <div class="container">
-                <div class="row">
-
-            <div class="col-md-3 mb32" id="left_column">
-                <ul class="nav nav-pills nav-stacked mt16">
-                    <li class="nav-header"><h3>Associations</h3></li>
-                    <li t-att-class="'' if membership_id else 'active'"><a href="/members">All</a></li>
-                    <t t-foreach="memberships_data" t-as="membership_data">
-                        <li t-att-class="membership_id and membership_data['id'] == membership_id and 'active' or None">
-                            <a t-attf-href="/members/association/#{ membership_data['id'] }#{current_country and '/country/%s' % slug(current_country) or ''}#{ search }"><t t-esc="membership_data['name']"/></a>
-                        </li>
-                    </t>
-                </ul>
-            </div>
-            <div class="col-md-8" id="ref_content">
-                <div class='navbar'>
-                    <t t-call="website.pager">
-                       <t t-set="classname">pull-left</t>
-                    </t>
-                    <form action="" method="get" class="navbar-search pull-right pagination form-inline">
-                        <t t-call="website.website_search_box">
-                            <t t-set="search" t-value="post.get('search', '')"/>
-                        </t>
-                    </form>
-                </div>
-                <div>
-                    <t t-if="not memberships_partner_ids">
-                        <p>No result found.</p>
-                    </t>
-                    <t t-foreach="memberships_data" t-as="membership_data">
-                        <t t-if="memberships_partner_ids.get(membership_data['id'])">
-                            <h3 class="text-center"><span t-esc="membership_data['name']"/></h3>
-                            <t t-foreach="memberships_partner_ids[membership_data['id']]" t-as="partner_id">
-                                <t t-set="partner" t-value="partners[partner_id]"/>
-                                <div class="media">
-                                    <a class="pull-left" t-attf-href="/members/#{slug(partner)}"
-                                       t-field="partner.image_small"
-                                       t-options='{"widget": "image", "class": "media-object"}'
-                                    ></a>
-                                    <div class="media-body" style="min-height: 64px;">
-                                        <a class="media-heading" t-attf-href="/members/#{slug(partner)}">
-                                            <span t-field="partner.display_name"/>
-                                        </a>
-                                        <div t-field="partner.website_short_description"/>
-                                    </div>
-                                </div>
-                            </t>
-                        </t>
-                    </t>
-                </div>
-            </div>
-
-                </div>
-            </div>
-            <div class="oe_structure"/>
-        </div>
-    </t>
-</template>
-
-<template id="opt_index_country" name="Location"
-        customize_show="True" inherit_id="website_membership.index">
-    <xpath expr="//div[@id='left_column']/ul[1]" position="after">
-        <ul class="nav nav-pills nav-stacked mt16">
-            <li class="nav-header"><h3>Location</h3></li>
-            <t t-foreach="countries" t-as="country">
-                <li t-if="country['country_id']" t-att-class="country['country_id'] and country['country_id'][0] == current_country_id and 'active' or None">
-                    <a t-attf-href="/members#{ membership_id and '/association/%s' % membership_id or '' }#{ country['country_id'][0] and '/country/%s' % slug(country['country_id']) or '' }#{ search }"><t t-esc="country['country_id'][1]"/>
-                        <span class="badge pull-right"><t t-esc="country['country_id_count'] or '0'"/></span>
-                    </a>
-                </li>
-            </t>
-        </ul>
-    </xpath>
-</template>
-
-<!-- Option: index: Left Google Map -->
-<template id="opt_index_google_map" name="Left World Map"
-        customize_show="True" inherit_id="website_membership.index">
-    <xpath expr="//div[@id='left_column']/ul[last()]" position="after">
-        <!-- modal for large map -->
-        <div class="modal fade partner_map_modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
-          <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                    <h4 class="modal-title">World Map</h4>
-                </div>
-                <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
-                style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
-            </div>
-          </div>
-        </div>
-        <!-- modal end -->
-        <h3>World Map<button class="btn btn-link" data-toggle="modal" data-target=".partner_map_modal"><span class="fa fa-external-link" /></button></h3>
-        <ul class="nav">
-            <iframe t-attf-src="/google_map/?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
-                style="width:260px; height:240px; border:0; padding:0; margin:0;"></iframe>
-        </ul>
-    </xpath>
-</template>
-
-<template id="partner" name="Members">
-    <t t-call="website.layout">
-        <div id="wrap">
-            <div class="oe_structure"/>
-            <div class="container">
-                <div class="row">
-                    <t t-call="website_partner.partner_detail"/>
-                </div>
-            </div>
-            <div class="oe_structure"/>
-        </div>
-    </t>
-</template>
-
-</data>
-</openerp>
diff --git a/addons/website_membership/views/website_membership_templates.xml b/addons/website_membership/views/website_membership_templates.xml
new file mode 100644
index 00000000000..40e84628b2f
--- /dev/null
+++ b/addons/website_membership/views/website_membership_templates.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+<!-- Layout add nav and footer -->
+<template id="footer_custom" inherit_id="website.footer_default" name="Footer Associations Link">
+    <xpath expr="//div[@id='info']/ul" position="inside">
+        <li><a href="/members">Members</a></li>
+    </xpath>
+</template>
+
+<template id="index" name="Members">
+    <t t-call="website.layout">
+        <t t-set="additional_title">Members</t>
+        <div id="wrap">
+            <div class="oe_structure">
+                <section>
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <h1 class="text-center">Our Members Directory</h1>
+                                <h3 class="text-muted text-center">Find a business partner</h3>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+            </div>
+            <div class="container">
+                <div class="row">
+
+            <div class="col-md-3 mb32" id="left_column">
+                <ul class="nav nav-pills nav-stacked mt16">
+                    <li class="nav-header"><h3>Associations</h3></li>
+                    <li t-att-class="'' if membership_id else 'active'"><a href="/members">All</a></li>
+                    <t t-foreach="memberships_data" t-as="membership_data">
+                        <li t-att-class="membership_id and membership_data['id'] == membership_id and 'active' or None">
+                            <a t-attf-href="/members/association/#{ membership_data['id'] }#{current_country and '/country/%s' % slug(current_country) or ''}#{ search }"><t t-esc="membership_data['name']"/></a>
+                        </li>
+                    </t>
+                </ul>
+            </div>
+            <div class="col-md-8" id="ref_content">
+                <div class='navbar'>
+                    <t t-call="website.pager">
+                       <t t-set="classname">pull-left</t>
+                    </t>
+                    <form action="" method="get" class="navbar-search pull-right pagination form-inline">
+                        <t t-call="website.website_search_box">
+                            <t t-set="search" t-value="post.get('search', '')"/>
+                        </t>
+                    </form>
+                </div>
+                <div>
+                    <t t-if="not memberships_partner_ids">
+                        <p>No result found.</p>
+                    </t>
+                    <t t-foreach="memberships_data" t-as="membership_data">
+                        <t t-if="memberships_partner_ids.get(membership_data['id'])">
+                            <h3 class="text-center"><span t-esc="membership_data['name']"/></h3>
+                            <t t-foreach="memberships_partner_ids[membership_data['id']]" t-as="partner_id">
+                                <t t-set="partner" t-value="partners[partner_id]"/>
+                                <div class="media">
+                                    <a class="pull-left" t-attf-href="/members/#{slug(partner)}"
+                                       t-field="partner.image_small"
+                                       t-options='{"widget": "image", "class": "media-object"}'
+                                    ></a>
+                                    <div class="media-body" style="min-height: 64px;">
+                                        <a class="media-heading" t-attf-href="/members/#{slug(partner)}">
+                                            <span t-field="partner.display_name"/>
+                                        </a>
+                                        <div t-field="partner.website_short_description"/>
+                                    </div>
+                                </div>
+                            </t>
+                        </t>
+                    </t>
+                </div>
+            </div>
+
+                </div>
+            </div>
+            <div class="oe_structure"/>
+        </div>
+    </t>
+</template>
+
+<template id="opt_index_country" name="Location"
+        customize_show="True" inherit_id="website_membership.index">
+    <xpath expr="//div[@id='left_column']/ul[1]" position="after">
+        <ul class="nav nav-pills nav-stacked mt16">
+            <li class="nav-header"><h3>Location</h3></li>
+            <t t-foreach="countries" t-as="country">
+                <li t-if="country['country_id']" t-att-class="country['country_id'] and country['country_id'][0] == current_country_id and 'active' or None">
+                    <a t-attf-href="/members#{ membership_id and '/association/%s' % membership_id or '' }#{ country['country_id'][0] and '/country/%s' % slug(country['country_id']) or '' }#{ search }"><t t-esc="country['country_id'][1]"/>
+                        <span class="badge pull-right"><t t-esc="country['country_id_count'] or '0'"/></span>
+                    </a>
+                </li>
+            </t>
+        </ul>
+    </xpath>
+</template>
+
+<!-- Option: index: Left Google Map -->
+<template id="opt_index_google_map" name="Left World Map"
+        customize_show="True" inherit_id="website_membership.index">
+    <xpath expr="//div[@id='left_column']/ul[last()]" position="after">
+        <!-- modal for large map -->
+        <div class="modal fade partner_map_modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+          <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                    <h4 class="modal-title">World Map</h4>
+                </div>
+                <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
+                style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
+            </div>
+          </div>
+        </div>
+        <!-- modal end -->
+        <h3>World Map<button class="btn btn-link" data-toggle="modal" data-target=".partner_map_modal"><span class="fa fa-external-link" /></button></h3>
+        <ul class="nav">
+            <iframe t-attf-src="/google_map/?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
+                style="width:260px; height:240px; border:0; padding:0; margin:0;"></iframe>
+        </ul>
+    </xpath>
+</template>
+
+<template id="partner" name="Members">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <div class="oe_structure"/>
+            <div class="container">
+                <div class="row">
+                    <t t-call="website_partner.partner_detail"/>
+                </div>
+            </div>
+            <div class="oe_structure"/>
+        </div>
+    </t>
+</template>
+
+</data>
+</openerp>
-- 
cgit v1.2.3