[Merge]trunk

bzr revid: mba@tinyerp.com-20140214072005-1teoisyk2ljq6sw9

3 files changed, 334 insertions, 550 deletions

diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile
index d6b4f4b2fc8..f4f1f6d1bb5 100644
--- a/addons/web/static/src/css/Makefile
+++ b/addons/web/static/src/css/Makefile
@@ -1,3 +1,2 @@
-base.css: base.sass
-	sass --trace -t expanded base.sass base.css
-
+sass:
+	sass -t expanded --compass --unix-newlines --watch base.sass:base.css&
\ No newline at end of file
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1510a4c4b0a..9bd1f495f1e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -27,7 +27,6 @@
   color: #4c4c4c;
   font-size: 13px;
   background: white;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
    */
@@ -114,7 +113,7 @@
   font-weight: bold;
   font-size: inherit;
 }
-.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
+.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp .oe_button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
   display: inline-block;
   border: 1px solid rgba(0, 0, 0, 0.4);
   color: #4c4c4c;
@@ -139,7 +138,7 @@
   -webkit-font-smoothing: antialiased;
   outline: none;
 }
-.openerp a.button:hover, .openerp button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover {
+.openerp a.button:hover, .openerp button:hover, .openerp .oe_button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover {
   background-color: #ececec;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
   background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3);
@@ -150,7 +149,7 @@
   cursor: pointer;
   background-position: 0;
 }
-.openerp a.button:focus, .openerp button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus {
+.openerp a.button:focus, .openerp button:focus, .openerp .oe_button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus {
   border: 1px solid #80bfff;
   background-position: 0;
   background-color: #ececec;
@@ -164,7 +163,7 @@
   -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
   box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 }
-.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active {
+.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp .oe_button:active, .openerp .oe_button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active {
   background-color: #ececec;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6));
   background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6);
@@ -176,7 +175,7 @@
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-.openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled {
+.openerp a.button.disabled, .openerp button:disabled, .openerp .oe_button:disabled, .openerp input[type='submit']:disabled {
   background: #efefef !important;
   border: 1px solid #d1d1d1 !important;
   -moz-box-shadow: none !important;
@@ -223,6 +222,9 @@
   padding: 16px;
 }
 .openerp.ui-dialog .ui-dialog-titlebar {
+  border-top: none;
+  border-left: none;
+  border-right: none;
   border-bottom: 1px solid #cacaca;
   -moz-border-radius: 2px 2px 0 0;
   -webkit-border-radius: 2px 2px 0 0;
@@ -239,9 +241,6 @@
   margin: 0;
   padding: 0;
 }
-.openerp.ui-dialog .ui-widget-header {
-  border: none;
-}
 .openerp.ui-dialog .ui-dialog-content {
   background: white;
   width: auto !important;
@@ -350,6 +349,7 @@
   font-family: "entypoRegular" !important;
   font-size: 34px;
   font-weight: 300 !important;
+  line-height: 100%;
 }
 .openerp .oe_left {
   float: left;
@@ -441,17 +441,6 @@
 .openerp .oe_form_dirty button.oe_highlight_on_dirty:hover {
   background: #ed6f6a;
 }
-.openerp .oe_title {
-  width: 50%;
-  float: left;
-}
-.openerp .oe_title:after {
-  content: ".";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
-}
 .openerp .oe_button_box {
   width: 270px;
   text-align: right;
@@ -875,153 +864,6 @@
   padding: 5px;
   width: 32px;
 }
-.openerp .oe_login {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
-  text-align: center;
-  font-size: 14px;
-  height: 100%;
-}
-.openerp .oe_login ul, .openerp .oe_login li {
-  margin: 0;
-  list-style-type: none;
-  padding: 0 0 4px 0;
-}
-.openerp .oe_login button {
-  cursor: pointer;
-  padding: 6px 16px;
-  border: 1px solid #222222;
-  color: white;
-  margin: 0;
-  background-color: #8c1313;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#b92020), to(#600606));
-  background-image: -webkit-linear-gradient(top, #b92020, #600606);
-  background-image: -moz-linear-gradient(top, #b92020, #600606);
-  background-image: -ms-linear-gradient(top, #b92020, #600606);
-  background-image: -o-linear-gradient(top, #b92020, #600606);
-  background-image: linear-gradient(to bottom, #b92020, #600606);
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
-}
-.openerp .oe_login input, .openerp .oe_login select {
-  width: 252px;
-  font-family: "Lucida Grande", Helvetica, Verdana, Arial;
-  border: 1px solid #999999;
-  background: whitesmoke;
-  -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4);
-  -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4);
-  box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4);
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-}
-.openerp .oe_login input {
-  margin-bottom: 9px;
-  padding: 5px 6px;
-}
-.openerp .oe_login select {
-  padding: 1px;
-}
-.openerp .oe_login .oe_login_dbpane {
-  position: fixed;
-  top: 0;
-  right: 8px;
-  padding: 5px 10px;
-  color: #eeeeee;
-  border: solid 1px #333333;
-  background: #1e1e1e;
-  background: rgba(30, 30, 30, 0.94);
-  -moz-border-radius: 0 0 8px 8px;
-  -webkit-border-radius: 0 0 8px 8px;
-  border-radius: 0 0 8px 8px;
-}
-.openerp .oe_login .oe_login_dbpane input {
-  padding: 2px 4px;
-  margin: 4px 0;
-}
-.openerp .oe_login .oe_login_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);
-}
-.openerp .oe_login .oe_login_pane {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin: -160px -166px;
-  border: solid 1px #333333;
-  background: #1e1e1e;
-  background: rgba(30, 30, 30, 0.94);
-  padding: 22px 32px;
-  color: #eeeeee;
-  text-align: left;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  border-radius: 8px;
-  -moz-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
-  -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
-  box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
-}
-.openerp .oe_login .oe_login_pane h2 {
-  margin-top: 0;
-  font-size: 18px;
-}
-.openerp .oe_login .oe_login_logo {
-  position: absolute;
-  top: -70px;
-  left: 0;
-  width: 100%;
-  margin: 0 auto;
-  text-align: center;
-}
-.openerp .oe_login .oe_login_footer {
-  position: absolute;
-  bottom: -40px;
-  left: 0;
-  width: 100%;
-  text-align: center;
-}
-.openerp .oe_login .oe_login_footer a {
-  color: #eeeeee;
-  margin: 0 6px;
-}
-.openerp .oe_login .oe_login_footer a:hover {
-  text-decoration: underline;
-}
-.openerp .oe_login .oe_login_footer span {
-  font-weight: bold;
-  font-size: 16px;
-}
-.openerp .oe_login .oe_login_error_message {
-  display: none;
-  background-color: #b41616;
-  color: #eeeeee;
-  padding: 14px 18px;
-  margin-top: 15px;
-  text-align: center;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
-}
-.openerp .oe_login_invalid .oe_login_error_message {
-  display: inline-block;
-}
 .openerp .oe_database_manager {
   background: white;
   color: black;
@@ -1051,7 +893,7 @@
   background-image: -moz-linear-gradient(top, #fc8787, maroon);
   background-image: -ms-linear-gradient(top, #fc8787, maroon);
   background-image: -o-linear-gradient(top, #fc8787, maroon);
-  background-image: linear-gradient(to bottom, #fc8787, maroon);
+  background-image: linear-gradient(to bottom, #fc8787, #800000);
 }
 .openerp .navbar .oe_topbar_anonymous_login a {
   display: block;
@@ -1363,6 +1205,12 @@
 .openerp .oe_about .oe_bottom a {
   color: #eeeeee;
 }
+.openerp .oe_form_uri {
+  color: #7c7bad;
+}
+.openerp .oe_form_uri:hover {
+  text-decoration: underline;
+}
 .openerp .oe_application {
   width: 100%;
   height: 100%;
@@ -1370,9 +1218,6 @@
 .openerp .oe_application a {
   color: #7c7bad;
 }
-.openerp .oe_application a:hover {
-  text-decoration: underline;
-}
 .openerp .oe_application > div {
   height: 100%;
 }
@@ -2167,8 +2012,21 @@
 .openerp .oe_application .oe_form_sheet .oe_notebook_page {
   padding: 0 16px;
 }
+.openerp .oe_form > :not(.oe_form_nosheet) header {
+  padding-left: 2px;
+}
+.openerp .oe_form > :not(.oe_form_nosheet) header ul {
+  display: inline-block;
+  float: right;
+}
+.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button {
+  margin: 3px 2px 1px;
+  float: left;
+}
+.openerp .oe_form > :not(.oe_form_nosheet) header .oe_button:first-child {
+  margin-left: 6px;
+}
 .openerp .oe_form header {
-  position: relative;
   border-bottom: 1px solid #cacaca;
   padding-left: 2px;
   background-color: #ededed;
@@ -2182,16 +2040,6 @@
 .openerp .oe_form header > span {
   margin-left: 4px;
 }
-.openerp .oe_form header ul {
-  display: inline-block;
-  float: right;
-}
-.openerp .oe_form header .oe_button {
-  margin: 3px 2px 1px;
-}
-.openerp .oe_form header .oe_button:first-child {
-  margin-left: 6px;
-}
 .openerp .oe_form header .oe_tags {
   margin: 5px 0 0 5px;
   width: 400px;
@@ -3171,6 +3019,7 @@
 }
 .openerp .oe_debug_view_log {
   font-size: 95%;
+  line-height: 1.2em;
 }
 .openerp .oe_debug_view_log label {
   display: block;
@@ -3186,6 +3035,123 @@
   float: right;
   color: #333333;
 }
+.openerp .navbar {
+  min-height: 32px;
+  margin-bottom: 0px;
+  border: none;
+  z-index: 1;
+  background-color: #414141;
+  background-color: #454343;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
+  background-image: -webkit-linear-gradient(top, #646060, #262626);
+  background-image: -moz-linear-gradient(top, #646060, #262626);
+  background-image: -ms-linear-gradient(top, #646060, #262626);
+  background-image: -o-linear-gradient(top, #646060, #262626);
+  background-image: linear-gradient(to bottom, #646060, #262626);
+}
+.openerp .navbar-default .navbar-nav li a:hover, .openerp .navbar-default .navbar-nav li a:focus {
+  background: rgba(0, 0, 0, 0.3);
+}
+.openerp .navbar-default .navbar-nav .open > a, .openerp .navbar-default .navbar-nav a:hover, .openerp .navbar-default .navbar-nav a:focus {
+  background: rgba(0, 0, 0, 0.3) !important;
+}
+.openerp .navbar-default .navbar-nav .dropdown > a .caret {
+  border-top-color: #777777 !important;
+  border-bottom-color: #777777 !important;
+}
+.openerp .navbar-nav li a {
+  padding: 4px 32px 4px 12px;
+}
+.openerp .oe_navbar .dropdown-menu {
+  font-size: 13px;
+  padding: 4px 0;
+  background: #333333 !important;
+  background: rgba(37, 37, 37, 0.9) !important;
+  border-color: #999999;
+  border-color: rgba(0, 0, 0, 0.2);
+  background-color: #414141;
+  text-shadow: none;
+  background-color: #454343;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
+  background-image: -webkit-linear-gradient(top, #646060, #262626);
+  background-image: -moz-linear-gradient(top, #646060, #262626);
+  background-image: -ms-linear-gradient(top, #646060, #262626);
+  background-image: -o-linear-gradient(top, #646060, #262626);
+  background-image: linear-gradient(to bottom, #646060, #262626);
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+}
+.openerp .oe_navbar .dropdown-menu li a, .openerp .oe_navbar .dropdown-menu li a:hover, .openerp .oe_navbar .dropdown-menu li a:focus {
+  color: #eeeeee;
+}
+.openerp .oe_view_manager_new .oe_form_nosheet {
+  margin-top: 8px;
+}
+.openerp .oe_view_manager_new .oe_form_nosheet .oe_form_label {
+  font-weight: normal;
+}
+.openerp .nav li > a {
+  padding: 3px 4px 2px 18px;
+  color: #4c4c4c;
+}
+.openerp .nav nav-pills.nav-stacked > li > ul {
+  padding-left: 16px;
+}
+.openerp .nav-pills > li.active > a, .openerp a.list-group-item.active > a {
+  background-color: #7c7bad;
+  color: white;
+  border-radius: 0;
+}
+.openerp .nav-pills > li.active a:hover, .openerp .nav-pills > li.active a:focus, .openerp a.list-group-item.active a:hover, .openerp a.list-group-item.active a:focus {
+  background-color: #7c7bad;
+}
+.openerp .nav-pills > li.active .badge, .openerp a.list-group-item.active .badge {
+  background-color: white;
+  color: #7c7bad;
+  text-shadow: none;
+}
+.openerp .badge {
+  font-weight: normal;
+  font-size: 11px;
+  background-color: #7c7bad;
+}
+.openerp button, .openerp body {
+  line-height: normal;
+}
+.openerp h1, .openerp h2 {
+  font-weight: bold;
+}
+.openerp h3 {
+  font-size: 1.17em;
+  font-weight: bold;
+}
+.openerp p {
+  display: block;
+  -webkit-margin-before: 1em;
+  -webkit-margin-after: 1em;
+  -webkit-margin-start: 0px;
+  -webkit-margin-end: 0px;
+}
+.openerp pre {
+  background-color: white;
+  border: none;
+  padding: 10px 0 3px 0;
+}
+.openerp .jqstooltip {
+  height: auto !important;
+  width: auto !important;
+}
+.openerp h5 {
+  font-weight: bold;
+  font-size: smaller;
+}
+.openerp .oe_form .oe_subtype label, .openerp .oe_subtype label {
+  font-weight: normal;
+}
+.openerp .oe_msg_subtype_check {
+  margin: 3px 3px 0 !important;
+}
 
 @-moz-document url-prefix() {
   .openerp .oe_searchview .oe_searchview_search {
@@ -3265,6 +3231,33 @@ div.ui-widget-overlay {
   padding-bottom: 10px !important;
 }
 
+body.oe_single_form {
+  background: #eeeeee url(/web/static/src/img/form_sheetbg.png);
+  height: 100%;
+}
+body.oe_single_form .oe_single_form_logo {
+  padding: 10px;
+  text-align: center;
+  margin-bottom: 10px;
+}
+body.oe_single_form .oe_single_form_footer {
+  position: absolute;
+  bottom: -30px;
+  right: 0px;
+  width: 100%;
+  text-align: center;
+}
+body.oe_single_form .oe_single_form_container {
+  padding: 10px;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  width: 400px;
+  /* Set margins to offset 50% of the w/h */
+  margin-top: -200px;
+  margin-left: -200px;
+}
+
 .openerp_ie .placeholder {
   color: #afafb6 !important;
   font-style: italic !important;
@@ -3441,140 +3434,6 @@ div.ui-widget-overlay {
     overflow: hidden !important;
   }
 }
-.nav li > a {
-  padding: 3px 4px 2px 18px;
-  color: #4c4c4c;
-}
-.nav nav-pills.nav-stacked > li > ul {
-  padding-left: 16px;
-}
-
-.nav-pills > li.active > a, a.list-group-item.active > a {
-  background-color: #7c7bad;
-  color: white;
-  border-radius: 0;
-}
-.nav-pills > li.active a:hover, .nav-pills > li.active a:focus, a.list-group-item.active a:hover, a.list-group-item.active a:focus {
-  background-color: #7c7bad;
-}
-.nav-pills > li.active .badge, a.list-group-item.active .badge {
-  background-color: white;
-  color: #7c7bad;
-  text-shadow: none;
-}
-
-.badge {
-  font-weight: normal;
-  font-size: 11px;
-  background-color: #7c7bad;
-}
-
-button, body {
-  line-height: normal;
-}
-
-h1, h2 {
-  font-weight: bold;
-}
-
-h3 {
-  font-size: 1.17em;
-  font-weight: bold;
-}
-
-p {
-  display: block;
-  -webkit-margin-before: 1em;
-  -webkit-margin-after: 1em;
-  -webkit-margin-start: 0px;
-  -webkit-margin-end: 0px;
-}
-
-pre {
-  background-color: white;
-  border: none;
-  padding: 10px 0 3px 0;
-}
-
-.jqstooltip {
-  height: auto !important;
-  width: auto !important;
-}
-
-h5 {
-  font-weight: bold;
-  font-size: smaller;
-}
-
-.oe_form .oe_subtype label, .oe_subtype label {
-  font-weight: normal;
-}
-
-.oe_msg_subtype_check {
-  margin: 3px 3px 0 !important;
-}
-
-.oe_view_manager_new .oe_form_nosheet {
-  margin-top: 8px;
-}
-.oe_view_manager_new .oe_form_nosheet .oe_form_label {
-  font-weight: normal;
-}
-
-.navbar {
-  min-height: 32px;
-  margin-bottom: 0px;
-  border: none;
-  z-index: 1;
-  background-color: #414141;
-  background-color: #454343;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
-  background-image: -webkit-linear-gradient(top, #646060, #262626);
-  background-image: -moz-linear-gradient(top, #646060, #262626);
-  background-image: -ms-linear-gradient(top, #646060, #262626);
-  background-image: -o-linear-gradient(top, #646060, #262626);
-  background-image: linear-gradient(to bottom, #646060, #262626);
-}
-
-.navbar-default .navbar-nav li a:hover, .navbar-default .navbar-nav li a:focus {
-  background: rgba(0, 0, 0, 0.3);
-}
-.navbar-default .navbar-nav .open > a, .navbar-default .navbar-nav a:hover, .navbar-default .navbar-nav a:focus {
-  background: rgba(0, 0, 0, 0.3) !important;
-}
-.navbar-default .navbar-nav .dropdown > a .caret {
-  border-top-color: #777777 !important;
-  border-bottom-color: #777777 !important;
-}
-
-.navbar-nav li a {
-  padding: 4px 32px 4px 12px;
-}
-
-.dropdown-menu {
-  font-size: 13px;
-  padding: 4px 0;
-  background: #333333 !important;
-  background: rgba(37, 37, 37, 0.9) !important;
-  border-color: #999999;
-  border-color: rgba(0, 0, 0, 0.2);
-  background-color: #414141;
-  text-shadow: none;
-  background-color: #454343;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
-  background-image: -webkit-linear-gradient(top, #646060, #262626);
-  background-image: -moz-linear-gradient(top, #646060, #262626);
-  background-image: -ms-linear-gradient(top, #646060, #262626);
-  background-image: -o-linear-gradient(top, #646060, #262626);
-  background-image: linear-gradient(to bottom, #646060, #262626);
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-}
-.dropdown-menu li a, .dropdown-menu li a:hover, .dropdown-menu li a:focus {
-  color: #eeeeee;
-}
-
 .dropdown-menu.state {
   background: white;
   background: white !important;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c9f3e6f51b1..6a065668376 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -151,7 +151,6 @@ $sheet-padding: 16px
     color: #4c4c4c
     font-size: 13px
     background: white
-    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5)
     &.openerp_webclient_container
         height: 100%
     // }}}
@@ -208,7 +207,7 @@ $sheet-padding: 16px
         font-size: inherit
     // }}}
     // Button style {{{
-    a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
+    a.button:link, a.button:visited, button, .oe_button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
         display: inline-block
         border: 1px solid rgba(0,0,0,0.4)
         color: #4c4c4c
@@ -223,22 +222,22 @@ $sheet-padding: 16px
         -webkit-font-smoothing: antialiased
         outline: none
 
-    a.button:hover, button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover
+    a.button:hover, button:hover,.oe_button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover
         @include vertical-gradient(#f6f6f6, #e3e3e3)
         cursor: pointer
         background-position: 0
 
-    a.button:focus, button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus
+    a.button:focus, button:focus, .oe_button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus
         border: 1px solid #80bfff
         background-position: 0
         @include vertical-gradient(#f6f6f6, #e3e3e3)
         @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset))
 
-    a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active
+    a.button:active, a.button.active, button:active, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active
         @include vertical-gradient(#e3e3e3, #f6f6f6)
         @include box-shadow(none)
 
-    a.button.disabled, button:disabled, input[type='submit']:disabled
+    a.button.disabled, button:disabled, .oe_button:disabled, input[type='submit']:disabled
         background: #efefef !important
         border: 1px solid #d1d1d1 !important
         @include box-shadow(none !important)
@@ -280,14 +279,15 @@ $sheet-padding: 16px
         .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
             padding: 16px
         .ui-dialog-titlebar
+            border-top: none
+            border-left: none
+            border-right: none
             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
             width: auto !important
@@ -370,6 +370,7 @@ $sheet-padding: 16px
         font-family: "entypoRegular" !important
         font-size: 34px
         font-weight: 300 !important
+        line-height: 100%
     .oe_left
         float: left
         margin-right: 8px
@@ -416,15 +417,6 @@ $sheet-padding: 16px
             @include box-shadow(none)
             &:hover
                 background: #ED6F6A
-    .oe_title
-        width: 50%
-        float: left
-    .oe_title:after
-        content: "."
-        display: block
-        height: 0
-        clear: both
-        visibility: hidden
     .oe_button_box
         width: 270px
         text-align: right
@@ -748,108 +740,6 @@ $sheet-padding: 16px
         padding: 5px
         width: 32px
     // }}}
-    // Login {{{
-    .oe_login
-        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
-        text-align: center
-        font-size: 14px
-        height: 100%
-        ul, li
-            margin: 0
-            list-style-type: none
-            padding: 0 0 4px 0
-        button
-            cursor: pointer
-            padding: 6px 16px
-            border: 1px solid #222
-            color: white
-            margin: 0
-            @include vertical-gradient(#b92020, #600606)
-            @include radius(4px)
-            @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset))
-        input, select
-            width: 252px
-            font-family: "Lucida Grande", Helvetica, Verdana, Arial
-            border: 1px solid #999999
-            background: whitesmoke
-            @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.4))
-            @include radius(3px)
-        input
-            margin-bottom: 9px
-            padding: 5px 6px
-        select
-            padding: 1px
-        .oe_login_dbpane
-            position: fixed
-            top: 0
-            right: 8px
-            padding: 5px 10px
-            color: #eee
-            border: solid 1px #333
-            background: #1e1e1e
-            background: rgba(30,30,30,0.94)
-            @include radius(0 0 8px 8px)
-            input
-                padding: 2px 4px
-                margin: 4px 0
-        .oe_login_bottom
-            position: absolute
-            top: 50%
-            left: 0
-            right: 0
-            bottom: 0
-            text-shadow: 0 1px 1px #999999
-            @include vertical-gradient(#b41616, #600606)
-        .oe_login_pane
-            position: absolute
-            top: 50%
-            left: 50%
-            margin: -160px -166px
-            border: solid 1px #333333
-            background: #1e1e1e
-            background: rgba(30,30,30,0.94)
-            padding: 22px 32px
-            color: #eee
-            text-align: left
-            @include radius(8px)
-            @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9))
-            h2
-                margin-top: 0
-                font-size: 18px
-        .oe_login_logo
-            position: absolute
-            top: -70px
-            left: 0
-            width: 100%
-            margin: 0 auto
-            text-align: center
-        .oe_login_footer
-            position: absolute
-            bottom: -40px
-            left: 0
-            width: 100%
-            text-align: center
-            a
-                color: #eee
-                margin: 0 6px
-                &:hover
-                    text-decoration: underline
-            span
-                font-weight: bold
-                font-size: 16px
-        .oe_login_error_message
-            display: none
-            background-color: #b41616
-            color: #eee
-            padding: 14px 18px
-            margin-top: 15px
-            text-align: center
-            @include radius(4px)
-            @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.8))
-    .oe_login_invalid
-        .oe_login_error_message
-            display: inline-block
-    // }}}
     // DatabaseManager {{{
     .oe_database_manager
         background: #fff
@@ -1112,13 +1002,15 @@ $sheet-padding: 16px
                 color: #eee
     // }}}
     // ActionManager {{{
+    .oe_form_uri
+        color: $link-color
+        &:hover
+            text-decoration: underline
     .oe_application
         width: 100%
         height: 100%
         a
             color: $link-color
-            &:hover
-                text-decoration: underline
         > div
             height: 100%
         .oe_breadcrumb_item:not(:last-child)
@@ -1740,20 +1632,24 @@ $sheet-padding: 16px
                 padding: 0 16px
     // }}}
     // FormView.header {{{
-    .oe_form header
-        position: relative
-        border-bottom: 1px solid #cacaca
+    .oe_form > :not(.oe_form_nosheet) header
         padding-left: 2px
-        @include vertical-gradient(#fcfcfc, #dedede)
-        > span
-            margin-left: 4px
         ul
             display: inline-block
             float: right
         .oe_button
             margin: 3px 2px 1px
+            float: left
             &:first-child
                 margin-left: 6px
+
+    .oe_form  header
+        border-bottom: 1px solid #cacaca
+        padding-left: 2px
+        @include vertical-gradient(#fcfcfc, #dedede)
+        > span
+            margin-left: 4px        
+        
     // }}}
     // FormView.custom tags and classes {{{
     .oe_form
@@ -2081,7 +1977,7 @@ $sheet-padding: 16px
                 .oe_e
                     position: relative
                     top: -1px
-                    left: -9px
+                    left: -9px                    
             input.oe_form_binary_file
                 display: inline-block
                 margin-left: -85px
@@ -2522,6 +2418,7 @@ $sheet-padding: 16px
         float: left
     .oe_debug_view_log
         font-size: 95%
+        line-height: 1.2em
     .oe_debug_view_log label
         display: block
         width: 49%
@@ -2535,6 +2432,106 @@ $sheet-padding: 16px
         float: right
         color: #333
     // }}}
+    // Bootstrap HACKS {{{
+    .navbar
+        min-height: 32px
+        margin-bottom: 0px
+        border: none
+        z-index: 1
+        background-color: #414141
+        @include vertical-gradient(#646060, #262626)
+    .navbar-default
+        .navbar-nav
+            li
+                a:hover,a:focus
+                    background: rgba(0, 0, 0, 0.3)
+            .open > a,a:hover,a:focus
+                background: rgba(0, 0, 0, 0.3) !important
+            .dropdown > a .caret
+                border-top-color: #777 !important
+                border-bottom-color: #777 !important
+    .navbar-nav
+        li
+            a
+                padding: 4px 32px 4px 12px
+    .oe_navbar .dropdown-menu
+        font-size: 13px
+        padding: 4px 0
+        background: #333333 !important
+        background: rgba(37, 37, 37, 0.9) !important
+        border-color: #999999
+        border-color: rgba(0, 0, 0, 0.2)
+        background-color: #414141
+        text-shadow: none
+        @include vertical-gradient(#646060, #262626)
+        @include radius(3px)
+        li
+            a,a:hover,a:focus
+                color: #eeeeee
+
+    // Minimized unused white space and label weight for wizard popup
+    .oe_view_manager_new .oe_form_nosheet
+        margin-top: 8px
+        .oe_form_label
+            font-weight: normal
+
+    // Customize bootstrap3 for leftbar
+    .nav
+        li > a
+            padding: 3px 4px 2px 18px
+            color: #4c4c4c
+        nav-pills.nav-stacked > li > ul
+            padding-left: 16px
+    .nav-pills > li.active,a.list-group-item.active
+        > a
+            background-color: #7c7bad
+            color: white
+            border-radius: 0
+        a:hover,a:focus
+            background-color: #7c7bad
+        .badge
+            background-color: white
+            color: #7c7bad
+            text-shadow: none
+    .badge
+        font-weight: normal
+        font-size: 11px
+        background-color: #7c7bad
+
+    // Customize for global tags
+    button, body
+        line-height: normal
+    h1,h2
+        font-weight: bold
+    h3
+        font-size: 1.17em
+        font-weight: bold
+    p
+        display: block
+        -webkit-margin-before: 1em
+        -webkit-margin-after: 1em
+        -webkit-margin-start: 0px
+        -webkit-margin-end: 0px
+    pre
+        background-color: #FFFFFF
+        border: none
+        padding: 10px 0 3px 0
+
+    // Customize for kanban tooltip
+    .jqstooltip
+        height: auto !important
+        width: auto !important
+
+    // Customize for chatter
+    h5
+        font-weight: bold
+        font-size: smaller
+    .oe_form .oe_subtype label, .oe_subtype label
+        font-weight: normal
+    .oe_msg_subtype_check
+        margin: 3px 3px 0 !important
+    // }}}
+
 @-moz-document url-prefix()
     .openerp
         .oe_searchview .oe_searchview_search
@@ -2596,6 +2593,38 @@ div.ui-widget-overlay
         td
             padding-bottom: 10px !important
 
+// Server side single forms {{{
+@mixin single-form($width: 400px)
+    padding: 10px
+    position: absolute
+    left: 50%
+    top: 50%
+    width: $width
+    /* Set margins to offset 50% of the w/h */
+    margin-top: -($width / 2)
+    margin-left: -($width / 2)
+
+body.oe_single_form
+    background: #eee url(/web/static/src/img/form_sheetbg.png)
+    height: 100%
+
+    .oe_single_form_logo
+        padding: 10px
+        text-align: center
+        margin-bottom: 10px
+
+    .oe_single_form_footer
+        position: absolute
+        bottom: -30px
+        right: 0px
+        width: 100%
+        text-align: center
+
+    .oe_single_form_container
+        @include single-form(400px)
+
+// }}}
+
 // Internet Explorer 9+ specifics {{{
 .openerp_ie
     .placeholder
@@ -2745,109 +2774,6 @@ div.ui-widget-overlay
             overflow: hidden !important
 // }}}
 
-// Customize bootstrap3 for leftbar
-.nav
-    li > a
-        padding: 3px 4px 2px 18px
-        color: #4c4c4c
-    nav-pills.nav-stacked > li > ul
-        padding-left: 16px
-.nav-pills > li.active,a.list-group-item.active
-    > a
-        background-color: #7c7bad
-        color: white
-        border-radius: 0
-    a:hover,a:focus
-        background-color: #7c7bad
-    .badge
-        background-color: white
-        color: #7c7bad
-        text-shadow: none
-.badge
-    font-weight: normal
-    font-size: 11px
-    background-color: #7c7bad
-// End of customize
-
-// Customize for global tags
-button, body
-    line-height: normal
-h1,h2
-    font-weight: bold
-h3
-    font-size: 1.17em
-    font-weight: bold
-p
-    display: block
-    -webkit-margin-before: 1em
-    -webkit-margin-after: 1em
-    -webkit-margin-start: 0px
-    -webkit-margin-end: 0px
-pre
-    background-color: #FFFFFF
-    border: none
-    padding: 10px 0 3px 0
-// End of customize
-
-// Customize for kanban tooltip
-.jqstooltip
-    height: auto !important
-    width: auto !important
-// End of kanban tooltip
-
-// Customize for chatter
-h5
-    font-weight: bold
-    font-size: smaller
-.oe_form .oe_subtype label, .oe_subtype label
-    font-weight: normal
-.oe_msg_subtype_check
-    margin: 3px 3px 0 !important
-// End of customize
-
-// Minimized unused white space and label weight for wizard popup
-.oe_view_manager_new .oe_form_nosheet
-    margin-top: 8px
-    .oe_form_label
-        font-weight: normal
-// End of customize
-
-// navbar hack {{{
-.navbar
-    min-height: 32px
-    margin-bottom: 0px
-    border: none
-    z-index: 1
-    background-color: #414141
-    @include vertical-gradient(#646060, #262626)
-.navbar-default
-    .navbar-nav
-        li
-            a:hover,a:focus
-                background: rgba(0, 0, 0, 0.3)
-        .open > a,a:hover,a:focus
-            background: rgba(0, 0, 0, 0.3) !important
-        .dropdown > a .caret
-            border-top-color: #777 !important
-            border-bottom-color: #777 !important
-.navbar-nav
-    li
-        a
-            padding: 4px 32px 4px 12px
-.dropdown-menu
-    font-size: 13px
-    padding: 4px 0
-    background: #333333 !important
-    background: rgba(37, 37, 37, 0.9) !important
-    border-color: #999999
-    border-color: rgba(0, 0, 0, 0.2)
-    background-color: #414141
-    text-shadow: none
-    @include vertical-gradient(#646060, #262626)
-    @include radius(3px)
-    li
-        a,a:hover,a:focus
-            color: #eeeeee
 .dropdown-menu.state
     background: white
     background: white !important