Commit Graph

244 Commits

Author SHA1 Message Date
Richard Mathot (OpenERP) 77e89f6a81 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140220120929-lbhrdz5sv190ylhu
2014-02-20 13:09:29 +01:00
Paramjit Singh Sahota e776245b8b [ADD] Added jquery.placeholder lib. because IE9 is not supporting the placeholders.
bzr revid: psa@tinyerp.com-20140220100716-01mjib3w692qdgi1
2014-02-20 15:37:16 +05:30
Christophe Matthieu 09397684b3 [FIX] website: change odrer of script tag because jquery-ui-1.9.1.custom overwrite jQuery and cancel some bootstrap method in edit mode
bzr revid: chm@openerp.com-20140218153451-uxd87o5b7zy3asvv
2014-02-18 16:34:51 +01:00
Christophe Matthieu 00c810ab14 [FIX] website: Don't allow to edit the menu inline. Users try to change the link, but it does not work. We can put a tooltip explaning they should use the content top menu to edit the menu; bootstrap tooltip don't available in edit mode.
bzr revid: chm@openerp.com-20140218145619-fboofhu111s3g45p
2014-02-18 15:56:19 +01:00
Christophe Matthieu 8830cb581c [FIX] website: In the footer, users record their phone number inbetween the fa-phone and the t-field. As a result, they change the footer template, not the phone number of the company. This zone should be t-ignore to avoid this mistake.
bzr revid: chm@openerp.com-20140218110250-lvvem8ibkg3g8e8d
2014-02-18 12:02:50 +01:00
openerp-sle 2445e9f0bc [MERGE] trunk
bzr revid: openerp-sle@openerp-sle.home-20140216103609-ihf3bz4nf4rds5ue
2014-02-16 11:36:09 +01:00
openerp-sle 0ae6d1f4e7 [FIX] More accurate values for the demo paper format and website contact widget enhanced
bzr revid: openerp-sle@openerp-sle.home-20140213120739-4jh30s94scfr584e
2014-02-13 13:07:39 +01:00
openerp-sle eb4bdb1a49 [IMP] Website: contact widget has now an option to disable fontawesome markers
bzr revid: openerp-sle@openerp-sle.home-20140212220801-66kuwbz8d3piy2sa
2014-02-12 23:08:01 +01:00
Christophe Matthieu ed785f0783 [FIX] website_sale: pager and breadcrum keep search and filter. Filter keep search and category. Links for category
bzr revid: chm@openerp.com-20140212115516-3izdv7cszgh2n3l4
2014-02-12 12:55:16 +01:00
Christophe Matthieu ac03ba3095 [FIX] website: pager don't keep searches
bzr revid: chm@openerp.com-20140212102805-5khiv3cgslci9che
2014-02-12 11:28:05 +01:00
Christophe Matthieu 1b52723e97 [IMP] website: remove bootstrap in addons/website and use bootstrap from web
bzr revid: chm@openerp.com-20140211110457-cmqdhbs6wugqt14x
2014-02-11 12:04:57 +01:00
Christophe Matthieu 7d1ba3329c [FIX] website: contactus: address of the company above the phone, typo edit button
bzr revid: chm@openerp.com-20140211095933-s712ssydrv1d54nq
2014-02-11 10:59:33 +01:00
Richard Mathot (OpenERP) af58bb70bc [MERGE] Merge trunk
bzr revid: rim@openerp.com-20140211072305-uzc1oocfn4jnuf8i
2014-02-11 08:23:05 +01:00
Frédéric van der Essen 04a6074b1a [MERGE] forward porting fixes from saas-3
bzr revid: fva@openerp.com-20140210155628-75mgw7qcq9k5ncem
2014-02-10 16:56:28 +01:00
Xavier Morel d4c7de4b03 [FIX] work around distribute_branding
distribute_branding is applied after view inheritance is applied, and does not
take it in account. As a result, altering an existing view "from the top"
(e.g. adding a div element preceding an existing div) will alter the xpath
leading to whatever element we need to deal with.

Move fakebar injection to the bottom of the body, where it can't have any
impact on preceding node paths.

bzr revid: xmo@openerp.com-20140210132855-lwh1ow1tq1e0pidp
2014-02-10 14:28:55 +01:00
Richard Mathot (OpenERP) 7b606a662b [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140210082325-orsule85beliwswl
2014-02-10 09:23:25 +01:00
Antony Lesuisse 87172d90d2 [MERGE] saas-3
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
2014-02-09 15:03:15 +01:00
Richard Mathot (OpenERP) 1a7d7a3f55 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140207163324-0fj6qsqs79bvutx6
2014-02-07 17:33:24 +01:00
Fabien Pinckaers 5f92743b18 [IMP] logo by default (easier to configure)
bzr revid: fp@tinyerp.com-20140207134836-pjub0d84nxmgb560
2014-02-07 14:48:36 +01:00
Christophe Matthieu b21bb08c22 [ADD] website: test login, backend, go back, branding, edit, logout
bzr revid: chm@openerp.com-20140207125231-3zd0i1axdwuht5g4
2014-02-07 13:52:31 +01:00
Christophe Matthieu e8964f896c [FIX] website: tour, test and test_runner
bzr revid: chm@openerp.com-20140206140746-jmeyx8q9qxv7sz1j
2014-02-06 15:07:46 +01:00
Christophe Matthieu d819d494f1 [IMP] website: add debugger template used to create nex tours/tests (display in customize menu in debug mode)
bzr revid: chm@openerp.com-20140206135036-geq8fubtz39pxp20
2014-02-06 14:50:36 +01:00
Xavier Morel 18d9e91394 [IMP] make editor bar appear faster to avoid impression of slowness and reflow
bzr revid: xmo@openerp.com-20140204153616-swho76l8v3s4p1dq
2014-02-04 16:36:16 +01:00
ddm@openerp.com 319185a1ed [FIX] Remove redundant microdata
bzr revid: ddm@openerp.com-20140203131454-7h3t2x4ff1z085xi
2014-02-03 14:14:54 +01:00
ddm@openerp.com 0733d51365 [IMP] Organization microdata
bzr revid: ddm@openerp.com-20140203124718-8ogunilwsvm42ikt
2014-02-03 13:47:18 +01:00
Richard Mathot (OpenERP) 7f0c30580b [MERGE] Sync with trunk-website-al
bzr revid: rim@openerp.com-20140131154544-tfcci0uo0q6652jh
bzr revid: rim@openerp.com-20140202135602-82pcqeqqtdp6h9fr
2014-02-02 14:56:02 +01:00
Fabien Meghazi 5451f5587d [REV] Bring back QWebExceptions
bzr revid: fme@openerp.com-20140131113611-wee3xvnvzw9smq2r
2014-01-31 12:36:11 +01:00
Richard Mathot (OpenERP) 7b70388235 [MERGE] Sync with trunk-website-al
bzr revid: rim@openerp.com-20140131075821-qx8cc0ybtxqr7219
2014-01-31 08:58:21 +01:00
Antony Lesuisse 974c666bcd [REV] website qweb dont change exception types
bzr revid: al@openerp.com-20140131011427-3bome249kut8fs3t
2014-01-31 02:14:27 +01:00
Fabien Meghazi 1931c307a2 [IMP] Improved qweb exeptions handling
bzr revid: fme@openerp.com-20140130212053-fkb9ug49qun54ehi
2014-01-30 22:20:53 +01:00
Fabien Meghazi fc979b9a7a [FIX] url_for()
bzr revid: fme@openerp.com-20140130195043-pkfkmqg80c2yk5p5
2014-01-30 20:50:43 +01:00
Fabien Pinckaers 51af63eeb7 [FIX] margin left fa-envelop
bzr revid: fp@tinyerp.com-20140130182558-63lw9szcro3qmjee
2014-01-30 19:25:58 +01:00
Christophe Simonis fb69a8bf70 [IMP] website: use company logo
bzr revid: chs@openerp.com-20140130181210-y5zbmtc0fimcn9ia
2014-01-30 19:12:10 +01:00
Richard Mathot (OpenERP) afdc063112 [MERGE] Sync with trunk-website-al
bzr revid: rim@openerp.com-20140130073558-afmllqhuwghv374g
2014-01-30 08:35:58 +01:00
Antony Lesuisse 632c014b76 [FIX] fix werkzeug dependency on debian, misc changes
- add an more friendly syntax for images /website/image/<model>/<id>/<field>
- reorder methods based on their use case
- move new page to /website namespace

bzr revid: al@openerp.com-20140129163809-d4z4f8t3h11n5ozv
2014-01-29 17:38:09 +01:00
Richard Mathot (OpenERP) f88389bbeb [MERGE] Sync with trunk-website-al
bzr revid: rim@openerp.com-20140129083209-w119hzabepx233af
2014-01-29 09:32:09 +01:00
Fabien Meghazi 326c35aecd [IMP] Merge bananas and cumcumbers in order to prepare the t-href|t-action removal
bzr revid: fme@openerp.com-20140128201417-1elmttz8qen9q3ws
2014-01-28 21:14:17 +01:00
Richard Mathot (OpenERP) 8c00a0125c [MERGE] Sync with trunk-website-al
bzr revid: rim@openerp.com-20140128143445-tse97tsr0yvubv0y
2014-01-28 15:34:45 +01:00
Antony Lesuisse 7c90d3afa5 [FIX] website page creation
bzr revid: al@openerp.com-20140128140017-r8yy8tzsvo4y0e92
2014-01-28 15:00:17 +01:00
Richard Mathot (OpenERP) c43fff5627 [MERGE] Sync with trunk-website-al
bzr revid: rim@openerp.com-20140128125340-j6ennyh75o2js7e9
2014-01-28 13:53:40 +01:00
Christophe Matthieu d588e44d34 [IMP] event,event_sale: refactoring; remove crappy 9999 hardcoded values; remove visibility; add constraints
[FIX] remove module_portal_anonymous ref
[IMP] website: res_config with wizard
[IMP] event: remove related field to res.partner
[FIX] website_sale: change crappy _get_pricelist method (who return a browse record to a function field type many2one)

bzr revid: chm@openerp.com-20140128092037-zrrbz1hrmgat88o4
2014-01-28 10:20:37 +01:00
Christophe Matthieu 43044d8ee7 [IMP] event,event_sale: refactoring; remove crappy 9999 hardcoded values; remove visibility; add constraints
bzr revid: chm@openerp.com-20140127135828-z848mvpis5d9xyh8
2014-01-27 14:58:28 +01:00
Fabien Meghazi a2fb618354 [FIX] do not crash when trying to rescue a wrong t-call in template
Need trunk-website-al server's Rev#5173

bzr revid: fme@openerp.com-20140127114034-luhekopukpbmntqt
2014-01-27 12:40:34 +01:00
Fabien Pinckaers 28a0355775 [IMP] website_quote new modules + small fixes
bzr revid: fp@tinyerp.com-20140125234925-mlg0rlwg3moiueuk
2014-01-26 00:49:25 +01:00
Fabien Pinckaers d820b63956 [IMP] clean 404
bzr revid: fp@tinyerp.com-20140125225233-rkvsavn6np5s0z3e
2014-01-25 23:52:33 +01:00
Fabien Pinckaers ec9d4b6613 [FIX] CSS bug in menu when edit
bzr revid: fp@tinyerp.com-20140125132939-byp7m5p699cbc77j
2014-01-25 14:29:39 +01:00
Christophe Simonis 79fc8d3d20 [FIX] website: select2 is now included in web module
bzr revid: chs@openerp.com-20140124155944-sfre35hkyk0dxcnb
2014-01-24 16:59:44 +01:00
Xavier Morel ce155acefe [IMP] with device-width, iOS devices don't respond to orientation changes. Use initial-scale instead
bzr revid: xmo@openerp.com-20140124135713-e0uzbnaq5m9hiocr
2014-01-24 14:57:13 +01:00
Xavier Morel 11c2325374 [ADD] viewport meta, so the responsive bootstrapy stuff actually does things
bzr revid: xmo@openerp.com-20140124134729-epag5dnbjk8y2hcw
2014-01-24 14:47:29 +01:00
Richard Mathot (OpenERP) 8e11708bd1 [MERGE] Sync with trunk-website-al
bzr revid: rim@openerp.com-20140124081035-h2tgo573na68vadi
2014-01-24 09:10:35 +01:00
Fabien Meghazi df63fcba81 [MERGE] upstream
bzr revid: fme@openerp.com-20140122102232-77lvvwpzet58sa7p
2014-01-22 11:22:32 +01:00
Fabien Meghazi 060cbedfb0 [IMP] Sign in shall not redirect to website
bzr revid: fme@openerp.com-20140122085948-18tzsgz2p7f2zqpl
2014-01-22 09:59:48 +01:00
Fabien Pinckaers 9d39a2c1b7 [IMP] better formatting of address
bzr revid: fp@openerp.com-20140121190242-dfs8difj7tey9fts
2014-01-21 20:02:42 +01:00
ddm@openerp.com 1c3a7a8fd3 [IMP] Add support for Google Analytics
bzr revid: ddm@openerp.com-20140121163456-i3v3a7oh8qejc9oo
2014-01-21 17:34:56 +01:00
Christophe Matthieu 87d6f608da [IMP] website: In the top menu, we should see the active page
bzr revid: chm@openerp.com-20140121154348-1y6uqc6t2oveae7i
2014-01-21 16:43:48 +01:00
Christophe Matthieu b38d4d8a81 [FIX] website_blog: tour
bzr revid: chm@openerp.com-20140121152307-kx92ee0za0w0pprr
2014-01-21 16:23:07 +01:00
Christophe Matthieu 4ff1af4d01 [FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget
bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
2014-01-21 13:39:12 +01:00
Richard Mathot (OpenERP) e3139e05fb [IMP] Enabling jQuery.form plugin for website (required to process surveys)
bzr revid: rim@openerp.com-20140121091344-mrujw28mykj8h6wc
2014-01-21 10:13:44 +01:00
Christophe Matthieu 53d8280f1d [IMP] website: test class with test for website_sale sale process
bzr revid: chm@openerp.com-20140120182643-tw65rig4qqi3sqqf
2014-01-20 19:26:43 +01:00
Fabien Meghazi c1f0fb5ed1 [MERGE] upstream
bzr revid: fme@openerp.com-20140120161145-ntxx6y01vekk3tg2
2014-01-20 17:11:45 +01:00
Fabien Pinckaers 57505a1b24 [IMP] better about us page
bzr revid: fp@tinyerp.com-20140119203319-ctai57l7kd4v2qxq
2014-01-19 21:33:19 +01:00
Fabien Pinckaers 986546ae16 [IMP] improved footer CSS, 8 pixels more
bzr revid: fp@tinyerp.com-20140119200952-6cfsm3wwwv8b6x3x
2014-01-19 21:09:52 +01:00
Fabien Pinckaers a83f1282fa [IMP] CSS for logo, one pixel better
bzr revid: fp@tinyerp.com-20140119193527-8e7oc1umebqkqxgx
2014-01-19 20:35:27 +01:00
Fabien Pinckaers 40d490f507 [iMP] CSS langs
bzr revid: fp@openerp.com-20140119182208-owtazt6q3hn3v7wm
2014-01-19 19:22:08 +01:00
Fabien Pinckaers d554f09ca7 [IMP] Logo
bzr revid: fp@openerp.com-20140119122959-etp99cwiuuagws30
2014-01-19 13:29:59 +01:00
Fabien Pinckaers 270a25c7f5 [IMP] Allow logo in header
bzr revid: fp@openerp.com-20140119120858-43rgeymrjmt42f11
2014-01-19 13:08:58 +01:00
Fabien Meghazi f41243acd3 [FIX] Login link from website
bzr revid: fme@openerp.com-20140116182759-sq1aohhrufu1zh6f
2014-01-16 19:27:59 +01:00
Fabien Meghazi 735c2b501b [IMP] integrate login into the website.layout
bzr revid: fme@openerp.com-20140116181746-e2z9m4gym5kcdgmr
2014-01-16 19:17:46 +01:00
Christophe Matthieu 4ff74cbf99 [IMP] website: editor menus is displayed in function of users groups (event, blog...)
bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
2014-01-16 19:05:35 +01:00
Thibault Delavallée 006ffd00ad [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140115091759-fdupd1vral3z3ng8
2014-01-15 10:17:59 +01:00
Fabien Pinckaers 2affab61ef [IMP] remove badge for login, better design
bzr revid: fp@tinyerp.com-20140114223426-praiwqupdlh9cyy9
2014-01-14 23:34:26 +01:00
Fabien Pinckaers d73c8f15b6 [IMP] cleaned CSS, removed CSS
bzr revid: fp@tinyerp.com-20140114212533-iz4oleo0opads01l
2014-01-14 22:25:33 +01:00
Thibault Delavallée b97727701c [IMP] [ADD] website: added base for template designer.
[ADD] website: email_template: added website_link field, a link to edit the template
directly in the website
[ADD] website_mail: added controller and page to edit templates. They are still jinja
templates editable in the website. Not qweb templates.
[ADD] website_mail: JS file and editor override to enable only certain snippets. Those
are still to add, but will be base templates for email.
[IMP] website: improved the addition of editor JS in the template header to be able
to add JS file that override the editor without having to hack everything in the
template.

bzr revid: tde@openerp.com-20140113125534-djy48pi7lf42f9ms
2014-01-13 13:55:34 +01:00
Christophe Matthieu c4ea06327c [FIX] website: typo
bzr revid: chm@openerp.com-20140106103855-vjd6ro0w4m0xkfrc
2014-01-06 11:38:55 +01:00
Fabien Pinckaers cd0913cb6a [IMP] css print
bzr revid: fp@tinyerp.com-20131222232118-w4ig4wktyeg017d5
2013-12-23 00:21:18 +01:00
Xavier Morel eb44a6b21e [FIX] in contactus page, replace res_company.partner_id by res_company.name so it can be saved
bzr revid: xmo@openerp.com-20131218132610-adby5u0daviprjev
2013-12-18 14:26:10 +01:00
Fabien Meghazi f57869a89d [FIX] menu should honor the 'Open in a new window' option
bzr revid: fme@openerp.com-20131218130515-7ztpt4qpfb9bq5ah
2013-12-18 14:05:15 +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
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
Fabien Pinckaers d53d456c8c [IMP] revert bug
bzr revid: fp@tinyerp.com-20131213214438-ac4mmrurq90vn01r
2013-12-13 22:44:38 +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
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
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 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
Christophe Matthieu bdc2caab61 [FIX] website: publish function not clear
bzr revid: chm@openerp.com-20131210103253-j1n7cqufivh7ng09
2013-12-10 11:32:53 +01:00
Christophe Matthieu d0b813a016 [IMP] fix website_hr_recruitment, website_event, and create contact qweb widget
bzr revid: chm@openerp.com-20131206133003-to4lbgoynvviifq5
2013-12-06 14:30:03 +01:00
Fabien Meghazi 2a2f50e08f [IMP] Better exception handling
bzr revid: fme@openerp.com-20131205150633-lnfvhjq42n0r26tv
2013-12-05 16:06:33 +01:00
Christophe Matthieu b1765e2834 [IMP] website: slip layout
bzr revid: chm@openerp.com-20131204161754-5dq4bt7gghnk878c
2013-12-04 17:17:54 +01:00
Christophe Matthieu d19c722da3 [FIX] website: language link use keep query
bzr revid: chm@openerp.com-20131204133804-7rzeofuwsa8uuk19
2013-12-04 14:38:04 +01:00
Christophe Matthieu 704607db5a [FIX] website: signin and logout redirect url
bzr revid: chm@openerp.com-20131203173146-7om0xl9b7ubb5cqc
2013-12-03 18:31:46 +01:00
Fabien Meghazi 6745bb3fed [FIX] font-awesome icons migration to v4
bzr revid: fme@openerp.com-20131203141632-ubc35ca7d4l80s7m
2013-12-03 15:16:32 +01:00
Fabien Meghazi cc1467a6ab [---] Use badge for sign in link. still ugly.
bzr revid: fme@openerp.com-20131203111256-v3q2apdcjb83ac9t
2013-12-03 12:12:56 +01:00
Fabien Meghazi b78f196362 [IMP] cached website's default_lang and language_ids
bzr revid: fme@openerp.com-20131202172110-h7s023xv4ohq31tw
2013-12-02 18:21:10 +01:00
Fabien Pinckaers cf3ecb9ff0 [IMP] Huge speed improvements 64 SQL queries to render '/' --> 10 Queries
bzr revid: fp@tinyerp.com-20131130193739-095yd4p9llmj0kt1
2013-11-30 20:37:39 +01:00
Christophe Matthieu 20a0119ed6 [IMP] website: hide publish/edit button on editable mode
bzr revid: chm@openerp.com-20131128143646-fl3okv6wisqio8xq
2013-11-28 15:36:46 +01:00
Fabien Meghazi 07eaace3ee [ADD] custom website ir.http#dispatch and rerouting
bzr revid: fme@openerp.com-20131127170432-z7d1w4ck03d7wwia
2013-11-27 18:04:32 +01:00