diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index 7f47ee29fe1..d37ed48ec34 100644 --- a/addons/website_blog/controllers/main.py +++ b/addons/website_blog/controllers/main.py @@ -47,8 +47,28 @@ class WebsiteBlog(http.Controller): return nav @website.route([ - '/blog/', + '/blog', '/blog/page//', + ], type='http', auth="public", multilang=True) + def blogs(self, page=1): + BYPAGE = 60 + cr, uid, context = request.cr, request.uid, request.context + blog_obj = request.registry['blog.post'] + total = blog_obj.search(cr, uid, [], count=True, context=context) + pager = request.website.pager( + url='/blog/', + total=total, + page=page, + step=BYPAGE, + ) + bids = blog_obj.search(cr, uid, [], offset=(page-1)*BYPAGE, limit=BYPAGE, context=context) + blogs = blog_obj.browse(cr, uid, bids, context=context) + return request.website.render("website_blog.blogs", { + 'blogs': blogs, + 'pager': pager + }) + + @website.route([ '/blog/cat//', '/blog/cat//page//', '/blog/tag//', diff --git a/addons/website_blog/data/website_blog_demo.xml b/addons/website_blog/data/website_blog_demo.xml index 6c8a9620ce3..41f272c628d 100644 --- a/addons/website_blog/data/website_blog_demo.xml +++ b/addons/website_blog/data/website_blog_demo.xml @@ -23,6 +23,8 @@ + OpenERP, Point of Sale, Hardware, Interface, Payment Terminal, Store + Open source Point of Sale with no installation required that runs online and offline.
@@ -235,6 +237,8 @@ Touchscreen Point of Sale + Point of Sale, Hardware, Interface, Payment Terminal, Store + Point of Sale with no installation required that runs online and offline. The brand new OpenERP touchscreen point of sale available with 6.1 allows you to manage your shop sales very easily. It's fully web based so that you don't @@ -272,6 +276,8 @@ Think of it as an out-of-the-box solution to boost your business' productivity. + OpenERP, Partnership, News, Accounting + Our company partners with OpenERP to develop accounting best practices.
diff --git a/addons/website_blog/static/src/js/website_blog.js b/addons/website_blog/static/src/js/website_blog.js index 79ccd08f57f..abacbb02781 100644 --- a/addons/website_blog/static/src/js/website_blog.js +++ b/addons/website_blog/static/src/js/website_blog.js @@ -1,9 +1,4 @@ $(document).ready(function () { - $('.js_nav_year a:first').on('click', function (e) { - e.preventDefault(); - $(this).next("ul").toggle(); - }); - $('.js_nav_month a:first').on('click', function (e) { e.preventDefault(); var $ul = $(this).next("ul"); @@ -25,4 +20,4 @@ $(document).ready(function () { } }); -}); \ No newline at end of file +}); diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index e3219098c9e..920c613f8a4 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -14,6 +14,84 @@ + + + +