Commit Graph
701 Commits
Author SHA1 Message Date
Xavier Morel ea65573b48 [ADD] image edition button v0
bzr revid: xmo@openerp.com-20131107092018-66tae9nu1kcft21g
2013-11-07 10:20:18 +01:00
Christophe Matthieu ef86f6d12a [FIX] website snippet: the 'insert block' button is loaded before the editor widget -> confusing in slow connectivity
bzr revid: chm@openerp.com-20131107094256-nqp5coey0fy732pl
2013-11-07 10:42:56 +01:00
Christophe Matthieu bc5772ab7e [FIX] website snippet: editor overlay (bounce, display after click on insert block)
bzr revid: chm@openerp.com-20131106163927-vdqxfamnkspnb193
2013-11-06 17:39:27 +01:00
Xavier Morel 20899155c5 [IMP] during image upload, disable save button
hide it and replace it with a button telling the user what we're
currently doing (uploading the image).

Leave the possibility of discarding the whole thing and going away
though.

bzr revid: xmo@openerp.com-20131106152412-eb283vghb18aafyr
2013-11-06 16:24:12 +01:00
Christophe Matthieu 21ffca33c5 [FIX] website snippet carousel: new slide editable
bzr revid: chm@openerp.com-20131106152126-lzop8daui959k0gc
2013-11-06 16:21:26 +01:00
Christophe Matthieu cdd7f70308 [FIX] website snippet: banner editor
bzr revid: chm@openerp.com-20131106133917-ira7oirkv8gfrlgq
2013-11-06 14:39:17 +01:00
Fabien Meghazi 2d81712e2c [FIX] Prevent dropdown closing when a contenteditable children is focused
bzr revid: fme@openerp.com-20131106115754-lyt6hd8pnrfv7vfi
2013-11-06 12:57:54 +01:00
Fabien Pinckaers f385e3af01 [IMP] Text for translate dialog
bzr revid: fp@tinyerp.com-20131106110819-yflp80pdqehwp9gy
2013-11-06 12:08:19 +01:00
Fabien Pinckaers 5a425dda78 [IMP] More explicit; where is the Edit button
[IMP] remove "Create a free website if logged", see usertesting
[IMP] Advanced view editor -> "HTML Editor"
[IMP] Footer: editable zone grouped in a <div> for efficient distribute branding

bzr revid: fp@tinyerp.com-20131106083833-cz4xc2ast5d9ao19
2013-11-06 09:38:33 +01:00
Christophe Matthieu 0503a5cf5e [FIX] website_hr: img method for hr.employee to display picture for public user
bzr revid: chm@openerp.com-20131105160617-wqdz3xg7bb1que8k
2013-11-05 17:06:17 +01:00
Fabien Meghazi 6ba57343da [WIP] Trying to use t-fields for menus
Not working quite well
Working it out

bzr revid: fme@openerp.com-20131105151651-8jn1po2fhyojum2c
2013-11-05 16:16:51 +01:00
Nicolas Wisniewski 18dba6d41c [ADD] Add icons for some snippets
bzr revid: nwi@openerp.com-20131105095639-6a69h7jr9herzm95
2013-11-05 10:56:39 +01:00
Fabien Meghazi cbed4f5661 [FIX] Hide edit structure on other languages than master
bzr revid: fme@openerp.com-20131105091547-b5k014x090m91qed
2013-11-05 10:15:47 +01:00
Fabien Meghazi 3f7252e444 [ADD] Structure topmenu button
bzr revid: fme@openerp.com-20131105091117-hgzbnrxju3ftzmyx
2013-11-05 10:11:17 +01:00
Fabien Pinckaers 843e16e57e [IMP] Small layout improvements
bzr revid: fp@tinyerp.com-20131105080743-jy5ee76500dhh923
2013-11-05 09:07:43 +01:00
Fabien Meghazi 92e01169a0 [IMP] Edit menu button
bzr revid: fme@openerp.com-20131104174720-4qhpu2t8v02227wa
2013-11-04 18:47:20 +01:00
Christophe Matthieu bfc8f61984 [FIX] website: can choose an other controller to publish data. Website sale: add a contraint for address and organizer for publish an event. Auto publish address and organizer in front end. Clean website_hr_recruitment publisher
bzr revid: chm@openerp.com-20131104155230-j36l2e1fez0vnkwi
2013-11-04 16:52:30 +01:00
Fabien Meghazi 5f2dc489b2 [MERGE] upstream
bzr revid: fme@openerp.com-20131104114431-dhjp6iy1sfxq4cg1
2013-11-04 12:44:31 +01:00
Fabien Meghazi f880400e43 [IMP] Improved menu link dialog
bzr revid: fme@openerp.com-20131104113412-q5d8263741pq9wna
2013-11-04 12:34:12 +01:00
Christophe Matthieu fb8991d404 [FIX] website snippets: filter insead of siblings readXMLData. (fix vertical drop zone, activation snippets...)
bzr revid: chm@openerp.com-20131104102914-jltkz5u88heu87xd
2013-11-04 11:29:14 +01:00
Fabien Meghazi cf58fd485b [IMP] first menu becomes root url
bzr revid: fme@openerp.com-20131031173428-c6l8b19ig5npwb9i
2013-10-31 18:34:28 +01:00
Fabien Meghazi 35d469d51f [FIX] Reuse website.editor.LinkDialog#bind_data()
bzr revid: fme@openerp.com-20131031165117-13yo8nrfg1ru4cp8
2013-10-31 17:51:17 +01:00
Fabien Meghazi 9f97b24318 [ADD] Edit menu entry
bzr revid: fme@openerp.com-20131031160211-zwxmdtokf59s5sq3
2013-10-31 17:02:11 +01:00
Fabien Meghazi aa2f9217c0 [IMP] Menu entry dialog
bzr revid: fme@openerp.com-20131030160405-crxjr6agtmf2x89p
2013-10-30 17:04:05 +01:00
Fabien Meghazi a87196eece [REM] Removed useless feature
bzr revid: fme@openerp.com-20131030151201-liz3qyn4mkv2ukc2
2013-10-30 16:12:01 +01:00
Fabien Meghazi 90814d781a [MERGE] upstream
bzr revid: fme@openerp.com-20131030144813-xmjb6i9ayv23aqyi
2013-10-30 15:48:13 +01:00
Fabien Meghazi 418e10c382 [IMP] Misc menu improvements
bzr revid: fme@openerp.com-20131030140216-f2fz7p3waur3l8j7
2013-10-30 15:02:16 +01:00
Fabien Meghazi fcdef0faaf [ADD] delete menu
bzr revid: fme@openerp.com-20131030105803-yq7r5lt9vtnd21p0
2013-10-30 11:58:03 +01:00
Xavier Morel 4007b79fb3 [FIX] move contenteditable manipulations from banner template to editor object
otherwise the banner sections stay editable when saved/outside of editable mode

bzr revid: xmo@openerp.com-20131030103048-6tdcvytrf60z89m2
2013-10-30 11:30:48 +01:00
ddm 655eed1395 [MERGE] trunk-website-aboutus-parallaxsnippet-bth
Improvements to the CMD 'About Us' page

bzr revid: ddm@openerp.com-20131030101334-8nvqusbvu5nvq5wv
2013-10-30 11:13:34 +01:00
Fabien Meghazi 12801a8cbc [MERGE] upstream
bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr
2013-10-30 09:20:46 +01:00
Fabien Meghazi 4ae5425fb8 [FIX] Buggy qweb template loading
bzr revid: fme@openerp.com-20131029161128-ko0ocpa0h6kziooh
2013-10-29 17:11:28 +01:00
Fabien Meghazi 07b9cf0f02 [IMP] Save menu is working
bzr revid: fme@openerp.com-20131029143346-nu9skoj5s06hwgw6
2013-10-29 15:33:46 +01:00
Fabien Meghazi 7ac3061c42 [WIP] Edit menu dialog
bzr revid: fme@openerp.com-20131029112450-gnu2c3fl9ddypdf1
2013-10-29 12:24:50 +01:00
Fabien Meghazi 2d0158d8cc [ADD] Menu drag'n dro
bzr revid: fme@openerp.com-20131029083718-e6jrinmh6z48vn5j
2013-10-29 09:37:18 +01:00
bth-openerp 2d3cafbe2a [MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131029065923-v1oizv7bf8f5krj5
2013-10-29 12:29:23 +05:30
Fabien Meghazi 2fc5da3f95 [WIP] Add menu
bzr revid: fme@openerp.com-20131028162815-2nou1okxovo8thkr
2013-10-28 17:28:15 +01:00
Fabien Meghazi b7ed1d3e6d [FIX] Translation shall not prevent website administration
bzr revid: fme@openerp.com-20131028162704-gm1o64e6ww1zurj2
2013-10-28 17:27:04 +01:00
Fabien Meghazi 82c749c91d [IMP] Refactor LinkDialog -> RTELinkDialog
bzr revid: fme@openerp.com-20131028162623-i2a4cixspm8q1crx
2013-10-28 17:26:23 +01:00
Xavier Morel 0db0f20bda [ADD] WIP link combo
bzr revid: xmo@openerp.com-20131028152342-5clhbwwwfcdxxxq0
2013-10-28 16:23:42 +01:00
bth-openerp 36991e7019 [MERGE]Merge trunk-website-al branch.
bzr revid: bth@tinyerp.com-20131028132942-o6uk559f2lgjyrk8
2013-10-28 18:59:42 +05:30
Fabien Meghazi 26e62b0e0e [IMP] Menu tree from client side
bzr revid: fme@openerp.com-20131028112350-9or1z3e3ndgk4mfg
2013-10-28 12:23:50 +01:00
Fabien Meghazi 321bf56b99 [MERGE] upstream
bzr revid: fme@openerp.com-20131028091527-hbki8epj0oh4s821
2013-10-28 10:15:27 +01:00
Fabien Meghazi eb7b1362cd [WIP] Menu working from database (not yet multi-website)
bzr revid: fme@openerp.com-20131025152446-si9gsjujzcn40hip
2013-10-25 17:24:46 +02:00
Xavier Morel 4c88701f3d [FIX] change access rights for customize_template_*
bzr revid: xmo@openerp.com-20131025095952-9ditm4q3fwr9auto
2013-10-25 11:59:52 +02:00
Fabien Meghazi ec09c0fa2c [ADD] Added website_id in client side context.
This allow us to comply to the 'ids' argument of website's model method (if needed)

bzr revid: fme@openerp.com-20131025074343-6nqgte7lzj7uhopj
2013-10-25 09:43:43 +02:00
Xavier Morel c8dd901b04 [FIX] todo/notes
bzr revid: xmo@openerp.com-20131024141024-3kdx3jfcsn8vzsyg
2013-10-24 16:10:24 +02:00
bth-openerp c7ddd83bb2 [REM]Removed image.
bzr revid: bth@tinyerp.com-20131023135506-olydfbpmvtq9vt8h
2013-10-23 19:25:06 +05:30
Xavier Morel 1ce3230d13 [IMP] don't completely wedge the RTE in case save fails. This may well break snippets entirely in case of save failure.
bzr revid: xmo@openerp.com-20131023130918-j5s81t0j60gitr1t
2013-10-23 15:09:18 +02:00
bth-openerp e84f95360f [MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131023123435-nfv542f67ndogazl
2013-10-23 18:04:35 +05:30