Commit Graph
74857 Commits
Author SHA1 Message Date
Christophe Matthieu f181f21cf4 [IMP] website: publish button with link to backend
bzr revid: chm@openerp.com-20130924115004-xjpy6sayze2she1w
2013-09-24 13:50:04 +02:00
Xavier Morel 8b06e72716 [FIX] block-level links
bzr revid: xmo@openerp.com-20130924112402-twcgdh0b18vzdwru
2013-09-24 13:24:02 +02:00
Xavier Morel 7533fe77b4 [FIX] paste in webkit-ish browsers
clipboard plugin was getting lost due to method used to get a readonly
toplevel editor with editable sub-sections in it.

The clipboard plugin creates a hidden pasteboard element to safely get
a the clipboard data before inserting it at paste point, this
clipboard may have to be made @contenteditable if it's created in a
readonly area. Which was the case here: the pasteboard was inserted at
the root of the editor, which is not editable.

But because of @data-cke-editable being explicitly set, ckeditor would
believe it had inserted the pasteboard in an editable section and thus
would *not* set its @contenteditable leading to a useless readonly
pasteboard.

The purpose of @data-cke-editable was to make the editor itself
"editable" for cke (in order for the toolbar to not be disabled) while
it would not actually be editable (@contenteditable) for users.

This is better reimplemented by calling API methods to make the editor
editable but its root element not editable, one of the improvements
being that commands (and thus toolbar buttons) now switch state
correctly based on context.

bzr revid: xmo@openerp.com-20130924110601-gfvc395rsedpnoh3
2013-09-24 13:06:01 +02:00
Christophe Matthieu 02f2f28b42 [FIX] website/image controller display image if website_published
bzr revid: chm@openerp.com-20130924102921-ca83jve77j0su2zu
2013-09-24 12:29:21 +02:00
Christophe Matthieu 51fae1fcf8 [IMP] website_sale display only non empty category in non editable mode
bzr revid: chm@openerp.com-20130924102834-op0bm475w20x35j4
2013-09-24 12:28:34 +02:00
Christophe Matthieu abc273e9a1 [IMP] website_sale: change size y when category is displayed
bzr revid: chm@openerp.com-20130924085507-9m1gsdnlsfgn4fj4
2013-09-24 10:55:07 +02:00
Christophe Matthieu 458121ab5c [IMP] website_sale: when the products is displayed from a search, use the same size x,y for all products
bzr revid: chm@openerp.com-20130924084100-y6pgvislcpdo9izx
2013-09-24 10:41:00 +02:00
Christophe Matthieu b1cf178978 [MERGE] website_sale: add layout options and css
bzr revid: chm@openerp.com-20130924083349-1woicpx50668272g
2013-09-24 10:33:49 +02:00
Christophe Matthieu 9bb4af7d9f [IMP] website snippet: add comment for auto set snippet and remove data-snippet-id in website_sale view
bzr revid: chm@openerp.com-20130924082423-ylzeprl3w4tlb83e
2013-09-24 10:24:23 +02:00
Paramjit Singh Sahota ce9a7cccce [MERGE] Merged trunk-website-al
bzr revid: psa@tinyerp.com-20130924064913-fgr3btfwwbtb68xn
2013-09-24 12:19:13 +05:30
Paramjit Singh Sahota 8fc3877646 [IMP] Improved code to make small way to change to list view rather than writing the whole product template code twice.
bzr revid: psa@tinyerp.com-20130924064617-40ruht7l15c08p7y
2013-09-24 12:16:17 +05:30
Thibault Delavallée 3862a4e83d [MERGE] website, website_mail, website_blog: Mail/Blog Update part I
[REF] document_page: refactored the module, towards using it in website_blog
Main modifications:
- document.page is now blog.post
- category is now a blog.category object, instead of a document.page with type='category'
- added blog.tag model, to be able to tag posts, and a m2m relationship between blog.post and blog.tag
- cleaned document.page, removing type and unnecessary features
- added chatter on blog.post, blog.category
- added subtypes to enable direct follow of posts when following a category
- updated document.page.history (now blog.post.history)
- commented menu creation, because this does not seem to be necessary anymore considering the new website
- updated wizard.document.page.history.show_diff, now blog.post.history.show_diff
- updated all views accordingly, as well as demo data
- removed the use of document_user group, simplified rules on blog.post
- misc cleaning

[REF] website_mail refactoring; document_page, website_blog: merge of the two modules. document_page is now contained inside website_blog, last part of the refactoring before
cleaning and improving the blog feature. Usefull files have been transfered. Translations have been discarded, they will have to be re-translated again. Document_page module is now dead. Long live website_blog!

The module is now called website_blog, and not based on mail.group anymore. It uses document_page module, previously renamed blog.post (see previous commits). Refactored controllers and views to work with the new model.

[ADD] Added website_mail module, that holds mail-related stuff necessary for the website. This is an auto-install module.

Also added templates, js and css to have a generic follow button. Based on the same principle as publish, there is now a generic button to follow or unfollow objects in openerp. This should replace all custom instance of subscription in other addons.

[FIX] website:
- [FIX] call write with a list of ids because I can't be arsed to handle the other case
- [FIX] turns out a new mandatory positional argument blows things up a bit

bzr revid: tde@openerp.com-20130923155917-ak0gwah9bh3em6ab
2013-09-23 17:59:17 +02:00
Thibault Delavallée ec22dee6d1 [FIX] website_blog: fixed m2m between blog.post and blog.tag
bzr revid: tde@openerp.com-20130923155605-r2x40550sq71mhtx
2013-09-23 17:56:05 +02:00
Thibault Delavallée 65a0fcd394 [MERGE] Sync with main branch
bzr revid: tde@openerp.com-20130923154116-9m974057rmnn542m
2013-09-23 17:41:16 +02:00
Thibault Delavallée a42d020a34 [CLEAN] [IMP] website_blog: cleaned blog.post, blog.post.category and blog.tag models; added basic appearance of tags and base routing method in controllers. Will have to be improved in a future branch.
bzr revid: tde@openerp.com-20130923154039-ppn1loy002tcppun
2013-09-23 17:40:39 +02:00
Xavier Morel 68d9add6ce [ADD] saving m2o fields
bzr revid: xmo@openerp.com-20130923151633-61v7gw0llol4fvyo
2013-09-23 17:16:33 +02:00
Xavier Morel d71a200543 [FIX] handling of multiple children in an HTML field
bzr revid: xmo@openerp.com-20130923145744-3dpta6w2qnqe851b
2013-09-23 16:57:44 +02:00
Thibault Delavallée 5ebd3c5047 [IMP] website_blog: blog_post: public user limited to published posts
bzr revid: tde@openerp.com-20130923144853-unxxa7i5u5zfskhk
2013-09-23 16:48:53 +02:00
Thibault Delavallée 0d49f723eb [CLEAN] website_blog: misc cleaning
bzr revid: tde@openerp.com-20130923144422-7vuocxo8bntvuana
2013-09-23 16:44:22 +02:00
Thibault Delavallée f420f98492 [FIX] turns out a new mandatory positional argument blows things up a bit
bzr revid: tde@openerp.com-20130923143534-qnab6bv6upw1vt70
2013-09-23 16:35:34 +02:00
Thibault Delavallée f217813c62 [FIX] call write with a list of ids because I can't be arsed to handle the other case
bzr revid: tde@openerp.com-20130923143501-99onvm218vg222pq
2013-09-23 16:35:01 +02:00
Thibault Delavallée a1ea8bbc8a [MERGE] Sync with main website branch
bzr revid: tde@openerp.com-20130923135527-c385v0ewn0166wrf
2013-09-23 15:55:27 +02:00
Xavier Morel f040cfc7b1 [FIX] placeholder image when edition starts
it's apparently better when it's completely broken and can't be edited. YMMV

bzr revid: xmo@openerp.com-20130923134914-1si4fz8fg72iktvw
2013-09-23 15:49:14 +02:00
Thibault Delavallée 4b0c341f2b [CLEAN] website_blog: cleaned controllers blog code
bzr revid: tde@openerp.com-20130923134702-d426ypzic6g9n1oj
2013-09-23 15:47:02 +02:00
Thibault Delavallée dcdefd0e8d [IMP] website_mail: added override of mail.message search and check_access_rule to restrict messages vsible by public user to have website_published = True
bzr revid: tde@openerp.com-20130923134639-ou1hkwzetm9st95f
2013-09-23 15:46:39 +02:00
ddm 5c9bdf1dcb [IMP] SEO sitemap.xml + robots.txt
bzr revid: ddm@openerp.com-20130923134240-4qx4pyfv2rl65xyz
2013-09-23 15:42:40 +02:00
ddm d910b8c533 [FIX] improve keyword detection
bzr revid: ddm@openerp.com-20130923133703-ysil60j2t08gk0kf
2013-09-23 15:37:03 +02:00
Paramjit Singh Sahota c931f60bd3 [MERGE] MERGED trunk-website-al
bzr revid: psa@tinyerp.com-20130923133137-heq2s7r9hjlm150g
2013-09-23 19:01:37 +05:30
Paramjit Singh Sahota 7a76a45a50 done the same changes in sass as in css.
bzr revid: psa@tinyerp.com-20130923131611-eoexbw2a9dbxxyum
2013-09-23 18:46:11 +05:30
Xavier Morel 59b46346b1 [FIX] crappy snippets initialization signal
bzr revid: xmo@openerp.com-20130923130321-lpbxy7qckcu0svrp
2013-09-23 15:03:21 +02:00
Paramjit Singh Sahota de41937cfb [IMP] Improved the template id.
bzr revid: psa@tinyerp.com-20130923130238-4it782jesm211t6w
2013-09-23 18:32:38 +05:30
Christophe Matthieu 7ed222baf3 [IMP] website: name connected user; carousel selection; imp drop zone
bzr revid: chm@openerp.com-20130923125606-b6pcr52dai0yh2ia
2013-09-23 14:56:06 +02:00
Paramjit Singh Sahota f06f48ce52 [IMP] added list grid for shop.
bzr revid: psa@tinyerp.com-20130923124752-dhg0aao3diuh1isn
2013-09-23 18:17:52 +05:30
Thibault Delavallée 35ce110ab0 [IMP] website_blog: improved blog post view, to integrate comments and a comments pager
bzr revid: tde@openerp.com-20130923124248-zuuoqbyb1d5sqi6a
2013-09-23 14:42:48 +02:00
Christophe Matthieu fdd1aa5e37 [fix] website snippet: change layer and add arrow
bzr revid: chm@openerp.com-20130923123359-v6bt5sq8fhj3i3ff
2013-09-23 14:33:59 +02:00
Christophe Matthieu ddee2798dc [IMP] website snippet: select background of banner
bzr revid: chm@openerp.com-20130923121503-1etp4iwkj0eog48m
2013-09-23 14:15:03 +02:00
Xavier Morel e72e65b6fd [IMP] RTE
bzr revid: xmo@openerp.com-20130923120638-wydikh3e6y20zca5
2013-09-23 14:06:38 +02:00
Xavier Morel 89fc31a633 [MERGE] from trunk
bzr revid: xmo@openerp.com-20130923120328-0wgd7wxhl1y5qyhr
2013-09-23 14:03:28 +02:00
Thibault Delavallée 54f1895330 [IMP] website_blog:
- content is now an html field
- removed print statements
- uses new expand options of html_email_clean to redirect the read more to the blog post
- fixed demo data

bzr revid: tde@openerp.com-20130923113054-bb02cerlfuruquwr
2013-09-23 13:30:54 +02:00
Paramjit Singh Sahota 71ab933988 More customizable options:
Add to Cart must be in a inherit_option_id
Product sale_description must be in a inherit_option_id

bzr revid: psa@tinyerp.com-20130923111441-pxhn2u2ex1oh1cws
2013-09-23 16:44:41 +05:30
Xavier Morel be4b1b9b59 [FIX] matching of site page URLs
With page urls not necessarily being full xmlids, match to result of
list_pages needs to take that in account to correctly infer a url is a
site page's.

bzr revid: xmo@openerp.com-20130923110618-ckicw4a5bpvatzie
2013-09-23 13:06:18 +02:00
Christophe Matthieu 5bd6c371d0 [IMP] website snippet: carousel options with sub menu. Change on mouse hover
bzr revid: chm@openerp.com-20130923105604-w8dukt0u8bdxw5ui
2013-09-23 12:56:04 +02:00
Thibault Delavallée bef092ba19 [ADD] website_mail: added skeleton for tests and doc
bzr revid: tde@openerp.com-20130923104612-b1x1nk1izygvl9oi
2013-09-23 12:46:12 +02:00
Thibault Delavallée 4d59eb9aeb [REM] website_blog: security: removed unnecessary rule on mail.message, cleaned indentation
bzr revid: tde@openerp.com-20130923104417-cijlf4d1sbbi5am3
2013-09-23 12:44:17 +02:00
Thibault Delavallée 0a208211af [FIX] Please stop fucking record rules.
bzr revid: tde@openerp.com-20130923104308-sceporwt5wrcmt1u
2013-09-23 12:43:08 +02:00
Thibault Delavallée daf5aed1a3 [IMP] website_blog: re-enabled navigation
bzr revid: tde@openerp.com-20130923103534-4sbb1gqylekhmbim
2013-09-23 12:35:34 +02:00
Thibault Delavallée 8c89bfda88 [IMP] website_blog:
Some file renaming
Delegated followers of categories / blog posts management to website_mail, allowing to 
remove some templates and controllers
Various cleanings and improvements in blog templates

bzr revid: tde@openerp.com-20130923101730-b9606qcyd3sj2pwx
2013-09-23 12:17:30 +02:00
Xavier Morel 3e336cda54 [FIX] selection of default section on opening link dialog
bzr revid: xmo@openerp.com-20130923100241-n42lczqdpupfiae4
2013-09-23 12:02:41 +02:00
Thibault Delavallée b34f746c36 [ADD] website_mail: added templates, js and css to have a generic follow button.
Based on the same principle as publish, there is now a generic button to follow
or unfollow objects in openerp. This should replace all custom instance of
subscription in other addons.

bzr revid: tde@openerp.com-20130923095909-4p5aiswlwy14g32k
2013-09-23 11:59:09 +02:00
Christophe Matthieu b1fc013fae [IMP] website snippet: add drop zone for end of table
bzr revid: chm@openerp.com-20130923095122-vnaaw1z5jz0x3i37
2013-09-23 11:51:22 +02:00