diff --git a/addons/website_event_track/data/event_track_data.xml b/addons/website_event_track/data/event_track_data.xml
index 8cb0d19115d80e1fd9e5bc4468157b5db25f4cb7..3fb12b614b3dc211d22c3f8b01b165906960041e 100644
--- a/addons/website_event_track/data/event_track_data.xml
+++ b/addons/website_event_track/data/event_track_data.xml
@@ -14,9 +14,9 @@
<br/>
You will find more details here:
<div style="margin: 16px 0px 16px 0px;">
- <a href="/event/${object.event_id.id}/"
+ <a href="/event/${object.event_id.id}/track/${object.id}"
style="padding: 8px 16px 8px 16px; font-size: 14px; color: #FFFFFF; text-decoration: none !important; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px">
- View Event
+ View Talk
</a>
</div>
<br/><br/>
diff --git a/addons/website_event_track/models/event_track.py b/addons/website_event_track/models/event_track.py
index 20b146f0f845050dc4e6a0db5dc3689e31d6c1b6..bc6318b6faa590d7c5147b869eaf310d31d524ed 100644
--- a/addons/website_event_track/models/event_track.py
+++ b/addons/website_event_track/models/event_track.py
@@ -58,11 +58,11 @@ class Track(models.Model):
name = fields.Char('Title', required=True, translate=True)
active = fields.Boolean(default=True)
user_id = fields.Many2one('res.users', 'Responsible', tracking=True, default=lambda self: self.env.user)
- partner_id = fields.Many2one('res.partner', 'Speaker')
- partner_name = fields.Char('Speaker Name')
- partner_email = fields.Char('Speaker Email')
- partner_phone = fields.Char('Speaker Phone')
- partner_biography = fields.Html('Speaker Biography')
+ partner_id = fields.Many2one('res.partner', 'Partner')
+ partner_name = fields.Char('Name')
+ partner_email = fields.Char('Email')
+ partner_phone = fields.Char('Phone')
+ partner_biography = fields.Html('Biography')
tag_ids = fields.Many2many('event.track.tag', string='Tags')
stage_id = fields.Many2one(
'event.track.stage', string='Stage', ondelete='restrict',
@@ -78,7 +78,7 @@ class Track(models.Model):
" * Grey is the default situation\n"
" * Red indicates something is preventing the progress of this track\n"
" * Green indicates the track is ready to be pulled to the next stage")
- description = fields.Html('Track Description', translate=html_translate, sanitize_attributes=False)
+ description = fields.Html(translate=html_translate, sanitize_attributes=False)
date = fields.Datetime('Track Date')
duration = fields.Float('Duration', default=1.5)
location_id = fields.Many2one('event.track.location', 'Room')
diff --git a/addons/website_event_track/views/event_track_templates.xml b/addons/website_event_track/views/event_track_templates.xml
index cf924566f1f5cb6c71438a57bf791b8f21c96c3c..a62c6cd27fc4371a80ab3ea0e4c889fe58e8f726 100644
--- a/addons/website_event_track/views/event_track_templates.xml
+++ b/addons/website_event_track/views/event_track_templates.xml
@@ -233,7 +233,7 @@
<div t-field="track.description"/>
</div>
<div class="col-lg-12">
- <h3>About The Author</h3>
+ <h3>About The Speaker</h3>
<div t-field="track.partner_biography"/>
</div>
</div>
@@ -339,29 +339,26 @@
<h3 class="o_page_header">Application</h3>
<p>
Fill this form to propose your talk.
-
</p>
+ <div class="alert alert-info" role="alert">
+ <i class="fa fa-info-circle"/>
+ You can add multiple speakers by separating names, emails and phones with commas.
+ </div>
</section>
</div>
<section id="forms" t-if="event.website_track_proposal">
<form class="mt32 js_website_submit_form" t-attf-action="/event/#{event.id}/track_proposal/post" method="post" enctype="multipart/form-data">
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
<div class="form-group row">
- <label class="col-lg-3 col-md-4 col-form-label" for="partner_name">Your Name</label>
- <div class="col-lg-7 col-md-8">
- <input type="text" class="form-control" name="partner_name" required="True" />
- </div>
- </div>
- <div class="form-group row">
- <label class="col-lg-3 col-md-4 col-form-label" for="email_from">Your Email</label>
+ <label class="col-lg-3 col-md-4 col-form-label" for="track_name">Talk Title</label>
<div class="col-lg-7 col-md-8">
- <input type="email" class="form-control" name="email_from" required="True" />
+ <input type="text" class="form-control" name="track_name" required="True"/>
</div>
</div>
<div class="form-group row">
- <label class="col-lg-3 col-md-4 col-form-label" for="phone">Your Phone</label>
+ <label class="col-lg-3 col-md-4 col-form-label" for="description">Talk Introduction</label>
<div class="col-lg-7 col-md-8">
- <input type="text" class="form-control" name="phone" required="True" />
+ <textarea class="form-control" name="description" style="min-height: 120px"/>
</div>
</div>
<div class="form-group row" t-if="len(event.allowed_track_tag_ids)">
@@ -376,24 +373,30 @@
</div>
</div>
<div class="form-group row">
- <label class="col-lg-3 col-md-4 col-form-label" for="track_name">Talk Title</label>
+ <label class="col-lg-3 col-md-4 col-form-label" for="partner_name">Speaker(s) Name</label>
<div class="col-lg-7 col-md-8">
- <input type="text" class="form-control" name="track_name" required="True"/>
+ <input type="text" class="form-control" name="partner_name" required="True"/>
</div>
</div>
<div class="form-group row">
- <label class="col-lg-3 col-md-4 col-form-label" for="phone">Speaker Biography</label>
+ <label class="col-lg-3 col-md-4 col-form-label" for="email_from">Speaker(s) Email</label>
<div class="col-lg-7 col-md-8">
- <textarea class="form-control" name="biography" style="min-height: 120px"/>
+ <input type="email" class="form-control" name="email_from" required="True" multiple="multiple"/>
</div>
</div>
<div class="form-group row">
- <label class="col-lg-3 col-md-4 col-form-label" for="description">Talk Introduction</label>
+ <label class="col-lg-3 col-md-4 col-form-label" for="phone">Speaker(s) Phone</label>
<div class="col-lg-7 col-md-8">
- <textarea class="form-control" name="description" style="min-height: 120px"/>
+ <input type="text" class="form-control" name="phone" required="True"/>
</div>
</div>
<div class="form-group row">
+ <label class="col-lg-3 col-md-4 col-form-label" for="biography">Speaker(s) Biography</label>
+ <div class="col-lg-7 col-md-8">
+ <textarea class="form-control" name="biography" rows="5"/>
+ </div>
+ </div>
+ <div class="form-group row o_form_buttons">
<div class="offset-lg-3 offset-md-4 col-md-8 col-lg-7">
<button type="submit" class="btn btn-primary">Submit Proposal</button>
</div>
diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml
index 19a7fcd10eacef4d35584101a9ba4917f1435f49..1f2e3e226aa04876ce3cd8cf552f325d075411a6 100644
--- a/addons/website_event_track/views/event_track_views.xml
+++ b/addons/website_event_track/views/event_track_views.xml
@@ -124,30 +124,38 @@
<h1>
<field name="name" placeholder="e.g. Inspiring Business Talk"/>
</h1>
- <label for="event_id" class="oe_edit_only"/>
- <h3>
- <field name="event_id"/>
- </h3>
</div>
<group>
- <group>
- <field name="user_id"/>
- <field name="active" invisible="1"/>
- <field name="partner_id"/>
- <field name="partner_name"/>
- <field name="partner_email"/>
- <field name="partner_phone"/>
- </group>
<group>
<field name="date"/>
+ <field name="location_id"/>
<label for="duration"/>
- <div>
- <field name="duration" class="oe_inline" widget="float_time"/> hours
+ <div class="o_row">
+ <field name="duration" widget="float_time"/>
+ <span>hours</span>
</div>
- <field name="location_id"/>
+ <field name="active" invisible="1"/>
+ </group>
+ <group>
+ <field name="user_id"/>
+ <field name="event_id"/>
<field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
</group>
</group>
+ <notebook>
+ <page string="Speakers">
+ <group>
+ <field name="partner_id"/>
+ <field name="partner_name"/>
+ <field name="partner_email"/>
+ <field name="partner_phone"/>
+ <field name="partner_biography"/>
+ </group>
+ </page>
+ <page string="Description">
+ <field name="description"/>
+ </page>
+ </notebook>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>