merge

bzr revid: fp@openerp.com-20120707071654-bomheifq0v3e6e2k

5 files changed, 233 insertions, 52 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 863dbb80044..1425162d833 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -91,7 +91,7 @@
   list-style-type: none;
 }
 .openerp input, .openerp textarea, .openerp select {
-  padding: 1px 4px;
+  padding: 2px 4px;
   border: 1px solid #cccccc;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -187,15 +187,97 @@
   background: #f0f0fa;
 }
 .openerp.ui-dialog {
-  border: 13px solid rgba(0, 0, 0, 0.3);
-  -moz-border-radius: 16px;
-  -webkit-border-radius: 16px;
-  border-radius: 16px;
+  display: none;
+  position: fixed;
+  padding: 6px;
+  top: 50%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin: -150px 0 0 -280px;
+  background-color: rgba(60, 60, 60, 0.7);
+  border: 1px solid;
+  border-color: #888888 #555555 #444444;
+  -moz-border-radius: 8px;
+  -webkit-border-radius: 8px;
+  border-radius: 8px;
+  -moz-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
+  -webkit-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
+  box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
+  -webkit-background-clip: padding-box;
   -moz-background-clip: padding-box;
-  -webkit-background-clip: padding;
   background-clip: padding-box;
-  box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6);
-  -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2);
+}
+.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane {
+  padding: 16px;
+}
+.openerp.ui-dialog .ui-dialog-titlebar {
+  border-bottom: 1px solid #cacaca;
+  -moz-border-radius: 2px 2px 0 0;
+  -webkit-border-radius: 2px 2px 0 0;
+  border-radius: 2px 2px 0 0;
+  background-color: #fcfcfc;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
+  background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
+}
+.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title {
+  margin: 0;
+  padding: 0;
+}
+.openerp.ui-dialog .ui-widget-header {
+  border: none;
+}
+.openerp.ui-dialog .ui-dialog-content {
+  background: white;
+}
+.openerp.ui-dialog .ui-dialog-buttonpane {
+  border-top: 1px solid #e0e0e0;
+  background: #f5f7f9;
+  padding: 8px;
+  margin: 0;
+  -moz-border-radius: 0 0 2px 2px;
+  -webkit-border-radius: 0 0 2px 2px;
+  border-radius: 0 0 2px 2px;
+}
+.openerp.ui-dialog .ui-dialog-buttonpane button {
+  margin-left: 8px;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close {
+  padding: 0;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close .ui-icon-closethick {
+  display: none;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close:before {
+  content: "×";
+  font-size: 18px;
+  font-weight: bold;
+  line-height: 16px;
+  color: black;
+  text-shadow: 0 1px 0 white;
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close:before:hover {
+  color: black;
+  text-decoration: none;
+}
+.openerp .modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: black;
+  filter: alpha(opacity=30);
+  opacity: 0.3;
 }
 .openerp .oe_i {
   font-family: "mnmliconsRegular" !important;
@@ -352,17 +434,17 @@
 .openerp .oe_button.oe_link span:hover {
   text-decoration: underline;
 }
-.openerp .oe_star_on, .openerp .oe_star_off {
+.openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off {
   color: #cccccc;
   text-shadow: 0 0 2px black;
   vertical-align: top;
   position: relative;
   top: -5px;
 }
-.openerp .oe_star_on:hover, .openerp .oe_star_off:hover {
+.openerp .oe_webclient .oe_star_on:hover, .openerp .oe_webclient .oe_star_off:hover {
   text-decoration: none;
 }
-.openerp .oe_star_on {
+.openerp .oe_webclient .oe_star_on {
   color: gold;
 }
 .openerp.oe_tooltip {
@@ -453,6 +535,10 @@
   position: relative;
   cursor: pointer;
 }
+.openerp .oe_dropdown_toggle {
+  color: #888888;
+  font-weight: normal;
+}
 .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {
   display: block;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index be1e8b6c08e..82ed305a275 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -144,7 +144,7 @@ $sheet-max-width: 860px
     li
         list-style-type: none
     input, textarea, select
-        padding: 1px 4px
+        padding: 2px 4px
         border: 1px solid #ccc
         @include radius(3px)
         background: white
@@ -201,14 +201,75 @@ $sheet-max-width: 860px
             width: auto
             a.ui-state-active
                 background: #f0f0fa
+
+    // Modal box
     &.ui-dialog
-        border: 13px solid rgba(0, 0, 0, 0.3)
-        @include radius(16px)
-        -moz-background-clip: padding-box
-        -webkit-background-clip: padding
-        background-clip: padding-box
-        box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.6)
-        -webkit-box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.2)
+        display: none
+        position: fixed
+        padding: 6px
+        top: 50%
+        left: 50%
+        z-index: 1050
+        width: 560px
+        margin: -150px 0 0 -280px
+        //overflow: hidden
+        background-color: rgba(60,60,60,0.7)
+        border: 1px solid
+        border-color: #888 #555 #444
+        //overflow: hidden
+        @include radius(8px)
+        @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6))
+        @include background-clip()
+        .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
+            padding: 16px
+        .ui-dialog-titlebar
+            border-bottom: 1px solid #cacaca
+            @include radius(2px 2px 0 0)
+            @include vertical-gradient(#FCFCFC, #DEDEDE)
+            .ui-dialog-title
+                margin: 0
+                padding: 0
+        .ui-widget-header
+            border: none
+        .ui-dialog-content
+            background: white
+        .ui-dialog-buttonpane
+            border-top: 1px solid #e0e0e0
+            background: #f5f7f9
+            padding: 8px
+            margin: 0
+            @include radius(0 0 2px 2px)
+            button
+                margin-left: 8px
+        .ui-dialog-titlebar-close
+            padding: 0
+            .ui-icon-closethick
+                display: none
+            &:before
+                content: "×"
+                font-size: 18px
+                font-weight: bold
+                line-height: 16px
+                color: black
+                text-shadow: 0 1px 0 white
+                padding: 0
+                cursor: pointer
+                background: transparent
+                border: 0
+                &:hover
+                    color: black
+                    text-decoration: none
+
+    .modal-backdrop
+        position: fixed
+        top: 0
+        right: 0
+        bottom: 0
+        left: 0
+        z-index: 1040
+        background-color: black
+        @include opacity(.3)
+
     // }}}
     // Generic classes {{{
     .oe_i
@@ -288,18 +349,17 @@ $sheet-max-width: 860px
             font-weight: bold
             &:hover
                 text-decoration: underline
-    .oe_star_on, .oe_star_off
-        color: #cccccc
-        text-shadow: 0 0 2px black
-        vertical-align: top
-        position: relative
-        top: -5px
-
-    .oe_star_on:hover, .oe_star_off:hover
-        text-decoration: none
-
-    .oe_star_on
-        color: gold
+    .oe_webclient
+        .oe_star_on, .oe_star_off
+            color: #cccccc
+            text-shadow: 0 0 2px black
+            vertical-align: top
+            position: relative
+            top: -5px
+        .oe_star_on:hover, .oe_star_off:hover
+            text-decoration: none
+        .oe_star_on
+            color: gold
 
     //.oe_edit_only 
     // }}}
@@ -371,6 +431,9 @@ $sheet-max-width: 860px
     .oe_dropdown, .oe_dropdown_hover, .oe_dropdown_toggle
         position: relative
         cursor: pointer
+    .oe_dropdown_toggle
+        color: #888
+        font-weight: normal
     .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
         display: block
     .oe_dropdown_menu
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 6919947b093..5d0ac9ea8f3 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -15,6 +15,19 @@
 .openerp .oe_kanban_view .oe_kanban_clear {
   clear: both;
 }
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_on, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off {
+  color: #cccccc;
+  text-shadow: 0 0 2px black;
+  vertical-align: top;
+  position: relative;
+  top: -5px;
+}
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_on:hover, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off:hover {
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_on {
+  color: gold;
+}
 .openerp .oe_kanban_view .oe_kanban_content div:first-child {
   margin-right: 12px;
 }
@@ -26,13 +39,23 @@
   height: inherit;
   width: 100%;
 }
+.openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban {
+  display: inline-block;
+}
+.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_menu {
+  font-weight: normal;
+  font-size: 13px;
+}
 .openerp .oe_kanban_view .oe_kanban_group_title {
-  margin-bottom: 4px;
   font-size: 16px;
   font-weight: bold;
   color: #333333;
   text-shadow: 0 1px 0 white;
 }
+.openerp .oe_kanban_view .oe_kanban_group_title > span {
+  float: left;
+  margin-right: 4px;
+}
 .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
   vertical-align: top;
   padding: 6px 7px 0 6px;
@@ -93,12 +116,14 @@
   background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat;
 }
 .openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
-  float: right;
   margin-left: 4px;
   cursor: pointer;
   position: relative;
   top: -8px;
 }
+.openerp .oe_kanban_view .oe_kanban_add {
+  float: right;
+}
 .openerp .oe_kanban_view .oe_kanban_quick_create {
   overflow: hidden;
   margin-bottom: 4px;
@@ -112,6 +137,7 @@
 }
 .openerp .oe_kanban_view .oe_kanban_quick_create input {
   display: block;
+  margin: 0 0 8px 0;
   font-size: 13px;
   box-sizing: border-box;
   width: 100%;
@@ -393,14 +419,13 @@
   top: -8px;
   right: 3px;
   display: none;
-  color: #4c4c4c;
   cursor: pointer;
 }
 .openerp .oe_kanban_view .oe_dropdown_kanban:hover {
   text-decoration: none;
 }
 .openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu {
-  right: -140px;
+  left: 0;
   min-width: 160px;
 }
 .openerp .oe_kanban_view .oe_kanban_colorpicker {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 4ff2fc37d75..872d694c4db 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -53,12 +53,21 @@
     .oe_kanban_groups
         height: inherit
         width: 100%
+    .oe_kanban_header
+        &:hover
+            .oe_dropdown_kanban
+                display: inline-block
+        .oe_dropdown_menu
+            font-weight: normal
+            font-size: 13px
     .oe_kanban_group_title
-        margin-bottom: 4px
         font-size: 16px
         font-weight: bold
         color: #333333
         text-shadow: 0 1px 0 white
+        > span
+            float: left
+            margin-right: 4px
 
     .oe_kanban_column, .oe_kanban_group_header
         vertical-align: top
@@ -117,14 +126,12 @@
     // }}}
     // KanbanQuickCreate {{{
     .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
-        float: right
         margin-left: 4px
         cursor: pointer
         position: relative
         top: -8px
-        //right: 6px
-        //width: 16px
-        //height: 16px
+    .oe_kanban_add
+        float: right
 
     .oe_kanban_quick_create
         overflow: hidden
@@ -136,7 +143,7 @@
         padding: 10px
     .oe_kanban_quick_create input
         display: block
-        // margins within width
+        margin: 0 0 8px 0
         font-size: 13px
         box-sizing: border-box
         width: 100%
@@ -340,12 +347,11 @@
         top: -8px
         right: 3px
         display: none
-        color: #4c4c4c
         cursor: pointer
         &:hover
             text-decoration: none
         .oe_dropdown_menu
-            right: -140px
+            left: 0
             min-width: 160px
     // }}}
     // KanbanColorPicker {{{
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index b71f50d8731..7eb453371b2 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -23,22 +23,23 @@
     <td class="oe_kanban_group_header">
         <t t-if="widget.view.group_by">
             <div class="oe_kanban_header">
-                <div class="oe_dropdown_toggle">
-                  <span class="oe_e">í</span>
-                  <ul class="oe_dropdown_menu">
-                    <li><a href="#">Fold</a></li>
-                    <li><a href="#">Edit</a></li>
-                    <li><a href="#">Delete</a></li>
-                  </ul>
-                </div>
                 <t t-if="widget.view._is_quick_create_enabled()">
                     <div class="oe_kanban_add oe_e">]</div>
                 </t>
                 <div class="oe_fold_column">
                     <div t-attf-class="oe_kanban_group_title #{widget.undefined_title ? 'oe_kanban_group_title_undefined' : ''}">
-                        <t t-esc="widget.title"/>
+                        <span><t t-esc="widget.title"/></span>
                         <span class="oe_kanban_group_length">(<t t-esc="widget.group.length"/>)</span>
+                        <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                          <span class="oe_e">í</span>
+                          <ul class="oe_dropdown_menu">
+                            <li><a data-type="fold" href="#" class="">Fold</a></li>
+                            <li><a data-type="edit" href="#" class="">Edit</a></li>
+                            <li><a data-type="delete" href="#" class="">Delete</a></li>
+                          </ul>
+                        </div>
                     </div>
+                    <div class="oe_clear"/>
                     <ul class="oe_kanban_aggregates">
                         <li t-foreach="widget.aggregates" t-as="aggregate">
                             <span><t t-esc="aggregate"/>:</span> <t t-esc="aggregate_value"/>