diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2013-12-22 19:36:32 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2013-12-22 19:36:32 +0100 |
| commit | 301085c8fe86d79cd9fbfbd236512b2edbbfe123 (patch) | |
| tree | 5b6d3982b61232520fd53944d0832c7fadbeec1e | |
| parent | 786398cac0124612d6bd347dc1898767dbb6ab0d (diff) | |
[IMP] Agenda
bzr revid: fp@tinyerp.com-20131222183632-jkzhe3muu8gz2h9o
| -rw-r--r-- | addons/website_event_track/controllers/event.py | 11 | ||||
| -rw-r--r-- | addons/website_event_track/models/event.py | 1 | ||||
| -rw-r--r-- | addons/website_event_track/views/website_event.xml | 84 |
3 files changed, 93 insertions, 3 deletions
diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py index 0da067fc733..c68ab65535b 100644 --- a/addons/website_event_track/controllers/event.py +++ b/addons/website_event_track/controllers/event.py @@ -38,6 +38,15 @@ class website_event(http.Controller): values = { 'track': track, 'event': track.event_id, 'main_object': track } return request.website.render("website_event_track.track_view", values) + @website.route(['/event/<model("event.event"):event>/agenda/'], type='http', auth="public", multilang=True) + def event_agenda(self, event, tag=None, **post): + website.preload_records(event, on_error="website_event.404") + values = { + 'event': event, + 'main_object': event, + } + return request.website.render("website_event_track.agenda", values) + @website.route([ '/event/<model("event.event"):event>/track/', '/event/<model("event.event"):event>/track/tag/<model("event.track.tag"):tag>' @@ -69,6 +78,8 @@ class website_event(http.Controller): } return request.website.render("website_event_track.tracks", values) + + @website.route(['/event/<model("event.event"):event>/track_proposal/'], type='http', auth="public", multilang=True) def event_track_proposal(self, event, **post): website.preload_records(event, on_error="website_event.404") diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py index 4aac7ea2a36..98ae665a456 100644 --- a/addons/website_event_track/models/event.py +++ b/addons/website_event_track/models/event.py @@ -144,6 +144,7 @@ class event_event(osv.osv): result = super(event_event, self)._get_new_menu_pages(cr, uid, event, context=context) if event.show_tracks: result.append( (_('Talks'), '/event/%s/track/' % event.id)) + result.append( (_('Agenda'), '/event/%s/agenda/' % event.id)) if event.blog_id: result.append( (_('News'), '/blogpost/'+str(event.blog_ig.id))) if event.show_track_proposal: diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml index 2a365f52555..3d8fe45bb44 100644 --- a/addons/website_event_track/views/website_event.xml +++ b/addons/website_event_track/views/website_event.xml @@ -29,9 +29,87 @@ </xpath> </template> +<template id="agenda"> + <t t-call="website_event.event_details"> + <div id="left_column"> + </div> + <div class="col-md-12" id="right_column"> + <h3 class="page-header">Monday, 3rd June</h3> + <div class="table-responsive"> + <table class="table table-bordered table-condensed"> + <tr> + <th></th> + <th class="active"><a href="#">Room 1</a></th> + <th class="active"><a href="#">Room 2</a></th> + <th class="active"><a href="#">Room 3</a></th> + <th class="active"><a href="#">Room 5</a></th> + <th class="active"><a href="#">Room 6</a></th> + </tr> + <tr> + <td class="active"><b>09:00</b><br/><span class="text-muted">10:00</span></td> + <th colspan="5" class="success text-center"> + <a href="#">Plenary Session</a><br/> + Room 5 + </th> + </tr> + <tr> + <td class="active"><b>10:00</b><br/><span class="text-muted">10:30</span></td> + <td><a href="#">fkdsj kl jkl sdfjksdfj kl</a></td> + <td rowspan="2"><a href="#">Learning Python</a></td> + <td></td> + <td><a href="#">Learning Pytdon</a></td> + <td><a href="#">Boost your Sales Witd OpenERP CRM</a></td> + </tr> + <tr> + <th class="active">10:30<br/><span class="text-muted">11:00</span></th> + <td></td> + <td>Boost your Sales Witd OpenERP CRM</td> + <td>Learning Pytdon</td> + <td rowspan="2">fkdsj kl jkl sdfjksdfj kl</td> + </tr> + <tr> + <th class="active">11:00<br/><span class="text-muted">12:00</span></th> + <td>Learning Pytdon</td> + <td>Boost your Sales Witd OpenERP CRM</td> + <td>Learning Pytdon</td> + <td>this is a test</td> + </tr> + <tr class="active"> + <td colspan="6" class="text-center text-muted"><span class="fa fa-clock-o"/></td> + </tr> + <tr> + <th class="active">14:00<br/><span class="text-muted">15:00</span></th> + <td>Boost your Sales Witd OpenERP CRM</td> + <td>Learning Pytdon</td> + <td></td> + <td>fkdsj kl jkl sdfjksdfj kl</td> + <td>fkdsj kl jkl sdfjksdfj kl</td> + </tr><tr> + <td class="active"><b>10:00</b><br/><span class="text-muted">10:30</span></td> + <td>fkdsj kl jkl sdfjksdfj kl</td> + <td rowspan="2">Learning Python</td> + <td></td> + <td>Learning Pytdon</td> + <td>Boost your Sales Witd OpenERP CRM</td> + </tr> + <tr> + <th class="active">10:30<br/><span class="text-muted">11:00</span></th> + <td></td> + <td>Boost your Sales Witd OpenERP CRM</td> + <td>Learning Pytdon</td> + <td rowspan="2">fkdsj kl jkl sdfjksdfj kl</td> + </tr> + + </table> + </div> + </div> + </t> +</template> + + <template id="tracks"> <t t-call="website_event.event_details"> - <div name="left_column"> + <div id="left_column"> </div> <div class="col-md-9"> <div class="row mb32" t-foreach="tracks" t-as="track"> @@ -72,7 +150,7 @@ </template> <template id="tracks_filter" inherit_id="website_event_track.tracks" inherit_option_id="website_event_track.tracks" name="Filter on Tags"> - <xpath expr="//div[@name='left_column']" position="inside"> + <xpath expr="//div[@id='left_column']" position="inside"> <ul class="nav nav-pills nav-stacked"> <li t-att-class="'' if searches.get('tag') else 'active'"><a t-href="/event/#{ slug(event) }/track/">All Tags</a></li> <t t-foreach="tags" t-as="tag"> @@ -84,7 +162,7 @@ </t> </ul> </xpath> - <xpath expr="//div[@name='left_column']" position="attributes"> + <xpath expr="//div[@id='left_column']" position="attributes"> <attribute name="class">col-md-3 css_no_print</attribute> </xpath> </template> |
