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

[MERGE] Sync with trunk 

bzr revid: tde@openerp.com-20140205115653-7ktnizsmvppv90wk
This commit is contained in:
Thibault Delavallée 2014-02-05 12:56:53 +01:00
parent 8d1713170a 766f7d4808
commit 47309f045b
3 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/website/models/website.py
View File

@ -517,7 +517,7 @@ class website_menu(osv.osv):
_description = "Website Menu"
_columns = {
'name': fields.char('Menu', size=64, required=True, translate=True),
'url': fields.char('Url', required=True, translate=True),
'url': fields.char('Url', translate=True),
'new_window': fields.boolean('New Window'),
'sequence': fields.integer('Sequence'),
# TODO: support multiwebsite once done for ir.ui.views

20
addons/website_blog/views/website_blog_templates.xml
View File

@ -97,17 +97,15 @@
<!-- Blog Post Summary -->
<template id="blog_post_short" name="Blog Post Summary">
<t t-call="website_blog.index">
<div t-if="not blog_posts">
<div class="text-center text-muted">
<h3 class="css_editable_display">No blog post found</h3>
<h3 class="css_editable_hidden">Nothing published yet click <a t-attf-href="/page/website.contactus">here</a> to contact us</h3>
<t groups="base.group_website_publisher">
<t groups="base.group_document_user">
<p>Click on "Content" to define a new blog post or "Help" for more informations.</p>
<img src="/website/static/src/img/content_here.png"/>
</t>
</t>
</div>
<div t-if="not blog_posts" class="container mb64">
<p class="css_editable_hidden">
<h1>No blog post yet.</h1>
</p>
<t groups="base.group_website_publisher">
<t groups="base.group_document_user">
<p>Click on "Content" on the top menu to write your first blog post.</p>
</t>
</t>
</div>
<t t-foreach="blog_posts" t-as="blog_post">
<div t-att-data-publish="blog_post.website_published and 'on' or 'off'">

19
addons/website_event/views/website_event.xml
View File

@ -40,19 +40,12 @@
</div>
<div class="row mt32 mb32">
<div class="col-md-9" id="middle_column">
<t t-if="not event_ids">
<div class="text-center text-muted">
<h3 class="css_editable_display">No event found</h3>
<h3 class="css_editable_hidden">There isn't available events right now, <t t-if="current_date or current_country or current_type">click <a t-attf-href="/event">here</a> to check all events or</t> click <a t-attf-href="/page/website.contactus">here</a> to contact us</h3>
<t groups="base.group_website_publisher">
<t groups="event.group_event_manager">
<p>Click on "Content" to define a new event or "Help" for more informations.</p>
<img src="/website/static/src/img/content_here.png"/>
<p>In the backend's event form contains information to customize your events: location, oranizer, tikets, registrations, etc.</p>
</t>
</t>
</div>
</t>
<div class="text-center text-muted" t-if="not event_ids">
<h1>No event found</h1>
<t groups="base.group_website_publisher">
<p groups="event.group_event_manager">Use the top menu <i>'Content'</i> to create your first event.</p>
</t>
</div>
<ul class="media-list">
<li t-foreach="event_ids" t-as="event" class="media">
<div class="media-body">