diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-10-16 16:04:39 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-10-16 16:04:39 +0200 |
| commit | 52fee2811d658031a34257b911b1d2b40bfa0c04 (patch) | |
| tree | 61a625efad5e5ffe237e712bf1db2a840b71cb4a /addons/website_event/data | |
| parent | 904adc8b51abd3a0fc29c979884f845d6641da3c (diff) | |
| parent | 2b192bef2242c71d0ff3a45b9efb9e717fd364c4 (diff) | |
[MERGE] forward port of branch 8.0 up to 2b192be
Diffstat (limited to 'addons/website_event/data')
| -rw-r--r-- | addons/website_event/data/event_data.xml | 13 | ||||
| -rw-r--r-- | addons/website_event/data/event_demo.xml | 6 |
2 files changed, 16 insertions, 3 deletions
diff --git a/addons/website_event/data/event_data.xml b/addons/website_event/data/event_data.xml index 763e887172c..7065db38555 100644 --- a/addons/website_event/data/event_data.xml +++ b/addons/website_event/data/event_data.xml @@ -18,5 +18,18 @@ <field name="state">open</field> </record> + <record id="mt_event_published" model="mail.message.subtype"> + <field name="name">Event published</field> + <field name="res_model">event.event</field> + <field name="default" eval="False"/> + <field name="description">Event published</field> + </record> + <record id="mt_event_unpublished" model="mail.message.subtype"> + <field name="name">Event unpublished</field> + <field name="res_model">event.event</field> + <field name="default" eval="False"/> + <field name="description">Event unpublished</field> + </record> + </data> </openerp> diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml index 729fcb39d5e..e5f41d99638 100644 --- a/addons/website_event/data/event_demo.xml +++ b/addons/website_event/data/event_demo.xml @@ -18,7 +18,7 @@ <h4>to learn .JS development</h4> </div> -<img class="carousel-image hidden-xs" alt="Banner Odoo Image" src="/website/static/src/img/banner/banner_picture.png"> +<img class="hidden-xs" alt="Banner Odoo Image" src="/website/static/src/img/banner/banner_picture.png"> </div> </div> </div> @@ -180,7 +180,7 @@ <h4>to learn .JS development</h4> </div> -<img class="carousel-image hidden-xs" alt="Banner Odoo Image" src="/website/static/src/img/banner/banner_picture.png"> +<img class="hidden-xs" alt="Banner Odoo Image" src="/website/static/src/img/banner/banner_picture.png"> </div> </div> </div> @@ -355,7 +355,7 @@ <h4>to learn .JS development</h4> </div> -<img class="carousel-image hidden-xs" alt="Banner Odoo Image" src="/website/static/src/img/banner/banner_picture.png"> +<img class="hidden-xs" alt="Banner Odoo Image" src="/website/static/src/img/banner/banner_picture.png"> </div> </div> </div> |