Skip to content

Commit

Permalink
[FIX] website_event, *: review some design
Browse files Browse the repository at this point in the history
* base

With #30559, the event pages were
a bit redesigned (even though the original goal of the task was to
focus on the mobile registration). This commit reviews part of the
redesign (titles too big, misalignment, ...).
  • Loading branch information
qsm-odoo committed Mar 18, 2019
1 parent add45ee commit a703ada
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
14 changes: 8 additions & 6 deletions addons/website_event/views/event_templates.xml
Expand Up @@ -321,7 +321,7 @@


<template id="event_description_full"> <template id="event_description_full">
<t t-call="website_event.event_details"> <t t-call="website_event.event_details">
<div class="col-lg-9"> <div class="col">
<div t-if="event.state == 'done' or not registrable" class="alert alert-info" role="status">Registration for this event is now closed</div> <div t-if="event.state == 'done' or not registrable" class="alert alert-info" role="status">Registration for this event is now closed</div>
<t t-if="event.state != 'done' and registrable" t-call="website_event.registration_template"/> <t t-if="event.state != 'done' and registrable" t-call="website_event.registration_template"/>
<div class="clearfix"/> <div class="clearfix"/>
Expand All @@ -344,7 +344,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="col-lg-3 css_noprint"> <div class="col-lg-4 css_noprint">
<div class="clearfix"/> <div class="clearfix"/>
<t t-if="not event.is_online"> <t t-if="not event.is_online">
<div class="card bg-secondary" t-if="event.address_id"> <div class="card bg-secondary" t-if="event.address_id">
Expand All @@ -355,7 +355,7 @@
<img t-att-src="event.google_map_img()" width="100%%" alt="Google Maps"/> <img t-att-src="event.google_map_img()" width="100%%" alt="Google Maps"/>
</a> </a>
</t> </t>
<h4 t-field="event.address_id" class="text-secondary font-weight-bold" t-options='{ <div t-field="event.address_id" class="text-secondary font-weight-bold" t-options='{
"widget": "contact", "widget": "contact",
"fields": ["name"] "fields": ["name"]
}'/> }'/>
Expand All @@ -373,17 +373,19 @@
<div class="card bg-secondary my-3"> <div class="card bg-secondary my-3">
<h4 class="card-header">When</h4> <h4 class="card-header">When</h4>
<div class="card-body"> <div class="card-body">
<span class="font-weight-bold small">From</span> <i class="fa fa-clock-o"/>
<span>From</span>
<span t-field="event.with_context(tz=event.date_tz).date_begin" t-options='{"hide_seconds":"True"}'/> <span t-field="event.with_context(tz=event.date_tz).date_begin" t-options='{"hide_seconds":"True"}'/>
<hr/> <hr/>
<span class="font-weight-bold small">To</span> <i class="fa fa-clock-o"/>
<span>To</span>
<span t-field="event.with_context(tz=event.date_tz).date_end" t-options='{"hide_seconds":"True"}'/> <span t-field="event.with_context(tz=event.date_tz).date_end" t-options='{"hide_seconds":"True"}'/>
</div> </div>
</div> </div>
<div class="card bg-secondary my-3" t-if="event.organizer_id"> <div class="card bg-secondary my-3" t-if="event.organizer_id">
<h4 class="card-header">Organizer</h4> <h4 class="card-header">Organizer</h4>
<div class="card-body"> <div class="card-body">
<h4 t-field="event.organizer_id" class="text-secondary font-weight-bold"/> <div t-field="event.organizer_id" class="text-secondary font-weight-bold"/>
<div itemprop="location" t-field="event.organizer_id" t-options='{ <div itemprop="location" t-field="event.organizer_id" t-options='{
"widget": "contact", "widget": "contact",
"fields": ["phone", "mobile", "email"] "fields": ["phone", "mobile", "email"]
Expand Down
14 changes: 8 additions & 6 deletions odoo/addons/base/views/ir_qweb_widget_templates.xml
Expand Up @@ -21,14 +21,16 @@
<t t-call="base.contact_name"/> <t t-call="base.contact_name"/>
</t> </t>
<div itemprop="address" itemscope="itemscope" itemtype="http://schema.org/PostalAddress"> <div itemprop="address" itemscope="itemscope" itemtype="http://schema.org/PostalAddress">
<div t-if="address and 'address' in fields"> <div t-if="address and 'address' in fields" class="d-flex align-items-baseline">
<i t-if="not options.get('no_marker')" class='fa fa-map-marker fa-fw text-primary' role="img" aria-label="Address" title="Address"/> <i t-if="not options.get('no_marker')" class="fa fa-map-marker fa-fw" role="img" aria-label="Address" title="Address"/>
<span itemprop="streetAddress" t-raw="address.replace('\n', options.get('no_tag_br') and ', ' or ('&lt;br/&gt;%s' % ('' if options.get('no_marker') else '')))"/> <span itemprop="streetAddress" t-raw="address.replace('\n', options.get('no_tag_br') and ', ' or ('&lt;br/&gt;%s' % ('' if options.get('no_marker') else '')))"/>
</div> </div>
<div t-if="city and 'city' in fields"> <div t-if="city and 'city' in fields" class="d-flex align-items-baseline">
<i t-if="not options.get('no_marker')" class='fa fa-map-marker fa-fw text-primary' role="img" aria-label="Address" title="Address"/> <i t-if="not options.get('no_marker')" class="fa fa-map-marker fa-fw" role="img" aria-label="Address" title="Address"/>
<span itemprop="addressLocality" t-esc="city"/>, <div>
<span itemprop="addressCountry" t-esc="country_id"/> <span itemprop="addressLocality" t-esc="city"/>,
<span itemprop="addressCountry" t-esc="country_id"/>
</div>
</div> </div>
<div t-if="phone and 'phone' in fields"><i t-if="not options.get('no_marker') or options.get('phone_icons')" class='fa fa-phone fa-fw' role="img" aria-label="Phone" title="Phone"/> <span itemprop="telephone" t-esc="phone"/></div> <div t-if="phone and 'phone' in fields"><i t-if="not options.get('no_marker') or options.get('phone_icons')" class='fa fa-phone fa-fw' role="img" aria-label="Phone" title="Phone"/> <span itemprop="telephone" t-esc="phone"/></div>
<div t-if="mobile and 'mobile' in fields"><i t-if="not options.get('no_marker') or options.get('phone_icons')" class='fa fa-mobile fa-fw' role="img" aria-label="Mobile" title="Mobile"/> <span itemprop="telephone" t-esc="mobile"/></div> <div t-if="mobile and 'mobile' in fields"><i t-if="not options.get('no_marker') or options.get('phone_icons')" class='fa fa-mobile fa-fw' role="img" aria-label="Mobile" title="Mobile"/> <span itemprop="telephone" t-esc="mobile"/></div>
Expand Down

0 comments on commit a703ada

Please sign in to comment.