diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 96938f56ef1..c9200324bb7 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -41,10 +41,9 @@ Notes can be found in the 'Home' main menu, under 'Tool' submenu.
'security/note_security.xml',
'security/ir.model.access.csv',
'note_view.xml',
- #'note_workflow.xml',
],
'demo_xml': [
- #"note_data.xml"
+ "note_data.xml"
],
'test':[
],
diff --git a/addons/note/note.py b/addons/note/note.py
index a9afad770c4..89049bf6ec8 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -93,7 +93,7 @@ class note_note(osv.Model):
'active': fields.boolean('Active'),
'color': fields.integer('Color Index'),
#'follower_ids': fields.one2many('mail.subscription', 'res_id', 'Followers', domain=[('res_model','=', 'note.note')])
- 'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers', join_filter="mail_subscription.res_model='note.note'")
+ #'follower_ids': fields.many2many('res.users', 'mail_subscription', 'res_id', 'user_id', 'Followers', join_filter="mail_subscription.res_model='note.note'")
}
_sql_constraints = [
diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
new file mode 100644
index 00000000000..15226bd48b0
--- /dev/null
+++ b/addons/note/note_data.xml
@@ -0,0 +1,224 @@
+
+
+
+
+ Today
+ 1
+
+
+
+ Tomorrow
+ 2
+
+
+
+ This week
+ 3
+
+
+
+ This month
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 9f8c91e9c62..ded45474f2f 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -84,9 +84,11 @@
-
+
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
index a6b097ece88..4b3c7e0e57d 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -1,6 +1,6 @@
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
+.openerp .oe_fold_column .oe_kanban_card {
text-decoration:none;
color:#000;
display:block;
@@ -14,35 +14,72 @@
}
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
+
+.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);
}
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups:nth-child(even) .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
- -o-transform:rotate(1deg);
- -webkit-transform:rotate(1deg);
+.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);
- position:relative;
- top:3px;
}
+/* .openerp .oe_fold_column:nth-child(even) .oe_kanban_card { */
+/* -webkit-transform: rotate(-3deg); */
+/* -o-transform: rotate(-3deg); */
+/* -moz-transform:rotate(-3deg); */
+/* } */
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups:nth-child(2n) .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
- -o-transform:rotate(-2deg);
- -webkit-transform:rotate(-2deg);
- -moz-transform:rotate(-2deg);
- position:relative;
- top:-3px;
-}
+/* .openerp .oe_kanban_groups_records .oe_kanban_column .oe_fold_column:nth-child(even) .oe_kanban_card { */
+/* -o-transform:rotate(1deg); */
+/* -webkit-transform:rotate(1deg); */
+/* -moz-transform:rotate(1deg); */
+/* position:relative; */
+/* top:3px; */
+/* } */
-.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups:nth-child(2n) .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card {
- -o-transform:rotate(2deg);
- -webkit-transform:rotate(2deg);
- -moz-transform:rotate(2deg);
- position:relative;
- top:-5px;
-}
+/* .openerp .oe_fold_column:nth-child(3n) .oe_kanban_card { */
+/* -o-transform:rotate(-2deg); */
+/* -webkit-transform:rotate(-2deg); */
+/* -moz-transform:rotate(-2deg); */
+/* position:relative; */
+/* top:-3px; */
+/* } */
+
+/* .openerp.oe_fold_column:nth-child(5n) .oe_kanban_card { */
+/* -o-transform:rotate(2deg); */
+/* -webkit-transform:rotate(2deg); */
+/* -moz-transform:rotate(2deg); */
+/* position:relative; */
+/* top:-5px; */
+/* } */
.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card:hover,
.openerp .oe_webclient .oe_application .oe_view_manager .oe_view_manager_body .oe_view_manager_view_kanban .oe_kanban_view .oe_kanban_groups .oe_kanban_groups_records .oe_kanban_column .oe_fold_column .oe_kanban_card:focus
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"
+