diff options
| author | bth-openerp <bth@tinyerp.com> | 2013-10-17 18:41:39 +0530 |
|---|---|---|
| committer | bth-openerp <bth@tinyerp.com> | 2013-10-17 18:41:39 +0530 |
| commit | addc2d5f9cefc4c7cd1eb7f3abcc496f2c8eeabe (patch) | |
| tree | 9bcb89044f3ca6854b2942206b73653f52859e84 /addons/website/static/src/xml | |
| parent | e3d3cf674c461b2d39418b98898e21d32c08a20d (diff) | |
| parent | d5bbf2501a08dd6b0bab0ea4e2e9ff4b0b03fed7 (diff) | |
[MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131017131139-whjjmuin6g9cby9r
Diffstat (limited to 'addons/website/static/src/xml')
| -rw-r--r-- | addons/website/static/src/xml/website.seo.xml | 3 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.snippets.xml | 23 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 2 |
3 files changed, 24 insertions, 4 deletions
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> 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"> 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> |