[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al

bzr revid: psa@tinyerp.com-20131224053125-3lrogsrgd3ccp0i6

2 files changed, 15 insertions, 31 deletions

diff --git a/addons/website_event/data/event_data.xml b/addons/website_event/data/event_data.xml
index baf732b781b..f46d18001ed 100644
--- a/addons/website_event/data/event_data.xml
+++ b/addons/website_event/data/event_data.xml
@@ -6,32 +6,17 @@
             <field name="name">Events</field>
             <field name="url">/event</field>
             <field name="parent_id" ref="website.main_menu"/>
-            <field name="sequence" type="int">40</field>
+            <field name="sequence" type="int">30</field>
         </record>
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website Home</field>
             <field name="target">self</field>
-            <field name="url">/event</field>
+            <field name="url">/event?tutorial.event=true</field>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>
             <field name="state">open</field>
         </record>
 
-        
-        <record id="view_event_twitter_form" model="ir.ui.view">
-            <field name="name">view_event_twitter_form</field>
-            <field name="model">event.event</field>
-            <field name="inherit_id" ref="event.view_event_form"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='speaker_confirmed']" position="after">
-                        <field name="twitter_hashtag"/>
-                    </xpath>
-               </data>
-            </field>
-        </record>
-
-
     </data>
 </openerp>
diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index 35654f0282e..1b1576eef0c 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -5,6 +5,7 @@
         <record id="base.res_partner_6" model="res.partner">
             <field name="website_published">True</field>
         </record>
+
         <record id="event.event_0" model="event.event">
             <field name="website_published">True</field>
             <field name="twitter_hashtag">openerp</field>
@@ -17,8 +18,7 @@
 
 <h4>to learn .JS development</h4>
 </div>
-
-<div class="carousel-image hidden-xs"><img alt="Banner OpenERP Image" src="/website/static/src/img/banner/banner_picture.png"></div>
+<img class="carousel-image hidden-xs" alt="Banner OpenERP Image" src="/website/static/src/img/banner/banner_picture.png">
 </div>
 </div>
 </div>
@@ -115,7 +115,7 @@
 <div class="col-md-12 mb16 mt16" data-snippet-id="colmd">
 <p><strong>Objectives:</strong></p>
 
-<p>Having attended this course, participants should be able to:</p>
+<p><strong>Having attended this course, participants should be able to:</strong></p>
 
 <ul><li>Understand the development concepts and architecture;</li>
 	<li>Install and administer your own server;</li>
@@ -142,10 +142,10 @@
 </div>
 
 
-<div class="container dark">
+<div class="container oe_dark">
 <div class="row">
 <div class="col-md-12" data-snippet-id="colmd">
-<h1 class="text-center">A great content...</h1>
+<h1 class="text-center">Read Great Contents</h1>
 
 <h3 class="text-muted text-center">What do people&nbsp;say about this course?</h3>
 </div>
@@ -180,8 +180,7 @@
 
 <h4>to learn .JS development</h4>
 </div>
-
-<div class="carousel-image hidden-xs"><img alt="Banner OpenERP Image" src="/website/static/src/img/banner/banner_picture.png"></div>
+<img class="carousel-image hidden-xs" alt="Banner OpenERP Image" src="/website/static/src/img/banner/banner_picture.png">
 </div>
 </div>
 </div>
@@ -278,7 +277,7 @@
 <div class="col-md-12 mb16 mt16" data-snippet-id="colmd">
 <p><strong>Objectives:</strong></p>
 
-<p>Having attended this course, participants should be able to:</p>
+<p><strong>Having attended this course, participants should be able to:</strong></p>
 
 <ul><li>Understand the development concepts and architecture;</li>
 	<li>Install and administer your own server;</li>
@@ -305,10 +304,10 @@
 </div>
 
 
-<div class="container dark">
+<div class="container oe_dark">
 <div class="row">
 <div class="col-md-12" data-snippet-id="colmd">
-<h1 class="text-center">A great content...</h1>
+<h1 class="text-center">Read Great Contents</h1>
 
 <h3 class="text-muted text-center">What do people&nbsp;say about this course?</h3>
 </div>
@@ -356,7 +355,7 @@
 <h4>to learn .JS development</h4>
 </div>
 
-<div class="carousel-image hidden-xs"><img alt="Banner OpenERP Image" src="/website/static/src/img/banner/banner_picture.png"></div>
+<img class="carousel-image hidden-xs" alt="Banner OpenERP Image" src="/website/static/src/img/banner/banner_picture.png">
 </div>
 </div>
 </div>
@@ -453,7 +452,7 @@
 <div class="col-md-12 mb16 mt16" data-snippet-id="colmd">
 <p><strong>Objectives:</strong></p>
 
-<p>Having attended this course, participants should be able to:</p>
+<p><strong>Having attended this course, participants should be able to:</strong></p>
 
 <ul><li>Understand the development concepts and architecture;</li>
 	<li>Install and administer your own server;</li>
@@ -480,10 +479,10 @@
 </div>
 
 
-<div class="container dark">
+<div class="container oe_dark">
 <div class="row">
 <div class="col-md-12" data-snippet-id="colmd">
-<h1 class="text-center">A great content...</h1>
+<h1 class="text-center">Read Great Contents</h1>
 
 <h3 class="text-muted text-center">What do people&nbsp;say about this course?</h3>
 </div>