[MERGE] merge with main addons

bzr revid: cha@tinyerp.com-20120905092925-w14dvgxgunzefvz1

2 files changed, 14 insertions, 17 deletions

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index a7c17a29869..73636ce1a9a 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -47,7 +47,7 @@
       <field name="name">note.note.kanban</field>
       <field name="model">note.note</field>
       <field name="arch" type="xml">
-        <kanban default_group_by="stage_id">
+        <kanban default_group_by="stage_id" class="oe_notes" version="7.0">
           <field name="color"/>
           <field name="sequence"/>
           <field name="name"/>
@@ -57,7 +57,7 @@
           <field name="follower_ids"/>
           <templates>
             <t t-name="kanban-box">
-              <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+              <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
                 <!-- dropdown menu -->
                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                   <span class="oe_e">í</span>
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index e5a3d1455c2..7e79438b46a 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -1,6 +1,4 @@
-
-
-.openerp .oe_fold_column .oe_kanban_card {
+.openerp .oe_notes .oe_fold_column .oe_kanban_card {
     text-decoration:none;
     color:#000;
     display:block;
@@ -13,63 +11,62 @@
     box-shadow: 5px 5px 7px rgba(33,33,33,.7);
 }
 
-.oe_kanban_record .oe_kanban_card   {
+.openerp .oe_notes .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   {
+.openerp .oe_notes .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   {
+.openerp .oe_notes .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   {
+.openerp .oe_notes .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   {
+.openerp .oe_notes .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   {
+.openerp .oe_notes .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   {
+.openerp .oe_notes .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   {
+.openerp .oe_notes .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   {
+.openerp .oe_notes .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
-{
+.openerp .oe_notes .oe_kanban_column .oe_fold_column .oe_kanban_card:hover,
+.openerp .oe_notes .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);