From: Christophe Simonis <chs@odoo.com>
Date: Wed, 5 Nov 2014 20:46:42 +0000 (+0100)
Subject: [MERGE] forward port of branch saas-3 up to ec27773
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=c825d0552d187c44e52033d039d734bd05068af4;p=odoo%2Fodoo.git

[MERGE] forward port of branch saas-3 up to ec27773
---

c825d0552d187c44e52033d039d734bd05068af4
diff --cc addons/web/static/src/css/base.css
index e615f4f,eebb304..1c1b934
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@@ -19,59 -18,6 +18,58 @@@
    font-weight: normal;
    font-style: normal;
  }
- 
 +#oe_main_menu_navbar {
 +  min-height: 34px;
 +  z-index: 1001;
 +  border-radius: 0;
 +}
 +#oe_main_menu_navbar li a, #oe_main_menu_navbar li button {
 +  padding: 4px 8px 4px 8px;
 +  margin-top: 2px;
 +  font-size: 13px;
 +}
 +#oe_main_menu_navbar .oe_topbar_avatar {
 +  max-height: 18px;
 +  width: auto;
 +}
 +
 +#oe_main_menu_navbar.navbar {
 +  margin-bottom: 0px;
 +}
 +
 +.oe_systray {
 +  margin-right: 0px !important;
 +}
 +
 +.oe_notification {
 +  z-index: 1600;
 +}
 +
 +.oe_webclient_timezone_notification a {
 +  color: white;
 +  text-decoration: underline;
 +}
 +.oe_webclient_timezone_notification p {
 +  margin-top: 1em;
 +}
 +.oe_webclient_timezone_notification dt {
 +  font-weight: bold;
 +}
 +
 +.oe_timezone_systray span {
 +  margin-top: 1px;
 +  background-color: #f6cf3b;
 +}
 +
 +.navbar .oe_topbar_name {
 +  max-width: 150px;
 +  display: inline-block;
 +  height: 15px;
 +  text-overflow: ellipsis;
 +  white-space: nowrap;
 +  overflow: hidden;
 +}
 +
  .openerp {
    padding: 0;
    margin: 0;
@@@ -369,69 -451,14 +367,69 @@@
    box-shadow: none;
  }
  .openerp .oe_form_dirty button.oe_highlight_on_dirty:hover {
-   background: #ed6f6a;
+   background: #ED6F6A;
  }
 +.openerp .oe_warning_redirect {
 +  border: none !important;
 +  padding: 0 !important;
 +  margin-left: 20px !important;
 +  background: #f5f7f9 !important;
 +  box-shadow: none !important;
 +}
 +.openerp .oe_warning_redirect:hover {
 +  text-decoration: underline !important;
 +}
 +.openerp .oe_stat_button {
 +  font-weight: normal;
 +  width: 132px !important;
 +  height: 40px;
-   color: #666666;
++  color: #666;
 +  margin: 0px -1px -1px 0px;
 +  padding: 0;
 +  border: 1px solid #dddddd;
 +  border-radius: 0;
 +  box-shadow: none;
 +  background: white;
 +}
 +.openerp .oe_stat_button > div {
 +  display: table-cell;
 +  vertical-align: middle;
 +  text-align: left;
 +  padding: 0;
 +  line-height: 120%;
 +}
 +.openerp .oe_stat_button .stat_button_icon {
-   color: #7c7bad;
++  color: #7C7BAD;
 +  font-size: 24px;
 +  padding: 0px 3px;
 +  width: 37px;
 +  text-align: center;
 +}
 +.openerp .oe_stat_button .oe_form_field_percent_pie {
 +  width: 42px;
 +}
 +.openerp .oe_stat_button .oe_form_field_bar_chart {
 +  width: 42px;
 +}
 +.openerp .oe_stat_button svg {
 +  width: 38px;
 +  height: 38px;
 +  display: inline;
 +  vertical-align: middle;
 +}
 +.openerp .oe_stat_button:hover {
 +  background: #7c7bad;
 +  color: white;
 +}
 +.openerp .oe_stat_button:hover .fa {
 +  color: white;
 +}
  .openerp .oe_button_box {
 -  width: 270px;
 +  width: 400px;
    text-align: right;
  }
 -.openerp .oe_button_box button {
 -  margin: 4px;
 +.openerp .oe_button_box .oe_stat_button {
 +  display: inline-table;
  }
  .openerp .oe_avatar > img {
    max-height: 90px;
@@@ -516,43 -543,6 +514,43 @@@
    border-style: inset;
    border-width: 1px;
  }
 +.openerp .oe_kanban_status {
 +  position: relative;
 +  display: inline-block;
 +  height: 12px;
 +  width: 12px;
 +  -moz-border-radius: 6px;
 +  -webkit-border-radius: 6px;
 +  border-radius: 6px;
 +  background-position: center center;
-   background-image: -webkit-radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
-   background-image: -moz-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
-   background-image: -ms-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
++  background-image: -webkit-radial-gradient(circle, #eee 0%, #ccc 40%, #bbb 100%);
++  background-image: -moz-radial-gradient(#eee 0%, #ccc 40%, #bbb 100%);
++  background-image: -ms-radial-gradient(#eee 0%, #ccc 40%, #bbb 100%);
 +  background-image: radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
 +}
 +.openerp .oe_kanban_status_green {
 +  background: green;
 +  background-position: center center;
 +  background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44aa44 40%, #339933 100%);
 +  background-image: -moz-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
 +  background-image: -ms-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
 +  background-image: radial-gradient(circle, #55dd55 0%, #44aa44 40%, #339933 100%);
 +}
 +.openerp .oe_kanban_status_red {
 +  background: red;
 +  background-position: center center;
 +  background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%);
 +  background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
 +  background-image: -ms-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
 +  background-image: radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%);
 +}
 +.openerp .btn-group.kanban_state {
 +  padding-top: 8px;
 +  margin-right: 4px !important;
 +}
 +.openerp .btn-group.kanban_state a {
 +  color: #333333;
 +}
  .openerp .oe_tag {
    border: 1px solid #afafb6;
    font-size: 11px;
@@@ -960,81 -1163,58 +958,81 @@@
    filter: alpha(opacity=50);
    opacity: 0.5;
  }
 -.openerp .oe_secondary_submenu .oe_menu_opened:before {
 -  margin-top: 6px;
 -  margin-left: -16px;
 -  margin-right: 4px;
 -  border-left: 4px solid transparent;
 -  border-right: 4px solid transparent;
 -  border-top: 4px solid #4c4c4c;
 +.openerp .oe_secondary_submenu .oe_menu_opened:before {
 +  margin-top: 6px;
 +  margin-left: -16px;
 +  margin-right: 4px;
 +  border-left: 4px solid transparent;
 +  border-right: 4px solid transparent;
 +  border-top: 4px solid #4c4c4c;
 +}
 +.openerp .oe_secondary_submenu .oe_secondary_submenu li {
 +  margin-left: 20px;
 +}
 +.openerp .oe_about .label {
 +  background-color: #a24689;
 +}
 +.openerp .oe_about a {
 +  color: #a24689;
 +}
 +.openerp .oe_about .user-details {
 +  position: relative;
 +  padding: 0;
 +  margin-bottom: 275px;
 +}
 +.openerp .oe_about .user-details .user-image {
 +  width: 100%;
 +  text-align: center;
 +}
 +.openerp .oe_about .user-details .user-info-block {
 +  width: 100%;
 +  position: absolute;
 +  top: 55px;
 +  padding-top: 35px;
 +}
 +.openerp .oe_about .user-details .user-info-block .user-heading {
 +  text-align: center;
 +  margin: 10px 0 0;
  }
 -.openerp .oe_secondary_submenu .oe_secondary_submenu li {
 -  margin-left: 20px;
 +.openerp .oe_about .user-details .user-info-block .navigation li a {
 +  padding: 10px 20px;
  }
 -.openerp .oe_about {
 -  background-color: white;
 -  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
 -  -moz-border-radius: 0 0 2px 2px;
 -  -webkit-border-radius: 0 0 2px 2px;
 -  border-radius: 0 0 2px 2px;
 +.openerp .oe_about .user-details .user-info-block .navigation li.active a {
 +  background: #a24689;
-   color: white;
++  color: #fff;
  }
 -.openerp .oe_about a {
 -  color: #7C7BAD;
 +.openerp .oe_about .user-details .user-info-block .user-body {
 +  text-align: center;
  }
 -.openerp .oe_about a:hover {
 -  text-decoration: underline;
 +.openerp .oe_about .user-details .user-info-block .user-body .tab-content > div {
 +  float: left;
 +  width: 100%;
  }
 -.openerp .oe_about a:focus {
 -  outline: none;
 +.openerp .oe_about a.oe_activate_debug_mode {
 +  color: white !important;
 +  font-size: 100%;
  }
 -.openerp .oe_about .oe_logo {
 -  margin-left: -6px;
 +.openerp .oe_about #social i {
 +  margin: 10px;
  }
 -.openerp .oe_about .oe_bottom {
 -  position: absolute;
 -  top: 50%;
 -  left: 0;
 -  right: 0;
 -  bottom: 0;
 -  text-shadow: 0 1px 1px #999999;
 -  background-color: #8a0e0e;
 -  background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606));
 -  background-image: -webkit-linear-gradient(top, #b41616, #600606);
 -  background-image: -moz-linear-gradient(top, #b41616, #600606);
 -  background-image: -ms-linear-gradient(top, #b41616, #600606);
 -  background-image: -o-linear-gradient(top, #b41616, #600606);
 -  background-image: linear-gradient(to bottom, #b41616, #600606);
 -  color: #eee;
 -  padding: 0 16px;
 -  -moz-border-radius: 0 0 2px 2px;
 -  -webkit-border-radius: 0 0 2px 2px;
 -  border-radius: 0 0 2px 2px;
 +.openerp .oe_about #social i:hover {
 +  -webkit-transform: scale(1.3);
 +  -moz-transform: scale(1.3);
 +  -ms-transform: scale(1.3);
 +  -o-transform: scale(1.3);
 +  transform: scale(1.3);
  }
 -.openerp .oe_about .oe_bottom a {
 -  color: #eee;
 +.openerp .oe_about #social .social-fb:hover {
-   color: #3b5998;
++  color: #3B5998;
 +}
 +.openerp .oe_about #social .social-tw:hover {
-   color: #4099ff;
++  color: #4099FF;
 +}
 +.openerp .oe_about #social .social-gp:hover {
 +  color: #d34836;
 +}
 +.openerp .oe_about #social .social-lk:hover {
 +  color: #007bb6;
  }
  .openerp a.oe_form_uri:hover {
    text-decoration: underline;
@@@ -1044,29 -1224,11 +1042,29 @@@
    height: 100%;
  }
  .openerp .oe_application a {
-   color: #7c7bad;
+   color: #7C7BAD;
  }
  .openerp .oe_application > div {
 +  position: relative;
 +  height: 100%;
 +}
 +.openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper {
 +  display: table-row;
 +  height: 100%;
 +}
 +.openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div {
 +  position: relative;
    height: 100%;
  }
 +.openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body {
 +  position: absolute;
 +  position: static\9;
 +  top: 0;
 +  bottom: 0;
 +  left: 0;
 +  right: 0;
 +  overflow: auto;
 +}
  .openerp .oe_application .oe_breadcrumb_item:not(:last-child) {
    max-width: 7em;
    white-space: nowrap;
@@@ -1497,79 -1665,22 +1495,79 @@@
    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
  }
 -.openerp .oe_searchview .oe_searchview_drawer > div {
 -  border-top: 1px solid #ccc;
 -  margin: 0;
 -  padding: 8px;
 +.openerp .oe_searchview .oe-autocomplete ul {
 +  list-style-type: none;
 +  padding-left: 0;
 +  margin: 5px 0px;
  }
 -.openerp .oe_searchview .oe_searchview_drawer > div:first-child {
 -  border-top: none;
 -  margin: 0;
 +.openerp .oe_searchview .oe-autocomplete ul li {
 +  padding-left: 20px;
 +  text-shadow: 0 0 0 white;
 +}
 +.openerp .oe_searchview .oe-autocomplete ul li span:first-child {
 +  margin-right: 5px;
 +}
 +.openerp .oe_searchview .oe-autocomplete ul li span.oe-expand {
 +  cursor: pointer;
 +}
 +.openerp .oe_searchview .oe-autocomplete ul li.oe-indent {
 +  margin-left: 20px;
 +}
 +.openerp .oe_searchview .oe-autocomplete ul li.oe-selection-focus {
 +  background-color: #7c7bad;
 +  color: white;
 +}
 +.openerp .oe_searchview .oe-autocomplete ul li.oe-separator {
 +  margin-top: 2px;
 +  margin-bottom: 2px;
 +  border-top: 1px solid #afafb6;
 +}
 +.openerp .oe_searchview .oe-autocomplete ul li.oe-separator:last-child {
 +  display: none;
 +}
 +.openerp .oe_searchview_drawer_container {
 +  overflow: auto;
 +}
 +.openerp .oe_searchview_drawer {
 +  display: none;
 +  width: 100%;
 +  cursor: default;
 +  display: none;
 +  overflow: hidden;
 +  border-bottom: 1px solid #afafb6;
 +  text-align: left;
 +  padding: 8px 0;
 +}
 +.openerp .oe_searchview_drawer .badge {
 +  font-size: 12px;
 +  line-height: 12px;
 +}
 +.openerp .oe_searchview_drawer > div:first-child {
 +  border: none;
 +  padding-left: 0;
 +}
 +.openerp .oe_searchview_drawer > div:first-child li:hover:not(.badge) {
 +  background-color: #f0f0fa;
 +}
 +.openerp .oe_searchview_drawer .col-md-5 {
 +  padding-left: 0;
 +}
 +.openerp .oe_searchview_drawer dl {
 +  margin-bottom: 0;
  }
 -.openerp .oe_searchview .oe_searchview_drawer h3 {
 -  margin: 8px 4px 4px 0px;
 +.openerp .oe_searchview_drawer dt {
-   color: #7c7bad;
+   color: #7C7BAD;
    font-size: 13px;
 +  line-height: 24px;
 +}
 +.openerp .oe_searchview_drawer dd {
 +  line-height: 24px;
 +  font-size: 13px;
 +  padding-top: 3px;
  }
 -.openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * {
 +.openerp .oe_searchview_drawer h4, .openerp .oe_searchview_drawer h4 * {
    margin: 0 0 0 2px;
 +  padding-left: 20px;
    cursor: pointer;
    font-weight: normal;
    display: inline-block;
@@@ -3295,58 -3445,7 +3292,58 @@@ body.oe_single_form .oe_single_form_con
    .openerp .openerp div.oe_mail_wall {
      overflow: hidden !important;
    }
 +
 +  .openerp.openerp_webclient_container {
 +    overflow: visible;
 +  }
 +}
 +.tooltip {
 +  padding: 0;
 +  margin: 0;
 +  font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
 +  color: #4c4c4c;
 +  font-size: 12px;
 +  background: white;
 +  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
 +  background-color: transparent;
 +  z-index: 1800;
 +}
 +.tooltip .tooltip-inner {
 +  text-align: left !important;
 +  max-width: 350px;
 +}
 +.tooltip .tooltip-inner .oe_tooltip_string {
-   color: #ffdd55;
++  color: #FD5;
 +  font-weight: bold;
 +  font-size: 13px;
 +}
 +.tooltip .tooltip-inner .oe_tooltip_help {
 +  white-space: pre-wrap;
 +}
 +.tooltip .tooltip-inner .oe_tooltip_technical {
 +  padding: 0 0 4px 0;
 +  margin: 5px 0 0 15px;
 +}
 +.tooltip .tooltip-inner .oe_tooltip_technical li {
 +  list-style: circle;
 +}
 +.tooltip .tooltip-inner .oe_tooltip_technical_title {
 +  font-weight: bold;
 +}
 +.tooltip .tooltip-inner .oe_tooltip_close {
 +  margin: -5px 0 0 2px;
 +  cursor: default;
 +  float: right;
 +  color: white;
 +}
 +.tooltip .tooltip-inner .oe_tooltip_close:hover {
-   color: #999999;
++  color: #999;
 +  cursor: pointer;
 +}
 +.tooltip .tooltip-inner .oe_tooltip_message {
 +  max-width: 310px;
  }
 +
  .ui-icon {
    width: 18px;
    height: 18px;
@@@ -3385,46 -3460,3 +3382,46 @@@ input[type="radio"], input[type="checkb
    background-color: black;
    opacity: 0.6;
  }
 +
 +/* ---- EDITOR TOUR ---- {{{ */
 +div.tour-backdrop {
 +  z-index: 2009;
 +}
 +
 +.popover.tour.orphan .arrow {
 +  display: none;
 +}
 +.popover.tour .popover-navigation {
 +  padding: 9px 14px;
 +}
 +.popover.tour .popover-navigation *[data-role="end"] {
 +  float: right;
 +}
 +.popover.tour .popover-navigation *[data-role="next"], .popover.tour .popover-navigation *[data-role="end"] {
 +  cursor: pointer;
 +}
 +
 +.popover.fixed {
 +  position: fixed;
 +}
 +
 +.tour-backdrop {
 +  position: fixed;
 +  top: 0;
 +  right: 0;
 +  bottom: 0;
 +  left: 0;
 +  z-index: 1100;
-   background-color: black;
++  background-color: #000;
 +  opacity: 0.8;
 +}
 +
 +body {
 +  overflow: hidden;
 +}
 +
 +@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
 +  .oe_secondary_menus_container {
 +    position: static !important;
 +  }
 +}
diff --cc addons/web_kanban/static/src/css/kanban.css
index 50a9e54,7ac57f0..eac7f20
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@@ -17,7 -16,7 +16,7 @@@
    max-width: 700px;
  }
  .openerp .oe_kanban_view .oe_view_nocontent .oe_view_nocontent_bg {
--  background: #eeeeee;
++  background: #eee;
    opacity: 0.7;
    position: absolute;
    top: 0;
@@@ -520,8 -519,39 +519,8 @@@
    position: relative;
    top: 2px;
  }
 -.openerp .oe_kanban_view .oe_kanban_status {
 -  position: relative;
 -  top: 4px;
 -  display: inline-block;
 -  height: 12px;
 -  width: 12px;
 -  -moz-border-radius: 6px;
 -  -webkit-border-radius: 6px;
 -  border-radius: 6px;
 -  background-position: center center;
 -  background-image: -webkit-radial-gradient(circle, #eee 0%, #ccc 40%, #bbb 100%);
 -  background-image: -moz-radial-gradient(#eee 0%, #ccc 40%, #bbb 100%);
 -  background-image: -ms-radial-gradient(#eee 0%, #ccc 40%, #bbb 100%);
 -  background-image: radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
 -}
 -.openerp .oe_kanban_view .oe_kanban_status_green {
 -  background: green;
 -  background-position: center center;
 -  background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44aa44 40%, #339933 100%);
 -  background-image: -moz-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
 -  background-image: -ms-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
 -  background-image: radial-gradient(circle, #55dd55 0%, #44aa44 40%, #339933 100%);
 -}
 -.openerp .oe_kanban_view .oe_kanban_status_red {
 -  background: red;
 -  background-position: center center;
 -  background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%);
 -  background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
 -  background-image: -ms-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
 -  background-image: radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%);
 -}
  .openerp .oe_kanban_view .oe_kanban_text_red {
-   color: #a61300;
+   color: #A61300;
    font-weight: bold;
    -moz-border-radius: 4px;
    -webkit-border-radius: 4px;