[MERGE] fixes from india
bzr revid: fp@tinyerp.com-20130830130152-7xrcbeuxh17mhglu
This commit is contained in:
Fabien Pinckaers
commit
29735543e4
|
|
@ -30,31 +30,28 @@
|
|||
<h1 class="col-md-12 text-center">Customer References</h1>
|
||||
<h2 class="col-md-12 text-center">Trusted by millions worldwide</h2>
|
||||
<div class="col-md-12" id="ref_content">
|
||||
<div class="navbar navbar-inverse">
|
||||
<div class="navbar-collapse">
|
||||
<t t-call="website.pager">
|
||||
<t t-set="classname">pull-left</t>
|
||||
</t>
|
||||
<form action="/references/" method="get" class="navbar-search pull-right pagination">
|
||||
<div class="col-md-10">
|
||||
<div class="col-md-5">
|
||||
<input type="text" name="search" class="search-query form-control" placeholder="Search" t-att-value="searches.get('search') or '' or ''" />
|
||||
</div>
|
||||
<div class="col-lg-5">
|
||||
<select class="search-query mt4 form-control" name="country" t-if="len(countries) > 1" onchange="submit()">
|
||||
<t t-foreach="countries">
|
||||
<t t-if="country_id">
|
||||
<option t-att-selected="searches.get('country') == str(country_id and country_id[0]) and 'selected'" t-att-value="country_id[0]">
|
||||
<t t-esc="country_id[1]"/> (<t t-esc="country_id_count"/>)
|
||||
</option>
|
||||
</t>
|
||||
</t>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<t t-call="website.pager">
|
||||
<t t-set="classname">pull-left</t>
|
||||
</t>
|
||||
<form action="/references/" method="get" class="pull-right pagination">
|
||||
<div class="form-group">
|
||||
<input type="text" name="search" class="search-query form-control" placeholder="Search" t-att-value="searches.get('search') or '' or ''" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<select class="search-query form-control" name="country" t-if="len(countries) > 1" onchange="submit()">
|
||||
<t t-foreach="countries">
|
||||
<t t-if="country_id">
|
||||
<option t-att-selected="searches.get('country') == str(country_id and country_id[0]) and 'selected'" t-att-value="country_id[0]">
|
||||
<t t-esc="country_id[1]"/> (<t t-esc="country_id_count"/>)
|
||||
</option>
|
||||
</t>
|
||||
</t>
|
||||
</select>
|
||||
</div>
|
||||
</form>
|
||||
<div class="clearfix"/>
|
||||
|
||||
<div>
|
||||
<div t-foreach="partner_ids" t-as="partner" class="media thumbnail">
|
||||
<a class="pull-left" t-attf-href="/references/#{ partner.id }/">
|
||||
|
|
|
|||
|
|
@ -27,33 +27,39 @@
|
|||
<template id="index" name="Partners">
|
||||
<t t-call="website_crm_partner_assign.layout">
|
||||
<t t-set="ref_content">
|
||||
<h1 class="span12 text-center">
|
||||
<h1 class="col-md-12 text-center">
|
||||
Want services on OpenERP?<br/>
|
||||
<small>Contact a local partner</small>
|
||||
</h1>
|
||||
<div class="span12" id="ref_content">
|
||||
<div class="col-md-12" id="ref_content">
|
||||
<div class='navbar'>
|
||||
<div class='navbar-inner'>
|
||||
<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()">
|
||||
<t t-foreach="countries">
|
||||
<t t-if="country_id">
|
||||
<option t-att-selected="searches.get('country') == str(country_id and country_id[0]) and 'selected'" t-att-value="country_id[0]">
|
||||
<t t-esc="country_id[1]"/> (<t t-esc="country_id_count"/>)
|
||||
</option>
|
||||
<div>
|
||||
<form action="/partners/" method="get" class="navbar-search pull-right pagination form-inline">
|
||||
<div class="form-group">
|
||||
<input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search') or '' or ''"/>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<select class="search-query col-md-2 mt4 form-control" name="country" t-if="len(countries) > 1" onchange="submit()">
|
||||
<t t-foreach="countries">
|
||||
<t t-if="country_id">
|
||||
<option t-att-selected="searches.get('country') == str(country_id and country_id[0]) and 'selected'" t-att-value="country_id[0]">
|
||||
<t t-esc="country_id[1]"/> (<t t-esc="country_id_count"/>)
|
||||
</option>
|
||||
</t>
|
||||
</t>
|
||||
</t>
|
||||
</select>
|
||||
<select class="search-query span2 mt4" name="grade" t-if="len(countries) > 1" onchange="submit()">
|
||||
<t t-foreach="grades">
|
||||
<t t-if="grade_id">
|
||||
<option t-att-selected="searches.get('grade') == str(grade_id and grade_id[0]) and 'selected'" t-att-value="grade_id[0]">
|
||||
<t t-esc="grade_id[1]"/> (<t t-esc="grade_id_count"/>)
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<select class="search-query col-md-2 mt4 form-control" name="grade" t-if="len(countries) > 1" onchange="submit()">
|
||||
<t t-foreach="grades">
|
||||
<t t-if="grade_id">
|
||||
<option t-att-selected="searches.get('grade') == str(grade_id and grade_id[0]) and 'selected'" t-att-value="grade_id[0]">
|
||||
<t t-esc="grade_id[1]"/> (<t t-esc="grade_id_count"/>)
|
||||
</option>
|
||||
</t>
|
||||
</t>
|
||||
</t>
|
||||
</select>
|
||||
</select>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -82,16 +88,16 @@
|
|||
|
||||
<template id="ref_country" inherit_id="website_crm_partner_assign.index" inherit_option_id="website_crm_partner_assign.index" name="Left World Map">
|
||||
<xpath expr="//div[@id='ref_content']" position="before">
|
||||
<div class="span4">
|
||||
<ul class="nav nav-list">
|
||||
<li class="nav-header">World Map</li>
|
||||
<div class="col-md-4">
|
||||
<ul class="nav">
|
||||
<li class="navbar-header">World Map</li>
|
||||
<iframe t-attf-src="/worldmap/?width=320&height=240&partner_ids=#{ worldmap_partner_ids }&partner_url=/partners/"
|
||||
style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
|
||||
</ul>
|
||||
</div>
|
||||
</xpath>
|
||||
<xpath expr="//div[@id='ref_content']" position="attributes">
|
||||
<attribute name="class">span8</attribute>
|
||||
<attribute name="class">col-md-8</attribute>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
|
|
@ -99,8 +105,8 @@
|
|||
<t t-call="website_crm_partner_assign.layout">
|
||||
<t t-set="ref_content">
|
||||
<t t-call="website.publish"><t t-set="object" t-value="partner_id"/></t>
|
||||
<h1 class="span12 text-center" t-field="partner_id.name"/>
|
||||
<div class="span4">
|
||||
<h1 class="col-md-12 text-center" t-field="partner_id.name"/>
|
||||
<div class="col-md-4">
|
||||
<div class="text-center">
|
||||
<img t-att-src="partner_id.img('image_medium')"/>
|
||||
</div>
|
||||
|
|
@ -122,7 +128,7 @@
|
|||
</table>
|
||||
</address>
|
||||
</div>
|
||||
<div class="span8 mt32" t-field="partner_id.website_description"/>
|
||||
<div class="col-md-8 mt32" t-field="partner_id.website_description"/>
|
||||
</t>
|
||||
</t>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ t-attf-class="label label-default pull-right label-#{ event_id.register_avail &l
|
|||
<td t-field="ticket.price"/>
|
||||
<td><span t-if="ticket.register_max"><t t-esc="ticket.register_current"/>/<t t-field="ticket.register_max"/></span></td>
|
||||
<td>
|
||||
<select t-if="ticket.register_avail" t-attf-name="ticket- #{ ticket.id }">
|
||||
<select t-if="ticket.register_avail" t-attf-name="ticket- #{ ticket.id }" class="form-control">
|
||||
<t t-foreach="range(0, ticket.register_avail > 9 and 10 or ticket.register_avail+1 )" t-as="nb"><option t-esc="nb"/></t>
|
||||
</select>
|
||||
<span t-if="not ticket.register_avail">Not ticket available</span>
|
||||
|
|
|
|||
Loading…
Reference in New Issue