diff options
| author | openerp-sle <openerp-sle@openerp-sle.home> | 2014-01-30 22:24:34 +0100 |
|---|---|---|
| committer | openerp-sle <openerp-sle@openerp-sle.home> | 2014-01-30 22:24:34 +0100 |
| commit | d34abbf1ccc9f68d7539fb64e84fc8ec40cad93f (patch) | |
| tree | aea752a0f58058d74fbba6eed1da599b5b7eeb3d | |
| parent | 1931c307a27996541df4ad307c2d2d1acc558d43 (diff) | |
[FIX] harmonize website_customer, website_crm_partner_assign and website_membership views
bzr revid: openerp-sle@openerp-sle.home-20140130212434-pqvwrrcd355y77id
3 files changed, 10 insertions, 10 deletions
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 9906eaf87c6..3afa77581ac 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 @@ -42,7 +42,8 @@ <t t-if="country_dict['country_id']"> <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''"> <a t-attf-href="#{ country_dict['country_id'][0] and '/partners/country/%s' % slug(country_dict['country_id']) or '/partners/' }#{ search_path }"> - <t t-esc="country_dict['country_id'][1]"/> <small>(<t t-esc="country_dict['country_id_count']"/>)</small> + <span class="badge pull-right" t-esc="country_dict['country_id_count'] or ''"/> + <t t-esc="country_dict['country_id'][1]"/> </a> </li> </t> diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml index d58e3dfa262..00c3552c59e 100644 --- a/addons/website_customer/views/website_customer.xml +++ b/addons/website_customer/views/website_customer.xml @@ -43,15 +43,14 @@ <p>No result found.</p> </t> <t t-foreach="partners_data" t-as="partner_data" class="media"> - <div class="col-md-2"> - <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/"> - <img class="img img-thumbnail" t-attf-src="data:image/png;base64,#{partner_data.get('image')}"/> + <div class="media thumbnail"> + <a class="pull-left" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/"> + <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/> </a> - </div><div class="col-md-10"> - <h4> + <div class="media-body" style="min-height: 64px;"> <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/" t-esc="partner_data.get('name')"/> - </h4> - <div t-raw="partner_data.get('website_short_description') or ''"/> + <div t-raw="partner_data.get('website_short_description') or ''"/> + </div> </div> <div class="clearfix mb8"/> </t> @@ -76,7 +75,7 @@ <template id="opt_country_list" inherit_id="website_customer.index" inherit_option_id="website_customer.index" name="Filter on Countries"> <xpath expr="//div[@id='ref_left_column']" position="inside"> - + <h3>References by Country</h3> <ul class="nav nav-pills nav-stacked mt16 mb32"> <t t-foreach="countries" t-as="country_dict"> <t t-if="country_dict['country_id']"> diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml index 8e9ceb0b387..644d893b600 100644 --- a/addons/website_membership/views/website_membership.xml +++ b/addons/website_membership/views/website_membership.xml @@ -60,7 +60,7 @@ <h3 class="text-center"><span t-field="membership_line_id.membership_id"/></h3> </t> <t t-set="partner_data" t-value="partners_data[membership_line_id.partner.id]"/> - <div class="media"> + <div class="media thumbnail"> <a class="pull-left" t-attf-href="/members/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/"> <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/> </a> |