[IMP] website_crm_partner_assign: imp views

bzr revid: chm@openerp.com-20130829150058-bmcedth32o4nrdvh

diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml
index 278486b..4efc1ef 100644 (file)
--- a/addons/website_contract/views/website_contract.xml
+++ b/addons/website_contract/views/website_contract.xml
@@ -27,10 +27,12 @@
     <template id="index" name="References">
         <t t-call="website_contract.layout">
             <t t-set="ref_content">
-                <h1 class="span12 text-center">Trusted by millions worldwide</h1>
-                <h2 class="span12 text-center">Our public references</h2>
+                <h1 class="span12 text-center">
+                    Trusted by millions worldwide<br/>
+                    <small>Our public references</small>
+                </h1>
                 <div class="span12" id="ref_content">
-                    <div class='navbar navbar-inverse'>
+                    <div class='navbar'>
                         <div class='navbar-inner'>
                             <t t-call="website.pager" >
                                 <t t-set="classname">pull-left</t>

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index fb9fe9f..cc4af24 100644 (file)
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -51,7 +51,8 @@ class website_crm_partner_assign(http.Controller):
 
         step = 20
         pager = website.pager(url="/partners/", total=len(partner_ids), page=page, step=step, scope=7, url_args=post)
-        partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('id', 'in', partner_ids)], limit=step, offset=pager['offset'])
+        partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('id', 'in', partner_ids)], 
+            limit=step, offset=pager['offset'], order="grade_id ASC,partner_weight DESC")
 
 
         values = website.get_rendering_context({

diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index becb608..8fee7dc 100644 (file)
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -27,14 +27,13 @@
     <template id="index" name="Partners">
         <t t-call="website_crm_partner_assign.layout">
             <t t-set="ref_content">
-                <h1 class="span12 text-center">Want services on OpenERP?</h1>
-                <h2 class="span12 text-center">Contact a local partner</h2>
+                <h1 class="span12 text-center">
+                    Want services on OpenERP?<br/>
+                    <small>Contact a local partner</small>
+                </h1>
                 <div class="span12" id="ref_content">
-                    <div class='navbar navbar-inverse'>
+                    <div class='navbar'>
                         <div class='navbar-inner'>
-                            <t t-call="website.pager" >
-                                <t t-set="classname">pull-left</t>
-                            </t>
                             <form action="/partners/" method="get" class="navbar-search pull-right pagination">
                                 <input type="text" name="search" class="search-query span2 mt4" placeholder="Search" t-att-value="searches.get('search') or '' or ''"/>
                                 <select class="search-query span2 mt4" name="country" t-if="len(countries) > 1" onchange="submit()">
@@ -59,16 +58,22 @@
                         </div>
                     </div>
                     <div>
-                        <div t-foreach="partner_ids" t-as="partner" class="media thumbnail">
-                            <a class="pull-left" t-attf-href="/partners/#{ partner.id }/">
-                                <img class="media-object" t-att-src="partner.img('image_small')"/>
-                            </a>
-                            <div class="media-body">
-                                <t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
-                                <a class="media-heading" t-attf-href="/partners/#{ partner.id }/"><span t-field="partner.parent_id"/> <span t-field="partner.name"/></a> - <span t-field="partner.grade_id"/>
-                                <div t-field="partner.website_short_description"/>
+                        <t t-foreach="partner_ids" t-as="partner">
+                            <t t-if="grade_id != partner.grade_id.id">
+                                <t t-set="grade_id" t-value="partner.grade_id.id"/>
+                                <h3 class="text-center well"><span t-field="partner.grade_id"/> Partners</h3>
+                            </t>
+                            <div class="media thumbnail">
+                                <a class="pull-left" t-attf-href="/partners/#{ partner.id }/">
+                                    <img class="media-object" t-att-src="partner.img('image_small')"/>
+                                </a>
+                                <div class="media-body">
+                                    <t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
+                                    <a class="media-heading" t-attf-href="/partners/#{ partner.id }/"><span t-field="partner.parent_id"/> <span t-field="partner.name"/></a> - <span t-field="partner.grade_id"/>
+                                    <div t-field="partner.website_short_description"/>
+                                </div>
                             </div>
-                        </div>
+                        </t>
                     </div>
                 </div>
             </t>

diff --git a/addons/website_crm_partner_assign/website_crm_partner_assign.py b/addons/website_crm_partner_assign/website_crm_partner_assign.py
index 1d89a2b..828df9b 100644 (file)
--- a/addons/website_crm_partner_assign/website_crm_partner_assign.py
+++ b/addons/website_crm_partner_assign/website_crm_partner_assign.py
@@ -11,3 +11,10 @@ class res_partner(osv.osv):
 
     def img(self, cr, uid, ids, field='image_small', context=None):
         return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0])
+
+
+class res_partner_grade(osv.osv):
+    _inherit = 'res.partner.grade'
+    _columns = {
+        'website_description': fields.html('Description for the website'),
+    }
\ No newline at end of file

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 3d099c5..47b0a23 100644 (file)
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -40,7 +40,7 @@
                             </t>
                         </ul>
                     </div>
-                    <div class='span8 navbar navbar-inverse'>
+                    <div class='span8 navbar'>
                         <div class='navbar-inner'>
                             <t t-call="website.pager" >
                                 <t t-set="classname">pull-left</t>

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index b7a40a5..6eb80aa 100644 (file)
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -97,7 +97,7 @@
         <t t-call="website_sale.layout">
             <t t-set="title">Product</t>
             <t t-set="shop_content">
-                <div class='navbar navbar-inverse'>
+                <div class='navbar'>
                     <div class='navbar-inner'>
                         <t t-call="website.pager" >
                             <t t-set="classname">pull-left</t>
@@ -142,7 +142,7 @@
         <t t-call="website_sale.layout">
             <t t-set="title">Product</t>
             <t t-set="shop_content">
-                <div class='navbar navbar-inverse'>
+                <div class='navbar'>
                     <div class='navbar-inner'>
                         <form t-attf-action="/shop/#{ category_id and ('category/%s/' % category_id) or ''}" method="get" class="navbar-search pull-right pagination">
                             <input type="text" name="search" class="search-query span2" placeholder="Search" t-att-value="search or '' or ''"/>