odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]improved typo, display time slot in one line and used define color when location_id = False. 

bzr revid: dka@tinyerp.com-20140314071608-3al2qurbjwq65o9b
This commit is contained in:
Darshan Kalola (OpenERP) 2014-03-14 12:46:08 +05:30
parent 9a9aa166ac
commit 9374159c00
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/website_event_track/controllers/event.py
View File

@ -170,7 +170,7 @@ class website_event(http.Controller):
'speaker_ids': [s.name for s in event_tracks.speaker_ids],
'row_span': index - row_span,
'color': color,
'publish': not event_tracks.website_published
'publish': event_tracks.website_published
})
#Get All Locations and make room_list contain unique value.

2
addons/website_event_track/data/website_event_track_demo.xml
View File

@ -284,6 +284,7 @@
<field name="duration" eval="60"/>
<field eval="[(4, ref('base.res_partner_1'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage2"/>
<field name="color">3</field>
</record>
<record id="event_track28" model="event.track">
<field name="name">OpenERP Status &amp; Strategy 2014</field>
@ -302,6 +303,7 @@
<field name="duration" eval="15"/>
<field eval="[(4, ref('base.res_partner_19'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage1"/>
<field name="color">6</field>
</record>
<record id="event_track30" model="event.track">
<field name="name">Morning break</field>

6
addons/website_event_track/views/website_event.xml
View File

@ -59,7 +59,7 @@
<t t-esc="day"/>
<small><t t-esc="(talks[(days.keys()).index(day)])[0]"/> talks</small>
<div class="form-group col-md-3 pull-right">
<input type="text" class="form-control" placeholder="Search..." id="start_search"/>
<input type="text" class="form-control" placeholder="Filter..." id="start_search"/>
</div>
</h3>
<table id="table_search" class="table table-bordered table-condensed">
@ -75,7 +75,7 @@
<t t-foreach="days[day]" t-as="slot">
<t t-set="skip_it" t-value="skip_td[day].keys()"/>
<tr>
<td t-attf-style="width: #{td_width}px;"><t t-esc= "slot"/></td>
<td><t t-esc= "slot"/></td>
<t t-foreach="room_list" t-as="room">
<t t-set="sid" t-value="not (room[0] in skip_it and slot in skip_td[day][room[0]])" />
<t t-if="sid">
@ -86,7 +86,7 @@
<t t-if="len(days[day][slot])">
<t t-if="not days[day][slot][index]['location_id'] and for_all" >
<t t-set="for_all" t-value="False"/>
<td t-if="sid" id="seach_enable" t-att-colspan="len(room_list)" class="success text-center">
<td t-if="sid" id="seach_enable" t-att-colspan="len(room_list)" t-attf-class="event_color_#{days[day][slot][index]['color']} text-center">
<img t-if="days[day][slot][index]['publish']" title="Not Published" style="width:10px; height:10px" src="/web/static/src/img/icons/gtk-no.png" />
<a t-attf-href="/event/#{ slug(event) }/track/#{ slug([ days[day][slot][index]['id'], days[day][slot][index]['title']]) }"> <t t-esc="days[day][slot][index]['title']" /> </a>
<t t-foreach="days[day][slot][index]['speaker_ids']" t-as="speaker">