Merge lp:~openerp-dev/openerp-web/trunk-imp-user-form-psa into lp:openerp-web

[Paramjit Singh Sahota(OpenERP)]

[lp:~openerp-dev/openerp-web/trunk-imp-user-form-psa]

3967. By Paramjit Singh Sahota(OpenERP) on 2014-04-09

[MERGE]MergeD lp:openerp-web.

3968. By Paramjit Singh Sahota(OpenERP) on 2014-04-11

[IMP] Improved active/deactive code with caret to open the dropdown but still need to work on it.

3969. By Paramjit Singh Sahota(OpenERP) on 2014-04-14

[IMP] Changed the class according to active and deactive

3970. By Paramjit Singh Sahota(OpenERP) on 2014-05-06

[MERGE] Merged lp:openerp-web

3971. By Mehul Mehta(OpenERP) on 2014-05-06

[MERGE] Merged lp:openerp-web

3972. By Paramjit Singh Sahota(OpenERP) on 2014-05-12

[MERGE] Merged lp:openerp-web.

3973. By Paramjit Singh Sahota(OpenERP) on 2014-05-13

[IMP] Improved code for active/deactive without color.

3974. By Gaurav Panchal (OpenERP) on 2014-05-15

[MERGE ]merge lp:openerp-web.

3975. By Gaurav Panchal (OpenERP) on 2014-05-19

[IMP]Improve code for confirm message when deactive user

3976. By Gaurav Panchal (OpenERP) on 2014-05-19

[IMP]Change the name of Activated/Deactivated

Unmerged revisions

3976. By Gaurav Panchal (OpenERP) on 2014-05-19

[IMP]Change the name of Activated/Deactivated

3975. By Gaurav Panchal (OpenERP) on 2014-05-19

[IMP]Improve code for confirm message when deactive user

3974. By Gaurav Panchal (OpenERP) on 2014-05-15

[MERGE ]merge lp:openerp-web.

3973. By Paramjit Singh Sahota(OpenERP) on 2014-05-13

[IMP] Improved code for active/deactive without color.

3972. By Paramjit Singh Sahota(OpenERP) on 2014-05-12

[MERGE] Merged lp:openerp-web.

3971. By Mehul Mehta(OpenERP) on 2014-05-06

[MERGE] Merged lp:openerp-web

3970. By Paramjit Singh Sahota(OpenERP) on 2014-05-06

[MERGE] Merged lp:openerp-web

3969. By Paramjit Singh Sahota(OpenERP) on 2014-04-14

[IMP] Changed the class according to active and deactive

3968. By Paramjit Singh Sahota(OpenERP) on 2014-04-11

[IMP] Improved active/deactive code with caret to open the dropdown but still need to work on it.

3967. By Paramjit Singh Sahota(OpenERP) on 2014-04-09

[MERGE]MergeD lp:openerp-web.

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-05-08 15:25:16 +0000
+++ addons/web/static/src/css/base.css	2014-05-19 11:56:20 +0000
@@ -3423,3 +3423,10 @@
   background-color: black;
   opacity: 0.6;
 }
+
+.oe_ActiveWidgetButton .btn-danger .oe_activated, .oe_ActiveWidgetButton .deactive .oe_activated {
+  display: none;
+}
+.oe_ActiveWidgetButton .btn-success .oe_deactivated, .oe_ActiveWidgetButton .active .oe_deactivated {
+  display: none;
+}

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-05-08 15:25:16 +0000
+++ addons/web/static/src/css/base.sass	2014-05-19 11:56:20 +0000
@@ -2778,6 +2778,13 @@
     background-color: black
     opacity: 0.6000000238418579
 
+.oe_ActiveWidgetButton
+    .btn-danger
+        .oe_activated
+            display: none
+    .btn-success
+        .oe_deactivated
+            display: none
 
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-05-08 15:34:18 +0000
+++ addons/web/static/src/js/view_form.js	2014-05-19 11:56:20 +0000
@@ -6174,6 +6174,38 @@
 
 });
 
+instance.web.form.ActiveWidgetButton = instance.web.form.AbstractField.extend({
+    template: 'ActiveWidgetButton',
+    render_value: function() {
+        this._super();
+        this.$("button:first")
+            .toggleClass("btn-success", this.get_value())
+            .toggleClass("btn-danger", !this.get_value());
+        this.$('ul.dropdown-menu li a.js_publish_btn')
+            .toggleClass("active", this.get_value())
+            .toggleClass("deactive", !this.get_value());
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+        this.$("button:first")
+            .on("click", function () {
+                if(self.get_value()){
+                    if (!confirm(_t("Do you really want to deactive user?"))) { return false; }
+                }
+                self.set_value(!!$(this).hasClass("btn-danger"));
+                return self.view.recursive_save();
+        });
+        this.$('ul.dropdown-menu li a.js_publish_btn')
+            .on("click", function () {
+                if(self.get_value()){
+                    if (!confirm(_t("Do you really want to deactive user?"))) { return false; }
+                }
+                self.set_value(!!$(this).hasClass("deactive"));
+                return self.view.recursive_save();
+        });
+    },
+});
 
 /**
  * Registry of form fields, called by :js:`instance.web.FormView`.
@@ -6218,6 +6250,7 @@
     'priority':'instance.web.form.Priority',
     'kanban_state_selection':'instance.web.form.KanbanSelection',
     'statinfo': 'instance.web.form.StatInfo',
+    'active_deactive_button': 'instance.web.form.ActiveWidgetButton',
 });
 
 /**

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2014-05-08 15:34:18 +0000
+++ addons/web/static/src/xml/base.xml	2014-05-19 11:56:20 +0000
@@ -2018,5 +2018,25 @@
     <a href="javascript:void(0)"><t t-esc="text"/></a>
 </t>
 <t t-name="StatInfo">
-    <strong><t t-esc="value"/></strong><br/><t t-esc="text"/></t>
+    <strong><t t-esc="value"/></strong><br/><t t-esc="text"/>
+</t>
+<t t-name="ActiveWidgetButton">
+    <div class="btn-group oe_ActiveWidgetButton">
+        <button class="btn btn-sm btn-success">
+            <span class="oe_deactivated">Deactivated</span>
+            <span class="oe_activated">Activated</span>
+        </button>
+        <button type="button" t-attf-class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+            <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu" role="menu">
+            <li>
+                <a href="#" class="js_publish_btn active">
+                    <span class="oe_activated">Deactivate</span>
+                    <span class="oe_deactivated">Activate</span>
+                </a>
+            </li>
+        </ul>
+    </div>
+</t>
 </templates>