Commit Graph

181 Commits

Author SHA1 Message Date
Fabien Meghazi 366843b002 [ADD] website.reload()
bzr revid: fme@openerp.com-20130923115054-bvx1ssa3pag6d56x
2013-09-23 13:50:54 +02:00
Xavier Morel 922053531e [MERGE] from parent
bzr revid: xmo@openerp.com-20130912141026-mmmyg91nwlzccr0g
2013-09-12 16:10:26 +02:00
Xavier Morel 6dca1c21d6 [IMP] let jquery's deferred thingie do template counterizing
bzr revid: xmo@openerp.com-20130912113733-mywljr0w0xnjt1ao
2013-09-12 13:37:33 +02:00
Xavier Morel 48c17faf25 [IMP] no point in using jquery just to fetch an attribute on root element
bzr revid: xmo@openerp.com-20130912113028-gsascr30eqw33d3p
2013-09-12 13:30:28 +02:00
Fabien Meghazi 3f4d64b1f0 [IMP] Use context in website's js rpc calls
bzr revid: fme@openerp.com-20130911161854-zhm53dugiisychfb
2013-09-11 18:18:54 +02:00
Christophe Matthieu 819eb62490 [WIP] website: snippets: work carousel insert and vomify
bzr revid: chm@openerp.com-20130909153251-9ixd50vy4ulyecgq
2013-09-09 17:32:51 +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 8a3f1742e0 [MERGE] from website-al
bzr revid: chm@openerp.com-20130906083500-4n5knaxiqt4cg2ht
2013-09-06 10:35:00 +02:00
Christophe Matthieu 91052e02c9 [IMP] website: apply publisher css to all website modules
bzr revid: chm@openerp.com-20130903110410-cxigps11scpr9dpr
2013-09-03 13:04:10 +02:00
Christophe Matthieu 1fbf4c6349 [IMP] website: publisher with css for activated and disabled
bzr revid: chm@openerp.com-20130903104115-9yukaqh0teh45ipf
2013-09-03 12:41:15 +02:00
Christophe Matthieu d95305b7a4 [IMP] website: publish button layout
bzr revid: chm@openerp.com-20130902141454-z3rec943y5tjcg92
2013-09-02 16:14:54 +02:00
Frédéric van der Essen c5fa23bffa [IMP] website editor: allow click trough on snippet manipulators
bzr revid: fva@openerp.com-20130902091005-pnhb05fxk29z5q0r
2013-09-02 11:10:05 +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
Xavier Morel 796dcee2c3 [IMP] split out website.js
bzr revid: xmo@openerp.com-20130829102956-prfe9t5308m6y0vn
2013-08-29 12:29:56 +02:00
Xavier Morel 243ac25379 [IMP] avoid selectors when they are unnecessary
bzr revid: xmo@openerp.com-20130829093633-tjxrcbms076ihdv0
2013-08-29 11:36:33 +02:00
ddm 189dabab53 Mergefix
bzr revid: ddm@openerp.com-20130828140326-82z41q5yn08olrlv
2013-08-28 16:03:26 +02:00
ddm 3c9f07d244 SEO: keyword suggest mockup
bzr revid: ddm@openerp.com-20130828135558-w4ysgixr6l7n45b5
2013-08-28 15:55:58 +02:00
Xavier Morel d5ec571b8d [FIX] using the correct event turns out to work better than using the wrong one
The event for an editor being ready is instanceReady not loaded, turns
out there's no need for big comments whining about things not working
when using the right one.

bzr revid: xmo@openerp.com-20130828113905-sp2nby6hbnae8jfp
2013-08-28 13:39:05 +02:00
Xavier Morel 43c0bb84df [IMP] String#slice can take a negative second index
bzr revid: xmo@openerp.com-20130828092003-mjrao9vl9ju6bxa1
2013-08-28 11:20:03 +02:00
Xavier Morel 217fb8a53b [IMP] style & jquery usage & stuff
bzr revid: xmo@openerp.com-20130828091741-p1qdgqq8er47ouoq
2013-08-28 11:17:41 +02:00
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
ddm 3871d540f8 SEO: enforce max 10 keywords
bzr revid: ddm@openerp.com-20130827151654-utzf6zz382m3oz3g
2013-08-27 17:16:54 +02:00
ddm fcd97879e3 Improve SEO tools CSS across themes
bzr revid: ddm@openerp.com-20130827141235-wfrx21hqem1v076b
2013-08-27 16:12:35 +02:00
Fabien Meghazi f6fac87a45 [FIX] CKeditor customization
bzr revid: fme@openerp.com-20130827134259-pftz0iar2c5eqvge
2013-08-27 15:42:59 +02:00
ddm be165dbb7a SEO tools visual cleanup
bzr revid: ddm@openerp.com-20130827113550-xi8r0qs8oz2uu990
2013-08-27 13:35:50 +02:00
Fabien Pinckaers 8f64dd7f65 [IMP] Themes as a separate page, need to load all bootswatch themes when moving to BS3
bzr revid: fp@tinyerp.com-20130827095658-22jfyowv3bq3wfa1
2013-08-27 11:56:58 +02:00
ddm 5ddbdeac96 SEO keywords list mockup
bzr revid: ddm@openerp.com-20130827093237-v13oihsyhadl92w3
2013-08-27 11:32:37 +02:00
ddm 48a8aa14a3 SEO keywords must be unique
bzr revid: ddm@openerp.com-20130827085121-2vkxscag56dze107
2013-08-27 10:51:21 +02:00
ddm 85e54aba60 Add SEO keyword with [ENTER]
bzr revid: ddm@openerp.com-20130827083721-k49j8z0t081ig2p0
2013-08-27 10:37:21 +02:00
ddm 5f7d4098a0 Code cleanup
bzr revid: ddm@openerp.com-20130827082232-4irtyjd4t67pz5hl
2013-08-27 10:22:32 +02:00
ddm 08be8ad7b8 Prevent scrolling on SEO modal
bzr revid: ddm@openerp.com-20130827075552-udkn3d5xqpe62zka
2013-08-27 09:55:52 +02:00
ddm f880ce9ae7 Code cleanup
bzr revid: ddm@openerp.com-20130827074816-1kuvpbz6vubhel68
2013-08-27 09:48:16 +02:00
ddm 5787f089d3 SEO mockup fixes
bzr revid: ddm@openerp.com-20130827072124-41iuhuwr0dsdfbm6
2013-08-27 09:21:24 +02:00
ddm bda0a4fa36 SEO configurator mockup
bzr revid: ddm@openerp.com-20130827070435-bqrhg887ynz1f6ys
2013-08-27 09:04:35 +02:00
Frédéric van der Essen ae1687c6ab [WIP] website: trying to make inpage snippet drag and drop work
bzr revid: fva@openerp.com-20130826143921-myctckmddoexa1fv
2013-08-26 16:39:21 +02:00
Frédéric van der Essen 306138327f [IMP] website: snippet resizing
bzr revid: fva@openerp.com-20130823160411-xoxek62wwhi5w3by
2013-08-23 18:04:11 +02:00
Frédéric van der Essen 8b23e73241 [FIX] website: fix regression in carousel insertion:w
bzr revid: fva@openerp.com-20130823100221-bm3jd0lzrv8929g7
2013-08-23 12:02:21 +02:00
Frédéric van der Essen b4ca228747 [IMP] website: clean up client side templates
bzr revid: fva@openerp.com-20130823100022-a2f0n4oc7f16glfd
2013-08-23 12:00:22 +02:00
Frédéric van der Essen d59a47f79c [IMP] website: merge snippet insert and mutation drag & drop code
bzr revid: fva@openerp.com-20130823091647-uoatz0k1458idhf3
2013-08-23 11:16:47 +02:00
Frédéric van der Essen 3ad504ffc4 [IMP] website: cleanup drop zones css and sort out z-index issues
bzr revid: fva@openerp.com-20130823090757-ffqvcselr1merggk
2013-08-23 11:07:57 +02:00
Frédéric van der Essen 678bb7c4a0 [MERGE] from upstream
bzr revid: fva@openerp.com-20130823083724-9jq4cjc1wea0b59q
2013-08-23 10:37:24 +02:00
Frédéric van der Essen a2e4c9b7e0 [IMP] website: mutation snippets
bzr revid: fva@openerp.com-20130823082712-sdcke0hy5yspszkb
2013-08-23 10:27:12 +02:00
ddm fe45f507a2 Fix variable name
bzr revid: ddm@openerp.com-20130822200407-450rptud8peg4fp7
2013-08-22 22:04:07 +02:00
ddm 141dcf577b Clarify
bzr revid: ddm@openerp.com-20130822133621-237gzh6wxisxnn00
2013-08-22 15:36:21 +02:00
ddm f820c074a1 Disable editor on smartphones
<=767px according to bootstrap responsive classes

bzr revid: ddm@openerp.com-20130822124013-br8ccw8hb26dr060
2013-08-22 14:40:13 +02:00
Christophe Matthieu 4b67f75722 [IMP] website: kanban: remove default layout with thumbnail class
bzr revid: chm@openerp.com-20130822093049-6kcj1eobj2sl2nn4
2013-08-22 11:30:49 +02:00
Christophe Matthieu 833951634e [FIX] website: kanban pager position
bzr revid: chm@openerp.com-20130822092536-lij12jeueg6bbo6v
2013-08-22 11:25:36 +02:00
Christophe Matthieu 8c23530b85 [FIX] website: kanban javascript
bzr revid: chm@openerp.com-20130822092416-sfcygyz15oi7qygr
2013-08-22 11:24:16 +02:00
Christophe Matthieu 0edba38c86 [IMP] website: kanban view; script in js file, dynamique template
bzr revid: chm@openerp.com-20130822091812-i71rjpxj1cprifbh
2013-08-22 11:18:12 +02:00
ddm 7d40a7db38 Mobile preview (initial commit)
bzr revid: ddm@openerp.com-20130822085825-7mpsoi0nyujekg5f
2013-08-22 10:58:25 +02:00
Frédéric van der Essen 6ccd087ee0 [MERGE] from upstream
bzr revid: fva@openerp.com-20130821163002-y45g9l65xwrcxmsn
2013-08-21 18:30:02 +02:00
Frédéric van der Essen 5848dc526f [IMP] website: basics of snippet system are now working and looking good
bzr revid: fva@openerp.com-20130821162534-yr6nx292xoj2m2s2
2013-08-21 18:25:34 +02:00
Xavier Morel 667dbbfdd9 [IMP] simplify ckeditor image and link dialogs
& add easy linking to existing site pages and attachments

bzr revid: xmo@openerp.com-20130821143816-0hvp0m0eklh6ti1m
2013-08-21 16:38:16 +02:00
Xavier Morel 92a20deca8 [ADD] simplified link dialog + link to existing pages dropdown
TODO: better UI, create new page, correct selection when reopen dialog

bzr revid: xmo@openerp.com-20130821143152-o3lawyupxcssuq2v
2013-08-21 16:31:52 +02:00
Xavier Morel 71f2c8ee4b [IMP] simplify CKEditor's image dialog, implement very basic attachment picker
TODO: image picker which isn't just a crappy select, using widget type
      html (?)

bzr revid: xmo@openerp.com-20130821094550-u3k5aaqna7zyl8ek
2013-08-21 11:45:50 +02:00
Fabien Meghazi ae8630a735 [IMP] website's framework setup and template loading
bzr revid: fme@openerp.com-20130820213450-r71yyp42lw45plem
2013-08-20 23:34:50 +02:00
Fabien Meghazi 2794f018b7 [FIX] jshint
bzr revid: fme@openerp.com-20130820205820-m24w4b4so10k4fql
2013-08-20 22:58:20 +02:00
Frédéric van der Essen 6284b4b925 [WIP] cms: snippets are ugly but working well
bzr revid: fva@openerp.com-20130820164557-kjh87mrtv4tueln8
2013-08-20 18:45:57 +02:00
Frédéric van der Essen 63dd1b0bb7 [MERGE] from trunk
bzr revid: fva@openerp.com-20130819141108-s2vsjqdzzzlib4oi
2013-08-19 16:11:08 +02:00
Frédéric van der Essen 660e8798ab [WIP] website: Cleaning up the snippet editor
bzr revid: fva@openerp.com-20130819092507-s3d9wl1ph6z43thh
2013-08-19 11:25:07 +02:00
Fabien Meghazi c94c7c4226 [WIP] unwebclientification of the Editorbar
bzr revid: fme@openerp.com-20130814171532-36trhgx2vso7yrr3
2013-08-14 19:15:32 +02:00
Christophe Matthieu ddf32f4f9e [IMP] website: refact. python for website publish button
bzr revid: chm@openerp.com-20130814084505-5ynbrmfvbu48v7kx
2013-08-14 10:45:05 +02:00
Christophe Matthieu 39d5bced7f [IMP] website: refact. javascript,xml for website publish button
bzr revid: chm@openerp.com-20130814083439-wvc07n0sg2vblq1y
2013-08-14 10:34:39 +02:00
Xavier Morel 99810cb885 [FIX] disable RTE titles auto-set by ckeditor
they're used for accessibility purpose (set both as @title and
@aria-label), but the generated default is kinda crap.

Set better title if we can, for now disable them.

bzr revid: xmo@openerp.com-20130813134144-6jhqpv2jd9ov52yt
2013-08-13 15:41:44 +02:00
Xavier Morel 744e7214d5 [IMP] enable CKEDITOR on every element, seems to work acceptably well for now
potential problem: toolbar allowing creation of block elements inside inlines

bzr revid: xmo@openerp.com-20130813132547-pxcm6jvodabv7xc6
2013-08-13 15:25:47 +02:00
Fabien Meghazi 61f39203e2 [REM] Removed useless code
bzr revid: fme@openerp.com-20130813101338-35aceg5d9n0obzpw
2013-08-13 12:13:38 +02:00
Xavier Morel 8f73da7290 [FIX] extraction & saving of view sections
editor.getData() only gets the (cleaned-up) innerHTML of the editor,
whereas the server expects all of the editor (root element included).

* #destroy() so ckeditor removes its stuff
* cleanup attributes/classes added internally
* send/save outerHTML data

bzr revid: xmo@openerp.com-20130812123612-gxen3ifd2pbbdg78
2013-08-12 14:36:12 +02:00
Xavier Morel 8a697a8b84 [FIX] missing element reference used in error handler
bzr revid: xmo@openerp.com-20130812121148-wuyxjn6ubyc4tthp
2013-08-12 14:11:48 +02:00
Fabien Meghazi f9463c0490 [FIX] Customize menu. Added data-view-xmlid in html's rendered dom
bzr revid: fme@openerp.com-20130812105521-esswt5zckea0lzuc
2013-08-12 12:55:21 +02:00
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
Fabien Pinckaers e521318db7 [IMP] add comment
bzr revid: fp@tinyerp.com-20130811144648-h2m5319w5nq40pbm
2013-08-11 16:46:48 +02:00
Fabien Pinckaers a416267806 [IMP] Website Apps
bzr revid: fp@tinyerp.com-20130811140619-a164pkqxwpdwrohc
2013-08-11 16:06:19 +02:00
Fabien Pinckaers a40abac6cb [IMP] bootstrapifying topbar
bzr revid: fp@tinyerp.com-20130811103514-l2enykdzxk3ov4wz
2013-08-11 12:35:14 +02:00
Fabien Pinckaers 25fc0addfc [IMP] Toolbar Editor
bzr revid: fp@tinyerp.com-20130809132316-zpo429mzzb2v23om
2013-08-09 15:23:16 +02:00
Fabien Pinckaers f5c06fc363 [IMP] Style toolbar
bzr revid: fp@tinyerp.com-20130809131352-l9z5316abe1mlit2
2013-08-09 15:13:52 +02:00
Xavier Morel 8f1acfff3b [ADD] basic stylesSet conf
bzr revid: xmo@openerp.com-20130807121746-10gjzibadyr1kdml
2013-08-07 14:17:46 +02:00
Xavier Morel 204fb89a8c [IMP] switch ck to built-in toolbar again
bzr revid: xmo@openerp.com-20130807115905-4ooacsvwh7tsone5
2013-08-07 13:59:05 +02:00
Fabien Meghazi fb7381107c [FIX] Temporary fix until un-webclientization of the editorbar
bzr revid: fme@openerp.com-20130805082638-62mrzilwcu7wapd5
2013-08-05 10:26:38 +02:00
Frédéric van der Essen 7664044486 you can insert snippets 'after' the selected zone, it makes more sense that way
bzr revid: fva@openerp.com-20130731154603-u89aajeivlqvi5uj
2013-07-31 17:46:03 +02:00
Frédéric van der Essen 5cd78dd614 working snippets
bzr revid: fva@openerp.com-20130731152220-tpdkg6lh4zt15bre
2013-07-31 17:22:20 +02:00
Xavier Morel f25335df31 [FIX] disable ckeditor's magicline plugin (not very useful and breaks droppables)
bzr revid: xmo@openerp.com-20130731150733-mna9qoygkn6qiers
2013-07-31 17:07:33 +02:00
Christophe Matthieu 7c2d3a871f [IMP] website: carousel edition
bzr revid: chm@openerp.com-20130731150511-8wfza72kb6lynmor
2013-07-31 17:05:11 +02:00
Christophe Matthieu ed2f62ba6c [HACK] website: hack for scrolling of pseudo snippet carousel. To do: change snippet
bzr revid: chm@openerp.com-20130731141424-pgobjw0yvri7sqaf
2013-07-31 16:14:24 +02:00
Fabien Meghazi 96d3080998 [HACK] Quick hack in order to disable parents and childs links of a raw editable element
bzr revid: fme@openerp.com-20130731140631-40a85qnk0ao54zlz
2013-07-31 16:06:31 +02:00
Frédéric van der Essen 2593a645fe [MERGE] from upstream
bzr revid: fva@openerp.com-20130731134958-m04umqrjepb6duqi
2013-07-31 15:49:58 +02:00
Frédéric van der Essen 24b68f0610 fixing snippets (just enough for the video demo)
bzr revid: fva@openerp.com-20130731134057-clqxu1mj149dsbhz
2013-07-31 15:40:57 +02:00
Xavier Morel 6796ce09b8 [IMP] disable ckeditor's context menu
bzr revid: xmo@openerp.com-20130731121358-x400woct28kh79xf
2013-07-31 14:13:58 +02:00
Xavier Morel 19eb0a33e0 [ADD] images upload
bzr revid: xmo@openerp.com-20130731121343-0uy1cfga6rbilkj5
2013-07-31 14:13:43 +02:00
Xavier Morel c5f28af3fe [WHATEVER] make snippet editor do stuff
bzr revid: xmo@openerp.com-20130731102248-kl5upc2w48h9bisv
2013-07-31 12:22:48 +02:00
Xavier Morel 444db71456 [HACK] filter snippets so ckeditor is not applied to them
bzr revid: xmo@openerp.com-20130731091513-u3fklrijeuc6l80a
2013-07-31 11:15:13 +02:00
Xavier Morel 7f74e4ade1 [FIX] disable automatic insertion of paragraphs in content sections by ckeditor
bzr revid: xmo@openerp.com-20130731090151-q0gqmjx50wf6nm2n
2013-07-31 11:01:51 +02:00
Christophe Matthieu 729f65bd71 [IMP] website: add menu item in backend
bzr revid: chm@openerp.com-20130731090625-6q7d2kmgaslvu3dl
2013-07-31 11:06:25 +02:00
Xavier Morel 7a12d33498 [FIX] whitelist section, header and footer for edition
bzr revid: xmo@openerp.com-20130731075635-wr3tdl2p12j34cmw
2013-07-31 09:56:35 +02:00
Antony Lesuisse d616e2d5fe m
bzr revid: al@openerp.com-20130731074829-koml85g6ofa9r1c0
2013-07-31 09:48:29 +02:00
Christophe Matthieu 5d90e20f8b [FIX] website: error on click on Edit button. Fix: filter not(data-oe-type). xmo
bzr revid: chm@openerp.com-20130730152856-du26nlnqjd4evulg
2013-07-30 17:28:56 +02:00
Xavier Morel 9b49dfb46a [FIX] RTE on links and 'correct' enabling of save button
bzr revid: xmo@openerp.com-20130730151544-m3ggaaoyckvhos65
2013-07-30 17:15:44 +02:00
Xavier Morel 4d41a7f389 [FIX] add event handlers on non-rte contenteditables to trigger enabling of save button, fixup filters
bzr revid: xmo@openerp.com-20130730150955-ttqovqamexqtd8r9
2013-07-30 17:09:55 +02:00
Christophe Matthieu 1d0af41f61 [IMP] website: carousel
bzr revid: chm@openerp.com-20130730143643-1itg8hhwuchnb5k3
2013-07-30 16:36:43 +02:00
Xavier Morel 2a0dc6af7a [ADD] quote, text justification, list indent/outdent
todo: really need contextual conditions on buttons

bzr revid: xmo@openerp.com-20130730094320-n352j55bo7bs3ubj
2013-07-30 11:43:20 +02:00
Xavier Morel 8370ba6adc [ADD] link/unlink commands
bzr revid: xmo@openerp.com-20130729152601-00gvds9r39mo2n2a
2013-07-29 17:26:01 +02:00