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

bzr revid: bth@tinyerp.com-20130927051709-qltvmcxbte3vjezv

3 files changed, 82 insertions, 6 deletions

diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 5a1ad2db4c5..987f824432b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -60,11 +60,13 @@
                   <li><a href="#snippet_structure">Structure</a></li>
                   <li><a href="#snippet_content">Content</a></li>
                   <li><a href="#snippet_business">Business</a></li>
+                  <li><a href="#snippet_effect">Effects</a></li>
                 </ul>
                 <div class="pill-content">
                     <div id="snippet_structure"><label><div>Structure</div></label></div>
                     <div id="snippet_content"><label><div>Content</div></label></div>
                     <div id="snippet_business"><label><div>Business</div></label></div>
+                    <div id="snippet_effect"><label><div>Effects</div></label></div>
                 </div>
             </div>
         </div>
@@ -369,12 +371,16 @@
 
     <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class="oe_snippet_thumbnail">Title</div>
-        <div class="oe_snippet_body row">
-            <div class="col-md-12">
-                <h2>Your Website Title</h2>
-                <h3 class="text-muted">Great products for great people</h3>
+        <section class="oe_snippet_body">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12">
+                        <h2 class="text-center">Your Website Title</h2>
+                        <h3 class="text-muted text-center">Great products for great people</h3>
+                    </div>
+                </div>
             </div>
-        </div>
+        </section>
     </div>
 
     <div t-name="website.snippets.hr" data-snippet-id='hr' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
@@ -789,4 +795,22 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.parallax" data-snippet-id='parallax' data-category='effect' data-selector-children='.oe_structure, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail'>Parallax</div>
+        <section class="oe_snippet_body parallax_full oe_structure">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12 mt128 mb32">
+                        <h1 class="text-center">
+                            <b>Our References</b>
+                        </h1>
+                        <h3 class="text-center">
+                            More than 500 happy customers.
+                        </h3>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </div>
+
 </templates>
diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml
new file mode 100644
index 00000000000..f35cf583da9
--- /dev/null
+++ b/addons/website/static/src/xml/website.translator.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates id="template" xml:space="preserve">
+<t t-name="website.TranslatorDialog">
+    <div class="modal fade oe_website_translator" tabindex="-1" role="dialog">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button title="Close" type="button" class="close" data-dismiss="modal">×</button>
+                    <h2 class="modal-title">Translate this page</h2>
+                </div>
+                <div class="modal-body">
+                    <section>
+                        <p>
+                            You are about to enter the translation mode.
+                        </p>
+                        <p>
+                            In this mode you can not change the structure of the document, you can only translate text.
+                        </p>
+                        <p>
+                            Here are the visuals used in order to help you in your translation flow:
+                            <ul class="oe_translate_examples">
+                                <li class="oe_translatable_text">
+                                    Normal translatable content
+                                </li>
+                                <li class="oe_translatable_field">
+                                    ERP translatable object data
+                                </li>
+                                <li class="oe_translatable_todo">
+                                    Translation TODO
+                                </li>
+                            </ul>
+                        </p>
+                    </section>
+                    <hr/>
+                    <section class="row">
+                        <div class="col-md-6">
+                            <button type="button" data-action="activate" class="btn btn-primary">Ok</button>
+                            or
+                            <a data-action="discard" data-dismiss="modal" href="#">Cancel</a>
+                        </div>
+                        <div class="col-md-6">
+                            <label>
+                                <input type="checkbox" name="do_not_show"/>
+                                Do not show this dialog later.
+                            </label>
+                        </div>
+                    </section>
+                </div>
+            </div>
+        </div>
+    </div>
+</t>
+</templates>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 04c2403eda2..c2f7abe6ed2 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -22,7 +22,6 @@
                         <li><a data-action="show-mobile-preview" href="#"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
                         <li class="divider-vertical"></li>
                         <li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li>
-                        <li><a href="#">Translate</a></li>
                         <li class="dropdown">
                             <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu" id="customize-menu">