[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu

3 files changed, 374 insertions, 0 deletions

diff --git a/addons/gamification/static/src/css/Makefile b/addons/gamification/static/src/css/Makefile
new file mode 100644
index 00000000000..3a6a70cf59b
--- /dev/null
+++ b/addons/gamification/static/src/css/Makefile
@@ -0,0 +1,3 @@
+gamification.css: gamification.sass
+	sass --trace -t expanded gamification.sass gamification.css
+
diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css
new file mode 100644
index 00000000000..4ac3a0340fa
--- /dev/null
+++ b/addons/gamification/static/src/css/gamification.css
@@ -0,0 +1,190 @@
+@charset "UTF-8";
+.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal {
+  width: 230px;
+  min-height: 200px;
+}
+.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
+  width: 250px;
+  min-height: 150px;
+}
+.openerp .oe_kanban_badge_avatars {
+  margin-top: 8px;
+}
+.openerp .oe_kanban_badge_avatars img {
+  width: 30px;
+  height: 30px;
+  padding-left: 0;
+  margin-top: 3px;
+  border-radius: 2px;
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+.openerp .oe_kanban_goal .oe_goal_state_block {
+  width: 200px;
+  height: 130px;
+  margin: auto;
+  margin-bottom: -20px;
+}
+.openerp .oe_kanban_goal .oe_goal_state_block .oe_goal_state {
+  font-size: 2.5em;
+  font-weight: bold;
+  padding-top: 30px;
+}
+.openerp .oe_kanban_goal .oe_goal_state_block .oe_goal_state.oe_e {
+  font-size: 7em;
+}
+.openerp .oe_kanban_goal .oe_goal_state_block, .openerp .oe_kanban_goal p {
+  text-align: center;
+}
+.openerp .oe_kanban_content .oe_goal_gauge:first-child {
+  margin: auto;
+}
+.openerp .oe_kanban_content .oe_goal_gauge svg {
+  margin-top: -20px;
+}
+.openerp .oe_no_overflow {
+  overflow: hidden;
+}
+.openerp .oe_red {
+  color: red;
+}
+.openerp .oe_green {
+  color: green;
+}
+.openerp .oe_orange {
+  color: orange;
+}
+.openerp .oe_form td .oe_no_padding {
+  margin-left: -6px;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside {
+  margin-top: 15px;
+  position: relative;
+  display: inline-block;
+  vertical-align: top;
+  width: 280px;
+  border-radius: 2px;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_gamification_challenge_list {
+  background-color: #ededf6;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_gamification_suggestion {
+  background-color: #d3def1;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_gamification_suggestion ul {
+  padding-left: 15px;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside h4, .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list .oe_thead {
+  text-align: center;
+  padding-bottom: 15px;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside > div {
+  border-bottom: solid 5px white;
+  border-radius: 2px;
+}
+.openerp .oe_mail_wall .oe_goal {
+  border-bottom: solid 3px white;
+  padding: 5px 10px;
+}
+.openerp .oe_mail_wall .oe_goal .oe_update_challenge.oe_e, .openerp .oe_mail_wall .oe_goal .oe_goal_action.oe_e {
+  visibility: hidden;
+  font-size: 25px;
+  float: right;
+  position: relative;
+}
+.openerp .oe_mail_wall .oe_goal div:hover > .oe_update_challenge, .openerp .oe_mail_wall .oe_goal div:hover > .oe_goal_action, .openerp .oe_mail_wall .oe_goal th:hover > .oe_goal_action {
+  visibility: visible;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list {
+  padding-left: 0;
+  margin-top: 5px;
+  margin-bottom: 10px;
+  width: 100%;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress div {
+  display: inline-block;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress::before {
+  content: "•";
+  padding-right: 4px;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress.oe_goal_reached::before {
+  content: "✓";
+  padding-right: 0;
+  margin-left: -2px;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress.oe_goal_reached .oe_cell {
+  text-decoration: line-through;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_cell.oe_goal_current {
+  font-size: 150%;
+  font-weight: bold;
+  min-width: 50px;
+  padding: 0 5px;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_outer_box {
+  display: inline-block;
+  position: relative;
+  z-index: 0;
+  vertical-align: middle;
+  width: 100%;
+  border: solid 1px rgba(0, 0, 0, 0.03);
+  border-radius: 2px;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_outer_box.oe_no_progress {
+  border: none;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_progress_background {
+  background-color: white;
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  z-index: -2;
+  top: 0;
+  left: 0;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_progress {
+  background-color: #d4e9de;
+  position: absolute;
+  height: 100%;
+  width: 0;
+  z-index: -1;
+  top: 0;
+  left: 0;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_thead {
+  font-weight: normal;
+  padding: 5px;
+  text-align: center;
+}
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_cell {
+  padding: 3px 0;
+}
+.openerp .oe_mail_wall .oe_table.oe_goals_list .col0 {
+  font-size: 200%;
+  font-weight: bold;
+  width: 25px;
+  text-align: center;
+}
+.openerp .oe_mail_wall .oe_table.oe_goals_list .col1 {
+  padding: 0 5px;
+}
+.openerp .oe_mail_wall .oe_table.oe_goals_list .col2 {
+  width: auto;
+}
+.openerp .oe_mail_wall .oe_user_avatar {
+  width: 24px;
+  padding-right: 5px;
+}
+.openerp .oe_mail_wall .oe_mail {
+  display: inline-block;
+}
+.openerp .oe_mail_wall .oe_table {
+  display: table;
+}
+.openerp .oe_mail_wall .oe_row {
+  display: table-row;
+}
+.openerp .oe_mail_wall .oe_cell {
+  display: table-cell;
+  vertical-align: middle;
+}
diff --git a/addons/gamification/static/src/css/gamification.sass b/addons/gamification/static/src/css/gamification.sass
new file mode 100644
index 00000000000..3bb6b570e66
--- /dev/null
+++ b/addons/gamification/static/src/css/gamification.sass
@@ -0,0 +1,181 @@
+@charset "utf-8"
+
+.openerp
+    // Kanban views
+    .oe_kanban_view 
+        .oe_kanban_card.oe_kanban_goal
+            width: 230px
+            min-height: 200px
+        .oe_kanban_card.oe_kanban_badge
+            width: 250px
+            min-height: 150px
+    .oe_kanban_badge_avatars
+        margin-top: 8px
+        img
+            width: 30px
+            height: 30px
+            padding-left: 0
+            margin-top: 3px
+            border-radius: 2px
+            -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2)
+
+    .oe_kanban_goal
+        .oe_goal_state_block
+            width: 200px
+            height: 130px
+            margin: auto
+            margin-bottom: -20px
+            .oe_goal_state
+                font-size: 2.5em
+                font-weight: bold
+                padding-top: 30px
+            .oe_goal_state.oe_e
+                font-size: 7em
+        .oe_goal_state_block,p
+            text-align: center
+    
+    .oe_kanban_content
+        .oe_goal_gauge:first-child
+            margin: auto /* avoid margin-right: 16px */
+        .oe_goal_gauge
+            svg
+                margin-top: -20px
+    .oe_no_overflow
+        overflow: hidden
+
+
+    .oe_red
+        color: red
+    .oe_green
+        color: green
+    .oe_orange
+        color: orange
+
+
+    // compensate padding from .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell
+    .oe_form td .oe_no_padding
+        margin-left: -6px
+
+
+    .oe_mail_wall
+        .oe_mail_wall_aside
+            margin-top: 15px
+            position: relative
+            display: inline-block
+            vertical-align: top
+            width: 280px
+            border-radius: 2px
+
+            .oe_gamification_challenge_list
+                background-color: #EDEDF6
+            .oe_gamification_suggestion
+                background-color: rgb(211, 222, 241)
+                ul
+                    padding-left: 15px
+
+            h4, .oe_goals_list .oe_thead
+                text-align: center
+                padding-bottom: 15px
+
+        .oe_mail_wall_aside > div
+            border-bottom: solid 5px white
+            border-radius: 2px
+
+        .oe_goal
+            border-bottom: solid 3px white
+            padding: 5px 10px
+            .oe_update_challenge.oe_e, .oe_goal_action.oe_e
+                visibility: hidden
+                font-size: 25px
+                float: right
+                position: relative
+            div:hover > .oe_update_challenge, div:hover > .oe_goal_action, th:hover > .oe_goal_action
+                visibility: visible
+
+            .oe_goals_list
+                padding-left: 0
+                margin-top: 5px
+                margin-bottom: 10px
+                width: 100%
+
+                .oe_no_progress
+                    div
+                        display: inline-block
+                .oe_no_progress::before
+                    content: "•"
+                    padding-right: 4px
+                .oe_no_progress.oe_goal_reached::before
+                    content: "✓"
+                    padding-right: 0
+                    margin-left: -2px
+                .oe_no_progress.oe_goal_reached
+                    .oe_cell
+                        text-decoration: line-through
+
+                .oe_cell.oe_goal_current
+                    font-size: 150%
+                    font-weight: bold
+                    min-width: 50px
+                    padding: 0 5px
+                
+                .oe_goal_outer_box
+                    display: inline-block
+                    position: relative
+                    z-index: 0
+                    vertical-align: middle
+                    width: 100%
+                    border: solid 1px rgba(0,0,0,0.03)
+                    border-radius: 2px
+                .oe_goal_outer_box.oe_no_progress
+                    border: none
+
+                .oe_goal_progress_background
+                    background-color: white
+                    position: absolute
+                    height: 100%
+                    width: 100%
+                    z-index: -2
+                    top: 0
+                    left: 0
+
+                .oe_goal_progress
+                    background-color: rgb(212, 233, 222)
+                    position: absolute
+                    height: 100%
+                    width: 0
+                    z-index: -1
+                    top: 0
+                    left: 0
+
+                .oe_thead
+                    font-weight: normal
+                    padding: 5px
+                    text-align: center
+                .oe_cell
+                    padding: 3px 0
+
+        .oe_table.oe_goals_list
+            .col0
+                font-size: 200%
+                font-weight: bold
+                width: 25px
+                text-align: center
+            .col1
+                padding: 0 5px
+            .col2
+                width: auto
+        
+        .oe_user_avatar
+            width: 24px
+            padding-right: 5px
+
+        .oe_mail
+            display: inline-block
+
+        .oe_table
+            display: table
+        .oe_row
+            display: table-row
+        .oe_cell
+            display: table-cell
+            vertical-align: middle