diff options
Diffstat (limited to 'addons/website_event/views/website_event.xml')
| -rw-r--r-- | addons/website_event/views/website_event.xml | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index a1797e1ebcb..6115491429c 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -10,17 +10,19 @@ <data> <xpath expr="//notebook" position="inside"> <page string="Tarifs"> - <group colspan="4"> - <field name="product_ids"> - <tree string="Payments" editable="top"> - <field name="product_id"/> - <field name="price"/> - <field name="max_qty"/> - </tree> - </field> - </group> + <field name="product_ids"> + <tree string="Payments" editable="bottom"> + <field name="product_id"/> + <field name="deadline"/> + <field name="price"/> + <field name="max_qty"/> + </tree> + </field> </page> </xpath> + <field name="address_id" position="after"> + <field name="organizer_id"/> + </field> </data> </field> </record> @@ -73,7 +75,7 @@ <ul class="nav nav-list"> <li class="nav-header">Category</li> <t t-foreach="types"> - <li t-if="type" t-att-class="searches.get('type') == str(type[0]) and 'active' or ''"> + <li t-if="type" t-att-class="searches.get('type') == str(type and type[0]) and 'active' or ''"> <a t-att-href="'/event/%%s&type=%%s' %% (search_path, type[0])"><t t-esc="type[1]"/> <small>(<t t-esc="type_count"/>)</small></a> </li> </t> @@ -81,7 +83,7 @@ <ul class="nav nav-list"> <li class="nav-header">Location</li> <t t-foreach="countries"> - <li t-if="country_id" t-att-class="searches.get('country') == str(country_id[0]) and 'active' or ''"> + <li t-if="country_id" t-att-class="searches.get('country') == str(country_id and country_id[0]) and 'active' or ''"> <a t-att-href="'/event/%%s&country=%%s' %% (search_path, country_id[0])"><t t-esc="country_id[1]"/><small>(<t t-esc="country_id_count"/>)</small></a> </li> </t> @@ -140,17 +142,12 @@ <h4>When & Where</h4> <img t-att-src="google_map_url"/> <address> - <h4 t-field="event_id.address_id">Name</h4><br/> - <span t-field="event_id.street"/><br/> - <span t-field="event_id.city"/>, <span t-field="event_id.zip"/><br/> - <span t-field="event_id.country_id"> </span><br/> + <pre t-field="event_id.address_id"/> <i class="icon-time"></i> <span t-field="event_id.date_begin"> </span><br/> - <i class="icon-time"></i> <span t-field="event_id.date_end"> </span><br/> - <br/> + <i class="icon-time"></i> <span t-field="event_id.date_end"> </span> <t t-if="event_id.user_id"> - Organized by: <span t-field="event_id.user_id"/><br/> - <span>&#x2706; <span t-field="organizer.phone"></span></span><br/> - <i class="icon-envelope"></i> <span t-field="organizer.email"></span> + <h6>Organized by:</h6> + <pre><t t-field="event_id.organizer_id"/><br/><span>&#x2706;</span> <span t-field="event_id.phone"></span><br/><i class="icon-envelope"></i> <span t-field="event_id.email"></span></pre> </t> </address> </div> @@ -167,6 +164,11 @@ </span> </t> <h4 class="media-heading"><a t-att-href="'/event/%%s/' %% event_id.id"><span t-field="event_id.name"> </span></a></h4> + <h5 class="media-heading"> + <span t-field="event_id.address_id"/><br/> + <i class="icon-time"></i> <span t-field="event_id.date_begin"/><br/> + <i class="icon-time"></i> <span t-field="event_id.date_end"/> + </h5> <a t-if="editable" href="#" t-att-data-id="event_id.id" class="pull-right"> <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span> <span t-att-class="'label label-important js_publish %%s' %% (event_id.website_published and 'hidden' or '')">Click to Publish</span> @@ -175,6 +177,7 @@ <form t-att-action="'/event/%%s/add_cart' %% event_id.id" method="post" t-if="event_id.product_ids"> <div t-foreach="event_id.product_ids" t-as="prod"> <span t-field="prod.product_id"/> + <span t-field="prod.deadline"/> <span t-field="prod.price"/> <span t-field="prod.qty"/> <span t-field="prod.max_qty"/> |