[MERGE] from trunk

bzr revid: xmo@openerp.com-20130913125230-38lb4jv8ypt6y9dh

1 files changed, 65 insertions, 59 deletions

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 9b8ecc886ab..fabf2185f2a 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -31,91 +31,97 @@
             </div>
         </div>
     </t>
+    <t t-name="website.editor.dialog.link.footer-button">
+        <button type="button" class="btn pull-left remove">Remove Link</button>
+    </t>
     <t t-name="website.editor.dialog.link">
         <t t-call="website.editor.dialog">
             <t t-set="title">Link to</t>
             <form>
-                <ul class="nav nav-pills nav-justified">
-                    <li class="active">
-                        <a href="#link-existing" data-toggle="pill">Your website</a>
-                    </li>
-                    <li><a href="#link-new" data-toggle="pill">New page</a></li>
-                    <li><a href="#link-external" data-toggle="pill">External Page</a></li>
-                    <li><a href="#link-email" data-toggle="pill">Email Address</a></li>
-                </ul>
-                <div class="tab-content">
-                    <div id="link-existing" class="tab-pane active form-group">
-                        <select id="link-existing-select"
-                                class="form-control url-source">
-                            <option disabled="disabled">Select existing page:</option>
+                <ul class="list-group">
+                    <li class="list-group-item form-group active">
+                        <h3 class="list-group-item-heading">
+                            <label for="link-existing" class="control-label">
+                                Existing page
+                            </label>
+                        </h3>
+                        <select class="existing form-control url-source"
+                                id="link-existing">
+                            <option/>
                         </select>
-                    </div>
-                    <div id="link-new" class="tab-pane form-group">
+                    </li>
+                    <li class="list-group-item form-group">
+                        <h3 class="list-group-item-heading">
+                            <label for="link-new" class="control-label">
+                                New page
+                            </label>
+                        </h3>
                         <input type="text" class="form-control pages url-source"
-                                placeholder="Enter the name of the new page"/>
-                    </div>
-                    <div id="link-external" class="tab-pane">
+                               id="link-new" placeholder="Create new page"/>
+                    </li>
+                    <li class="list-group-item form-group clearfix">
+                        <h3 class="list-group-item-heading">
+                            <label for="link-external" class="control-label">
+                                External Page
+                            </label>
+                        </h3>
                         <input type="text" class="form-control url url-source"
-                               placeholder="example: http://openerp.com"/>
+                               id="link-external" placeholder="http://openerp.com"/>
                         <div class="pull-right">
                             <label>
                                 <input type="checkbox" class="window-new"/>
                                 Open in new window
                             </label>
                         </div>
-                    </div>
-                    <div id="link-email" class="tab-pane">
+                    </li>
+                    <li class="list-group-item form-group">
+                        <h3 class="list-group-item-heading">
+                            <label for="link-email" class="control-label">
+                                Email Address
+                            </label>
+                        </h3>
                         <input type="email" class="form-control email-address url-source"
-                               placeholder="example: you@yourwebsite.com"/>
-                    </div>
-                </div>
+                               id="link-email" 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>
-                <div class="image-preview-container">
-                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
-                         class="pull-right img-rounded image-preview"
-                         width="100%"/>
-                    <select class="form-control image-style">
-                        <option value="">No styling</option>
-                        <option value="img-rounded">Rounded corners</option>
-                        <option value="img-thumbnail">Box</option>
-                        <option value="img-circle">Circle</option>
-                    </select>
-                </div>
+            <div class="row">
                 <form method="POST" action="/website/attach"
                       enctype="multipart/form-data"
-                      target="fileframe">
-                    <ul class="nav nav-pills nav-justified">
-                        <li class="active"><a href="#image-upload" data-toggle="pill">
-                            Upload
-                        </a></li>
-                        <li><a href="#image-existing" data-toggle="pill">Your images</a></li>
-                        <li><a href="#image-external" data-toggle="pill">External Image</a></li>
-                    </ul>
-                    <div class="tab-content">
-                        <div id="image-upload" class="tab-pane active form-group text-center">
-                            <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>
-                        <div id="image-existing" class="tab-pane well">
-                            <div class="existing-attachments"/>
-                        </div>
-                        <div id="image-external" class="tab-pane well form-group">
-                            <input type="text" class="form-control url"
-                                   placeholder="e.g. http://goo.gl/EDC325"/>
-                        </div>
+                      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>
-                <iframe src="about:blank" name="fileframe" class="hidden"/>
+                <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">