From 1cec2a5b6f392902adb7c19935a5519834366eaa Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 16 Oct 2013 11:32:48 +0200
Subject: [REM] Obsolete route /admin

bzr revid: fme@openerp.com-20131016093248-2q2c8ppkxxhfx1su
---
 addons/website/static/src/xml/website.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml')

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index b3e4cacd32a..409d73f1f27 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -35,7 +35,7 @@
                             </ul>
                         </li>
                         <li>
-                            <a href="/admin#action=website.action_module_website">Apps</a>
+                            <a href="/web#action=website.action_module_website">Apps</a>
                         </li>
                     </ul>
                 </div>
-- 
cgit v1.2.3


From 641477141f39ac02bcd933fb8b0a6f15cf1526de Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 16 Oct 2013 12:10:55 +0200
Subject: [IMP] website snippet: improve visibility of drop zone

bzr revid: chm@openerp.com-20131016101055-p6vhiijvladtbn87
---
 addons/website/static/src/xml/website.snippets.xml | 23 ++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/xml')

diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index e5dde368154..6aaf256b523 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -31,8 +31,8 @@
                             this one:
                         </p>
                         <div class="row">
-                            <div class="col-sm-4 col-sm-offset-4 oe_drop_zone_style text-center">
-                                <span class="mt16">drop in this zone</span>
+                            <div class="col-sm-6 col-sm-offset-3 oe_drop_zone_style text-center">
+                                <div>drop in this zone</div>
                             </div>
                         </div>
                         <div class="text-muted">
@@ -57,6 +57,25 @@
         <div id='oe_snippets'></div>
     </t>
 
+    <t t-name="website.snippet_drop_zone">
+        <div class='oe_drop_zone oe_insert'>
+            <div>Drag your block here (move your mouse in this zone)</div>
+            <div class="oe_active">Drop your block</div>
+        </div>
+    </t>
+
+    <t t-name="website.snippet_dark_for_dropzone">
+        <div id="dark_for_dropzone">
+            <table width="100%" height="100%">
+                <tbody>
+                    <tr><td colspan="3"></td></tr>
+                    <tr><td></td><td class="center"></td><td></td></tr>
+                    <tr><td colspan="3"></td></tr>
+                </tbody>
+            </table>
+        </div>
+    </t>
+
     <t t-name="website.snippet_overlay">
         <div class="oe_overlay">
             <div class="oe_overlay_options">
-- 
cgit v1.2.3


From 1625eb29ae716874761626e31e99c493fb90dcdb Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 16 Oct 2013 16:39:39 +0200
Subject: [FIX] SEO metadata saving

bzr revid: ddm@openerp.com-20131016143939-v0v1tcopq4zoqgxf
---
 addons/website/static/src/xml/website.seo.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml')

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 96a38a75d32..580779283ad 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -48,12 +48,13 @@
                                 </div>
                             </div>
                         </section>
+                        <!--
                         <section class="js_image_section">
                             <h3 class="page-header">3. Describe your images</h3>
                             <div class="row js_seo_image_list">
-                                <!-- filled in JS -->
                             </div>
                         </section>
+                        -->
                     </div><div class="modal-footer">
                         <button data-action="discard" data-dismiss="modal" href="#" class="btn btn-default">Discard</button>
                         <button type="button" data-action="update" class="btn btn-primary">Apply Changes</button>
-- 
cgit v1.2.3