Commit Graph
20 Commits
Author SHA1 Message Date
Xavier Morel 89fc31a633 [MERGE] from trunk
bzr revid: xmo@openerp.com-20130923120328-0wgd7wxhl1y5qyhr
2013-09-23 14:03:28 +02:00
Christophe Matthieu fd24ee28c0 [IMP] website snippets: change style of edit button; add font and fix bootstrap; add style menu
bzr revid: chm@openerp.com-20130919102014-vf8etjniyevj40n3
2013-09-19 12:20:14 +02:00
Xavier Morel 0c145b7577 [FIX] completely remove usages of link and image plugin and import missing pieces
CKEDITOR plugins are not loaded in dependency order (see previous
commits), and in the end the vast majority of the (used subpart of)
link and image plugins were reimplemented to handle new dialogs.

Bite the bullet, disable link and image and implement/import missing
parts (link removal, doubleclick hooks & toolbar button definition).

bzr revid: xmo@openerp.com-20130916090353-933av2nsrygxz64y
2013-09-16 11:03:53 +02:00
Xavier Morel 560f12cffc [FIX] monkey patch CKEDITOR loading
Order of plugin initialization is apparently completely fucked, and
most definitely does not take dependencies in account (the
dependencies get loaded, but *when* they are...).

One of the things which drives init order is local (already loaded)
versus remote (js file to fetch): local plugins will be initialized
before remote, whatever the dependencies are.

Monkey patch resourcemanager's load method so it yields an object
initialized in order of its input (nb *still* not dependency order) to
ensure our local plugins are loaded after all builtin ones.

bzr revid: xmo@openerp.com-20130913144554-020u1367wto6ooh9
2013-09-13 16:45:54 +02:00
Xavier Morel 16492e4ca7 [MERGE] from trunk
bzr revid: xmo@openerp.com-20130913125230-38lb4jv8ypt6y9dh
2013-09-13 14:52:30 +02:00
ddm 96d0662732 [FIX] Missing CDN files
bzr revid: ddm@openerp.com-20130913095105-go1lz4fjh8d7rq0j
2013-09-13 11:51:05 +02:00
ddm 2b0e1291f5 [IMP] include CDN scripts for faster local development
bzr revid: ddm@openerp.com-20130913094538-f4crv0ndsv1e7ryj
2013-09-13 11:45:38 +02:00
Xavier Morel 4513603573 [FIX] force ckeditor lang to en and replace en-gb localization file with en
avoids automatic locale picking selecting something different than the one locale file currently provided and blowing up, preventing edition from working

bzr revid: xmo@openerp.com-20130912154957-yod17u9xvw3r966i
2013-09-12 17:49:57 +02:00
Xavier Morel 399963058b [ADD] ckeditor source
forgot I'd just symlinked it locally

bzr revid: xmo@openerp.com-20130911163359-wtwxbiz2rxogdp2j
2013-09-11 18:33:59 +02:00
Xavier Morel f6762f79e6 [MERGE] from trunk likely completely broken
bzr revid: xmo@openerp.com-20130909094437-kyxvgoz7zxt3fes0
2013-09-09 11:44:37 +02:00
Fabien Pinckaers 31c9ddeb44 [IMP] remove unused file
bzr revid: fp@tinyerp.com-20130830101233-7ykfao5z7rf0jqac
2013-08-30 12:12:33 +02:00
bth-openerp 4eee602d6e [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130829063717-t8kqjombb25gqmsb
2013-08-29 12:07:17 +05:30
Xavier Morel a7e58993cd [ADD] oe_dirty handling via mutation observers
shim necessary for browsers supporting old mutation events but not new mutation observers

bzr revid: xmo@openerp.com-20130828084945-yfqrs0v9v8iecwjm
2013-08-28 10:49:45 +02:00
bth-openerp ee75ddc8a8 [IMP]Add faltly theme.
bzr revid: bth@tinyerp.com-20130827092251-mtm953jhudkrccqm
2013-08-27 14:52:51 +05:30
bth-openerp 29b1eab776 [REM]Removed responsive css and flalty theme's css files of bootstrap 2 and added themes css of bootstrap 3.0.
bzr revid: bth@tinyerp.com-20130827074521-xp62gk06irkhwrf7
2013-08-27 13:15:21 +05:30
bth-openerp d264a49b37 [IMP]Added js and css of bootstrap 3.0 in website module.
bzr revid: bth@tinyerp.com-20130823062541-nabdko619qkphdcz
2013-08-23 11:55:41 +05:30
Xavier Morel fc8321f103 [ADD] inline edition plugin
* No feature on plugin itself save marking field zones
  - TODO: handling of specific field types
* ckeditor 4.3 (?) broke sharedspace plugin
* symlinked ckeditor, to fix
* new save API (by view section)

bzr revid: xmo@openerp.com-20130812093314-ur8l7jjzf40fwlxy
2013-08-12 11:33:14 +02:00
Xavier Morel 5082758f86 [ADD] forgot sharedspace plugin
bzr revid: xmo@openerp.com-20130807123019-7mfe70kdk4wtvjx1
2013-08-07 14:30:19 +02:00
Frédéric van der Essen 195ebf72d0 replacing css madness by bootstrap, homepage is mostly ok, ecommerce is broken
bzr revid: fva@openerp.com-20130730160317-j5aj1ktxt3u5rlyf
2013-07-30 18:03:17 +02:00
Fabien Meghazi 9e3c561fc5 [FIX] bootstrap location
bzr revid: fme@openerp.com-20130722145732-lnqjpbp6nbbcr3ko
2013-07-22 16:57:32 +02:00