diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 67327c28f2e..d83b32d7afb 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -61,8 +61,8 @@
@@ -123,7 +123,7 @@
- Groups
+ Join a group
mail.group
form
kanban,tree,form
@@ -132,6 +132,6 @@
-
+
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index f6ef5bc2ee9..34efa05f812 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -3,7 +3,7 @@
-
@@ -11,8 +11,18 @@
-
-
+
+ My Feeds
+
+
+
+
+
+ My Posts
+
+
+
+
diff --git a/addons/note/__init__.py b/addons/note/__init__.py
new file mode 100644
index 00000000000..9bf064877b5
--- /dev/null
+++ b/addons/note/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import note
+
diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
new file mode 100644
index 00000000000..62d9962634a
--- /dev/null
+++ b/addons/note/__openerp__.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+{
+ 'name': 'Notes',
+ 'version': '0.1',
+ 'category': 'Tools',
+ 'description': """
+This module allows users to create their own notes inside OpenERP
+=================================================================
+
+Use notes to write meeting minutes, organize ideas, organize personnal todo
+lists, etc. Each user manages his own personnal notes. Notes are available to
+their authors only, but they can share notes to others users so that several
+people can work on the same note in real time. It's very efficient to share
+meeting minutes.
+
+Notes can be found in the 'Home' menu.
+""",
+ 'author': 'OpenERP SA',
+ 'website': 'http://openerp.com',
+ 'summary': 'Sticky Notes, Collaborative',
+ 'depends': [
+ 'base_tools',
+ 'mail',
+ 'pad',
+ ],
+ 'data': [
+ 'security/note_security.xml',
+ 'security/ir.model.access.csv',
+ 'note_data.xml',
+ 'note_view.xml',
+ ],
+ 'demo': [
+ 'note_demo.xml',
+ ],
+ 'css': [
+ 'static/src/css/note.css',
+ ],
+ 'installable': True,
+ 'application': True,
+ 'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/note/note.py b/addons/note/note.py
new file mode 100644
index 00000000000..f6a46c72c88
--- /dev/null
+++ b/addons/note/note.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+from tools.translate import _
+
+class note_stage(osv.osv):
+ """ Category of Note """
+ _name = "note.stage"
+ _description = "Note Stage"
+ _columns = {
+ 'name': fields.char('Category Name', size=64, required=True),
+ 'sequence': fields.integer('Sequence', help="Used to order the note stages"),
+ 'user_id': fields.many2one('res.users', 'Owner', help="Owner of the note stage.", required=True, readonly=True),
+ 'fold': fields.boolean('Folded'),
+ }
+ _order = 'sequence asc'
+ _defaults = {
+ 'fold': 0,
+ 'user_id': lambda self, cr, uid, ctx: uid,
+ 'sequence' : 1,
+ }
+
+class note_note(osv.osv):
+ """ Note """
+ _name = 'note.note'
+ _inherit = ['mail.thread','pad.common']
+ _pad_fields = ['note_pad']
+ _description = "Note"
+
+ def _get_note_first_line(self, cr, uid, ids, name, args, context=None):
+ res = {}
+ for note in self.browse(cr, uid, ids, context=context):
+ res[note.id] = (note.note or '').strip().split('\n')[0]
+ return res
+
+ def _get_default_stage_id(self,cr,uid,context=None):
+ ids = self.pool.get('note.stage').search(cr,uid,[('user_id','=',uid)])
+ return ids and ids[0] or False
+
+ def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
+ access_rights_uid = access_rights_uid or uid
+ stage_obj = self.pool.get('note.stage')
+
+ # only show stage groups not folded and owned by user
+ search_domain = [('fold', '=', False),('user_id', '=', uid)]
+
+ stage_ids = stage_obj._search(cr, uid, search_domain, order=self._order, access_rights_uid=access_rights_uid, context=context)
+ result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
+ return result
+
+ _columns = {
+ 'name': fields.function(_get_note_first_line, string='Note Summary', type="text", store=True),
+ 'note': fields.text('Pad Content'),
+ 'note_pad_url': fields.char('Pad Url', size=250),
+ 'sequence': fields.integer('Sequence'),
+ 'stage_id': fields.many2one('note.stage', 'Stage'),
+ 'active': fields.boolean('Active'),
+ 'color': fields.integer('Color Index'),
+ # to be replaced by message_follower_ids
+ 'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers')
+ }
+
+ _defaults = {
+ 'active' : 1,
+ 'stage_id' : _get_default_stage_id,
+ 'note_pad_url': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
+ }
+ _order = 'sequence asc'
+ _group_by_full = {
+ 'stage_id' : _read_group_stage_ids,
+ }
diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
new file mode 100644
index 00000000000..670b4c89269
--- /dev/null
+++ b/addons/note/note_data.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ Todo today
+ 1
+
+
+
+
+ Todo later
+ 2
+
+
+
+
+ For Info
+ 3
+
+
+
+
+
diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
new file mode 100644
index 00000000000..e322f362ef5
--- /dev/null
+++ b/addons/note/note_demo.xml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+ 7
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
new file mode 100644
index 00000000000..a7c17a29869
--- /dev/null
+++ b/addons/note/note_view.xml
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+ note.stage.form
+ note.stage
+
+
+
+
+
+
+
+ note.stage.tree
+ note.stage
+
+
+
+
+
+
+
+
+
+
+
+
+ Stages
+ note.stage
+ tree,form
+ [('user_id','=',uid)]
+
+
+
+
+
+
+ note.note.kanban
+ note.note
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ í
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ note.note.form
+ note.note
+
+
+
+
+
+
+
+ note.note.search
+ note.note
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Notes
+ note.note
+ form
+ kanban,tree,form
+
+
+
+
+
+
+
diff --git a/addons/note/security/ir.model.access.csv b/addons/note/security/ir.model.access.csv
new file mode 100644
index 00000000000..fdd6030ca51
--- /dev/null
+++ b/addons/note/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_note_stage_user,note.stage user,model_note_stage,base.group_user,1,1,1,1
+access_note_note_user,note.note user,model_note_note,base.group_user,1,1,1,1
diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml
new file mode 100644
index 00000000000..46eebee629c
--- /dev/null
+++ b/addons/note/security/note_security.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ My notes
+
+
+ [('follower_ids','=',user.id)]
+
+
+
+
diff --git a/addons/note/static/src/css/Makefile b/addons/note/static/src/css/Makefile
new file mode 100644
index 00000000000..d6019f4ed4a
--- /dev/null
+++ b/addons/note/static/src/css/Makefile
@@ -0,0 +1,3 @@
+note.css: note.sass
+ sass -t expanded note.sass note.css
+
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
new file mode 100644
index 00000000000..e5a3d1455c2
--- /dev/null
+++ b/addons/note/static/src/css/note.css
@@ -0,0 +1,81 @@
+
+
+.openerp .oe_fold_column .oe_kanban_card {
+ text-decoration:none;
+ color:#000;
+ display:block;
+ padding:1em;
+ margin-right: 1em;
+ margin-bottom: 1em;
+
+ -moz-box-shadow:5px 5px 7px rgba(33,33,33,1);
+ -webkit-box-shadow: 5px 5px 7px rgba(33,33,33,.7);
+ box-shadow: 5px 5px 7px rgba(33,33,33,.7);
+}
+
+.oe_kanban_record .oe_kanban_card {
+ -webkit-transform: rotate(-2deg);
+ -o-transform: rotate(-2deg);
+ -moz-transform:rotate(-2deg);
+}
+
+.oe_kanban_record:nth-of-type(even) .oe_kanban_card {
+ -webkit-transform: rotate(1deg);
+ -o-transform: rotate(1deg);
+ -moz-transform:rotate(1deg);
+}
+
+.oe_kanban_record:nth-of-type(3n) .oe_kanban_card {
+ -webkit-transform: rotate(4deg);
+ -o-transform: rotate(4deg);
+ -moz-transform:rotate(4deg);
+}
+
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record .oe_kanban_card {
+ -webkit-transform: rotate(2deg);
+ -o-transform: rotate(2deg);
+ -moz-transform:rotate(2deg);
+}
+
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(even) .oe_kanban_card {
+ -webkit-transform: rotate(-3deg);
+ -o-transform: rotate(-3deg);
+ -moz-transform:rotate(-3deg);
+}
+
+.oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card {
+ -webkit-transform: rotate(1deg);
+ -o-transform: rotate(1deg);
+ -moz-transform:rotate(1deg);
+}
+
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record .oe_kanban_card {
+ -webkit-transform: rotate(-2deg);
+ -o-transform: rotate(-2deg);
+ -moz-transform:rotate(-2deg);
+}
+
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(even) .oe_kanban_card {
+ -webkit-transform: rotate(1deg);
+ -o-transform: rotate(1deg);
+ -moz-transform:rotate(1deg);
+}
+
+.oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card {
+ -webkit-transform: rotate(-1deg);
+ -o-transform: rotate(-1deg);
+ -moz-transform:rotate(-1deg);
+}
+
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card:hover,
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card:focus
+{
+ box-shadow:10px 10px 7px rgba(0,0,0,.7);
+ -moz-box-shadow:10px 10px 7px rgba(0,0,0,.7);
+ -webkit-box-shadow: 10px 10px 7px rgba(0,0,0,.7);
+ -webkit-transform: rotate(0);
+ -moz-transform: rotate(0);
+ -o-transform: rotate(0);
+ position:relative;
+ z-index:5;
+}
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
new file mode 100644
index 00000000000..cd04015dcbb
--- /dev/null
+++ b/addons/note/static/src/css/note.sass
@@ -0,0 +1,137 @@
+@charset "utf-8"
+
+// Variables {{{
+$section-title-color: #8786b7
+$tag-bg-light: #f0f0fa
+$tag-bg-dark: #8786b7
+$tag-border: #afafb6
+$tag-border-selected: #a6a6fe
+$hover-background: #f0f0fa
+$link-color: #8a89ba
+$sheet-max-width: 860px
+// }}}
+// Mixins {{{
+@font-face
+ font-family: 'mnmliconsRegular'
+ src: url('/web/static/src/font/mnmliconsv21-webfont.eot') format('eot')
+ src: url('/web/static/src/font/mnmliconsv21-webfont.woff') format('woff')
+ src: url('/web/static/src/font/mnmliconsv21-webfont.ttf') format('truetype')
+ src: url('/web/static/src/font/mnmliconsv21-webfont.svg') format('svg') active
+ font-weight: normal
+ font-style: normal
+
+@font-face
+ font-family: 'EntypoRegular'
+ src: url('/web/static/src/font/entypo-webfont.eot') format('eot')
+ src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype')
+ src: url('/web/static/src/font/entypo-webfont.woff') format('woff')
+ src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype')
+ src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active
+ font-weight: normal
+ font-style: normal
+
+@mixin reset()
+ border: none
+ padding: 0
+ margin: 0
+ background: none
+ @include radius(none)
+ @include box-shadow(none)
+
+@mixin vertical-gradient($startColor: #555, $endColor: #333)
+ background-color: $startColor
+ background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */
+ background-image: -webkit-linear-gradient(top, $startColor, $endColor) /* Chrome 10+, Saf5.1+, iOS 5+ */
+ background-image: -moz-linear-gradient(top, $startColor, $endColor) /* FF3.6 */
+ background-image: -ms-linear-gradient(top, $startColor, $endColor) /* IE10 */
+ background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */
+ background-image: linear-gradient(to bottom, $startColor, $endColor)
+
+@mixin radial-gradient($gradient)
+ background-position: center center
+ background-image: -webkit-radial-gradient(circle, $gradient)
+ background-image: -moz-radial-gradient($gradient)
+ background-image: -ms-radial-gradient($gradient)
+ background-image: radial-gradient($gradient)
+
+@mixin radius($radius: 5px)
+ -moz-border-radius: $radius
+ -webkit-border-radius: $radius
+ border-radius: $radius
+
+@mixin box-shadow($bsval: 0px 1px 4px #777)
+ -moz-box-shadow: $bsval
+ -webkit-box-shadow: $bsval
+ box-shadow: $bsval
+
+@mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s))
+ -webkit-transition: $transval
+ -moz-transition: $transval
+ -ms-transition: $transval
+ -o-transition: $transval
+ transition: $transval
+
+@mixin opacity($opacity: .5)
+ filter: alpha(opacity=$opacity * 100)
+ opacity: $opacity
+
+@mixin background-clip($clip: padding-box)
+ -webkit-background-clip: $clip
+ -moz-background-clip: $clip
+ background-clip: $clip
+
+@mixin box-sizing($type: content)
+ // type = border || content || padding
+ -webkit-box-sizing: #{$type}-box
+ -moz-box-sizing: #{$type}-box
+ -ms-box-sizing: #{$type}-box
+ box-sizing: #{$type}-box
+
+// Transforms the (readable) text of an inline element into an mmlicons icon,
+// allows for actual readable text in-code (and in readers?) with iconic looks
+@mixin text-to-icon($icon-name, $color: #404040)
+ font-size: 1px
+ letter-spacing: -1px
+ color: transparent
+ &:before
+ font: 21px "mnmliconsRegular"
+ content: $icon-name
+ color: $color
+
+// }}}
+// CSS animation bounces {{{
+@-moz-keyframes bounce
+ 0%
+ -moz-transform: scale(0)
+ opacity: 0
+ 50%
+ -moz-transform: scale(1.3)
+ opacity: 0.4
+ 75%
+ -moz-transform: scale(0.9)
+ opacity: 0.7
+ 100%
+ -moz-transform: scale(1)
+ opacity: 1
+
+@-webkit-keyframes bounce
+ 0%
+ -webkit-transform: scale(0)
+ opacity: 0
+ 50%
+ -webkit-transform: scale(1.3)
+ opacity: 0.4
+ 75%
+ -webkit-transform: scale(0.9)
+ opacity: 0.7
+ 100%
+ -webkit-transform: scale(1)
+ opacity: 1
+// }}}
+
+
+.oe_kanban_color_2
+ background-color:red
+
+// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css"
+