Merge lp:~openerp-dev/openobject-addons/trunk-website-builder-onboarding-ptr into lp:openobject-addons

[Paramjit Singh Sahota(OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-website-builder-onboarding-ptr]

9389. By Pariket Trivedi(OpenERP) on 2014-05-01

[FIX]: when we use the style narrow is not possible to go back trhoug customize-> add style 'Normal'

9390. By Pariket Trivedi(OpenERP) on 2014-05-01

[IMP]: remove unwanted code.

Unmerged revisions

9390. By Pariket Trivedi(OpenERP) on 2014-05-01

[IMP]: remove unwanted code.

9389. By Pariket Trivedi(OpenERP) on 2014-05-01

[FIX]: when we use the style narrow is not possible to go back trhoug customize-> add style 'Normal'

9388. By Paramjit Singh Sahota(OpenERP) on 2014-05-01

[FIX] Fixed the endTour issue and
Added banner tour step for Close Tutorial

9387. By Pariket Trivedi(OpenERP) on 2014-05-01

[MERGE]: lp:~openerp/openobject-addons/trunk.

9386. By Pariket Trivedi(OpenERP) on 2014-04-29

[IMP]: change alert text.

9385. By Pariket Trivedi(OpenERP) on 2014-04-29

[FIX]: use img button add img and video.

9384. By Pariket Trivedi(OpenERP) on 2014-04-29

[IMP]: ADD aboutus menu in menubar.

9383. By Pariket Trivedi(OpenERP) on 2014-04-29

[FIX] Fixed the issue where the tour is not ended when the user click on discard in between the tour.

=== modified file 'website/data/website_data.xml'
--- website/data/website_data.xml	2014-02-10 08:23:25 +0000
+++ website/data/website_data.xml	2014-05-01 09:33:53 +0000
@@ -20,6 +20,13 @@
             <field name="sequence" type="int">10</field>
         </record>
 
+        <record id="menu_aboutus" model="website.menu">
+            <field name="name">About us</field>
+            <field name="url">/page/website.aboutus</field>
+            <field name="parent_id" ref="website.main_menu"/>
+            <field name="sequence" type="int">15</field>
+        </record>
+
         <record id="menu_contactus" model="website.menu">
             <field name="name">Contact us</field>
             <field name="url">/page/website.contactus</field>
 
=== modified file 'website/static/src/js/website.editor.js'
--- website/static/src/js/website.editor.js	2014-04-23 15:48:52 +0000
+++ website/static/src/js/website.editor.js	2014-05-01 09:33:53 +0000
@@ -621,6 +621,9 @@
             new $.Deferred(function (d) {
                 var $dialog = $(openerp.qweb.render('website.editor.discard')).appendTo(document.body);
                 $dialog.on('click', '.btn-danger', function () {
+                    if (website.Tour['timer']) {
+                        website.Tour.endTour();
+                    }
                     d.resolve();
                 }).on('hidden.bs.modal', function () {
                     d.reject();
@@ -1396,8 +1399,13 @@
                 var selection = this.editor.getSelection();
                 var range = selection.getRanges(true)[0];
                 this.media = new CKEDITOR.dom.element("img");
-                range.insertNode(this.media);
-                range.selectNodeContents(this.media);
+                if(range){
+                    range.insertNode(this.media);
+                    range.selectNodeContents(this.media);
+                }
+                else{
+                    alert(_t("Please select a position where you want to place an image."))
+                }
                 this.active.media = this.media;
             }
 
 
=== modified file 'website/static/src/js/website.tour.banner.js'
--- website/static/src/js/website.tour.banner.js	2014-04-16 07:46:34 +0000
+++ website/static/src/js/website.tour.banner.js	2014-05-01 09:33:53 +0000
@@ -103,15 +103,21 @@
                 placement: 'right',
                 title:     _t("Check Mobile Preview"),
                 content:   _t("Scroll to check rendering and then close the mobile preview."),
-                popover:   { next: _t("Continue") },
+                popover:   { fixed: true },
             },
             {
                 waitNot:   '.modal',
                 element:   '#content-menu-button',
-                placement: 'left',
+                placement: 'right',
                 title:     _t("Add new pages and menus"),
                 content:   _t("The 'Content' menu allows you to add pages or add the top menu."),
-                popover:   { next: _t("Close Tutorial") },
+                popover:   { next: _t("Continue") },
+            },
+            {
+                waitNot:   '.popover.tour',
+                title:     _t("Close"),
+                content:   _t("The tutorial is now over, you're ready to create your own website"),
+                popover:   { next: _t("Skip It") },
             },
         ]
     });
 
=== modified file 'website/views/snippets.xml'
--- website/views/snippets.xml	2014-04-14 14:26:31 +0000
+++ website/views/snippets.xml	2014-05-01 09:33:53 +0000
@@ -839,6 +839,7 @@
         <li class="dropdown-submenu">
             <a tabindex="-1" href="#">Style</a>
             <ul class="dropdown-menu">
+                <li data-value=""><a>Normal</a></li>
                 <li data-value="para_large"><a>Bigger Text</a></li>
                 <li data-value="readable"><a>Narrow</a></li>
             </ul>
@@ -963,6 +964,7 @@
         <li class="dropdown-submenu">
             <a tabindex="-1" href="#">Style</a>
             <ul class="dropdown-menu" name="parallax-scroll">
+                <li data-value=""><a>Normal</a></li>
                 <li data-value="img-rounded"><a>Rounded corners</a></li>
                 <li data-value="img-thumbnail"><a>Box</a></li>
                 <li data-value="img-circle"><a>Circle</a></li>