[MERGE] from website-al

bzr revid: chm@openerp.com-20130906083500-4n5knaxiqt4cg2ht

3 files changed, 282 insertions, 41 deletions

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
new file mode 100644
index 00000000000..927ad3df66e
--- /dev/null
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -0,0 +1,119 @@
+<templates id="template" xml:space="preserve">
+    <t t-extend="website.editorbar">
+        <t t-jquery="#website-top-view" t-operation="after">
+            <div class="navbar-inner" id="website-top-edit">
+                <form class="navbar-form pull-left">
+                    <button type="button" data-action="save"
+                            class="btn btn-primary">Save</button>
+                    <button type="button" data-action="cancel"
+                            class="btn">Cancel</button>
+                </form>
+                <ul class="nav navbar-nav pull-right">
+                    <li class="navbar-form"><button type="button" data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
+                </ul>
+            </div>
+        </t>
+    </t>
+    <t t-name="website.editor.dialog">
+        <div class="modal" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                        <h3 class="modal-title"><t t-esc="title"/></h3>
+                    </div>
+                    <div class="modal-body"><t t-raw="__content__"/></div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Discard</button>
+                        <button type="button" class="btn btn-primary save">Save Changes</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+    <t t-name="website.editor.dialog.link">
+        <t t-call="website.editor.dialog">
+            <t t-set="title">Link to</t>
+            <form>
+                <ul class="list-group form-group">
+                    <li class="list-group-item active">
+                        <h3 class="list-group-item-heading">Page on your website</h3>
+                        <div class="input-group">
+                            <input type="text" class="form-control pages url-source"
+                                    placeholder="Create new page"/>
+                            <div class="input-group-btn existing dropdown">
+                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Existing page <span class="caret"></span></button>
+                                <ul class="dropdown-menu pull-right"/>
+                            </div>
+                        </div>
+                    </li>
+                    <li class="list-group-item">
+                        <div class="pull-right">
+                            <label>
+                                <input type="checkbox" class="window-new"/>
+                                Open in new window
+                            </label>
+                        </div>
+                        <h3 class="list-group-item-heading">Website URL</h3>
+                        <input type="text" class="form-control url url-source"
+                               placeholder="http://openerp.com"/>
+                    </li>
+                    <li class="list-group-item">
+                        <h3 class="list-group-item-heading">Email Address</h3>
+                        <input type="email" class="form-control email-address url-source"
+                               placeholder="you@yourwebsite.com"/>
+                    </li>
+                </ul>
+            </form>
+        </t>
+    </t>
+    <t t-name="website.editor.dialog.image">
+        <t t-call="website.editor.dialog">
+            <t t-set="title">Image:</t>
+            <div class="row">
+                <form method="POST" action="/website/attach"
+                      enctype="multipart/form-data"
+                      target="fileframe"
+                      class="col-sm-8">
+                    <div class="well">
+                        <!-- a href="#" class="pull-left">Find image</a -->
+                        <h3 class="list-group-item-heading">Image URL</h3>
+                        <input type="text" class="form-control url"
+                               placeholder="http://openerp.com"/>
+                    </div>
+                    <div class="text-center">
+                        <p class="">— or —</p>
+                        <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                        <button type="button" class="btn btn-primary btn-lg filepicker">
+                            Upload an image from your computer
+                        </button>
+                    </div>
+                    <p class="text-center">— or —</p>
+                    <div class="well">
+                        <h3 class="list-group-item-heading">Pick an existing attachment</h3>
+                        <div class="existing-attachments"/>
+                    </div>
+                    <input type="hidden" name="func"/>
+                </form>
+                <div class="col-sm-4">
+                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
+                         class="pull-right img-rounded image-preview"
+                         width="100%"/>
+                </div>
+            </div>
+            <iframe src="about:blank" name="fileframe" class="hidden"/>
+        </t>
+    </t>
+    <t t-name="website.editor.dialog.image.existing">
+        <div class="existing-attachments">
+            <div class="row" t-foreach="rows" t-as="row">
+                <div class="col-md-4" t-foreach="row" t-as="attachment">
+                    <t t-set="url">/website/attachment/<t t-esc="attachment.id"/></t>
+                    <a t-att-href="url" class="thumbnail">
+                        <img t-att-src="url" t-att-alt="attachment.name"/>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </t>
+</templates>
diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
new file mode 100644
index 00000000000..ed65e318440
--- /dev/null
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="website.seo_configuration">
+        <div class="modal fade oe_seo_configuration" 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">Promote <small class="js_seo_page_url"></small></h2>
+                        <h4>Get your page efficiently referenced in Google to attract more visitors.</h4>
+                    </div>
+                    <div class="modal-body">
+                        <div class="js_seo_tips" />
+                        <section>
+                            <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
+                            <dl class="dl-horizontal">
+                                <dt>Suggestions</dt>
+                                <dd>
+                                    <ul class="list-inline js_seo_company_suggestions">
+                                        <!-- filled in JS -->
+                                    </ul>
+                                </dd>
+                            </dl>
+                            <div class="form-horizontal" role="form">
+                                <div class="form-group">
+                                    <label for="seo_page_keywords" class="col-lg-2 control-label">New keyword</label>
+                                    <div class="col-lg-4">
+                                        <div class="input-group">
+                                          <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
+                                          <span class="input-group-btn">
+                                              <button data-action="add" class="btn btn-default" type="button">Add</button>
+                                          </span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <dl class="dl-horizontal oe_seo_keywords_list">
+                                <dt>Current selection</dt>
+                                <dd class="js_seo_keywords_list">
+                                    <!-- filled in JS -->
+                                </dd>
+                            </dl>
+                        </section>
+                        <section>
+                            <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
+                            <div class="form-horizontal" role="form">
+                                <div class="form-group">
+                                    <label for="seo_page_title" class="col-lg-2 control-label">Title</label>
+                                    <div class="col-lg-8">
+                                        <input type="text" name="seo_page_title" class="form-control" maxlength="70" size="70"/>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label for="seo_page_description" class="col-lg-2 control-label">Description</label>
+                                    <div class="col-lg-8">
+                                        <textarea name="seo_page_description" class="form-control" rows="3" cols="70" size="160"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </section>
+                        <section>
+                            <h3 class="page-header">3. Describe your images</h3>
+                            <div class="row js_seo_image_list">
+                                  <!-- filled in JS -->
+                            </div>
+                        </section>
+                        <hr/>
+                        <section>
+                            <button type="button" data-action="update" class="btn btn-primary">Apply changes</button> or <a data-action="discard" data-dismiss="modal" href="#">Discard</a>
+                        </section>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="website.seo_list">
+        <ul class="list-inline">
+            <!-- filled in JS -->
+        </ul>
+    </t>
+
+    <t t-name="website.seo_tip">
+        <div t-attf-class="alert alert-#{widget.type}">
+              <button title="Dismiss" type="button" class="close" data-action="close" data-dismiss="alert" aria-hidden="true">×</button>
+              <t t-raw="widget.message"/>
+        </div>
+    </t>
+
+    <t t-name="website.seo_keyword">
+        <li class="oe_seo_keyword">
+            <span t-attf-class="label label-#{ widget.type } js_seo_keyword" t-att-data-keyword="widget.keyword">
+                <t t-raw="widget.keyword"/>
+                &amp;nbsp;
+                <a href="#" class="oe_remove" data-action="remove-keyword">x</a>
+            </span>
+        </li>
+    </t>
+
+    <t t-name="website.seo_suggestion">
+        <li class="oe_seo_suggestion">
+            <span t-attf-class="label label-#{ widget.type } js_seo_suggestion" t-att-data-keyword="widget.keyword">
+                <t t-raw="widget.keyword"/>
+            </span>
+        </li>
+    </t>
+
+    <t t-name="website.seo_image">
+        <div class="col-sm-6 col-md-3 oe_seo_image_preview">
+            <img t-att-src="widget.src" class="img-rounded thumbnail"/>
+            <input type="text" class="form-control" t-att-src="widget.src" t-att-value="widget.alt" placeholder="Description..."/>
+        </div>
+    </t>
+
+</templates>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index ab2f622429c..247b0e780fd 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -5,65 +5,72 @@
 
     <t t-name="website.editorbar">
         <div class="navbar navbar-inverse navbar-fixed-top">
-            <div class="navbar-inner" id="website-top-view">
-                <form class="navbar-form pull-left">
-                    <button data-action="edit" class="btn btn-primary">Edit</button>
-                </form>
-                <ul class="nav pull-right">
-                    <li><a data-action="show-mobile-preview" href="#mobile-preview" data-toggle="modal" role="button"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
-                    <li class="divider-vertical"></li>
-                    <li><a href="#">Promote<!-- <sup><span class="badge">1</span></sup> --></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>
-                        <div class="dropdown-menu">
-                            <ul class="nav nav-list" id="customize-menu">
+            <div id="website-top-view">
+                <div class="navbar-header">
+                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-edit-collapse">
+                        <span class="sr-only">Toggle navigation</span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                    <form class="navbar-form navbar-left">
+                        <button type="button" data-action="edit"
+                                class="btn btn-primary">Edit</button>
+                    </form>
+                </div>
+                <div class="collapse navbar-collapse navbar-edit-collapse">
+                    <ul class="nav navbar-nav navbar-right">
+                        <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">
                                 <!-- filled in JS -->
                             </ul>
-                        </div>
-                    </li>
-                    <li>
-                        <a href="/admin#action=website.action_module_website">Apps</a>
-                    </li>
-                </ul>
-            </div>
-
-            <div class="navbar-inner" id="website-top-edit">
-                <form class="navbar-form pull-left">
-                    <button data-action="save" class="btn btn-primary">Save</button>
-                    <button data-action="cancel" class="btn">Cancel</button>
-                </form>
-                <ul class="nav pull-right">
-                    <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
-                </ul>
+                        </li>
+                        <li>
+                            <a href="/admin#action=website.action_module_website">Apps</a>
+                        </li>
+                    </ul>
+                </div>
             </div>
         </div>
+    </t>
 
-        <div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
-            <div class="modal-header oe_mobile_preview_header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3 id="mobile-preview-title" class="oe_mobile_preview_title">Mobile preview</h3>
-            </div>
-            <div class="modal-body">
-                <div class="oe_mobile_preview">
-                    <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true"></iframe>
+    <t t-name="website.mobile_preview">
+        <div class="modal fade oe_mobile_preview" 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>
+                        <h3 class="modal-title">Mobile preview</h3>
+                    </div>
+                    <div class="modal-body">
+                        <div>
+                            <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true"></iframe>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-
     </t>
 
     <t t-name="website.carousel">
         <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
             <div class='container'>
-                <h1 class='mt64'>Your New Banner Slide</h1>
-                <h2>With another convincing subtitle</h2>
+                <div class="content" style="padding-top: 90px; padding-bottom:45px;">
+                    <h1>Your New Banner Slide</h1>
+                    <h3>With another convincing subtitle</h3>
+                    <a href="/page/website.contactus" class="btn btn-success btn-large mt16">Contact us</a>
+                </div>
             </div>
         </div>
     </t>
 
     <t t-name="website.snippets">
-        <div class='oe_snippets oe_hidden'>
+        <div class='oe_snippets hide'>
         </div>
     </t>