diff --git a/addons/website_crm/__openerp__.py b/addons/website_crm/__openerp__.py index 1f56f9be0af..eb40763464a 100644 --- a/addons/website_crm/__openerp__.py +++ b/addons/website_crm/__openerp__.py @@ -1,5 +1,5 @@ { - 'name': 'Contact Form', + 'name': 'Website Contact Form', 'category': 'CRM', 'version': '1.0', 'description': """ diff --git a/addons/website_hr/__init__.py b/addons/website_hr/__init__.py new file mode 100644 index 00000000000..db058b8b828 --- /dev/null +++ b/addons/website_hr/__init__.py @@ -0,0 +1,2 @@ +import controllers +import hr \ No newline at end of file diff --git a/addons/website_hr/__openerp__.py b/addons/website_hr/__openerp__.py new file mode 100644 index 00000000000..5aa9c24d8fb --- /dev/null +++ b/addons/website_hr/__openerp__.py @@ -0,0 +1,18 @@ +{ + 'name': 'Website Team', + 'category': 'mail', + 'version': '1.0', + 'description': """ +OpenERP Blog +============ + + """, + 'author': 'OpenERP SA', + 'depends': ['website', 'hr'], + 'data': [ + 'views/website_hr.xml', + ], + 'qweb': ['static/src/xml/*.xml'], + 'installable': True, + 'auto_install': True, +} diff --git a/addons/website_hr/controllers/__init__.py b/addons/website_hr/controllers/__init__.py new file mode 100644 index 00000000000..8ee9bae18d9 --- /dev/null +++ b/addons/website_hr/controllers/__init__.py @@ -0,0 +1 @@ +import main diff --git a/addons/website_hr/controllers/main.py b/addons/website_hr/controllers/main.py new file mode 100644 index 00000000000..4b5321f929c --- /dev/null +++ b/addons/website_hr/controllers/main.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +from openerp.addons.web.http import request +from openerp.addons.website import website + +class website_hr(website): + + @website.route(['/team'], type='http', auth="admin") + def blog(self, cr, uid, **post): + hr_obj = request.registry['hr.employee'] + + employee_ids = hr_obj.search(cr, uid, [(1, "=", 1)]) + values = { + 'res_company': request.registry['res.company'].browse(cr, uid, 1), + 'employee_ids': hr_obj.browse(cr, uid, employee_ids), + } + + html = self.render(cr, uid, "website_hr.index", values) + return html diff --git a/addons/website_hr/hr.py b/addons/website_hr/hr.py new file mode 100644 index 00000000000..3a661f56389 --- /dev/null +++ b/addons/website_hr/hr.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- + +from openerp.osv import osv, fields + + +class hr(osv.osv): + _inherit = 'hr.employee' + _columns = { + 'website_important': fields.boolean('Publish', help="Publish also on contact form"), + } + diff --git a/addons/website_hr/static/src/css/Makefile b/addons/website_hr/static/src/css/Makefile new file mode 100644 index 00000000000..2694cc0791b --- /dev/null +++ b/addons/website_hr/static/src/css/Makefile @@ -0,0 +1,2 @@ +sass: + sass --compass --trace -t expanded hr.sass hr.css diff --git a/addons/website_hr/static/src/css/hr.sass b/addons/website_hr/static/src/css/hr.sass new file mode 100644 index 00000000000..33ae61b5260 --- /dev/null +++ b/addons/website_hr/static/src/css/hr.sass @@ -0,0 +1 @@ +@import "compass/css3" diff --git a/addons/website_hr/static/src/js/hr.js b/addons/website_hr/static/src/js/hr.js new file mode 100644 index 00000000000..c7a609b0105 --- /dev/null +++ b/addons/website_hr/static/src/js/hr.js @@ -0,0 +1,3 @@ +$(document).ready(function () { + +}); \ No newline at end of file diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr.xml new file mode 100644 index 00000000000..356a9f2ba0d --- /dev/null +++ b/addons/website_hr/views/website_hr.xml @@ -0,0 +1,49 @@ + + + + + + + + footer_website_hr + + + + +
  • Team
  • +
    +
    +
    +
    + + + + +
    +
    diff --git a/addons/website_mail/__openerp__.py b/addons/website_mail/__openerp__.py index 4db4d339de9..ab0a24bfbc3 100644 --- a/addons/website_mail/__openerp__.py +++ b/addons/website_mail/__openerp__.py @@ -1,5 +1,5 @@ { - 'name': 'Blog', + 'name': 'Website Blog', 'category': 'mail', 'version': '1.0', 'description': """