Commit Graph
1340 Commits
Author SHA1 Message Date
Richard Mathot (OpenERP) 3bfbcfee36 [MERGE] Merge parents
bzr revid: rim@openerp.com-20131218072037-7g2t677f1fryj9tt
bzr revid: rim@openerp.com-20131218124833-07mgsnr35oibusn1
2013-12-18 13:48:33 +01:00
Xavier Morel 90a9e522f3 [ADD] placeholder support on t-field
A placeholder is looked up:

1. in the field's options ("placeholder")
2. on the t-field node itself (@placeholder)
3. on the field's column (.placeholder)

The first one found is used as the @placeholder of the resulting node
(in-HTML), and displayed when the field is empty and unfocused.

If no placeholder is found, an empty field just gets a small padding
in order to be easier to see & focus.

bzr revid: xmo@openerp.com-20131218114901-xi3ye11x5pysq2a2
2013-12-18 12:49:01 +01:00
Xavier Morel 128f1e1281 [FIX] odd behavior in cke widgets
in "block-level" widgets (divs), when hitting [return] instead of
adding a newline in the widget a new bit of widget may be added. This
is caused by an incompability between widgets and the enterKey plugin.

Remove enterKey, behavior on [Return] is slightly worse (always
inserts br) but widgets don't get broken.

See https://dev.ckeditor.com/ticket/11326 for issue in upstream.

bzr revid: xmo@openerp.com-20131217153751-7fbwp34o8kac9x94
2013-12-17 16:37:51 +01:00
Richard Mathot (OpenERP) 96a86525a4 [MERGE] Merge parents
bzr revid: rim@openerp.com-20131217102008-1ds3byarhyc86f8c
bzr revid: rim@openerp.com-20131217145121-v4s89fx8vsncmv4p
2013-12-17 15:51:21 +01:00
Fabien Meghazi fca5a85fc6 [FIX] forgot to remove a js statement
bzr revid: fme@openerp.com-20131217134734-tfz8c3e6watamac3
2013-12-17 14:47:34 +01:00
Fabien Meghazi 1434a5aae9 [IMP] allow to reset broken views in the 500 error page
bzr revid: fme@openerp.com-20131217134600-v0i170n9gw7752vj
2013-12-17 14:46:00 +01:00
ddm 5d97a99b1a [IMP] removed JS function from banner tour
bzr revid: ddm@openerp.com-20131217130240-hdbgp90f47uori0h
2013-12-17 14:02:40 +01:00
Xavier Morel 4469b36f77 [FIX] change view section saving: only save view section *content*
Before, would save view section itself (including root element). But
branding distribution (and thus editability) are set on the last
programmatic root, thus the root element may well be generated
e.g. <span t-att-foo> will define the span itself as editable.

Saving this would remove the programmatic content on the node, and
thus break the view section altogether.

Fix the issue by only saving the root's content in the previous root.

bzr revid: xmo@openerp.com-20131217112034-nbxbg919cffv4w51
2013-12-17 12:20:34 +01:00
Xavier Morel f6eb40fc90 [FIX] enable user-selection on editable buttons (when the button itself is editable, not just in an editable section)
bzr revid: xmo@openerp.com-20131217104702-jell0imowvzjlasl
2013-12-17 11:47:02 +01:00
Max Mumford 3aaa0c10fe [ADD] <main> tag around content for easy replacing, and CSS changes to maintain current UI
bzr revid: mmu@openerp.com-20131216160654-s75kx9xr2yutq5fg
2013-12-16 17:06:54 +01:00
Richard Mathot (OpenERP) edc5a2b62c [MERGE] Merge parents
bzr revid: rim@openerp.com-20131216153304-e703s4urghgn3vxp
2013-12-16 16:33:04 +01:00
Xavier Morel 98c4e6b3d4 [IMP] editability criteria for links and images
if a link or image is an editing host (has @contenteditable=true), its
body is editable *but* its attributes should not be considered
editable: if the attributes come from a t-att-*, @contenteditable will
be set on the node itself.

such elements should be ignored by the link & image dialog handling
thing, as editing their attributes has undesirable effects.

bzr revid: xmo@openerp.com-20131216134424-fdqs03i9pidbmaqt
2013-12-16 14:44:24 +01:00
Xavier Morel 87c3b6ac72 [FIX] disabling of field escaping
bzr revid: xmo@openerp.com-20131216092343-0e6t7nvse3r0p2zs
2013-12-16 10:23:43 +01:00
ddm 8f7db60fd6 [FIX] Tour should not start when testing
bzr revid: ddm@openerp.com-20131216075516-o70h4ydhgqj4i3kh
2013-12-16 08:55:16 +01:00
Richard Mathot (OpenERP) 28d2e77c77 [MERGE] Merge parents
bzr revid: rim@openerp.com-20131216074058-hiqiyv4s041hukvv
2013-12-16 08:40:58 +01:00
Fabien Pinckaers c62e8fc793 [IMP] Small improvements
bzr revid: fp@tinyerp.com-20131214192105-0ngdj4t6fz8xjd4q
2013-12-14 20:21:05 +01:00
Fabien Pinckaers d53d456c8c [IMP] revert bug
bzr revid: fp@tinyerp.com-20131213214438-ac4mmrurq90vn01r
2013-12-13 22:44:38 +01:00
Fabien Pinckaers bc749910f2 [IMP] Revert bad change in CSS, for height of footer
bzr revid: fp@tinyerp.com-20131213213759-fz3yjc79o09jmjw2
2013-12-13 22:37:59 +01:00
Christophe Matthieu b32dd93365 [IMP] website_sale: layout for all theme and mobile view
bzr revid: chm@openerp.com-20131213161850-le6823cp9njx8iny
2013-12-13 17:18:50 +01:00
Christophe Matthieu aca3b51bf3 [IMP] website_sale: layout for all theme and mobile view
bzr revid: chm@openerp.com-20131213161642-e1ltxlidm9apg3l4
2013-12-13 17:16:42 +01:00
Max Mumford 8d5b86759e [ADD] <main> tag around main content t-raw for easier content replacement
bzr revid: mmu@openerp.com-20131213124122-ciyin33zb1tw74lp
2013-12-13 13:41:22 +01:00
ddm 2c6eb6407f [IMP] Robustify automated tour execution
bzr revid: ddm@openerp.com-20131213102106-slphhqxhkwisgd0z
2013-12-13 11:21:06 +01:00
Xavier Morel bf876739fe [REM] undo RTE button by fp demand, apparently unseen & unused by users
bzr revid: xmo@openerp.com-20131213092025-thlltl0xjxq0noyp
2013-12-13 10:20:25 +01:00
Richard Mathot (OpenERP) 1f7ca47ac0 [MERGE] Merge parents
bzr revid: rim@openerp.com-20131213091426-q8l4r5nlt93xw8w5
2013-12-13 10:14:26 +01:00
Richard Mathot (OpenERP) dd153b843f [FIX] Re-enabling jQuery form (removed by mistake)
bzr revid: rim@openerp.com-20131212114225-crafyqtfbuhrmtnp
2013-12-12 12:42:25 +01:00
Richard Mathot (OpenERP) 90c0f50f20 [MERGE] Merge parents
bzr revid: rim@openerp.com-20131212111011-6vgxvixd4g3rpgqh
2013-12-12 12:10:11 +01:00
Christophe Matthieu 745a559c77 [IMP] website: Removing unnecessary spaces at beginning of line; website_sale: fix css
bzr revid: chm@openerp.com-20131212110740-4ofu3tebr3vgcrnd
2013-12-12 12:07:40 +01:00
Christophe Matthieu ee370a837c [IMP] website: Removing unnecessary spaces at beginning of line
bzr revid: chm@openerp.com-20131212105821-mqvxb7yc04cj5k2s
2013-12-12 11:58:21 +01:00
ddm 76b5bef5fb [FIX] Tour should not start 'uninvited'
bzr revid: ddm@openerp.com-20131212102807-ra4uon05udtp5twu
2013-12-12 11:28:07 +01:00
ddm 64794a8c3b [FIX] Restore tutorial on module install
bzr revid: ddm@openerp.com-20131212095950-3675vfd0tjpzlsug
2013-12-12 10:59:50 +01:00
ddm 8fe49cf3ca [IMP] Improve resume for automated tests
bzr revid: ddm@openerp.com-20131212094306-marvfv7zewlghiii
2013-12-12 10:43:06 +01:00
ddm e84d9a7f85 [FIX] Shop tour
bzr revid: ddm@openerp.com-20131211181410-rfy68dlqps8oldll
2013-12-11 19:14:10 +01:00
Christophe Matthieu 083e88167e [IMP] website: save (button) or discard (link), on left in modal
bzr revid: chm@openerp.com-20131211163305-5qwltn11k2ph179o
2013-12-11 17:33:05 +01:00
Christophe Matthieu ef7eef6197 [IMP] website snippet: remove parent snippet when user delete the last child colmd snippet
bzr revid: chm@openerp.com-20131211162305-wxzvmwsb91e4prlb
2013-12-11 17:23:05 +01:00
Fabien Meghazi b0c4ae43ac [FIX] My humble participation to the great World War Z-index
bzr revid: fme@openerp.com-20131211153646-an990cc99t08f534
2013-12-11 16:36:46 +01:00
Christophe Matthieu 2733f9b287 [FIX] website: t-field widget monetary layout
bzr revid: chm@openerp.com-20131211152514-4s0fmnqri4l4ekkt
2013-12-11 16:25:14 +01:00
Christophe Matthieu 1acf6d904f [FIX] website: editable in context
bzr revid: chm@openerp.com-20131211152511-5bw86drta0374x6y
2013-12-11 16:25:11 +01:00
Christophe Matthieu 2257e8d431 [IMP] website: change editable and use groups
bzr revid: chm@openerp.com-20131211145930-r0izxh9t0efjwhxh
2013-12-11 15:59:30 +01:00
Christophe Matthieu 5217c8ebe8 [IMP] website: remove secure_layout. Inherit with groups for js editor
bzr revid: chm@openerp.com-20131211144402-lpanprv3u362qvd7
2013-12-11 15:44:02 +01:00
Fabien Meghazi 7fa61493db [IMP] replace company name in header by a t-field
bzr revid: fme@openerp.com-20131211143515-d1kxwvokytjmf84j
2013-12-11 15:35:15 +01:00
Christophe Matthieu d7062b80ec [FIX] website snippet: change quote for selector for bug of jquery
bzr revid: chm@openerp.com-20131211142138-p3f38wuj1zoj8zmr
2013-12-11 15:21:38 +01:00
Christophe Matthieu 8f2f589561 [FIX] website: typo, partner order, event demo data
bzr revid: chm@openerp.com-20131211112617-11kdph7cieews0y8
2013-12-11 12:26:17 +01:00
Fabien Pinckaers 27ddae9d6d [FIX] typo
bzr revid: fp@tinyerp.com-20131211100816-30iig2jh6po4z42o
2013-12-11 11:08:16 +01:00
ddm 6893a6ab15 [IMP] Improve automated tests
bzr revid: ddm@openerp.com-20131210163522-p23703mcu8pfdsl0
2013-12-10 17:35:22 +01:00
ddm 8c91a8831e [FIX] Modify blog tour before automation
bzr revid: ddm@openerp.com-20131210154500-4k03t4yag7qz0p0v
2013-12-10 16:45:00 +01:00
Christophe Matthieu bfc9435830 [IMP] website snippet: layout for quotes
bzr revid: chm@openerp.com-20131210151015-3gq40iam388d35cq
2013-12-10 16:10:15 +01:00
ddm cbdb6a3d81 [IMP] Automated tests: remove useless delay
bzr revid: ddm@openerp.com-20131210145540-jhzh8rkxj4ryf19a
2013-12-10 15:55:40 +01:00
ddm dd583d5a98 [IMP] Automated tour tests
bzr revid: ddm@openerp.com-20131210142114-kkjy8quirw84azuq
2013-12-10 15:21:14 +01:00
Christophe Matthieu bbecbabb74 [FIX] website: Can't duplicate a snippet of type quote
bzr revid: chm@openerp.com-20131210125415-tur8ibjjejyyb1ne
2013-12-10 13:54:15 +01:00
ddm 6b43cc4eef [FIX] Remove console.log
bzr revid: ddm@openerp.com-20131210125138-wqmdy5ap9z1qxm1l
2013-12-10 13:51:38 +01:00