Merge lp:~openerp-dev/openerp-web/trunk-bs3-jke-mme into lp:~openerp-dev/openerp-web/trunk-bs3-jke

[Mehul Mehta(OpenERP)]

Hello,

    replace the jquery progressbar using bootstrap progressbar and replace oe_form_field_boolean to checkbox-inline in FieldBoolean template and add btn-sm btn-default in WidgetButton template.

    - add class in addons/web/static/src/css/base.sass
    - add class in addons/web/static/src/css/base.css
    - add class in addons/web/static/src/css/base-form.css
    - add class in addons/web/static/src/css/base-form.sass
    - improved code in addons/web/static/src/js/view_form.js
    - improved code in addons/web/static/src/js/view_list.js
    - improved code in addons/web/static/src/xml/base.xml

Please review it.

Thank you.

Unmerged revisions

3922. By Pariket Trivedi(OpenERP) on 2014-01-31

[IMP] : FieldBoolean template add checkbox-inline instead of oe_form_field_booleanand WidgetButton template add btn-sm btn-default.

3921. By Mehul Mehta(OpenERP) on 2014-01-31

[Fix] improvement progressbar

=== modified file 'addons/web/static/src/css/base-form.css'
--- addons/web/static/src/css/base-form.css	2014-01-22 14:34:14 +0000
+++ addons/web/static/src/css/base-form.css	2014-01-31 10:28:33 +0000
@@ -199,8 +199,9 @@
   .openerp .oe_form .oe_form_field_date,
   .openerp .oe_form .oe_form_field_datetime {
     white-space: nowrap; }
-  .openerp .oe_form .oe_form_field_boolean {
-    width: auto; }
+  .openerp .oe_form .checkbox-inline {
+    width: auto;
+    vertical-align: middle !important; }
   .openerp .oe_form .oe_datepicker_container {
     display: none; }
   .openerp .oe_form .oe_datepicker_root {

=== modified file 'addons/web/static/src/css/base-form.sass'
--- addons/web/static/src/css/base-form.sass	2014-01-27 12:21:18 +0000
+++ addons/web/static/src/css/base-form.sass	2014-01-31 10:28:33 +0000
@@ -302,8 +302,9 @@
         .oe_form_field_date,
         .oe_form_field_datetime
             white-space: nowrap
-        .oe_form_field_boolean
+        .checkbox-inline
             width: auto
+            vertical-align: middle !important
         .oe_datepicker_container
             display: none
         .oe_datepicker_root

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-01-27 12:21:18 +0000
+++ addons/web/static/src/css/base.css	2014-01-31 10:28:33 +0000
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 .openerp {
   font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
   color: #4c4c4c;
@@ -1097,3 +1097,12 @@
 
 .oe_view_manager_new .oe_form_nosheet {
   margin-top: 8px; }
+
+.progress {
+  height: 15px;
+  margin-bottom: 0px;
+  font-size: 10px; }
+
+.progress-bar {
+  background-color: #428bca;
+  color: #050404; }

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-01-27 12:21:18 +0000
+++ addons/web/static/src/css/base.sass	2014-01-31 10:28:33 +0000
@@ -1320,3 +1320,12 @@
 
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
+
+.progress
+    height: 15px
+    margin-bottom: 0px
+    font-size: 10px
+
+.progress-bar
+    background-color: #428bca
+    color: #050404
\ No newline at end of file

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-01-27 12:21:18 +0000
+++ addons/web/static/src/js/view_form.js	2014-01-31 10:28:33 +0000
@@ -2796,12 +2796,9 @@
 instance.web.form.FieldProgressBar = instance.web.form.AbstractField.extend({
     template: 'FieldProgressBar',
     render_value: function() {
-        this.$el.progressbar({
-            value: this.get('value') || 0,
-            disabled: this.get("effective_readonly")
-        });
         var formatted_value = instance.web.format_value(this.get('value') || 0, { type : 'float' });
-        this.$('span').html(formatted_value + '%');
+        this.$('div.progress-bar').html(formatted_value + '%');
+        this.$('div.progress-bar').css({'width':formatted_value + '%'});
     }
 });
 

=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js	2014-01-24 12:47:21 +0000
+++ addons/web/static/src/js/view_list.js	2014-01-31 10:28:33 +0000
@@ -2320,8 +2320,10 @@
      */
     _format: function (row_data, options) {
         return _.template(
-            '<progress value="<%-value%>" max="100"><%-value%>%</progress>', {
-                value: _.str.sprintf("%.0f", row_data[this.id].value || 0)
+            '<div class="progress">
+            	<div class="progress-bar" role="progressbar" style="width: <%-value%>%"><%-value%>%</div>
+            </div>', {
+                value: instance.web.format_value(row_data[this.id].value || 0, { type : 'float' })
             });
     }
 });

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2014-01-27 12:21:18 +0000
+++ addons/web/static/src/xml/base.xml	2014-01-31 10:28:33 +0000
@@ -1220,7 +1220,7 @@
     </table>
 </t>
 <t t-name="FieldBoolean">
-    <span class="oe_form_field oe_form_field_boolean" t-att-style="widget.node.attrs.style">
+    <span class="oe_form_field checkbox-inline" t-att-style="widget.node.attrs.style">
         <input type="checkbox"
             t-att-id="widget.id_for_label"
             t-att-name="widget.name"
@@ -1230,9 +1230,9 @@
     </span>
 </t>
 <t t-name="FieldProgressBar">
-    <span class="oe_form_field oe_form_field_progressbar" t-att-style="widget.node.attrs.style">
-        <span></span>
-    </span>
+    <div class="progress">
+    	<div class="progress-bar" role="progressbar"></div>
+    </div>
 </t>
 <t t-name="FieldStatus">
     <ul t-att-class="'oe_form_field_status ' + (widget.options.clickable ? 'oe_form_status_clickable' : 'oe_form_status')" t-att-style="widget.node.attrs.style"/>
@@ -1397,7 +1397,7 @@
     </div>
 </t>
 <t t-name="WidgetButton">
-    <button type="button" class="btn oe_form_button"
+    <button type="button" class="btn btn-sm btn-default oe_form_button"
         t-att-style="widget.node.attrs.style"
         t-att-tabindex="widget.node.attrs.tabindex"
         t-att-autofocus="widget.node.attrs.autofocus"