Commit Graph

1468 Commits

Author SHA1 Message Date
Fabien Meghazi 8d08e06758 [FIX] Bundlification remains (Fixes #2463) 2014-09-17 14:50:12 +02:00
Fabien Meghazi 0d890ab76e [ADD] Compress uploaded image by default
Added an opt-out option available from the button's dropdown
2014-09-16 19:55:00 +02:00
Denis Ledoux 87d458f0d7 [FIX] website: customize menu, only a with data-view-id should actually call do_customize 2014-09-11 15:48:37 +02:00
Denis Ledoux a259370fed [FIX] website: do not bind do_customize to menu without data-action 2014-09-11 13:57:58 +02:00
Christophe Matthieu 068e69c2ed [FIX] website.editor: need to set the range on start because the browser can be lost the caret and can't insert the media in the page. 2014-09-10 10:09:34 +02:00
Fabien Meghazi 40d4b6b49f [FIX] Website translation pairing bug
I think we could get rid of the .trim() calls (for performance sake)
but I don't want to break anything so I'll leave them.
2014-09-03 12:09:31 +02:00
Christophe Matthieu c3d2540477 [FIX] website.editor: must display link information in linkdialox box. Remove /page/ and /page/website. from the needle to search page and apply real url as filter after the search 2014-08-20 17:54:10 +02:00
Christophe Matthieu 37c4bd96c1 [FIX] website.snippet: before the save of the view clean_for_save is called. The option marginAndResize (called by twitter) try to bind events on the overlay but the builder don't load the overlay (for time perf). The fix set a default jquery empty div to avoid the error. 2014-08-20 17:54:10 +02:00
Christophe Matthieu d12974eee3 [FIX] website.snippet: can't edit website with firefox; remove firefox attr for media video is edit mode 2014-08-20 17:54:10 +02:00
Jeremy Kersten e4c2da59f8 [FIX] website: use internal route for SEO suggest keyword, old server is down 2014-08-11 10:19:22 +02:00
Denis Ledoux 1bb219907f [MERGE] forward port of branch saas-5 up to 655a5b9 2014-08-04 16:56:10 +02:00
Denis Ledoux 655a5b948d [MERGE] forward port of branch saas-4 up to 8c0c743 2014-08-04 16:14:31 +02:00
Christophe Matthieu 8d53c357ba Merge pull request #1428 from odoo-dev/sass-5-fixes-chm
[FIX] website_sale and point_of_sale fixes
2014-08-04 14:43:54 +02:00
Jeremy Kersten 28e62e46b5 [FIX] website: use internal route for SEO suggest keyword, old server is down 2014-08-04 12:25:59 +02:00
Christophe Matthieu 9bf1203c33 [FIX] website: the media video create by the media editor is not display in firefox. change the css to display the video and add z-index to the div for edit mode 2014-08-01 11:54:39 +02:00
Christophe Simonis fd4fd35e32 [MERGE] forward port of branch saas-5 up to e4cb520 2014-07-30 20:52:14 +02:00
Christophe Simonis e4cb5202a0 [MERGE] forward port of branch saas-4 up to fa07bc8 2014-07-30 20:30:14 +02:00
Olivier Dony 57352367dc [IMP] website: disable translations for example URLs 2014-07-30 13:24:39 +02:00
Denis Ledoux 88c022dfc8 [MERGE] forward port of branch 7.0 up to bbb8d8f25a 2014-07-29 11:42:10 +02:00
Jeremy Kersten 89e8626ab0 [FIX] website: catch exception on destroy of ckeditor to allow the modifications to be saved anyway 2014-07-24 18:12:32 +02:00
Christophe Matthieu 330808b2cf [FIX] website.snippet: display snippet editor button inline insead of 2 lines for the small boxes 2014-07-23 16:38:09 +02:00
Christophe Matthieu 0a13d8f1db [FIX] website.snippet: display snippet editor button inline insead of 2 lines for the small boxes 2014-07-23 16:21:53 +02:00
rlu-odoo 8b67a7202d [REF] OpenERP --> Odoo in various UI texts
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages

(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)

Closes #1260
2014-07-18 13:45:41 +02:00
Christophe Matthieu 9b8e307eb1 Merge pull request #1143 from odoo-dev/8.0-fix-website_sale-chm
[FIX] website_sale: fiscal_position is undefined; website: add user into the tour logs
2014-07-14 12:10:03 +02:00
Christophe Matthieu bd11d32694 [FIX] website: banner is broken if more than one on a banner page 2014-07-11 14:06:33 +02:00
Christophe Matthieu a72bdcca90 [FIX] website: add forgotten button type (btn-success) for link editor 2014-07-11 13:38:57 +02:00
Christophe Matthieu aca1865654 [FIX] website.seo: regexp doesn't match the object and object id 2014-07-11 11:33:18 +02:00
Christophe Matthieu 1eee1d2c51 [IMP] website: replace the select box into dropdown for link editor to have a preview 2014-07-11 11:09:24 +02:00
Christophe Matthieu 67e15d8d86 [FIX] web: update bootstrap to version 3.2.0; add bootstrap less files 2014-07-10 16:59:31 +02:00
Christophe Matthieu 886d6101ac [IMP] website editor: change link editor modal layout 2014-07-10 15:25:44 +02:00
Christophe Matthieu 0effbe3ca6 [FIX] website: enumarate page raise an exception if query_string is not null; Can't create a page with the modal link editor 2014-07-10 14:30:15 +02:00
Christophe Matthieu c2c0fdc916 [IMP] website editor: remove button style from cke and insert into the link dialog box. Fix the dialog box label value when the user create a link. 2014-07-10 13:34:02 +02:00
Christophe Matthieu ca02d8820a [FIX] website: customize menu stay empty if it's open to quick. Don't throw an exception when the tour have an error: log error and close tour. 2014-07-02 13:54:57 +02:00
Simon Lejeune 186b56519d Merge remote-tracking branch 'odoo/master' into master-allow-translate-on-noedit-sle 2014-07-01 17:17:40 +02:00
Simon Lejeune 95446047ee [IMP] website translator: allow to translate a page even when you can't edit it 2014-07-01 17:02:04 +02:00
Christophe Matthieu 6a2f3e2c2a [IMP] tour.js: raise an error when phantomjs run a tour and an other running tour has been detected. 2014-07-01 13:37:41 +02:00
Antony Lesuisse 4bc43e6ac2 [FIX] website snippet editor initialisation 2014-06-29 04:01:24 +02:00
Simon Lejeune 195fa93168 [MERGE] backend front end integration
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
Antony Lesuisse 893aace122 [MERGE] website_sale optional-products 2014-06-26 12:31:15 +02:00
Christophe Matthieu 77a07670cf [IMP] website: move custom scripts in the assets; fix website_sale_option to display modal in grid view 2014-06-25 14:03:23 +02:00
Christophe Simonis 1eaa69d342 [MERGE] forward port of branch saas-5 up to 9e8e365 2014-06-25 12:44:13 +02:00
Christophe Simonis 9e8e3653f2 [MERGE] forward port of branch saas-4 up to f68c835 2014-06-25 12:43:41 +02:00
Simon Lejeune 478a763cac [MERGE] manual merge of latest bootswatch minified stylesheets 2014-06-24 11:48:49 +02:00
Jeremy Kersten 2b44ac2cd6 [MERGE] Gengo - Merge saas-4-gengo-jke - Fix gengo to make it working 2014-06-23 12:22:25 +02:00
Jeremy Kersten 18bb52ee88 [FIX] Gengo - Update modoel ir_translation for gengo and make it working. Works with order and not job, because when you send a batch to translate, you don't know all the job but only the order. 2014-06-20 17:33:09 +02:00
Christophe Matthieu 5165b52b43 merge upstream 2014-06-19 18:46:49 +02:00
Christophe Matthieu 2d686988a4 [FIX] tour.js: forgotten backdrop and orphan css 2014-06-19 17:52:32 +02:00
Christophe Simonis eef6330c55 [MERGE] forward port of branch saas-5 up to adf07a9 2014-06-19 16:23:32 +02:00
Christophe Simonis adf07a9490 [MERGE] forward port of branch saas-4 up to 5087612 2014-06-19 16:13:35 +02:00
Christophe Simonis 5087612d1d [MERGE] forward port of branch saas-3 up to bf53aed 2014-06-19 15:44:07 +02:00
Paramjit Singh Sahota 5023816c55 [FIX] website: correct selector
The selector to toggle the theme was triggered too often (on almost each button) but had no effect because no view-id was present.
Patch fix #627
2014-06-19 14:45:56 +02:00
Xavier Morel ab1406cd7c [FIX] website: ignore SVG elements when looking for edition events in RTE 2014-06-19 11:39:14 +02:00
Christophe Matthieu bc3fc54fac [IMP] Tour: add tour in web module; tour became available in backend. 2014-06-18 12:25:13 +02:00
Thibault Delavallée 916a79184b Merge pull request #610 from odoo-dev/saas-5-mass-mailing-fixes-tde
[FIX] mass_mailing, website: fixed unsubscription link, fixed mobile preview of email designer crashing because of the redirection not taking search parameters
2014-06-18 11:52:04 +02:00
Thibault Delavallée 1de1b3c272 [FIX] website: mobile preview should keep the current search; some pages depends strongly of the url parameters, notably the email designer page. 2014-06-18 11:26:55 +02:00
xmo-odoo 3160eb74c4 Merge pull request #584 from xmo-odoo/master-qweb-groups-xmo
`@groups` attribute in qweb views
2014-06-18 09:37:02 +02:00
xmo-odoo 8482632c9b Merge pull request #354 from xmo-odoo/editor-xmlid
[IMP] add XID to view name in Ace editor dropdown
2014-06-17 16:24:04 +02:00
Xavier Morel 00c2644783 [IMP] display view's XID *below* the selection
* Looks better
* Allows for a label
* Allows for longer template names and ids without cutting off
* Room to grow more info bits
2014-06-17 16:22:28 +02:00
Denis Ledoux 3742b1ab3f [FIX] website: jquery attrbutes assignation is not supported by Firefox
Happens when trying to change an image in a a banner block
2014-06-17 15:43:56 +02:00
Xavier Morel dda18249c0 [FIX] @groups attribute should not disappear when editing
The @groups attribute in qweb views was not rendered (even when matched by the
user), so editing a template with an @groups would either remove the whole
section (if the user didn't have the groups, fixed in previous commit) or only
removed the attribute itself making it visible to everybody (which ought be
fixed-ish by this commit).
2014-06-17 12:22:15 +02:00
Xavier Morel 79e10200d5 [IMP] prevent edition of page if groups which current user doesn't have
If the current view uses @groups attributes (possibly in called templates),
the corresponding elements are rendered to a void (empty string in qweb). If
said user can edit the page, does so and saves a view section in which there's
a @groups to which he has no access, the element[@groups] is completely
removed from the template once saved, losing it.

If QWeb encounters an @groups to which the current user has no right during
rendering, have it request a no-RTE page, so the user can not RTE-edit the
page (or drop snippets in it).
2014-06-17 12:01:52 +02:00
Christophe Matthieu 3d66fff4d4 [FIX] website: clean for save of snippet editor don't remove conteneteditable attributes 2014-06-16 11:47:28 +02:00
Franck Bret e932ecb9df Use encodeURIComponent in place of encodeURI for website new page title, in order to escape special chars like question mark 2014-06-11 10:40:31 +02:00
Christophe Simonis a7c2125735 [MERGE] forward port of branch saas-4 up to 6b8e972 2014-06-10 13:15:46 +02:00
Christophe Simonis 6b8e9727e5 [MERGE] forward port of branch saas-3 up to 4601d85 2014-06-10 12:29:47 +02:00
Denis Ledoux 4b884ed100 [FIX] website: on adding a slide to slider, new slide is last on save
Before, the new slide was set as first slide
Moreover, the indicators were not correct neither
2014-06-05 18:58:01 +02:00
Xavier Morel fcb82dc5f1 [IMP] add XID to view name in Ace editor dropdown
When looking for template bit to override or alter (in-core) through the Ace
editor, displaying only the name is a pain:

- the name generally sucks diseased donkey balls
- having to go through the code to find out what the template's XID is is a
  waste of time
2014-06-05 13:10:48 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Xavier Morel d67161b649 [IMP] renamed some stuff for clarity 2014-05-27 11:57:06 +02:00
Richard Mathot b4c47bcf85 [FIX] website: SEO js 2014-05-26 09:43:01 +02:00
Richard Mathot e01725d15a [FIX] website: SEO promote box 2014-05-26 08:53:54 +02:00
Richard Mathot e28c810123 [FIX] website: convert non-standard HTML metatag to data attribute 2014-05-26 08:51:38 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
rim-odoo d3beae2921 [FIX] website: make sure the hidden properties on website will not be overwritten by other properties 2014-05-16 12:19:32 +02:00
Fabien Pinckaers 106abb6496 [FIX] css edit menu alignment and fix of / handling
bzr revid: fp@tinyerp.com-20140511154058-kj8nn9fdl3li9nzi
2014-05-11 17:40:58 +02:00
Christophe Simonis b8089a1521 [MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
chm@openerp.com 3f032f3f97 [FIX] website editor: background image
bzr revid: chm@openerp.com-20140505150722-gwewelvu3uv6joen
2014-05-05 17:07:22 +02:00
chm@openerp.com 74a6bde093 [MERGE] from trunk
bzr revid: chm@openerp.com-20140505134608-hqcmqyo3d98y851j
2014-05-05 15:46:08 +02:00
Fabien Meghazi b0cbaf330a [IMP] website: load website.xml templates only in editable mode
bzr revid: fme@openerp.com-20140505113800-wv5vh802us270oez
2014-05-05 13:38:00 +02:00
chm@openerp.com 939b2f2d44 [FIX] website_sale & tour
bzr revid: chm@openerp.com-20140502155124-98xz2b4gd2zzzrkx
2014-05-02 17:51:24 +02:00
Fabien Pinckaers b5209451cd [IMP] Lossless PNG compression. Reduced size by 3 with pngquant
bzr revid: fp@tinyerp.com-20140501161452-0pw17e2v0cjjlupm
2014-05-01 18:14:52 +02:00
Fabien Meghazi b7003a382a [MERGE] upstream
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Fabien Meghazi eae846f2c8 [FIX] remove @translatable conditions and de-activate group_website_designer specifics
Bundlification (and later merge of editor and web client) can't work with conditional
script inclusion

bzr revid: fme@openerp.com-20140425124913-9jsfhbfhoq6j6xxl
2014-04-25 14:49:13 +02:00
chm@openerp.com 90d0139ae1 [FIX] website tour: must retry running tour because in test mode some files are added after the first running try
bzr revid: chm@openerp.com-20140424124703-qeft3n8xjmb1mvxn
2014-04-24 14:47:03 +02:00
chm@openerp.com ee7ff4bd07 [MERGE] from trunk
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
2014-04-23 17:48:52 +02:00
chm@openerp.com ff9ae691d5 [FIX] website: snippet editor: speed up save view (construct only option with clean_for_save method); fix carousel arrow
bzr revid: chm@openerp.com-20140423095901-q945d4593uet41xy
2014-04-23 11:59:01 +02:00
Christophe Simonis 618fbde36f [MERGE] forward port of branch saas-4 up to revid 9365 chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
bzr revid: chs@openerp.com-20140422144651-840zze7p5549k88s
bzr revid: chs@openerp.com-20140422144933-0su8g7pgrcloijco
2014-04-22 16:49:33 +02:00
Christophe Simonis 12beacda08 [MERGE] backport of trunk revisions:
9362 fp@tinyerp.com-20140421205739-rki3bctinjy3amzy [MERGE] new module: website_forum_doc + small fixes (close) in forum
9363 fp@tinyerp.com-20140421213850-19gk3hfz8qxa6fw3 [IMP] improved form view for posts

bzr revid: chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
2014-04-22 16:32:49 +02:00
Fabien Pinckaers cbf071a62c [IMP] better layout for documentation
bzr revid: fp@tinyerp.com-20140421144510-9qo1whru5u5ec721
2014-04-21 16:45:10 +02:00
chm@openerp.com 02a9df59b7 [FIX] website: media editor: display popup when user click on save button of the view
bzr revid: chm@openerp.com-20140418150831-k7fnd7y6ywrmxv6j
2014-04-18 17:08:31 +02:00
Kunal Chavda 3452694885 [MERGE] [IMP] website: tour: nice smooth cool and sexy effect when closing
or ending the tour.

bzr revid: tde@openerp.com-20140417162820-bdcpdenddqxzj949
2014-04-17 18:28:20 +02:00
Thibault Delavallée d264cd1640 [IMP] website_mail: make the template / mail editor work. We now have a limited
set of fields that we try to edit (body_html and body for body, email_from and email for
email-from, name and subject for subject), because t-field is not dynamic. If the model
that should be edited does not hold those fields, the mail editor won't work.

Also fixed editor not being actiated when going into the body edition.

bzr revid: tde@openerp.com-20140416105901-vavkh9erjsq4mof9
2014-04-16 12:59:01 +02:00
chm@openerp.com dbe1b81d15 [MERGE] from trunk
bzr revid: chm@openerp.com-20140416074634-jkcn3ae30q9uqnsi
2014-04-16 09:46:34 +02:00
chm@openerp.com 9c0526b1bd [FIX] website tour: test mode + add log
bzr revid: chm@openerp.com-20140415153734-5n2sz3xn01ydfeh6
2014-04-15 17:37:34 +02:00
Christophe Simonis 61da3f4aba [MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
Kersten Jeremy 1e93741081 [FIX] Website banner tour - Fix test according to new banner structure
bzr revid: jke@openerp.com-20140415101406-54cdr44xayvyq8xo
2014-04-15 12:14:06 +02:00
Kersten Jeremy df55b1eb9d [FIX] Website tour - Click inside the zone before to insert sampleText
bzr revid: jke@openerp.com-20140415100834-2pstpw357y9klc89
2014-04-15 12:08:34 +02:00
Kersten Jeremy 66e72fec54 [FIX] Website - Don't set active on OpenDialog link else the user cannot click on it again after.
bzr revid: jke@openerp.com-20140414094803-bfyvu3wizy09n53c
2014-04-14 11:48:03 +02:00
chm@openerp.com 1b6585e614 [MERGE] from trunk
bzr revid: chm@openerp.com-20140414081610-h4qzg0okrwrxggar
2014-04-14 10:16:10 +02:00