Merge lp:~openerp-dev/openerp-web/7.0-imp-task-kanban-fka into lp:openerp-web/7.0

[Foram Katharotiya (OpenERP)]

Hello,

 - I have change icon into pen icon in project kanban.
 - In kaban view remove Remaining time" below column header if time estimations on tasks are not activated in the project settings.
 - select task form project, solve the issue of all projects appear in kanban of tasks when drag & drop column.

Thanks,
FKA

[lp:~openerp-dev/openerp-web/7.0-imp-task-kanban-fka]

3854. By Foram Katharotiya (OpenERP) on 2013-03-21

[MERGE] with 7.0

3855. By Foram Katharotiya (OpenERP) on 2013-03-21

[MERGE] with 7.0

3856. By Foram Katharotiya (OpenERP) on 2013-03-22

[MERGE] with 7.0

3857. By Foram Katharotiya (OpenERP) on 2013-03-25

[MERGE] with 7.0

3858. By Foram Katharotiya (OpenERP) on 2013-03-29

[MERGE] with 7.0

3859. By Foram Katharotiya (OpenERP) on 2013-04-01

[MERGE] with 7.0

3860. By Foram Katharotiya (OpenERP) on 2013-04-02

[MERGE] with 7.0

3861. By Foram Katharotiya (OpenERP) on 2013-04-11

[MERGE] with 7.0

3862. By Foram Katharotiya (OpenERP) on 2013-04-17

[MERGE] with 7.0

3863. By Foram Katharotiya (OpenERP) on 2013-04-23

[MERGE] with 7.0

3864. By Foram Katharotiya (OpenERP) on 2013-05-14

[MERGE] with 7.0

3865. By Foram Katharotiya (OpenERP) on 2013-05-20

[MERGE] with 7.0

3866. By Foram Katharotiya (OpenERP) on 2013-05-22

[MERGE] with 7.0

3867. By Foram Katharotiya (OpenERP) on 2013-05-31

[MERGE] with 7.0

3868. By Foram Katharotiya (OpenERP) on 2013-06-05

[MERGE] with 7.0

3869. By Foram Katharotiya (OpenERP) on 2013-06-07

[MERGE] with 7.0

3870. By Foram Katharotiya (OpenERP) on 2013-06-10

[MERGE] with 7.0

3871. By Foram Katharotiya (OpenERP) on 2013-06-11

[MERGE] with 7.0

3872. By Foram Katharotiya (OpenERP) on 2013-06-12

[MERGE] with 7.0

3873. By Foram Katharotiya (OpenERP) on 2013-06-17

[MERGE] with 7.0

3874. By Foram Katharotiya (OpenERP) on 2013-06-18

[MERGE] with 7.0

3875. By Foram Katharotiya (OpenERP) on 2013-06-20

[MERGE] with 7.0

3876. By Foram Katharotiya (OpenERP) on 2013-06-21

[MERGE] with 7.0

3877. By Foram Katharotiya (OpenERP) on 2013-06-24

[MERGE] with 7.0

3878. By Foram Katharotiya (OpenERP) on 2013-06-26

[MERGE] with 7.0

3879. By Foram Katharotiya (OpenERP) on 2013-07-01

[MERGE] with 7.0

Unmerged revisions

3879. By Foram Katharotiya (OpenERP) on 2013-07-01

[MERGE] with 7.0

3878. By Foram Katharotiya (OpenERP) on 2013-06-26

[MERGE] with 7.0

3877. By Foram Katharotiya (OpenERP) on 2013-06-24

[MERGE] with 7.0

3876. By Foram Katharotiya (OpenERP) on 2013-06-21

[MERGE] with 7.0

3875. By Foram Katharotiya (OpenERP) on 2013-06-20

[MERGE] with 7.0

3874. By Foram Katharotiya (OpenERP) on 2013-06-18

[MERGE] with 7.0

3873. By Foram Katharotiya (OpenERP) on 2013-06-17

[MERGE] with 7.0

3872. By Foram Katharotiya (OpenERP) on 2013-06-12

[MERGE] with 7.0

3871. By Foram Katharotiya (OpenERP) on 2013-06-11

[MERGE] with 7.0

3870. By Foram Katharotiya (OpenERP) on 2013-06-10

[MERGE] with 7.0

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-06-27 09:17:05 +0000
+++ addons/web/static/src/css/base.css	2013-07-01 10:30:15 +0000
@@ -347,6 +347,9 @@
   font-size: 34px;
   font-weight: 300 !important;
 }
+.openerp .oe_e .edit_icon:after {
+  content: "&";
+}
 .openerp .oe_left {
   float: left;
   margin-right: 8px;

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-06-27 09:17:05 +0000
+++ addons/web/static/src/css/base.sass	2013-07-01 10:30:15 +0000
@@ -366,6 +366,8 @@
         font-family: "entypoRegular" !important
         font-size: 34px
         font-weight: 300 !important
+        .edit_icon:after
+            content: "&"
     .oe_left
         float: left
         margin-right: 8px

=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2013-04-30 09:48:43 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2013-07-01 10:30:15 +0000
@@ -111,7 +111,7 @@
     */
     extract_aggregates: function(node) {
         for (var j = 0, jj = this.group_operators.length; j < jj;  j++) {
-            if (node.attrs[this.group_operators[j]]) {
+            if (node.attrs[this.group_operators[j]] && !node.attrs.invisible) {
                 this.aggregates[node.attrs.name] = node.attrs[this.group_operators[j]];
                 break;
             }
@@ -380,8 +380,8 @@
                     stop: function(event, ui) {
                         var stop_index = ui.item.index();
                         if (start_index !== stop_index) {
-                            var $start_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(start_index);
-                            var $stop_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(stop_index);
+                            var $start_column = self.$('.oe_kanban_groups_records .oe_kanban_column').eq(start_index);
+                            var $stop_column = self.$('.oe_kanban_groups_records .oe_kanban_column').eq(stop_index);
                             var method = (start_index > stop_index) ? 'insertBefore' : 'insertAfter';
                             $start_column[method]($stop_column);
                             var tmp_group = self.groups.splice(start_index, 1)[0];