css part2

bzr revid: al@openerp.com-20120328143720-tcgbovoukqsyerxc

6 files changed, 62 insertions, 81 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b03921107cf..618393a1fc0 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -475,10 +475,8 @@
 .openerp2 .oe_application a:hover {
   text-decoration: underline;
 }
-.openerp2 .oe_form_form {
-  border: 1px solid black;
-  margin: 5%;
-  padding: 10px;
+.openerp2 .oe_form label {
+  font-weight: bold;
 }
 .openerp2 .oe_form_topbar {
   border-bottom: 1px solid #cacaca;
@@ -550,6 +548,28 @@
   font-weight: bold;
   color: #b33630;
 }
+.openerp2 .oe_form_sheetbg {
+  background: url(/web/static/src/img/form_sheetbg.png);
+  padding: 8px;
+  border-bottom: 1px solid #dddddd;
+}
+.openerp2 .oe_form_sheet_width {
+  min-width: 650px;
+  max-width: 880px;
+  margin: 0 auto;
+}
+.openerp2 .oe_form_sheet {
+  padding-top: 8px;
+  background: white;
+  min-height: 420px;
+  border: 1px solid #afafb6;
+  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+  -box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+}
+.openerp2 .oe_form_group_cell {
+  line-height: 18px;
+}
 .openerp2 .oe_form_group_cell .oe_form_button {
   width: 100%;
   white-space: nowrap;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 7e2ae5441e3..9a0ab5692c6 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -402,10 +402,9 @@ $colour4: #8a89ba
                 text-decoration: underline
     // }}}
     // FormView Layout {{{
-    .oe_form_form
-        border: 1px solid black
-        margin: 5%
-        padding: 10px
+    .oe_form
+        label
+            font-weight: bold
     .oe_form_topbar
         border-bottom: 1px solid #cacaca
         @include vertical-gradient(#fcfcfc, #dedede)
@@ -458,8 +457,37 @@ $colour4: #8a89ba
         .oe_form_steps_active
             font-weight: bold 
             color: #b33630
-
+    .oe_form_sheetbg
+        background: url(/web/static/src/img/form_sheetbg.png)
+        padding: 8px
+        border-bottom: 1px solid #ddd 
+    .oe_form_sheet_width
+        min-width: 650px
+        max-width: 880px
+        margin: 0 auto
+    .oe_form_sheet
+        padding-top: 8px
+        background: white
+        min-height: 420px
+        border: 1px solid #afafb6
+        @include box-shadow(0 0 10px rgba(0,0,0,0.3))
+        //.avatar
+        //    max-height: 52px
+        //.contacts
+        //    li
+        //        float: left
+        //        width: 33%
+        //        margin-bottom: 4px
+        //    .avatar
+        //        height: 40px
+        //        width: 40px
+        //        border: 1px solid
+        //        border-color: #e5e5e5 #dbdbdb #d2d2d2
+        //    .data
+        //        padding: 2px
+        //        line-height: 18px
     .oe_form_group_cell
+        line-height: 18px
         .oe_form_button
             width: 100%
             white-space: nowrap
diff --git a/addons/web/static/src/css/base_old.css b/addons/web/static/src/css/base_old.css
index d1435da9a48..a4307146e9c 100644
--- a/addons/web/static/src/css/base_old.css
+++ b/addons/web/static/src/css/base_old.css
@@ -533,16 +533,6 @@ label.error {
     padding-bottom:3px;
 }
 
-.openerp .searchview_group_content .oe_form_label, .openerp .searchview_group_content .oe_form_label_help {
-    font-weight: bold;
-    color: #4c4c4c;
-}
-
-.openerp .oe-searchview-render-line .oe_form_label, .openerp .oe-searchview-render-line .oe_form_label_help {
-    font-weight: bold;
-    font-size: 80%;
-    white-space: nowrap;
-}
 
 .openerp .searchview_extended_group {
     padding: 3px;
@@ -864,26 +854,6 @@ label.error {
     width: 100%;
 }
 
-.openerp .oe_form_field_char input,
-.openerp .oe_form_field_email input,
-.openerp .oe_form_field_url input,
-.openerp .oe_form_field_date input,
-.openerp .oe_form_field_float input,
-.openerp .oe_form_field_many2one input,
-.openerp .oe_form_field_selection select,
-.openerp a.oe_form_uri {
-    vertical-align: middle;
-    padding-top: 3px;
-    font-size: 90%;
-    color: #222;
-}
-.openerp a.oe_form_uri {
-    color: #9A0404;
-    line-height: 12px;
-}
-
-
-
 /* Form */
 .openerp .oe_form_button_save_dirty {
     display: none;
@@ -958,29 +928,6 @@ label.error {
 }
 
 
-.openerp label.oe_form_label_help, .openerp label.oe_form_label,
-.openerp .oe_form_paragraph,
-.openerp .oe_form_field_statusbar,
-.openerp .oe_form input[type="text"],
-.openerp .oe_form input[type="password"],
-.openerp .oe_form input[type="file"],
-.openerp .oe_form select,
-.openerp .oe_form .oe_button,
-.openerp .oe_form textarea {
-    font-size: 85%;
-}
-
-.openerp label.oe_form_label_help, .openerp label.oe_form_label {
-    display: block;
-    color: #4c4c4c;
-    font-weight: normal;
-}
-.openerp label.oe_form_label_help {
-    cursor: help;
-}
-.openerp .oe_form_group_cell  .oe_form_label, .openerp .oe_form_group_cell  .oe_form_label_help {
-    font-weight: normal;
-}
 .openerp #tiptip_content {
     font-size: 12px;
 }
@@ -1001,22 +948,6 @@ label.error {
     font-weight: bold;
 }
 
-.openerp .oe_form label.oe_form_label, .openerp .oe_form label.oe_form_label_help {
-    margin: 3px 0 0 3px;
-    white-space: nowrap;
-}
-.openerp .oe_form .searchview_group_content label.oe_form_label, .openerp .searchview_group_content .oe_form label.oe_form_label_help { /* making a distinction between labels in search view and other labels */
-    margin: 3px 0 0 3px;
-}
-
-.openerp label.oe_form_label_help span {
-    font-size: 80%;
-    color: darkgreen;
-    vertical-align:top;
-    position: relative;
-    top: -4px;
-    padding: 0 2px;
-}
 .openerp .oe_align_left {
     text-align: left;
 }
diff --git a/addons/web/static/src/img/form_sheetbg.png b/addons/web/static/src/img/form_sheetbg.png
new file mode 100644
index 00000000000..d54b6302d5a
--- /dev/null
+++ b/addons/web/static/src/img/form_sheetbg.png
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f297446fd37..8752baee738 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -837,7 +837,7 @@ openerp.web.FormRenderingEngine = nova.Class.extend({
     },
     process_form: function($form) {
         var $new_form = this.render_element('FormRenderingForm', $form.getAttributes());
-            $dst = this.legacy_mode ? $new_form.find('group:first') : $new_form;
+        var $dst = this.legacy_mode ? $new_form.find('group:first') : $new_form.children();
         $new_form.attr("modifiers", $form.attr("modifiers"));
         $form.children().appendTo($dst);
         if ($form[0] === this.$form[0]) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 1065072cdab..3a6df378dfc 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -840,8 +840,10 @@
 </form>
 
 <t t-name="FormRenderingForm">
-    <div class="oe_form_form">
-        <group t-if="legacy_mode" col="4"/>
+    <div class="oe_form_sheetbg">
+        <div class="oe_form_sheet oe_form_sheet_width">
+            <group t-if="legacy_mode" col="4"/>
+        </div>
     </div>
 </t>
 <t t-name="FormRenderingGroup">