Commit Graph

277 Commits

Author SHA1 Message Date
ddm 7c45e5976e CMS basic view editing
bzr revid: ddm@openerp.com-20130909214626-51zfydwbw624heqz
2013-09-09 23:46:26 +02:00
Xavier Morel ca40afd144 [FIX] necessary widget implementation
``inline`` is now automatically inferred on a per-widget basis if not
specified.

``inline`` true|false tells the widget whether it should work on
inlines (e.g. span) or blocks (e.g. p). Specifying the wrong one blows
up because the wrapper is incorrect (inline==false on an inline
element will wrap it in a div and add linefeeds, inline==true on a
block element will wrap it in a span which will automatically split up
in multiple elements leading to downcast blowing up because the wrong
wrapper will be selected).

Since last time, inline inference was added: if *unspecified* widget
will check what type of object it's called on (using
``CKEDITOR.dtd.$inline``) and generate the correct wrapper for that
type.

=> fix misbehavior by removing explicit inline spec.

Also remove unused init and data methods.

bzr revid: xmo@openerp.com-20130909152312-1m5kwvgw04gcrfkv
2013-09-09 17:23:12 +02:00
Christophe Matthieu 0b199c50e5 [WIP] website: snippets: box snippet widget with resize options on click
bzr revid: chm@openerp.com-20130909132800-au0lgkf8thirsv8r
2013-09-09 15:28:00 +02:00
Xavier Morel 2cbfb88437 [FIX] order parameter in view.save call
bzr revid: xmo@openerp.com-20130909111040-ijffmxt8i81h5ynq
2013-09-09 13:10:40 +02:00
Xavier Morel 55a84256a3 [FIX] make RTE activate again
bzr revid: xmo@openerp.com-20130909104238-6deglc3axbu8zsez
2013-09-09 12:42:38 +02:00
Xavier Morel 19c8912cb3 [FIX] updated save, save RPC call
bzr revid: xmo@openerp.com-20130909095112-yihzl1oyop9641uj
2013-09-09 11:51:12 +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
Christophe Matthieu 4d1cc6a4ed [WIP] website: snippets
bzr revid: chm@openerp.com-20130906150408-81qzb2492lwqf7lb
2013-09-06 17:04:08 +02:00
Xavier Morel 81118812a8 [ADD] moved view.save method from server
bzr revid: xmo@openerp.com-20130906130916-txj4mwhulb89kpov
2013-09-06 15:09:16 +02:00
Xavier Morel e56953d94e [ADD] new table-creation button
bzr revid: xmo@openerp.com-20130906085045-zpemzy2akh3bz7q3
2013-09-06 10:50:45 +02:00
Xavier Morel 43ca2585c5 [FIX] don't try to be brokenly clever about preventing click on links during edition
bzr revid: xmo@openerp.com-20130904151021-otzw635in9lhh1e1
2013-09-04 17:10:21 +02:00
Xavier Morel 35fb66e8cf [IMP] use mutation observers on non-RTE editions
bzr revid: xmo@openerp.com-20130904141247-0bjm69ooy310egoj
2013-09-04 16:12:47 +02:00
Xavier Morel cdffb9943f [IMP] mutations filtering, only ignore cke_focus being removed, not all editor root changes
bzr revid: xmo@openerp.com-20130904140744-5ytn6bwfxrv52g9f
2013-09-04 16:07:44 +02:00
Xavier Morel b56cd5e2be [IMP] merge Format and Styles dropdowns
bzr revid: xmo@openerp.com-20130904131745-ro5c0c7myvyv98xw
2013-09-04 15:17:45 +02:00
Xavier Morel 4932521377 [ADD] selection of existing image in image dialog
bzr revid: xmo@openerp.com-20130904113222-xync5o48nwngvtj4
2013-09-04 13:32:22 +02:00
Christophe Matthieu 7704ce7e03 [IMP] website_sale: add product in website
bzr revid: chm@openerp.com-20130904084958-6rq5xu0xjwzcv399
2013-09-04 10:49:58 +02:00
Xavier Morel c89d31ca95 [ADD] creation of new page from link dialog
* Replace select by input with dropdown

* Add random crap to /pagenew so it does not blow up when a butterfly
  flaps its wings, also so it's possible to call it through xhr and
  get something out of it

* Fix duplicated save() call in link dialog widget thing

bzr revid: xmo@openerp.com-20130903143237-6pwsbqzc02bv3mri
2013-09-03 16:32:37 +02:00
Xavier Morel cf9ab25816 [ADD] image preview to dialog
bzr revid: xmo@openerp.com-20130902134920-um72bldsv19mf5ij
2013-09-02 15:49:20 +02:00
Christophe Matthieu 00c898378b [FIX] website.editor.js: customize click event
bzr revid: chm@openerp.com-20130902151140-jmhcyuuzoxbhlilo
2013-09-02 17:11:40 +02:00
Xavier Morel 9733c396fe [FIX] correctly select range after inserting a link in the document
Apparently same issue as noted in
xmo@openerp.com-20130902105411-ni3klun0k8v1tmjg, RTE and bootstrap
modal fight for focus (oddly not in Firefox), leading to the callstack
blowing up (after a fraction of a second of browser freezing).

Use same remedy, defer focus-manipulating operation to after the
dialog has been removed and destroyed in order to avoid focus fight.

bzr revid: xmo@openerp.com-20130902105637-1y9aogm1yx9z81jt
2013-09-02 12:56:37 +02:00
Xavier Morel 2f97feb322 [ADD] interaction between RTE and bootstrap image modal
bzr revid: xmo@openerp.com-20130902105411-ni3klun0k8v1tmjg
2013-09-02 12:54:11 +02:00
Xavier Morel 1916b769ac [ADD] bootstrap image dialog, behavior missing
bzr revid: xmo@openerp.com-20130902075216-4y83ed2r19z2fgha
2013-09-02 09:52:16 +02:00
Xavier Morel b49504a794 [FIX] bootstrap 3 events
bzr revid: xmo@openerp.com-20130830093211-s7bt1bawl1eftti5
2013-08-30 11:32:11 +02:00
Fabien Pinckaers 7768e28a7b [IMP] Bootstrap 3
bzr revid: fp@tinyerp.com-20130829175831-9f3sh4631m0jmq88
2013-08-29 19:58:31 +02:00
Xavier Morel 0d64c9037d [IMP] Implement custom bootstrap dialog for links.
Dialog doesn't work right as it's a bootstrap 3-ish dialog, not 2, so
none of the classes works correctly.

Also moved editor templates outside of main website template file.

bzr revid: xmo@openerp.com-20130829153441-w51n3hxxikyti0xj
2013-08-29 17:34:41 +02:00
bth-openerp 91d771f7dc [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130829132442-2td1iateub2j2eug
2013-08-29 18:54:42 +05:30
Xavier Morel 796dcee2c3 [IMP] split out website.js
bzr revid: xmo@openerp.com-20130829102956-prfe9t5308m6y0vn
2013-08-29 12:29:56 +02:00