-
@@ -23,6 +23,8 @@
@@ -34,5 +36,33 @@
+ view_event_form
+ event.event
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_recruitment/static/description/index.html b/addons/hr_recruitment/static/description/index.html
new file mode 100644
index 00000000000..f91da54ad55
--- /dev/null
+++ b/addons/hr_recruitment/static/description/index.html
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/project/static/description/index.html b/addons/project/static/description/index.html
index 2a1574c5d68..cd8deb1d0ec 100644
--- a/addons/project/static/description/index.html
+++ b/addons/project/static/description/index.html
@@ -42,7 +42,6 @@ allowing teams to optimize their job.
-
', type='http', auth="admin")
- def page(self, path):
+ def page(self, path, **kwargs):
website = request.registry.get("website")
values = website.get_rendering_context({
'path': path
@@ -63,6 +73,45 @@ class Website(openerp.addons.web.controllers.main.Home):
html = website.render('website.404', values)
return html
+ @http.route('/website/customize_template_toggle', type='json', auth='admin') # FIXME: auth
+ def customize_template_set(self, view_id):
+ view_obj = request.registry.get("ir.ui.view")
+ view = view_obj.browse(request.cr, request.uid, int(view_id), context=request.context)
+ if view.inherit_id:
+ print '*', view.inherit_id
+ value = False
+ else:
+ value = view.inherit_option_id and view.inherit_option_id.id or False
+ print '*', view.inherit_id, 'no', value, view
+ view_obj.write(request.cr, request.uid, [view_id], {
+ 'inherit_id': value
+ }, context=request.context)
+ print 'Wrote', value, 'on', view_id
+ return True
+
+ @http.route('/website/customize_template_get', type='json', auth='admin') # FIXME: auth
+ def customize_template_get(self, xml_id):
+ view = request.registry.get("ir.ui.view")
+ views = view._views_get(request.cr, request.uid, xml_id, request.context)
+ done = {}
+ result = []
+ for v in views:
+ if v.inherit_option_id:
+ if v.inherit_option_id.id not in done:
+ result.append({
+ 'name': v.inherit_option_id.name,
+ 'header': True,
+ 'active': False
+ })
+ done[v.inherit_option_id.id] = True
+ result.append({
+ 'name': v.name,
+ 'id': v.id,
+ 'header': False,
+ 'active': v.inherit_id.id == v.inherit_option_id.id
+ })
+ return result
+
@http.route('/website/attach', type='http', auth='admin') # FIXME: auth
def attach(self, CKEditorFuncNum, CKEditor, langCode, upload):
req = request.httprequest
@@ -107,4 +156,56 @@ class Website(openerp.addons.web.controllers.main.Home):
return response
+ @http.route('/website/image', type='http', auth="public")
+ def image(self, model, id, field, **kw):
+ last_update = '__last_update'
+ Model = request.registry[model]
+ headers = [('Content-Type', 'image/png')]
+ etag = request.httprequest.headers.get('If-None-Match')
+ hashed_session = hashlib.md5(request.session_id).hexdigest()
+ retag = hashed_session
+ try:
+ if etag:
+ date = Model.read(request.cr, request.uid, [id], [last_update], request.context)[0].get(last_update)
+ if hashlib.md5(date).hexdigest() == etag:
+ return werkzeug.wrappers.Response(status=304)
+
+ res = Model.read(request.cr, request.uid, [id], [last_update, field], request.context)[0]
+ retag = hashlib.md5(res.get(last_update)).hexdigest()
+ image_base64 = res.get(field)
+
+ if kw.get('resize'):
+ resize = kw.get('resize').split(',')
+ if len(resize) == 2 and int(resize[0]) and int(resize[1]):
+ width = int(resize[0])
+ height = int(resize[1])
+ # resize maximum 500*500
+ if width > 500: width = 500
+ if height > 500: height = 500
+ image_base64 = openerp.tools.image_resize_image(base64_source=image_base64, size=(width, height), encoding='base64', filetype='PNG')
+
+ image_data = base64.b64decode(image_base64)
+ except Exception:
+ image_data = open(os.path.join(http.addons_manifest['web']['addons_path'], 'web', 'static', 'src', 'img', 'placeholder.png'), 'rb').read()
+
+ headers.append(('ETag', retag))
+ headers.append(('Content-Length', len(image_data)))
+ try:
+ ncache = int(kw.get('cache'))
+ headers.append(('Cache-Control', 'no-cache' if ncache == 0 else 'max-age=%s' % (ncache)))
+ except:
+ pass
+ return request.make_response(image_data, headers)
+
+ @http.route(['/website/publish/'], type='http', auth="public")
+ def publish(self, **post):
+ _id = int(post['id'])
+ _object = request.registry[post['object']]
+
+ obj = _object.browse(request.cr, request.uid, _id)
+ _object.write(request.cr, request.uid, [_id], {'website_published': not obj.website_published})
+ obj = _object.browse(request.cr, request.uid, _id)
+
+ return obj.website_published and "1" or "0"
+
# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website/static/description/index.html b/addons/website/static/description/index.html
index b0c9a52569e..af0829ce38d 100644
--- a/addons/website/static/description/index.html
+++ b/addons/website/static/description/index.html
@@ -2,7 +2,7 @@
@@ -98,8 +102,53 @@ jobs announces, "our team" pages, etc.
+
+
+
+
+
+
-
+
+
+
+
+ Open Source Job Board
+Organize your job postings and applications
+
+
+
+
+ ![]()
+
+
+
+
+
+ + Organize your job board, promote your job announces and keep + track of application submissions easily. Follow every applicant + and build up a database of skills and profiles with indexed + documents. +
+ +
+
+Post Your Jobs on Best Job Boards
+LinkedIn, Monster, Kraigslist, Careerbuilder,...
+
+ ![]()
+
+
+
+ + Connect automatically to most famous job board websites; + linkedIn, Monster, Kraigslist, ... Every job position has a new + email address automatically assigned to route applications + automatically to the right job position. +
+ Whether applicants contact you by email or using an online + form, you get all the data indexed automatically (resumes, + motivation letter) and you can answer in just a click, reusing + templates of answers. +
+
+
+Customize Your Recruitment Process
+Define your own stages and interviewers
+
+
+ + Use the kanban view and customize the steps of your recruitments + process; pre-qualification, first interview, second interview, + negociaiton, ... +
+ Get accurate statistics on your recruitment pipeline. Get reports + to compare the performance of your different investments on + external job boards. +
+
+ ![]()
+
+
+
+Streamline Your Recruitment Process
+Index resumes, track applicants, search profiles
+
+ 
+
+
+
+
+ + Follow applicants in your recruitment process with the smart + kanban view. Save time by automating some communications with + email templates. +
+ Documents like resumes and motivation letters are indexed + automatically, allowing you to easily find for specific skills + and build up a database of profiles. +
+
+
+Integrated Surveys
+Define your own online or offline surveys
+
+
+
+ ![]()
+
+
+
+ + Create your own interview canvas based on our best practices. + Use the survey designer to adapt questions to your own process. + Ask the applicant to fill in the survey online, or the + interviewer to use it during real interviews. +
+Gantt Charts
-
Calendar
diff --git a/addons/website/__init__.py b/addons/website/__init__.py index be415754735..17879db9942 100644 --- a/addons/website/__init__.py +++ b/addons/website/__init__.py @@ -1,3 +1,5 @@ import controllers import res_config -from website import website \ No newline at end of file + +from website import website +import view diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py index 3cdb3230e5d..aa0f5dbf64f 100644 --- a/addons/website/__openerp__.py +++ b/addons/website/__openerp__.py @@ -1,6 +1,7 @@ { 'name': 'Website', - 'category': 'CMS', + 'category': 'Website', + 'summary': 'Create Your Enterprise Website', 'version': '1.0', 'description': """ OpenERP Website CMS @@ -14,13 +15,5 @@ OpenERP Website CMS 'views/views.xml', 'views/res_config.xml', 'website_data.xml', - ], - 'js': [ - 'static/lib/bootstrap/js/bootstrap.js', - 'static/src/js/website.js', ], - 'css': [ - 'static/src/css/editor.css', - ], - 'qweb': ['static/src/xml/*.xml'], } diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index a347f789f7c..bd3f7285126 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -2,21 +2,31 @@ import base64 import json import logging -import urllib import cStringIO -from PIL import Image, ImageOps +from PIL import Image import openerp from openerp.addons.web import http -from openerp.addons.web.controllers.main import manifest_list from openerp.addons.web.http import request import werkzeug import werkzeug.exceptions import werkzeug.wrappers +import hashlib +import os logger = logging.getLogger(__name__) + +def auth_method_public(): + registry = openerp.modules.registry.RegistryManager.get(request.db) + if not request.session.uid: + request.uid = registry['website'].get_public_user().id + else: + request.uid = request.session.uid +http.auth_methods['public'] = auth_method_public + + class Website(openerp.addons.web.controllers.main.Home): @http.route('/', type='http', auth="admin") def index(self, **kw): @@ -52,7 +62,7 @@ class Website(openerp.addons.web.controllers.main.Home): return werkzeug.utils.redirect("/page/%s" % path) @http.route('/page/Enterprise Website Builder
-Get an awesome website. Customize easily.
+Get an awesome website, easily customizable
@@ -14,9 +14,10 @@
-Create enterprise-grade website with our super easy builder; no backend, everything -is editable inline. Benefit from out-of-the-box business features; shop, events, blogs, -jobs announces, "our team" pages, etc. + Create enterprise grade website with our super easy builder; no + backend, everything is editable inline. Benefit from + out-of-the-box business features; ecommerce, events, blogs, + jobs announces, our references, "our team" page, call-to-actions, etc.
Create your free website
@@ -66,6 +67,9 @@ jobs announces, "our team" pages, etc.
Whether it's for products descriptions, blogs or static pages,
you don't need to be a professioanl designer to create modern
and clean web pages.
+
+ Get rid of traditional WYSIWYG editors that does not allow to + design clean and mobile friendly pages.
-
+Multi-languages Without Pain
-Automate updates and transaltions easily
+A Great Mobile Experience
+Responsive content on all pages
+
+
+
+ ![]()
+
+
+
+ + Get a mobile friendly website thanks to our responsive design + based on bootstrap. The layout of every page and content adapts + automatically to the screen size. (mobile phones, tablets, desktop) + You don't have to worry about mobile contents, it works by default. +
+ Our building blocks allows to reuse responsive components to + structure your website pages, which is not possible with + traditional WYSIWYG editors. + +
+
+Optimize your online presence efficiently
+SEO tools at your finger tips
+
+
+ + SEO tools are ready to use, with no configuration required. + OpenERP suggests keywords according to Google most searched + terms, Google Analytics tracks your shopping cart events, + sitemap and structuered content are created automatically for + Google indexation, etc. +
+
+
+
+ ![]()
+
+
+
![]()
@@ -109,13 +158,13 @@ jobs announces, "our team" pages, etc.
@@ -144,23 +193,49 @@ jobs announces, "our team" pages, etc.
Multilanguage Without Pain
+Propagate changes and automate translation updates
Get your website translated in multiple languages with no effort. OpenERP proposes and propagates translations automatically - across pages. + across pages, following what you edit on the master page.
Our translation "on demand" features allows you to benefit from - professional translators to translate all your changes + professional translators to translate all your contents automatically. Just change any part of your website (a new blog - post, a new pages, updated products, ...) and the translated - versions are updated automatically in around 32 hours. + post, new pages, updated products, ...) and the translated + versions are updated automatically in around 24 hours.
-
Optimize your online presence efficiently
-SEO tools at your finger tips
-
- ' + item.name + ' ');
+ } else {
+ menu.append(_.str.sprintf(' %s ',
+ item.id, item.active ? '' : '-empty', item.name));
+ }
+ });
+ }
+ );
+ });
+ menu.on('click', 'a', function (event) {
+ var view_id = $(event.target).data('view-id');
+ openerp.jsonRpc('/website/customize_template_toggle', 'call', {
+ 'view_id': view_id
+ }).then( function(result) {
+ window.location.reload();
+ });
+ });
},
start: function() {
var self = this;
- this.$('button[data-action]').prop('disabled', true)
- .parent().hide();
+ this.saving_mutex = new openerp.Mutex();
+
+ this.$('#website-top-edit').hide();
+ this.$('#website-top-view').show();
+
+ $('.dropdown-toggle').dropdown();
+ this.customize_setup();
+
this.$buttons = {
edit: this.$('button[data-action=edit]'),
save: this.$('button[data-action=save]'),
cancel: this.$('button[data-action=cancel]'),
snippet: this.$('button[data-action=snippet]'),
};
- this.$buttons.edit.prop('disabled', false).parent().show();
self.snippet_start();
- this.rte = new instance.website.RTE(this);
+ this.rte = new RTE(this);
this.rte.on('change', this, this.proxy('rte_changed'));
return $.when(
@@ -51,10 +96,14 @@ instance.website.EditorBar = instance.web.Widget.extend({
);
},
edit: function () {
- this.$buttons.edit.prop('disabled', true).parent().hide();
- this.$buttons.cancel.add(this.$buttons.snippet).prop('disabled', false)
- .add(this.$buttons.save)
- .parent().show();
+ this.$buttons.edit.prop('disabled', true);
+ this.$('#website-top-view').hide();
+ this.$('#website-top-edit').show();
+
+ // this.$buttons.cancel.add(this.$buttons.snippet).prop('disabled', false)
+ // .add(this.$buttons.save)
+ // .parent().show();
+ //
// TODO: span edition changing edition state (save button)
var $editables = $('[data-oe-model]')
.not('link, script')
@@ -62,7 +111,7 @@ instance.website.EditorBar = instance.web.Widget.extend({
.not('.oe_snippet_editor')
.prop('contentEditable', true)
.addClass('oe_editable');
- var $rte_ables = $editables.filter('div, p, li, section, header, footer').not('[data-oe-type]');
+ var $rte_ables = $editables.not('[data-oe-type]');
var $raw_editables = $editables.not($rte_ables);
// temporary fix until we fix ckeditor
@@ -121,7 +170,11 @@ instance.website.EditorBar = instance.web.Widget.extend({
.prop('contentEditable', false);
html = $w.wrap('
- SEO tools are ready to use, with no configuration required. - OpenERP suggests keywords according to Google most searched - terms, Google Analytics tracks your shopping cart events, - sitemap and structuered content are created automatically for - Google indexation, etc. -
+Fully Integrated With Others Apps
+Get hundreds of open source apps for free
+
+
+
- eCommerce
+
+ ![]()
+
+
+ + Promote products, sell online, optimize visitors' shopping experiences. +
-
+
diff --git a/addons/website/static/src/css/Makefile b/addons/website/static/src/css/Makefile
index 238219f8906..2c05352f1e1 100644
--- a/addons/website/static/src/css/Makefile
+++ b/addons/website/static/src/css/Makefile
@@ -1,3 +1,4 @@
sass:
sass -t expanded --unix-newlines --watch website.sass:website.css&
+ sass -t expanded --unix-newlines --watch website-flatly.sass:website-flatly.css&
sass -t expanded --unix-newlines --watch editor.sass:editor.css&
diff --git a/addons/website/static/src/css/website-flatly.css b/addons/website/static/src/css/website-flatly.css
new file mode 100644
index 00000000000..fb50b34062b
--- /dev/null
+++ b/addons/website/static/src/css/website-flatly.css
@@ -0,0 +1,50 @@
+@charset "utf-8";
+/* THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
+ *
+ * css for editor buttons, openerp widget included in the website and other
+ * stuff must go to the editor.css
+ *
+ */
+/* ----- GENERIC LAYOUTING HELPERS ---- */
+/* Theming pagination inside navbar */
+.navbar-inner > .pagination {
+ margin: 6px 0;
+}
+.navbar-inner > .pagination ul {
+ position: relative;
+ top: 2px;
+ border: solid 2px rgba(0, 0, 0, 0.05);
+ border-radius: 8px;
+}
+
+/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
+.subheader {
+ letter-spacing: 3px;
+ font-weight: 300;
+}
+
+.dark {
+ background: #eff8f8;
+ padding: 64px;
+}
+
+h5 {
+ font-weight: bold;
+}
+
+#myCarousel .item {
+ min-height: 300px;
+ color: white;
+}
+
+.thumbnail {
+ background: white;
+}
+
+.navbar .nav > li a {
+ float: none;
+ padding: 15px 15px 15px;
+ color: white;
+ text-decoration: none;
+ text-shadow: 0 1px 0 #2c3e50;
+}
diff --git a/addons/website/static/src/css/website-flatly.sass b/addons/website/static/src/css/website-flatly.sass
new file mode 100644
index 00000000000..0244d8b7511
--- /dev/null
+++ b/addons/website/static/src/css/website-flatly.sass
@@ -0,0 +1,49 @@
+@charset "utf-8"
+
+/*
+ * THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
+ *
+ * css for editor buttons, openerp widget included in the website and other
+ * stuff must go to the editor.css
+ *
+ */
+
+/* ----- GENERIC LAYOUTING HELPERS ---- */
+
+/* Theming pagination inside navbar */
+.navbar-inner > .pagination
+ margin: 6px 0
+ ul
+ position: relative
+ top: 2px
+ border: solid 2px rgba(0,0,0,0.05)
+ border-radius: 8px
+
+/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
+
+.subheader
+ letter-spacing: 3px
+ font-weight: 300
+
+.dark
+ background: rgb(239, 248, 248)
+ padding: 64px
+
+h5
+ font-weight: bold
+
+#myCarousel .item
+ min-height: 300px
+ color: white
+
+.thumbnail
+ background: white
+
+.navbar .nav > li a
+ float: none
+ padding: 15px 15px 15px
+ color: #ffffff
+ text-decoration: none
+ text-shadow: 0 1px 0 #2c3e50
+
+
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index f47daad8c83..eea25bea19d 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
/* THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
*
* css for editor buttons, openerp widget included in the website and other
@@ -112,17 +113,6 @@
vertical-align: bottom;
}
-/* Theming pagination inside navbar */
-.navbar-inner > .pagination {
- margin: 6px 0;
-}
-.navbar-inner > .pagination ul {
- position: relative;
- top: 2px;
- border: solid 2px rgba(0, 0, 0, 0.05);
- border-radius: 8px;
-}
-
/* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
html, body {
height: 100%;
@@ -141,42 +131,10 @@ html, body {
footer {
box-sizing: border-box;
- height: 300px;
+ height: 380px;
background: #eff8f8;
- padding-top: 64px;
- padding-bottom: 64px;
-}
-
-/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
-.subheader {
- letter-spacing: 3px;
- font-weight: 300;
-}
-
-header.navbar-fixed-top {
- position: static;
-}
-
-.dark {
- background: #eff8f8;
- padding: 64px;
-}
-
-h5 {
- font-weight: bold;
-}
-
-#myCarousel .item {
- min-height: 300px;
- color: white;
-}
-
-.nav > .pull-right {
- float: right !important;
-}
-
-.thumbnail {
- background: white;
+ padding-top: 48px;
+ padding-bottom: 48px;
}
/* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
@@ -188,14 +146,16 @@ h5 {
text-shadow: none;
}
-.navbar .nav > li a {
- float: none;
- padding: 15px 15px 15px;
- color: white;
- text-decoration: none;
- text-shadow: 0 1px 0 #2c3e50;
-}
-
.nav > li a {
display: block;
}
+
+/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
+header.navbar-fixed-top {
+ position: static;
+}
+
+#myCarousel .item {
+ min-height: 300px;
+ color: white;
+}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index c5e45aa288f..13037deb2d7 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -76,15 +76,6 @@
text-align: left
vertical-align: bottom
-/* Theming pagination inside navbar */
-.navbar-inner > .pagination
- margin: 6px 0
- ul
- position: relative
- top: 2px
- border: solid 2px rgba(0,0,0,0.05)
- border-radius: 8px
-
/* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
html,body
@@ -102,37 +93,11 @@ html,body
footer
box-sizing: border-box
- height: 300px
+ height: 380px
background: rgb(239, 248, 248) // rgb(221, 235, 227)
- padding-top: 64px
- padding-bottom: 64px
+ padding-top: 48px
+ padding-bottom: 48px
-/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
-
-.subheader
- letter-spacing: 3px
- font-weight: 300
-
-header.navbar-fixed-top
- position: static
-
-.dark
- background: rgb(239, 248, 248)
- padding: 64px
-
-h5
- font-weight: bold
-
-#myCarousel .item
- min-height: 300px
- color: white
-
-
-.nav > .pull-right
- float: right !important //bugfix for flatly theme
-
-.thumbnail
- background: white
/* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
@@ -142,13 +107,16 @@ h5
.navbar .nav > li a
text-shadow: none
-.navbar .nav > li a
- float: none
- padding: 15px 15px 15px
- color: #ffffff
- text-decoration: none
- text-shadow: 0 1px 0 #2c3e50
-
.nav > li a
display: block
+/* ---- HOMEPAGE THEME CUSTOMIZATION ---- */
+
+header.navbar-fixed-top
+ position: static
+
+#myCarousel .item
+ min-height: 300px
+ color: white
+
+
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index ba662288aae..2c589a49de5 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -1,20 +1,36 @@
-openerp.website = function(instance) {
+// Ugly. I'll clean this monday
+$(function () { if ($('html').attr('data-editable') !== '1') return;
-instance.web.ActionManager.include({
- // Temporary fix until un-webclientization of the editorbar
- ir_actions_client: function (action) {
- if (instance.web.client_actions.get_object(action.tag)) {
- return this._super.apply(this, arguments);
- } else {
- console.warn("Action '%s' not found in registry", action.tag);
- return $.when();
- }
- }
-});
+// TODO fme: put everything in openerp.website scope and load templates on
+// next tick or document ready
+// Also check with xmo if jquery.keypress.js is still needed.
-var _lt = instance.web._lt;
-var QWeb = instance.web.qweb;
-instance.website.EditorBar = instance.web.Widget.extend({
+var doc_ready = $.Deferred();
+$(doc_ready.resolve);
+
+var templates = [
+ '/website/static/src/xml/website.xml'
+];
+
+function loadTemplates(templates) {
+ var def = $.Deferred();
+ var count = templates.length;
+ templates.forEach(function(t) {
+ openerp.qweb.add_template(t, function(err) {
+ if (err) {
+ def.reject();
+ } else {
+ count--;
+ if (count < 1) {
+ def.resolve();
+ }
+ }
+ });
+ });
+ return def;
+}
+
+var EditorBar = openerp.Widget.extend({
template: 'Website.EditorBar',
events: {
'click button[data-action=edit]': 'edit',
@@ -23,26 +39,55 @@ instance.website.EditorBar = instance.web.Widget.extend({
'click button[data-action=snippet]': 'snippet',
},
container: 'body',
- init: function () {
- this._super.apply(this, arguments);
- this.saving_mutex = new $.Mutex();
+ customize_setup: function() {
+ var self = this;
+ var view_name = $('html').data('view-xmlid');
+ var menu = $('#customize-menu');
+ this.$('#customize-menu-button').click(function(event) {
+ menu.empty();
+ openerp.jsonRpc('/website/customize_template_get', 'call', { 'xml_id': view_name }).then(
+ function(result) {
+ _.each(result, function (item) {
+ if (item.header) {
+ menu.append('
- ![]()
-
+
+
+
+ Blogs
+
+ ![]()
+
+
+ + Write news, attract new visitors, build customer loyalty. +
+
+
+
+
Online Events
+
+ ![]()
+
+
+ + Schedule, organize, promote or sell events online; conferences, + webinars, trainings, etc. +
+').parent().html();
}
- return (new instance.web.DataSet(this, 'ir.ui.view')).call('save', [data.oeModel, data.oeId, data.oeField, html, xpath]);
+ return openerp.jsonRpc('/web/dataset/call', 'call', {
+ model: 'ir.ui.view',
+ method: 'save',
+ args: [data.oeModel, data.oeId, data.oeField, html, xpath]
+ });
},
cancel: function () {
window.location.reload();
@@ -159,7 +212,7 @@ instance.website.EditorBar = instance.web.Widget.extend({
},
});
-instance.website.RTE = instance.web.Widget.extend({
+var RTE = openerp.Widget.extend({
tagName: 'li',
id: 'oe_rte_toolbar',
className: 'oe_right oe_rte_toolbar',
@@ -191,6 +244,9 @@ instance.website.RTE = instance.web.Widget.extend({
'magicline'
];
return {
+ // Disable auto-generated titles
+ // FIXME: accessibility, need to generate user-sensible title, used for @title and @aria-label
+ title: false,
removePlugins: removed_plugins.join(','),
uiColor: '',
// Ensure no config file is loaded
@@ -205,14 +261,22 @@ instance.website.RTE = instance.web.Widget.extend({
// Place toolbar in controlled location
sharedSpaces: { top: 'oe_rte_toolbar' },
toolbar: [
- {name: 'items', items: [
+ {name: 'basicstyles', items: [
"Bold", "Italic", "Underline", "Strike", "Subscript",
- "Superscript", "TextColor", "BGColor", "RemoveFormat",
+ "Superscript", "TextColor", "BGColor", "RemoveFormat"
+ ]},{
+ name: 'span', items: [
"Link", "Unlink", "Blockquote", "BulletedList",
- "NumberedList", "Image", "Indent", "Outdent",
- "JustifyLeft", "JustifyCenter", "JustifyRight",
- "JustifyBlock", "Table", "Font", "FontSize", "Format",
- "Styles"
+ "NumberedList", "Indent", "Outdent",
+ ]},{
+ name: 'justify', items: [
+ "JustifyLeft", "JustifyCenter", "JustifyRight", "JustifyBlock"
+ ]},{
+ name: 'special', items: [
+ "Image", "Table"
+ ]},{
+ name: 'styles', items: [
+ "Format", "Styles"
]}
],
// styles dropdown in toolbar
@@ -232,7 +296,7 @@ instance.website.RTE = instance.web.Widget.extend({
var self = this;
$('.carousel .js_carousel_options .label').on('click', function (e) {
e.preventDefault();
- var $button = $(e.currentTarget)
+ var $button = $(e.currentTarget);
var $c = $button.parents(".carousel:first");
if($button.hasClass("js_add")) {
@@ -251,7 +315,12 @@ instance.website.RTE = instance.web.Widget.extend({
}
});
-$(function(){
+$.when(doc_ready, loadTemplates(templates)).then(function() {
+ var editor = new EditorBar();
+ editor.prependTo($('body'));
+ $('body').css('padding-top', '50px'); // Not working properly: editor.$el.outerHeight());
+
+ // TODO: Create an openerp.Widget out of this
function make_static(){
$('.oe_snippet_demo').removeClass('oe_new');
@@ -307,6 +376,12 @@ $(function(){
});
}
+ function customier_option_get(event){
+
+
+ event.preventDefault();
+ }
+
function append_snippet(event){
console.log('click',this,event.button);
if(event.button === 0){
@@ -330,17 +405,26 @@ $(function(){
}
});
-instance.web.ActionRedirect = function(parent, action) {
- var url = $.deparam(window.location.href).url;
- if (url) {
- window.location.href = url;
- }
-};
-instance.web.client_actions.add("redirect", "instance.web.ActionRedirect");
+});
+// }()); I'll clean this monday
-instance.web.GoToWebsite = function(parent, action) {
- window.location.href = window.location.href.replace(/[?#].*/, '').replace(/\/admin[\/]?$/, '');
-};
-instance.web.client_actions.add("website.gotowebsite", "instance.web.GoToWebsite");
-};
+$(function () {
+ $(document).on('click', '.js_publish, .js_unpublish', function (e) {
+ e.preventDefault();
+ var $link = $(this).parent();
+ $link.find('.js_publish, .js_unpublish').addClass("hidden");
+ var $unp = $link.find(".js_unpublish");
+ var $p = $link.find(".js_publish");
+ $.post('/website/publish', {'id': $link.data('id'), 'object': $link.data('object')}, function (result) {
+ if (+result) {
+ $p.addClass("hidden");
+ $unp.removeClass("hidden");
+ } else {
+ $p.removeClass("hidden");
+ $unp.addClass("hidden");
+ }
+ });
+ });
+});
+
diff --git a/addons/website/static/src/js/website_bootstrap.js b/addons/website/static/src/js/website_bootstrap.js
deleted file mode 100644
index 68d2388be68..00000000000
--- a/addons/website/static/src/js/website_bootstrap.js
+++ /dev/null
@@ -1,19 +0,0 @@
-$(function() {
- // Init headless webclient
- // TODO: Webclient research : use iframe embedding mode
- // Meanwhile, let's HACK !!!
- var s = new openerp.init(['web', 'website']);
- s.web.WebClient.bind_hashchange = s.web.WebClient.show_common = s.web.blockUI = s.web.unblockUI = function() {};
- s.web.WebClient.include({ do_push_state: function() {} });
- var wc = new s.web.WebClient();
- wc.start();
- var instance = openerp.instances[wc.session.name];
- // Another hack since we have no callback when webclient has loaded modules.
- instance.web.qweb.add_template('/website/static/src/xml/website.xml');
-
- $(function() {
- var editor = new instance.website.EditorBar(instance.webclient);
- editor.prependTo($('body'));
- $('body').css('padding-top', '32px'); // Not working properly: editor.$el.outerHeight());
- });
-});
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 941015fd0f5..9f11ff40bca 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -3,12 +3,43 @@
-->
-
+
+
+
+
-
+
- Contact us -
+
+
+
+
+
+
+
+
+
+
+
+ Contact us -
+
+
+ About us -
+
+
+
+
+
+
+
+
+
+ Unpublish
+ Publish
+
+
+
diff --git a/addons/website/website.py b/addons/website/website.py
index 3a01027669c..461ad67f86a 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -1,10 +1,17 @@
# -*- coding: utf-8 -*-
+import simplejson
import openerp
-from openerp.osv import osv
+from openerp.osv import osv, orm
from openerp.addons.web import http
from openerp.addons.web.controllers import main
from openerp.addons.web.http import request
+import urllib
+import math
+import traceback
+
+import logging
+logger = logging.getLogger(__name__)
def auth_method_public():
@@ -16,6 +23,15 @@ def auth_method_public():
http.auth_methods['public'] = auth_method_public
+def urlplus(url, params):
+ if not params:
+ return url
+ url += "?"
+ for k,v in params.items():
+ url += "%s=%s&" % (k, urllib.quote_plus(str(v)))
+ return url
+
+
class website(osv.osv):
_name = "website" # Avoid website.website convention for conciseness (for new api). Got a special authorization from xmo and rco
_description = "Website"
@@ -30,23 +46,24 @@ class website(osv.osv):
def get_rendering_context(self, additional_values=None):
debug = 'debug' in request.params
+ is_logged = True
+ try:
+ request.session.check_security()
+ except: # TODO fme: check correct exception
+ is_logged = False
is_public_user = request.uid == self.get_public_user().id
values = {
'debug': debug,
'is_public_user': is_public_user,
- 'editable': not is_public_user,
+ 'editable': is_logged and not is_public_user,
'request': request,
'registry': request.registry,
'cr': request.cr,
'uid': request.uid,
'host_url': request.httprequest.host_url,
'res_company': request.registry['res.company'].browse(request.cr, openerp.SUPERUSER_ID, 1),
+ 'json': simplejson,
}
- if values['editable']:
- values.update({
- 'script': "\n".join(['' % i for i in main.manifest_list('js', db=request.db, debug=debug)]),
- 'css': "\n".join('' % i for i in main.manifest_list('css', db=request.db, debug=debug))
- })
if additional_values:
values.update(additional_values)
return values
@@ -55,4 +72,71 @@ class website(osv.osv):
context = {
'inherit_branding': values.get('editable', False),
}
- return request.registry.get("ir.ui.view").render(request.cr, request.uid, template, values, context=context)
+ try:
+ return request.registry.get("ir.ui.view").render(request.cr, request.uid, template, values, context=context)
+ except (osv.except_osv, orm.except_orm), err:
+ logger.error(err)
+ values['error'] = err[1]
+ return self.render('website.401', values)
+ except ValueError:
+ logger.error("Website Rendering Error.\n\n%s" % (traceback.format_exc()))
+ return self.render('website.404', values)
+ except Exception:
+ logger.error("Website Rendering Error.\n\n%s" % (traceback.format_exc()))
+ if values['editable']:
+ values['traceback'] = traceback.format_exc()
+ return self.render('website.500', values)
+ else:
+ return self.render('website.404', values)
+
+ def pager(self, url, total, page=1, step=30, scope=5, url_args=None):
+ # Compute Pager
+ d = {}
+ d["page_count"] = int(math.ceil(float(total) / step))
+
+ page = max(1, min(int(page), d["page_count"]))
+
+ d["offset"] = (page-1) * step
+ scope -= 1
+
+ pmin = max(page - int(math.floor(scope/2)), 1)
+ pmax = min(pmin + scope, d["page_count"])
+
+ if pmax - pmin < scope:
+ pmin = pmax - scope > 0 and pmax - scope or 1
+
+ def get_url(page):
+ _url = "%spage/%s/" % (url, page)
+ if url_args:
+ _url = "%s?%s" % (_url, urllib.urlencode(url_args))
+ return _url
+
+ d["page"] = {'url': get_url(page), 'num': page}
+ d["page_start"] = {'url': get_url(pmin), 'num': pmin}
+ d["page_end"] = {'url': get_url(min(pmax, page+1)), 'num': min(pmax, page+1)}
+ d["pages"] = []
+ for page in range(pmin, pmax+1):
+ d["pages"].append({'url': get_url(page), 'num': page})
+
+ return d
+
+
+class res_partner(osv.osv):
+ _inherit = "res.partner"
+
+ def google_map_img(self, cr, uid, ids, zoom=8, width=298, height=298, context=None):
+ partner = self.browse(cr, uid, ids[0], context=context)
+ params = {
+ 'center': '%s, %s %s, %s' % (partner.street, partner.city, partner.zip, partner.country_id and partner.country_id.name_get()[0][1] or ''),
+ 'size': "%sx%s" % (height, width),
+ 'zoom': zoom,
+ 'sensor': 'false',
+ }
+ return urlplus('http://maps.googleapis.com/maps/api/staticmap' , params)
+
+ def google_map_link(self, cr, uid, ids, zoom=8, context=None):
+ partner = self.browse(cr, uid, ids[0], context=context)
+ params = {
+ 'q': '%s, %s %s, %s' % (partner.street, partner.city, partner.zip, partner.country_id and partner.country_id.name_get()[0][1] or ''),
+ }
+ return urlplus('https://maps.google.be/maps' , params)
diff --git a/addons/website/website_data.xml b/addons/website/website_data.xml
index c7fe2a771d1..deb8336839b 100644
--- a/addons/website/website_data.xml
+++ b/addons/website/website_data.xml
@@ -16,20 +16,28 @@
- Website
- website.gotowebsite
- website
+
+ Website Apps
+ ir.module.module
+ form
+ kanban,form
+
+
-
-
-
- Go to Website
-
+ Website
+ /
+ self
+
+
+ Website
+
-
\ No newline at end of file
+
diff --git a/addons/website_crm/__openerp__.py b/addons/website_crm/__openerp__.py
index eb40763464a..223d014cd09 100644
--- a/addons/website_crm/__openerp__.py
+++ b/addons/website_crm/__openerp__.py
@@ -1,6 +1,7 @@
{
- 'name': 'Website Contact Form',
- 'category': 'CRM',
+ 'name': 'Contact Form',
+ 'category': 'Website',
+ 'summary': 'Generate Leads From Contact Form',
'version': '1.0',
'description': """
OpenERP Contact Form
@@ -15,5 +16,4 @@ OpenERP Contact Form
'js': ['static/src/js/ecommerce.js'],
'css': ['static/src/css/ecommerce.css'],
'installable': True,
- 'auto_install': True,
}
diff --git a/addons/website_crm/static/description/index.html b/addons/website_crm/static/description/index.html
new file mode 100644
index 00000000000..9a132bb4e23
--- /dev/null
+++ b/addons/website_crm/static/description/index.html
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index 08e4da21983..478731db937 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -1,33 +1,68 @@
-
- contactus
- qweb
-
-
-
-
-
-
-
-
-
- Thank You!
-
diff --git a/addons/website/view.py b/addons/website/view.py
new file mode 100644
index 00000000000..9d990bdb388
--- /dev/null
+++ b/addons/website/view.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+
+from lxml import etree
+from openerp.osv import osv, fields
+
+
+class view(osv.osv):
+ _inherit = "ir.ui.view"
+ _columns = {
+ 'inherit_option_id': fields.many2one('ir.ui.view','Optional Inheritancy'),
+ 'inherited_option_ids': fields.one2many('ir.ui.view','inherit_option_id','Optional Inheritancies'),
+ }
+
+ # Returns all views (called and inherited) related to a view
+ # Used by translation mechanism, SEO and optional templates
+ def _views_get(self, cr, uid, view, options=True, context=None, root=True, stack_result=None):
+ if not context:
+ context = {}
+ if not stack_result:
+ stack_result = []
+
+ def view_obj(view):
+ if type(view) in (str, unicode):
+ mod_obj = self.pool.get("ir.model.data")
+ m, n = view.split('.')
+ _, view = mod_obj.get_object_reference(cr, uid, m, n)
+ if type(view) == int:
+ view_obj = self.pool.get("ir.ui.view")
+ view = view_obj.browse(cr, uid, view, context=context)
+ return view
+ view = view_obj(view)
+
+ while root and view.inherit_id:
+ view = view.inherit_id
+
+ result = [view]
+ todo = view.inherit_children_ids
+ if options:
+ todo += filter(lambda x: not x.inherit_id, view.inherited_option_ids)
+ for child_view in todo:
+ result += self._views_get(cr, uid, child_view, options=options, context=context, root=False, stack_result=result)
+ node = etree.fromstring(view.arch)
+ for child in node.xpath("//t[@t-call]"):
+ call_view = view_obj(child.get('t-call'))
+ if call_view not in stack_result:
+ result += self._views_get(cr, uid, call_view, options=options, context=context, stack_result=result)
+ return result
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 80802bd673f..509f0180f5d 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -3,80 +3,68 @@
-->
-
-
+
+
+
<!DOCTYPE html>
-
+
- <t t-esc="res_company.name"/>
+ <t t-esc="title or res_company.name"/>
+
+
+
-
-
+
@@ -315,38 +355,73 @@
-
- OpenERP
-
-
-
-
+
+
+
+
-
-
-
+
+
-
-
-
-
- Product and services
--
-
- Download -
- Launchpad -
- Automated Tests -
-
- Company name
--
-
- Contact us -
- News -
- About us -
- ✆ -
@@ -85,8 +73,53 @@
+
+
+
+
+ + This page does not exists, but you can create + it as you are administrator of this site. +
+ Create Page or Search a Page +
+ Edit the content bellow this line to adapt the default "page not found" page.
+
+
-
-
-
-
- 404: Page not found!
-- The page you were looking for could not be - found; it is possible you have typed the - address incorrectly, but it has most - probably been removed due to the recent - website reorganisation. -
- Maybe you were looking for one of these - popular pages ? -
--
-
- Homepage -
- Contact Us -
-
+
- Create Page
-
- 404: Page not found!
++ The page you were looking for could not be + found; it is possible you have typed the + address incorrectly, but it has most + probably been removed due to the recent + website reorganisation. +
+ Maybe you were looking for one of these + popular pages ? +
+-
+
- Homepage +
- Contact Us +
+
+ 500: Internal Server Error!
+ +
+
+ 401: Unauthorized Access!
++ The page you were looking for could not be + authorized. +
+ Maybe you were looking for one of these + popular pages ? +
+ +-
+
- Homepage +
- Contact Us +
Contact us
@@ -363,19 +438,67 @@
+
+ About us
+
+
+
+
+ Our vision
++ Contact us about anything related to our company or services. +
+ We'll do our best to get back to you as soon as possible. +
+
+
+ No website module found!
+You should try others search criteria.
+
+
+
+
+ Your Contact Form
+Integrate contact forms with your leads
+
+
+
+
+ ![]()
+
+
+
+
+
+ + This simple application integrates a contact form in your + "Contact us" page. Forms submissions create leads automatically + in OpenERP CRM. +
+ +
+
+Easy Contact Page
+A contact form is better than an email
+
+
+ + Get your leads filled up automatically with your contact form + integration. This application allows a better qualification of + the lead which is perfect to link them to marketing campaigns. +
+
+
+
+ ![]()
+
+
+
+Fully Integrated With Others Apps
+Get hundreds of open source apps for free
+
+
+
+ eCommerce
+
+ ![]()
+
+
+ + Promote products, sell online, optimize visitors' shopping experiences. +
+
+
+
+ Blogs
+
+ ![]()
+
+
+ + Write news, attract new visitors, build customer loyalty. +
+
+
+
+
+ CMS
+
+ ![]()
+
+
+ + Easily create awesome websites with no technical knowledge required. +
+
-
-
+
+
+
+
+
+
+ Message Sent
+
diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py
index 100175e6eee..41292ed1795 100644
--- a/addons/website_event/__openerp__.py
+++ b/addons/website_event/__openerp__.py
@@ -1,6 +1,7 @@
{
- 'name': 'Website Event',
- 'category': 'mail',
+ 'name': 'Online Events',
+ 'category': 'Website',
+ 'summary': 'Schedule, Promote and Sell Events Online',
'version': '1.0',
'description': """
OpenERP Blog
@@ -16,5 +17,4 @@ OpenERP Blog
],
'qweb': ['static/src/xml/*.xml'],
'installable': True,
- 'auto_install': True,
}
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index adc4342b7d5..8f681b6cbcd 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -14,8 +14,8 @@ import werkzeug
class website_event(http.Controller):
- @http.route(['/event'], type='http', auth="public")
- def events(self, **searches):
+ @http.route(['/event/', '/event/page//'], type='http', auth="public")
+ def events(self, page=1, **searches):
website = request.registry['website']
event_obj = request.registry['event.event']
@@ -80,13 +80,17 @@ class website_event(http.Controller):
countries = event_obj.read_group(request.cr, request.uid, domain, ["id", "country_id"], groupby="country_id", orderby="country_id")
countries.insert(0, {'country_id_count': event_obj.search(request.cr, request.uid, domain, count=True), 'country_id': ("all", _("All Countries"))})
+ step = 5
+ event_count = event_obj.search(request.cr, request.uid, dom_without("none"), count=True)
+ pager = website.pager(url="/event/", total=event_count, page=page, step=step, scope=5)
+ obj_ids = event_obj.search(request.cr, request.uid, dom_without("none"), limit=step, offset=pager['offset'], order="date_begin DESC")
- obj_ids = event_obj.search(request.cr, request.uid, dom_without("none"), order="date_begin DESC")
values = website.get_rendering_context({
'event_ids': event_obj.browse(request.cr, request.uid, obj_ids),
'dates': dates,
'types': types,
'countries': countries,
+ 'pager': pager,
'searches': searches,
'search_path': "?%s" % urllib.urlencode(searches),
})
@@ -99,24 +103,48 @@ class website_event(http.Controller):
event = request.registry['event.event'].browse(request.cr, request.uid, event_id, {'show_address': 1})
values = website.get_rendering_context({
'event_id': event,
- 'google_map_url': "http://maps.googleapis.com/maps/api/staticmap?center=%s&sensor=false&zoom=12&size=298x298" % urllib.quote_plus('%s, %s %s, %s' % (event.street, event.city, event.zip, event.country_id and event.country_id.name_get()[0][1] or ''))
})
return website.render("website_event.detail", values)
@http.route(['/event//add_cart'], type='http', auth="public")
def add_cart(self, event_id=None, **post):
- if not post:
+ order_line_obj = request.registry.get('sale.order.line')
+ ticket_obj = request.registry.get('event.event.ticket')
+
+ order = request.registry['website'].get_rendering_context()['order']
+ partner_id = request.registry.get('res.users').browse(request.cr, SUPERUSER_ID, request.uid).partner_id.id
+
+ context = {}
+
+ fields = [k for k, v in order_line_obj._columns.items()]
+ values = order_line_obj.default_get(request.cr, SUPERUSER_ID, fields, context=context)
+
+ _values = None
+ for key, value in post.items():
+ quantity = int(value)
+ ticket_id = key.split("-")[0] == 'ticket' and int(key.split("-")[1]) or None
+ if not ticket_id or not quantity:
+ continue
+ ticket = ticket_obj.browse(request.cr, request.uid, ticket_id)
+
+ values['product_id'] = ticket.product_id.id
+ values['event_id'] = ticket.event_id.id
+ values['event_ticket_id'] = ticket.id
+ values['product_uom_qty'] = quantity
+ values['price_unit'] = ticket.price
+ values['order_id'] = order.id
+ values['name'] = "%s: %s" % (ticket.event_id.name, ticket.name)
+
+ ticket.check_registration_limits_before(quantity)
+
+ # change and record value
+ pricelist_id = order.pricelist_id and order.pricelist_id.id or False
+ _values = order_line_obj.product_id_change(request.cr, SUPERUSER_ID, [], pricelist_id, ticket.product_id.id, partner_id=partner_id, context=context)['value']
+ _values.update(values)
+
+ order_line_id = order_line_obj.create(request.cr, SUPERUSER_ID, _values, context=context)
+ order.write({'order_line': [(4, order_line_id)]}, context=context)
+
+ if not _values:
return werkzeug.utils.redirect("/event/%s/" % event_id)
-
return werkzeug.utils.redirect("/shop/checkout")
-
- @http.route(['/event/publish'], type='http', auth="public")
- def publish(self, **post):
- obj_id = int(post['id'])
- data_obj = request.registry['event.event']
-
- obj = data_obj.browse(request.cr, request.uid, obj_id)
- data_obj.write(request.cr, request.uid, [obj_id], {'website_published': not obj.website_published})
- obj = data_obj.browse(request.cr, request.uid, obj_id)
-
- return obj.website_published and "1" or "0"
diff --git a/addons/website_event/event.py b/addons/website_event/event.py
index 65a8034951f..3a880503bc9 100644
--- a/addons/website_event/event.py
+++ b/addons/website_event/event.py
@@ -1,36 +1,25 @@
# -*- coding: utf-8 -*-
from openerp.osv import osv, fields
+from openerp import SUPERUSER_ID
-
-class event(osv.osv):
- _inherit = 'event.event'
- _columns = {
- 'website_published': fields.boolean('Available in the website'),
- 'description_website': fields.html('Description for the website'),
- 'event_product_ids': fields.one2many('event.event.product', "event_id", "Event"),
- 'organizer_id': fields.many2one('res.partner', "Orgonizer"),
- 'phone': fields.related('orgonizer_id', 'phone', type='char', string='Phone'),
- 'email': fields.related('orgonizer_id', 'email', type='char', string='Email'),
- }
-
-
-class event_product(osv.osv):
- _name = 'event.event.product'
- _columns = {
- 'deadline': fields.date("Sales End"),
- 'event_id': fields.many2one('event.event', "Event"),
- 'product_id': fields.many2one('product.product', 'Product', domain=[("event_type_id", "!=", False)]),
- 'price': fields.float('Price'),
- 'qty': fields.integer('Current Registrations', readonly=True),
- 'max_qty': fields.integer('Maximum Registrations'),
- }
- def onchange_product_id(self, cr, uid, ids, product_id=False, context=None):
- return {'value': {'price': self.pool.get("product.product").browse(cr, uid, product_id).list_price or 0}}
-
-
+# defined for access rules
class product(osv.osv):
_inherit = 'product.product'
_columns = {
- 'event_product_ids': fields.one2many('event.event.product', 'product_id', 'Linked event product'),
+ 'event_ticket_ids': fields.one2many('event.event.ticket', 'product_id', 'Event Tickets'),
}
+
+
+class event_event(osv.osv):
+ _inherit = "event.event"
+
+ def google_map_img(self, cr, uid, ids, zoom=8, width=298, height=298, context=None):
+ partner = self.browse(cr, uid, ids[0], context=context)
+ if partner.address_id:
+ return self.browse(cr, SUPERUSER_ID, ids[0], context=context).address_id.google_map_img()
+
+ def google_map_link(self, cr, uid, ids, zoom=8, context=None):
+ partner = self.browse(cr, uid, ids[0], context=context)
+ if partner.address_id:
+ return self.browse(cr, SUPERUSER_ID, ids[0], context=context).address_id.google_map_link()
diff --git a/addons/website_event/security/ir.model.access.csv b/addons/website_event/security/ir.model.access.csv
index 430fced34b5..1c35f9ea5e9 100644
--- a/addons/website_event/security/ir.model.access.csv
+++ b/addons/website_event/security/ir.model.access.csv
@@ -1,4 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_event_event_public,event.event.public,event.model_event_event,base.group_public,1,0,0,0
-access_event_event_product_public,event.event.product.public,website_event.model_event_event_product,base.group_public,1,0,0,0
+access_event_event_ticket_public,event.event.ticket.public,event_sale.model_event_event_ticket,base.group_public,1,0,0,0
access_event_product_product_public,event.product.product.public,product.model_product_product,base.group_public,1,0,0,0
\ No newline at end of file
diff --git a/addons/website_event/security/website_event.xml b/addons/website_event/security/website_event.xml
index 6c571eb4875..c26eac05841 100644
--- a/addons/website_event/security/website_event.xml
+++ b/addons/website_event/security/website_event.xml
@@ -11,9 +11,9 @@
- event product: Public
-
+ event ticket: Public
+ [('event_id.website_published', '=', True)]
Product linked to event: Public
[("event_type_id", "!=", False), ('event_product_ids.event_id.website_published', '=', True)]
+ [("event_type_id", "!=", False), ('event_ticket_ids.event_id.website_published', '=', True)]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_event/static/src/js/website_event.js b/addons/website_event/static/src/js/website_event.js
deleted file mode 100644
index 54115172481..00000000000
--- a/addons/website_event/static/src/js/website_event.js
+++ /dev/null
@@ -1,18 +0,0 @@
-$(document).ready(function () {
- $(document).on('click', '.js_publish, .js_unpublish', function (e) {
- e.preventDefault();
- var $link = $(this).parent();
- $link.find('.js_publish, .js_unpublish').addClass("hidden");
- var $unp = $link.find(".js_unpublish");
- var $p = $link.find(".js_publish");
- $.post('/event/publish', {'id': $link.data('id')}, function (result) {
- if (+result) {
- $p.addClass("hidden");
- $unp.removeClass("hidden");
- } else {
- $p.removeClass("hidden");
- $unp.addClass("hidden");
- }
- });
- });
-});
\ No newline at end of file
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 65ff07fa9dd..be9902732f4 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -2,68 +2,29 @@
-
- view_event_form
- event.event
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- header_website_event
-
-
-
- Events
-
-
-
-
-
- footer_website_event
-
-
-
- Events
-
-
-
-
+
+
+ Events
+
+
+ Events
+
+
-
+
-
-
Events
Thanks for your message.
+ +
+
+
+ Your message has been sent successfully.
+
+
+ Thanks!
++ We will get back to you shortly. +
+ If you have an emergency, do not hesitate to contact us by phone: +
+-
+
- : +
- : +
+
+
+
+ Organize Events, Trainings & Webinars
+Schedule, Promote, Sell, Organize
+
+
+
+
+ ![]()
+
+
+
+
+
+ + Schedule, promote, sell and organize your events online with no + effort. Whether you organize meetings, conferences, trainings + or webinars, OpenERP gives you all the features you need to + manage all aspects of your event. +
+ +
+
+Create Awesome Event Pages
+Get rid of old WYSIWYG editors
+
+
+ + Drag & Drop well designed 'Building Blocks' to + create beautifull event pages that your customer will love. + Use pre-defined building blocks like; speakers, schedules, + social icons, etc. +
+ OpenERP's unique 'edit inline' approach makes website + creation surprisingly easy. "Want to introduce a speaker? to + change the price of a ticket? to update a banner? promote sponsors?" + just click and change. What you see is what you get. Really. +
+
+
+
+ ![]()
+
+
+
+Sell Tickets Online
+Mass Mailing & Social Media Icons
+
+ ![]()
+
+
+
+ + Use the multi-ticketing feature to sell registrations to your + event. Events can be free or for a fee. Attendees can pay online + with a credit card or on invoice, based on your configuration. +
+ Boost your sales with early-bird prices, special conditions for + members, or extra services with multiple tickets. +
+
+
+Promote Events Efficiently
+Mass Mailing & Social Media Icons
+
+ ![]()
+
+
+
+ + Use the segmentation, the social network integration and mass + mailing features to promote your events to the right audience. + Setup automated emails to attendees to send them last minute + details. +
+
+
+A Clean Google Analytics Integration
+Control your sales funnel with Google Analytics
+
+
+ + Get a clear visibility of your sales funnel. OpenERP's Google + Analytics trackers are configured by default to track all kind of + events related to shopping carts, call-to-actions, etc. +
+ As OpenERP marketing tools (mass mailing, campaigns, etc) are also + linked with Google Analytics, you get a 360° view of your business. +
+
+ ![]()
+
+
+
+Designer-Friendly Themes
+Designers love working on OpenERP
+
+
+ + Themes are awesome and easy to design. You don't need to develop + to create new pages, themes or building blocks. We use a clean + HTML structure, a bootstrap + CSS and our modularity allows to distribute your themes easily. +
+ The building block approach allows the website to stay clean + after the end-users start creating new contents. +
+
+
+
+ ![]()
+
+
+
+Make Your Event More Visible
+SEO tools at your finger tips
+
+
+
+ ![]()
+
+
+
+ + SEO tools are ready to use, with no configuration required. + OpenERP suggests keywords according to Google most searched + terms, Google Analytics tracks your shopping cart events, + sitemap are created automatically. +
+ We even do structured content automatically to promote your + events and products efficiently in Google. +
+
+
+Leverage Social Media
+Optimize: from Ads to Conversions
+
+
+ + Create new landing pages easily with the OpenERP inline edition + feature. Send visitors of your different marketing campaigns to + event landing pages to optimize conversions. +
+
+
+
+ ![]()
+
+
+
+And Much More...
+
+
+ Schedule
+-
+
- Calendar of Events +
- Publish related documents +
- Ressources allocation +
- Automate purchases (cathering...) +
- Multiple locations and organizers +
- Mobile Interface +
+
+ Sell
+-
+
- Online or offline sales +
- Automated invoicing +
- Cancellation policies +
- Specific prices for members +
- Dashboards and reporting +
+
+ Organize
+-
+
- Advanced Planification +
- Print Badges +
- Automate Follow-up Emails +
- Min/Max capacities +
- Manage classes and ressources +
- Create group of attendees +
- Automate statisfaction surveys +
+
+Fully Integrated With Others Apps
+Get hundreds of open source apps for free
+
+
+
+ eCommerce
+
+ ![]()
+
+
+ + Promote products, sell online, optimize visitors' shopping experiences. +
+
+
+
+ Blogs
+
+ ![]()
+
+
+ + Write news, attract new visitors, build customer loyalty. +
+
+
+
+
+ Our Team
+
+ ![]()
+
+
+ + Create a great "About us" page by presenting your team + efficiently. +
+
-