From 5b50ea85d7051563492066dd7e5c65c48422713e Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Mon, 21 Oct 2013 16:11:22 +0530
Subject: [PATCH] [IMP]Improved typo. Css of address. put if condition before
 value. Removed strong from description. Improved code for search.

bzr revid: bth@tinyerp.com-20131021104122-jsbra3e8f2efwbxu
---
 .../crm_partner_assign/res_partner_demo.xml   |  8 ++++++--
 addons/website/static/src/css/website.css     |  8 ++++++++
 addons/website/static/src/css/website.sass    |  7 +++++++
 .../controllers/main.py                       |  2 +-
 .../views/website_crm_partner_assign.xml      |  2 +-
 .../views/website_partner_view.xml            | 19 ++++++++++++-------
 .../website_partner/website_partner_demo.xml  |  4 ++--
 7 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml
index 963748e5bf1..cb923efbf98 100644
--- a/addons/crm_partner_assign/res_partner_demo.xml
+++ b/addons/crm_partner_assign/res_partner_demo.xml
@@ -14,7 +14,7 @@
             <field name="sequence">3</field>
         </record>
         <record id="res_partner_grade_platinium" model="res.partner.grade">
-            <field name="name">Platinium</field>
+            <field name="name">Platinum</field>
             <field name="sequence">4</field>
         </record>
 
@@ -56,7 +56,11 @@
             <field name="grade_id" ref="res_partner_grade_gold"/>
             <field name="partner_weight">10</field>
         </record>
-
+        <record id="base.res_partner_12" model="res.partner">
+            <field name="grade_id" ref="res_partner_grade_gold"/>
+            <field name="partner_weight">10</field>
+        </record>
+        
         <record id="base.res_partner_9" model="res.partner">
             <field name="grade_id" ref="res_partner_grade_platinium"/>
             <field name="partner_weight">10</field>
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index c851c7e43f6..93ede5035ae 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -440,3 +440,11 @@ a[data-publish][data-publish='on']:hover .css_published {
 ::selection {
   background: rgba(150, 150, 220, 0.3);
 }
+
+.texttop {
+  vertical-align: top;
+}
+table.well tr th {
+  text-align: right;
+  padding-right: 10px;
+}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 4d9a6ae01c0..d5e991bfe2d 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -335,3 +335,10 @@ a[data-publish]
 
 ::selection
     background: rgba(150, 150, 220, 0.3)
+
+.texttop
+    vertical-align: top
+
+table.well tr th
+    text-align: right
+    padding-right: 10px
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index a2586f3a090..66042cfb536 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -28,7 +28,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
         if request.context['is_public_user']:
             base_partner_domain += [('website_published', '=', True)]
         partner_domain = list(base_partner_domain)
-        if grade_id:
+        if grade_id and grade_id != 'all':
             partner_domain += [('grade_id', '=', int(grade_id))]  # try/catch int
         if country_id:
             country = country_obj.browse(request.cr, request.uid, country_id, request.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 d6bac24fe42..738b6210f6c 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -85,7 +85,7 @@
                                     <img class="media-object" t-att-src="partner_id.img('image_small')"/>
                                 </a>
                                 <div class="media-body" style="min-height: 64px;">
-                                    <a class="media-heading" t-href="/partners/#{ partner_id.id }/"><span t-field="partner_id.parent_id"/> <span t-field="partner_id.name"/></a> - <span t-field="partner_id.grade_id"/>
+                                    <a class="media-heading" t-href="/partners/#{ partner_id.id }/"><span t-field="partner_id.parent_id"/> <span t-field="partner_id.name"/></a> <t t-if="partner_id.grade_id"> - <span t-field="partner_id.grade_id"/> </t>
                                     <t t-if="partner_id.website_short_description"><div t-field="partner_id.website_short_description"/></t>
                                 </div>
                             </div>
diff --git a/addons/website_partner/views/website_partner_view.xml b/addons/website_partner/views/website_partner_view.xml
index 842fde0e9e6..1567bb02a4a 100644
--- a/addons/website_partner/views/website_partner_view.xml
+++ b/addons/website_partner/views/website_partner_view.xml
@@ -17,12 +17,17 @@
                         </colgroup>
                         <tbody>
                             <t t-set="address" t-value="'&lt;br/&gt;'.join(partner_id.name_get()[0][1].split('\n')[1:])"/>
-                            <tr t-if="address or editable"><th>Address</th><td class="span2" t-raw="address"/></tr>
-                            <tr t-if="partner_id.website or editable"><th>Website</th><td class="span2"><span t-field="partner_id.website"/></td></tr>
-                            <tr t-if="partner_id.phone or editable"><th>Tel</th><td class="span2"><span t-field="partner_id.phone"/></td></tr>
-                            <tr t-if="partner_id.mobile or editable"><th>Tel</th><td class="span2"><span t-field="partner_id.mobile"/></td></tr>
-                            <tr t-if="partner_id.fax or editable"><th>Fax</th><td class="span2"><span t-field="partner_id.fax"/></td></tr>
-                            <tr t-if="partner_id.email or editable"><th>Email</th><td class="span2"><span t-field="partner_id.email"/></td></tr>
+                            <tr t-if="address or editable"><th class="texttop">Address</th><td class="span2" t-raw="address"/></tr>
+                            <tr t-if="partner_id.website or editable"><th>Website</th><td class="span2">
+                                <t t-if="partner_id.website"><span t-field="partner_id.website"/></t></td></tr>
+                            <tr t-if="partner_id.phone or editable"><th>Phone</th><td class="span2">
+                                <t t-if="partner_id.phone"><span t-field="partner_id.phone"/></t></td></tr>
+                            <tr t-if="partner_id.mobile or editable"><th>Tel</th><td class="span2">
+                                <t t-if="partner_id.mobile"><span t-field="partner_id.mobile"/></t></td></tr>
+                            <tr t-if="partner_id.fax or editable"><th>Fax</th><td class="span2">
+                                <t t-if="partner_id.fax"><span t-field="partner_id.fax"/></t></td></tr>
+                            <tr t-if="partner_id.email or editable"><th>Email</th><td class="span2">
+                                <t t-if="partner_id.email"><span t-field="partner_id.email"/></t></td></tr>
                         </tbody>
                     </table>
                 </address>
@@ -31,4 +36,4 @@
         </template>
 
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/website_partner/website_partner_demo.xml b/addons/website_partner/website_partner_demo.xml
index 8bba2827a4b..aec4dd59a84 100644
--- a/addons/website_partner/website_partner_demo.xml
+++ b/addons/website_partner/website_partner_demo.xml
@@ -247,9 +247,9 @@ Roadmap Development </li>
 
     <record id="base.res_partner_18" model="res.partner">
         <field name="website_short_description">We are a technology consulting &amp; strategic advisory firm that creates value enhancing solutions through the use of advanced software for our clients worldwide. At Think Big Systems we bring operational experience combined...</field>
-        <field name="website_description"><![CDATA[<strong>We are a technology consulting & strategic advisory firm that creates value enhancing solutions through the use of advanced software for our clients worldwide.</strong>
+        <field name="website_description"><![CDATA[We are a technology consulting & strategic advisory firm that creates value enhancing solutions through the use of advanced software for our clients worldwide.
  <br/> <br/>
-<strong>At Think Big Systems we bring operational experience combined with technological acumen. We understand that any software that supports business operations needs to be designed in such a way that facilitates the execution of critical operational processes, and serves as a tool to the users rather than a barrier. Our approach is focused on the process first, ensuring that it contributes to the goals of the company, we then optimize it, and design the software solutions to best support it.</strong>]]></field>
+At Think Big Systems we bring operational experience combined with technological acumen. We understand that any software that supports business operations needs to be designed in such a way that facilitates the execution of critical operational processes, and serves as a tool to the users rather than a barrier. Our approach is focused on the process first, ensuring that it contributes to the goals of the company, we then optimize it, and design the software solutions to best support it.]]></field>
     </record>
 
     <record id="base.res_partner_9" model="res.partner">