[IMP] website: add page: change default sequence and layout

bzr revid: chm@openerp.com-20140214103744-dptrytkfbcwti6t8

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 94a2e6f..6053150 100644 (file)
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -101,7 +101,7 @@ class Website(openerp.addons.web.controllers.main.Home):
             model, id  = request.registry["ir.model.data"].get_object_reference(request.cr, request.uid, 'website', 'main_menu')
             request.registry['website.menu'].create(request.cr, request.uid, {
                     'name': path,
-                    'url': path,
+                    'url': "/page/" + xml_id,
                     'parent_id': id,
                 }, context=request.context)
         url = "/page/" + xml_id

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index ea095c0..3dcb028 100644 (file)
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -494,9 +494,14 @@ class website_menu(osv.osv):
         'parent_left': fields.integer('Parent Left', select=True),
         'parent_right': fields.integer('Parent Right', select=True),
     }
+
+    def __defaults_sequence(self, cr, uid, context):
+        menu = self.search_read(cr, uid, [(1,"=",1)], ["sequence"], limit=1, order="sequence DESC", context=context)
+        return menu and menu[0]["sequence"] or 0
+
     _defaults = {
         'url': '',
-        'sequence': 0,
+        'sequence': __defaults_sequence,
         'new_window': False,
     }
     _parent_store = True

diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index dc990b3..19cf806 100644 (file)
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -22,18 +22,15 @@
                     input: _t("Page Title"),
                     init: function () {
                         var $group = this.$dialog.find("div.form-group");
-                        $group.find("label").removeClass("col-sm-3").addClass("col-sm-4");
-                        $group.find("div").removeClass("col-sm-9").addClass("col-sm-8");
                         $group.removeClass("mb0");
 
                         var $add = $(
                             '<div class="form-group mb0">'+
-                                '<label for="page-name" class="col-sm-4 control-label"></label>'+
-                                '<div class="col-sm-8 text-left">'+
-                                '    <input type="checkbox" class="form-control" style="width: 24px" checked="checked" required="required"/>'+
-                                '</div>'+
+                                '<label class="col-sm-offset-3 col-sm-9 text-left">'+
+                                '    <input type="checkbox" checked="checked" required="required"/> '+
+                                '</label>'+
                             '</div>');
-                        $add.find('label').text(_t("Add page in menu"));
+                        $add.find('label').append(_t("Add page in menu"));
                         $group.after($add);
                     }
                 }).then(function (val, field, $dialog) {