From 284b6dc267c7081003121d7c6e8a949b6dc6dd65 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 28 Mar 2012 10:25:31 +0530 Subject: [IMP]:improved kanban view bzr revid: apa@tinyerp.com-20120328045531-1cykq8x0gryefuv2 --- addons/project/static/src/css/project.css | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 addons/project/static/src/css/project.css (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css new file mode 100644 index 00000000000..e8ec4195add --- /dev/null +++ b/addons/project/static/src/css/project.css @@ -0,0 +1,57 @@ + +.oe_project_border{ + border-right: groove; +} + +.progress{ + text-align: le; + width: auto; +} +.oe_project_font{ + color: #000000; + +} +.sequence { +border-bottom: groove; +font-size: 20px; + +} + +.invoiced{ + font-size: 10px; + +} +.oe_project { +width: 70px; +} +.user { +color:rgb(192,192,192); +font-size: 10px; +} +.manager { +font-size: 9px; +} + +.oe_project_buttons { + display: inline-block; + padding: 0px 0px; + background-color: transparent; + border: hidden; + color: #0000FF; + +} + +.oe_project_buttons:hover { + cursor: pointer; + background-size: 100% 100%; +} + +.oe_project_font1{ + + -webkit-margin-before: 0em; +-webkit-margin-after: 0em; +} + +div.oe_fold_column{ + padding:0px !important; +} \ No newline at end of file -- cgit v1.2.3 From 5347fb2f2e3f140dcd9b8b26f7bd519119b8ca78 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 28 Mar 2012 11:34:24 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120328060424-layr7zdvr7lr04k3 --- addons/project/static/src/img/tasks.png | Bin 0 -> 2545 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 addons/project/static/src/img/tasks.png (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/img/tasks.png b/addons/project/static/src/img/tasks.png new file mode 100644 index 00000000000..5c5073b1633 Binary files /dev/null and b/addons/project/static/src/img/tasks.png differ -- cgit v1.2.3 From 99dceac2a6aaafd348e2d78d7f0bbbb44012d097 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 28 Mar 2012 11:55:32 +0530 Subject: [IMP]added image for issue. bzr revid: kbh@tinyerp.com-20120328062532-20i5yqodhtf6mkx9 --- addons/project/static/src/img/bug.png | Bin 0 -> 541 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 addons/project/static/src/img/bug.png (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/img/bug.png b/addons/project/static/src/img/bug.png new file mode 100644 index 00000000000..a18278ff5c4 Binary files /dev/null and b/addons/project/static/src/img/bug.png differ -- cgit v1.2.3 From df11d7174a58c9a8bc343dc3fba8d19cefcb767c Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 28 Mar 2012 14:29:27 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120328085927-hzcw0p32tr94i07i --- addons/project/static/src/css/project.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index e8ec4195add..3d8ef752a18 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -38,7 +38,8 @@ font-size: 9px; background-color: transparent; border: hidden; color: #0000FF; - + min-height: 50px; + min-width: 50px;* } .oe_project_buttons:hover { -- cgit v1.2.3 From a48a27a3bb0a1a212c868a175ea831368f02316f Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 28 Mar 2012 15:08:19 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120328093819-r7xnzw9o13uuvn58 --- addons/project/static/src/css/project.css | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 3d8ef752a18..0c1140f0386 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -3,6 +3,10 @@ border-right: groove; } +.oe_project_desc{ + width: 270px; +} + .progress{ text-align: le; width: auto; @@ -12,24 +16,22 @@ } .sequence { -border-bottom: groove; -font-size: 20px; - + border-bottom: groove; + font-size: 20px; } .invoiced{ font-size: 10px; - } .oe_project { -width: 70px; + width: 70px; } .user { -color:rgb(192,192,192); -font-size: 10px; + color:rgb(192,192,192); + font-size: 10px; } .manager { -font-size: 9px; + font-size: 9px; } .oe_project_buttons { @@ -38,7 +40,7 @@ font-size: 9px; background-color: transparent; border: hidden; color: #0000FF; - min-height: 50px; + min-height: 45px; min-width: 50px;* } @@ -50,9 +52,9 @@ font-size: 9px; .oe_project_font1{ -webkit-margin-before: 0em; --webkit-margin-after: 0em; + -webkit-margin-after: 0em; } div.oe_fold_column{ - padding:0px !important; + padding:2px !important; } \ No newline at end of file -- cgit v1.2.3 From 25776d016280b54e2f2c247299c3090d346a5eae Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Wed, 28 Mar 2012 15:16:54 +0530 Subject: [IMP]add image and sequence bzr revid: sgo@tinyerp.com-20120328094654-d02ntcsu6ghbonva --- addons/project/static/src/img/tasks_icon.png | Bin 0 -> 2545 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 addons/project/static/src/img/tasks_icon.png (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/img/tasks_icon.png b/addons/project/static/src/img/tasks_icon.png new file mode 100644 index 00000000000..5c5073b1633 Binary files /dev/null and b/addons/project/static/src/img/tasks_icon.png differ -- cgit v1.2.3 From 50923b0da3f733afe26db91c9633cee28aa87cbf Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 28 Mar 2012 17:31:00 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120328120100-vgtcpiphknkrb6nk --- addons/project/static/src/css/project.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 0251c5a7167..5e6ac22ba9a 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -54,10 +54,11 @@ display: inline-block; padding: 0px 0px; background-color: transparent; - border: hidden; + /*border: hidden;*/ color: #0000FF; - min-height: 50px; - min-width: 50px;* + min-height: 45px; + min-width: 45px; + text-align: center; } .oe_project_buttons:hover { -- cgit v1.2.3 From b77d3e06bbe945fb17d2c1ba2adebbf81babd54d Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 28 Mar 2012 17:39:14 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120328120914-ukfrhnw03o0o659x --- addons/project/static/src/css/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 5e6ac22ba9a..c11f927d342 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -54,7 +54,7 @@ display: inline-block; padding: 0px 0px; background-color: transparent; - /*border: hidden;*/ + border: hidden; color: #0000FF; min-height: 45px; min-width: 45px; -- cgit v1.2.3 From 1ac567d6b040ca551973d3e7e76469a1801ba64e Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 29 Mar 2012 10:02:17 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120329043217-2i8vxflhy6a0drix --- addons/project/static/src/css/project.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index c11f927d342..29f207540fb 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -17,7 +17,8 @@ } .sequence { border-bottom: groove; - font-size: 20px; + /*font-size: 20px;*/ + text-align: center; } .project_icon{ @@ -40,7 +41,7 @@ font-size: 10px; } .oe_project { - width: 70px; + width: 55px; } .user { color:rgb(192,192,192); -- cgit v1.2.3 From 80d32699f406e99a3e6a3cf564d889e413d46e56 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 29 Mar 2012 11:58:07 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120329062807-qprri6v7otjufmy3 --- addons/project/static/src/css/project.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 29f207540fb..39e7d506686 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -4,11 +4,12 @@ } .oe_project_desc{ - width: 270px; + width: 250px; } .progress{ - text-align: le; + text-align: right; + vertical-align: middle; width: auto; } .oe_project_font{ @@ -38,7 +39,7 @@ .invoiced{ - font-size: 10px; + font-size: 9px; } .oe_project { width: 55px; -- cgit v1.2.3 From b49496e2312afb20b8366d90aa1d8864121e84ec Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 29 Mar 2012 12:50:29 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120329072029-r1rpuaomkoba3z5v --- addons/project/static/src/css/project.css | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 39e7d506686..9d674163a7c 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -8,8 +8,7 @@ } .progress{ - text-align: right; - vertical-align: middle; + text-align: left; width: auto; } .oe_project_font{ @@ -23,9 +22,9 @@ } .project_icon{ - width: 35px; + width: 30px; display: block; - height: 35px; + height: 30px; text-align: center; } @@ -49,7 +48,7 @@ font-size: 10px; } .manager { - font-size: 9px; + font-size: 8px; } .oe_project_buttons { @@ -58,8 +57,8 @@ background-color: transparent; border: hidden; color: #0000FF; - min-height: 45px; - min-width: 45px; + min-height: 40px; + min-width: 40px; text-align: center; } -- cgit v1.2.3 From 829ec0a2d02dde8ce3b00f9564936a9b2ed83d85 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 29 Mar 2012 16:25:52 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120329105552-yf4edx77rzlleonn --- addons/project/static/src/css/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 9d674163a7c..62b97beadb2 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -74,5 +74,5 @@ } div.oe_fold_column{ - padding:2px !important; + padding:0px !important; } \ No newline at end of file -- cgit v1.2.3 From 2f042dc4330c86e6546c7c6f2b8250788d287573 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 29 Mar 2012 16:53:07 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120329112307-muo085udc4dh3oi5 --- addons/project/static/src/css/project.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 62b97beadb2..28bc351df28 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -1,3 +1,13 @@ +.oe_to_invoice_buttons { + min-height: 30px; + min-width: 50px; + vertical-align: baseline; +} + +.oe_to_invoice_buttons:hover { + cursor: pointer; +} + .oe_project_border{ border-right: groove; -- cgit v1.2.3 From 9aa3b59b2f1d0f471cfd27b6ca6e91c77b4e1881 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 29 Mar 2012 17:49:31 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120329121931-w3e4bclwmuhhzsg2 --- addons/project/static/src/css/project.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 28bc351df28..7e5869d80fe 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -1,7 +1,8 @@ .oe_to_invoice_buttons { - min-height: 30px; + min-height: 60px; min-width: 50px; - vertical-align: baseline; + vertical-align: top; + } .oe_to_invoice_buttons:hover { @@ -26,6 +27,7 @@ } .sequence { + padding-bottom: 4px !important; border-bottom: groove; /*font-size: 20px;*/ text-align: center; -- cgit v1.2.3 From f221ede36a34b83ff86fbcaf653c40b08f3f1313 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Thu, 29 Mar 2012 18:06:59 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120329123659-xun8tan1r0727wca --- addons/project/static/src/css/project.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 7e5869d80fe..a17cadd45e3 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -1,6 +1,6 @@ .oe_to_invoice_buttons { - min-height: 60px; - min-width: 50px; + min-height: 50px; + min-width: 40px; vertical-align: top; } -- cgit v1.2.3 From 2c152b00813557aaa10d2a1f98548f350f3b99c0 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Thu, 29 Mar 2012 18:16:11 +0530 Subject: [IMP]css changed bzr revid: kbh@tinyerp.com-20120329124611-l3j2zw8i3j9f1tcd --- addons/project/static/src/css/project.css | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index a17cadd45e3..627b0e951b7 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -48,7 +48,49 @@ text-align: center; } +.project_table{ + border:0; + width:350px; +} +.td_image{ + width:60px; + text-align:center; + vertical-align:top; +} +.avatar{ + height:40px; + width:40px; +} +.td_name{ + text-align:left; + vertical-align:middle; + width:220px; +} +.td_deadline{ + width:70px; + vertical-align:top; + text-align:right; +} +.td_member{ + text-align:right; + vertical-align:bottom; + width:130px; + height:20px; +} +.td_member_img{ + height:22px; + width:22px; +} +.td_hours{ + text-align:left; + vertical-align:bottom; + width:120px +} +.task{ + text-align:left; + vertical-align:middle; +} .invoiced{ font-size: 9px; } -- cgit v1.2.3 From 6439f4cba7a101a4bcb70014bd492719681c5937 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Thu, 29 Mar 2012 18:30:38 +0530 Subject: [IMP]css bzr revid: kbh@tinyerp.com-20120329130038-2phw98jzf4arxxsk --- addons/project/static/src/css/project.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 627b0e951b7..1dc146d7463 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -82,6 +82,10 @@ height:22px; width:22px; } +.img_member{ + height:20px; + width:20px; +} .td_hours{ text-align:left; vertical-align:bottom; -- cgit v1.2.3 From 60db095a88197692bd07c8ea797eefc5346feb97 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 29 Mar 2012 18:40:30 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120329131030-vjfix4ygwcyrs90w --- addons/project/static/src/css/project.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 1dc146d7463..54299eff356 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -69,8 +69,7 @@ } .td_deadline{ width:70px; - vertical-align:top; - text-align:right; + text-align:center; } .td_member{ text-align:right; -- cgit v1.2.3 From 299d0463e958ba35d9b11a59df42cf3d88b2126b Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 29 Mar 2012 19:03:04 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120329133304-v225x3lbowhqyoad --- addons/project/static/src/css/project.css | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 54299eff356..9657edf43ad 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -17,9 +17,7 @@ .oe_project_desc{ width: 250px; } - .progress{ - text-align: left; width: auto; } .oe_project_font{ @@ -28,6 +26,7 @@ } .sequence { padding-bottom: 4px !important; + padding-top: 3px !important; border-bottom: groove; /*font-size: 20px;*/ text-align: center; @@ -49,14 +48,12 @@ } .project_table{ - border:0; - width:350px; + width:350px; } .td_image{ - width:60px; - text-align:center; - vertical-align:top; - + width:60px; + text-align:center; + vertical-align:top; } .avatar{ height:40px; @@ -86,7 +83,7 @@ width:20px; } .td_hours{ - text-align:left; + text-align:right; vertical-align:bottom; width:120px } @@ -95,7 +92,7 @@ vertical-align:middle; } .invoiced{ - font-size: 9px; + font-size: 10px; } .oe_project { width: 55px; -- cgit v1.2.3 From 90065c1a88acab2ca031bae80dd0b5404612bb85 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 30 Mar 2012 11:23:12 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120330055312-b48taam1vr3l0d6s --- addons/project/static/src/css/project.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 9657edf43ad..f49cb9133ec 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -12,6 +12,7 @@ .oe_project_border{ border-right: groove; + border-left: groove; } .oe_project_desc{ @@ -83,7 +84,7 @@ width:20px; } .td_hours{ - text-align:right; + text-align:center; vertical-align:bottom; width:120px } @@ -122,7 +123,7 @@ } .oe_project_font1{ - + padding-left: 2px !important; -webkit-margin-before: 0em; -webkit-margin-after: 0em; } -- cgit v1.2.3 From 2ba790b37ebcd1a202d1cc729fb9bbee3cb829af Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 30 Mar 2012 11:30:38 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120330060038-701xyjxjaqmg1v6t --- addons/project/static/src/css/project.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index f49cb9133ec..0ef0db96ed6 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -14,7 +14,9 @@ border-right: groove; border-left: groove; } - +.oe_project_font:hover{ + text-decoration: underline; +} .oe_project_desc{ width: 250px; } -- cgit v1.2.3 From 7b2b46b741a5fc1d4f34d4e1c428f8dc9018a103 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 30 Mar 2012 11:54:13 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120330062413-9i7xyo9yh63zrdst --- addons/project/static/src/css/project.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 0ef0db96ed6..cab3f404e17 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -1,6 +1,6 @@ .oe_to_invoice_buttons { - min-height: 50px; - min-width: 40px; + min-height: 30px; + min-width: 70px; vertical-align: top; } @@ -105,7 +105,7 @@ font-size: 10px; } .manager { - font-size: 8px; + font-size: 9px; } .oe_project_buttons { -- cgit v1.2.3 From 21196f57edda8fe905a4e716e031e51ccacc5e51 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 30 Mar 2012 12:40:00 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120330071000-pbdqqj6pylvrghx6 --- addons/project/static/src/css/project.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index cab3f404e17..c5c0a243c9c 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -1,5 +1,5 @@ .oe_to_invoice_buttons { - min-height: 30px; + min-height: 33px; min-width: 70px; vertical-align: top; @@ -106,6 +106,7 @@ } .manager { font-size: 9px; + font: bold; } .oe_project_buttons { -- cgit v1.2.3 From 25268a28abbe33a7d7b7dbfb630b63e7ab01d4c6 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 30 Mar 2012 12:41:44 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120330071144-5xrfdzdx27342hxq --- addons/project/static/src/css/project.css | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index c5c0a243c9c..2e8fcca08e3 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -25,6 +25,7 @@ } .oe_project_font{ color: #000000; + padding-left: 5px !important; } .sequence { -- cgit v1.2.3 From 47ab29c93ca87183a770cdac0e126bac231b71c1 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 30 Mar 2012 12:54:25 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120330072425-7tf4uffzmxak8k19 --- addons/project/static/src/css/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 2e8fcca08e3..4078e3f01be 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -107,7 +107,7 @@ } .manager { font-size: 9px; - font: bold; + font: bolder; } .oe_project_buttons { -- cgit v1.2.3 From a5542944f94998434db1f75fd58845023d6ddb7e Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 30 Mar 2012 12:59:33 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120330072933-syjdkqs7excirqtn --- addons/project/static/src/css/project.css | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 4078e3f01be..4e1b5e5ad3a 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -107,7 +107,6 @@ } .manager { font-size: 9px; - font: bolder; } .oe_project_buttons { -- cgit v1.2.3 From f9398e1384d873b4311a4668e0e9b5dc0cc184ab Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 30 Mar 2012 13:59:48 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120330082948-d0wl0n1f64j80lo3 --- addons/project/static/src/css/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 4e1b5e5ad3a..d6ff6ef8695 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -132,5 +132,5 @@ } div.oe_fold_column{ - padding:0px !important; + padding:2px !important; } \ No newline at end of file -- cgit v1.2.3 From da2e47979e0b477285603798c5b9a40ce8e42699 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 30 Mar 2012 16:32:14 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120330110214-gy1g9fwt03dydcoh --- addons/project/static/src/css/project.css | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index d6ff6ef8695..9aa559bfb13 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -36,6 +36,7 @@ text-align: center; } + .project_icon{ width: 30px; display: block; -- cgit v1.2.3 From d35d6def03a1a50dea6972971798a6f1723a6b62 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 2 Apr 2012 12:00:45 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120402063045-gwpkxsd1tyuj5skh --- addons/project/static/src/css/project.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 9aa559bfb13..e62d37ac8b9 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -17,6 +17,10 @@ .oe_project_font:hover{ text-decoration: underline; } +.oe_project_members{ + padding-left: 6px !important; + text-align: left; +} .oe_project_desc{ width: 250px; } -- cgit v1.2.3 From 8a71a7c2b27b34df26297911181bd926a73062f7 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 2 Apr 2012 12:58:56 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120402072856-decyar52cmweu0l1 --- addons/project/static/src/css/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index e62d37ac8b9..840b0580033 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -18,7 +18,7 @@ text-decoration: underline; } .oe_project_members{ - padding-left: 6px !important; + padding-left: 5px !important; text-align: left; } .oe_project_desc{ -- cgit v1.2.3 From abf8934ff922e9d9b65567cf7469c14caf3b63f3 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 3 Apr 2012 14:29:56 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120403085956-00lj6epnjz3j5z7n --- addons/project/static/src/css/project.css | 256 +++++++++++++++--------------- addons/project/static/src/js/dropdown.js | 92 +++++++++++ 2 files changed, 218 insertions(+), 130 deletions(-) create mode 100644 addons/project/static/src/js/dropdown.js (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 840b0580033..70d220fd322 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -1,141 +1,137 @@ -.oe_to_invoice_buttons { - min-height: 33px; - min-width: 70px; - vertical-align: top; - -} +.vignettes { + margin: 4px; } + .vignettes li { + float: left; } + .vignettes .avatar { + margin-right: 2px; + width: 32px; + height: 32px; } + .vignettes .fields { + width: 100%; } + .vignettes .fields th { + font-weight: normal; } + .vignettes .fields td { + color: #888888; } + .vignettes h4 a { + color: #4c4c4c; } -.oe_to_invoice_buttons:hover { - cursor: pointer; -} +.vignettes > li { + height: 160px; + width: 250px; + padding: 8px; + margin: 4px; } + .vignettes > li h4 { + margin-bottom: 2px; } -.oe_project_border{ - border-right: groove; - border-left: groove; -} -.oe_project_font:hover{ - text-decoration: underline; -} -.oe_project_members{ - padding-left: 5px !important; - text-align: left; -} -.oe_project_desc{ - width: 250px; -} -.progress{ - width: auto; -} -.oe_project_font{ - color: #000000; - padding-left: 5px !important; - -} -.sequence { - padding-bottom: 4px !important; - padding-top: 3px !important; - border-bottom: groove; - /*font-size: 20px;*/ - text-align: center; -} +.i { + font-family: "mnmliconsRegular" !important; + font-size: 21px; + font-weight: 300 !important; } +.dropdown-menu { + display: none; + position: absolute; } -.project_icon{ - width: 30px; - display: block; - height: 30px; - text-align: center; -} +.dropdown-toggle:after { + width: 0; + height: 0; + display: inline-block; + content: "&darr"; + text-indent: -99999px; + vertical-align: top; + margin-top: 8px; + margin-left: 4px; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid white; + filter: alpha(opacity=50); + -khtml-opacity: 0.5; + -moz-opacity: 0.5; + opacity: 0.5; } -.project_icon:hover { - cursor: pointer; - display: block; - height: 40px; - width: 40px; - text-align: center; -} +.open { + display: block; + background: #333333; } + .open .dropdown-menu { + display: block; } -.project_table{ - width:350px; -} -.td_image{ - width:60px; - text-align:center; - vertical-align:top; -} -.avatar{ - height:40px; - width:40px; -} -.td_name{ - text-align:left; - vertical-align:middle; - width:220px; -} -.td_deadline{ - width:70px; - text-align:center; -} -.td_member{ - text-align:right; - vertical-align:bottom; - width:130px; - height:20px; -} -.td_member_img{ - height:22px; - width:22px; -} -.img_member{ - height:20px; - width:20px; -} -.td_hours{ - text-align:center; - vertical-align:bottom; - width:120px -} -.task{ - text-align:left; - vertical-align:middle; -} -.invoiced{ - font-size: 10px; -} -.oe_project { - width: 55px; -} -.user { - color:rgb(192,192,192); - font-size: 10px; -} -.manager { - font-size: 9px; -} -.oe_project_buttons { - display: inline-block; - padding: 0px 0px; - background-color: transparent; - border: hidden; - color: #0000FF; - min-height: 40px; - min-width: 40px; - text-align: center; -} +a.oe_kanban_action { + position: absolute; + right: 0; + } + a.oe_kanban_action:hover { + text-decoration: none; + } + a.oe_kanban_action .i { + color: #4c4c4c; } -.oe_project_buttons:hover { - cursor: pointer; - background-size: 100% 100%; -} -.oe_project_font1{ - padding-left: 2px !important; - -webkit-margin-before: 0em; - -webkit-margin-after: 0em; -} +.oe_kanban_vignette { + position: relative; + display: block; + min-height: 50px; + background: white; + border: 1px solid #d8d8d8; + border-bottom-color: #b9b9b9; + padding: 6px; + margin: 6px 0; + display: block; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; } + .oe_kanban_vignette:last-child { + margin-bottom: 0; } + .oe_kanban_vignette:hover { + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); + -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); } + .oe_kanban_vignette h4 { + margin: 0 0 2px; } + + +.oe_kanban_vignette .dropdown-menu { + top: 30px; + right: -140px; + padding: 4px; + border: 1px solid #afafb6; + width: 160px; + overflow-x: hidden; + z-index: 900; + background: white; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); } + .oe_kanban_vignette .dropdown-menu p { + margin-left: 12px; } + .oe_kanban_vignette .dropdown-menu li { + float: none; + display: block; + background-color: none; } + .oe_kanban_vignette .dropdown-menu li a { + display: block; + padding: 3px 6px; + clear: both; + font-weight: normal; + line-height: 14px; + color: #4c4c4c; + text-decoration: none; } + .oe_kanban_vignette .dropdown-menu li a:hover { + background: #f0f0fa; + background: -moz-linear-gradient(#f0f0fa, #eeeef6); + background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background: -webkit-linear-gradient(#f0f0fa, #eeeef6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + -box-shadow: none; } -div.oe_fold_column{ - padding:2px !important; -} \ No newline at end of file +.oe_kanban_vignette .dropdown-menu .color-chooser { + padding: 0 3px; } + .oe_kanban_vignette .dropdown-menu .color-chooser li { + float: left; } + .oe_kanban_vignette .dropdown-menu .color-chooser li a { + padding: 2px; } \ No newline at end of file diff --git a/addons/project/static/src/js/dropdown.js b/addons/project/static/src/js/dropdown.js new file mode 100644 index 00000000000..54b61c5e9d0 --- /dev/null +++ b/addons/project/static/src/js/dropdown.js @@ -0,0 +1,92 @@ +/* ============================================================ + * bootstrap-dropdown.js v2.0.2 + * http://twitter.github.com/bootstrap/javascript.html#dropdowns + * ============================================================ + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function( $ ){ + + "use strict" + + /* DROPDOWN CLASS DEFINITION + * ========================= */ + + var toggle = '[data-toggle="dropdown"]' + , Dropdown = function ( element ) { + var $el = $(element).on('click.dropdown.data-api', this.toggle) + $('html').on('click.dropdown.data-api', function () { + $el.parent().removeClass('open') + }) + } + + Dropdown.prototype = { + + constructor: Dropdown + + , toggle: function ( e ) { + var $this = $(this) + , selector = $this.attr('data-target') + , $parent + , isActive + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + $parent = $(selector) + $parent.length || ($parent = $this.parent()) + + isActive = $parent.hasClass('open') + + clearMenus() + !isActive && $parent.toggleClass('open') + + return false + } + + } + + function clearMenus() { + $(toggle).parent().removeClass('open') + } + + + /* DROPDOWN PLUGIN DEFINITION + * ========================== */ + + $.fn.dropdown = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('dropdown') + if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.dropdown.Constructor = Dropdown + + + /* APPLY TO STANDARD DROPDOWN ELEMENTS + * =================================== */ + + $(function () { + $('html').on('click.dropdown.data-api', clearMenus) + $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) + }) + +}( window.jQuery ); \ No newline at end of file -- cgit v1.2.3 From 777909e030b6bc43fb8d5df114e01a31885ec4a4 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Tue, 3 Apr 2012 16:06:58 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120403103658-mdkum0flrg2a40qf --- addons/project/static/src/css/project.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 70d220fd322..b87892c3951 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -22,6 +22,23 @@ margin: 4px; } .vignettes > li h4 { margin-bottom: 2px; } + +.oe_project_buttons { + display: inline-block; + padding: 0px 0px; + background-color: transparent; + border: hidden; + color: #8A89BA; + +} + +.avatar { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } .i { -- cgit v1.2.3 From f4bfc542029c46939a1501ce18664d1abdfef142 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Tue, 3 Apr 2012 18:38:52 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120403130852-w7809ri5tq805vay --- addons/project/static/src/css/project.css | 58 ++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 4 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index b87892c3951..334f07bd0fb 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -1,3 +1,21 @@ +.fields { + margin-top: 1px; + margin-bottom: 1px; + } +.fields td { + border: none; + padding: 2px 0 2px 8px; } +.fields th { + padding: 0; + border-right: 1px solid #dddddd; + vertical-align: top; + margin-right: 8px; } + +table { + padding: 0; + font-size: 13px; + border-collapse: collapse; } + .vignettes { margin: 4px; } .vignettes li { @@ -33,9 +51,9 @@ } .avatar { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } @@ -54,7 +72,6 @@ width: 0; height: 0; display: inline-block; - content: "&darr"; text-indent: -99999px; vertical-align: top; margin-top: 8px; @@ -67,6 +84,39 @@ -moz-opacity: 0.5; opacity: 0.5; } + .oe_kanban_vignette .dropdown-menu .color-chooser { + padding: 0 3px; } + .oe_kanban_vignette .dropdown-menu .color-chooser li { + float: left; } + .oe_kanban_vignette .dropdown-menu .color-chooser li a { + padding: 2px; } +a.oe_kanban_action { + position: absolute; + right: 0; + display: none; } + a.oe_kanban_action:hover { + text-decoration: none; } + a.oe_kanban_action .i { + color: #4c4c4c; } +.square { + display: inline-block; + width: 18px; + height: 18px; } + +.steelblue { + background: steelblue; } + +.firebrick { + background: firebrick; } + +.khaki { + background: khaki; } + +.thistle { + background: thistle; } + +.orange { + background: orange; } .open { display: block; background: #333333; } -- cgit v1.2.3 From a71f2b9f1425452b3abd161a34fb8551f2f43085 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Tue, 3 Apr 2012 18:51:18 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120403132118-9w2mjhq3fr5qdmp7 --- addons/project/static/src/css/project.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 334f07bd0fb..c11db8f718a 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -68,10 +68,14 @@ table { display: none; position: absolute; } +.dropdown { + position: relative; } + .dropdown-toggle:after { width: 0; height: 0; display: inline-block; + content: "&darr"; text-indent: -99999px; vertical-align: top; margin-top: 8px; @@ -84,6 +88,7 @@ table { -moz-opacity: 0.5; opacity: 0.5; } + .oe_kanban_vignette .dropdown-menu .color-chooser { padding: 0 3px; } .oe_kanban_vignette .dropdown-menu .color-chooser li { @@ -93,7 +98,7 @@ table { a.oe_kanban_action { position: absolute; right: 0; - display: none; } + } a.oe_kanban_action:hover { text-decoration: none; } a.oe_kanban_action .i { -- cgit v1.2.3 From fddbe738810ed4b80f2423f33c8d2e8a918e16c1 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Wed, 4 Apr 2012 11:12:04 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120404054204-vlkhhvrxp0ka15d7 --- addons/project/static/src/css/project.css | 68 +++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index c11db8f718a..2f6957f2c12 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -1,11 +1,11 @@ -.fields { +.project_fields { margin-top: 1px; margin-bottom: 1px; } -.fields td { +.project_fields td { border: none; padding: 2px 0 2px 8px; } -.fields th { +.project_fields th { padding: 0; border-right: 1px solid #dddddd; vertical-align: top; @@ -16,29 +16,29 @@ table { font-size: 13px; border-collapse: collapse; } -.vignettes { +.project_vignettes { margin: 4px; } - .vignettes li { + .project_vignettes li { float: left; } - .vignettes .avatar { + .project_vignettes .project_avatar { margin-right: 2px; width: 32px; height: 32px; } - .vignettes .fields { + .project_vignettes .project_fields { width: 100%; } - .vignettes .fields th { + .project_vignettes .project_fields th { font-weight: normal; } - .vignettes .fields td { + .project_vignettes .project_fields td { color: #888888; } - .vignettes h4 a { + .project_vignettes h4 a { color: #4c4c4c; } -.vignettes > li { +.project_vignettes > li { height: 160px; width: 250px; padding: 8px; margin: 4px; } - .vignettes > li h4 { + .project_vignettes > li h4 { margin-bottom: 2px; } .oe_project_buttons { @@ -50,7 +50,7 @@ table { } -.avatar { +.project_avatar { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -89,19 +89,19 @@ table { opacity: 0.5; } - .oe_kanban_vignette .dropdown-menu .color-chooser { + .oe_project_kanban_vignette .dropdown-menu .color-chooser { padding: 0 3px; } - .oe_kanban_vignette .dropdown-menu .color-chooser li { + .oe_project_kanban_vignette .dropdown-menu .color-chooser li { float: left; } - .oe_kanban_vignette .dropdown-menu .color-chooser li a { + .oe_project_kanban_vignette .dropdown-menu .color-chooser li a { padding: 2px; } -a.oe_kanban_action { +a.oe_project_kanban_action { position: absolute; right: 0; } - a.oe_kanban_action:hover { + a.oe_project_kanban_action:hover { text-decoration: none; } - a.oe_kanban_action .i { + a.oe_project_kanban_action .i { color: #4c4c4c; } .square { display: inline-block; @@ -129,18 +129,18 @@ a.oe_kanban_action { display: block; } -a.oe_kanban_action { +a.oe_project_kanban_action { position: absolute; right: 0; } - a.oe_kanban_action:hover { + a.oe_project_kanban_action:hover { text-decoration: none; } - a.oe_kanban_action .i { + a.oe_project_kanban_action .i { color: #4c4c4c; } -.oe_kanban_vignette { +.oe_project_kanban_vignette { position: relative; display: block; min-height: 50px; @@ -153,17 +153,17 @@ a.oe_kanban_action { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; } - .oe_kanban_vignette:last-child { + .oe_project_kanban_vignette:last-child { margin-bottom: 0; } - .oe_kanban_vignette:hover { + .oe_project_kanban_vignette:hover { -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); } - .oe_kanban_vignette h4 { + .oe_project_kanban_vignette h4 { margin: 0 0 2px; } -.oe_kanban_vignette .dropdown-menu { +.oe_project_kanban_vignette .dropdown-menu { top: 30px; right: -140px; padding: 4px; @@ -178,13 +178,13 @@ a.oe_kanban_action { -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); } - .oe_kanban_vignette .dropdown-menu p { + .oe_project_kanban_vignette .dropdown-menu p { margin-left: 12px; } - .oe_kanban_vignette .dropdown-menu li { + .oe_project_kanban_vignette .dropdown-menu li { float: none; display: block; background-color: none; } - .oe_kanban_vignette .dropdown-menu li a { + .oe_project_kanban_vignette .dropdown-menu li a { display: block; padding: 3px 6px; clear: both; @@ -192,7 +192,7 @@ a.oe_kanban_action { line-height: 14px; color: #4c4c4c; text-decoration: none; } - .oe_kanban_vignette .dropdown-menu li a:hover { + .oe_project_kanban_vignette .dropdown-menu li a:hover { background: #f0f0fa; background: -moz-linear-gradient(#f0f0fa, #eeeef6); background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); @@ -201,9 +201,9 @@ a.oe_kanban_action { -webkit-box-shadow: none; -box-shadow: none; } -.oe_kanban_vignette .dropdown-menu .color-chooser { +.oe_project_kanban_vignette .dropdown-menu .color-chooser { padding: 0 3px; } - .oe_kanban_vignette .dropdown-menu .color-chooser li { + .oe_project_kanban_vignette .dropdown-menu .color-chooser li { float: left; } - .oe_kanban_vignette .dropdown-menu .color-chooser li a { + .oe_project_kanban_vignette .dropdown-menu .color-chooser li a { padding: 2px; } \ No newline at end of file -- cgit v1.2.3 From f898722cc219b8c8991747f85ca97317aaf4b24a Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 11:12:35 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404054235-3cqyxav0b6l5blxb --- addons/project/static/src/css/project.css | 10 ++ .../static/src/font/mnmliconsv21-webfont.eot | Bin 0 -> 24173 bytes .../static/src/font/mnmliconsv21-webfont.svg | 149 +++++++++++++++++++++ .../static/src/font/mnmliconsv21-webfont.ttf | Bin 0 -> 39912 bytes .../static/src/font/mnmliconsv21-webfont.woff | Bin 0 -> 26348 bytes 5 files changed, 159 insertions(+) create mode 100755 addons/project/static/src/font/mnmliconsv21-webfont.eot create mode 100755 addons/project/static/src/font/mnmliconsv21-webfont.svg create mode 100755 addons/project/static/src/font/mnmliconsv21-webfont.ttf create mode 100755 addons/project/static/src/font/mnmliconsv21-webfont.woff (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index c11db8f718a..4b715428c2c 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -1,3 +1,13 @@ +@font-face { + font-family: "mnmliconsRegular"; + src: url("../font/mnmliconsv21-webfont.eot") format("eot"); + src: url("../font/mnmliconsv21-webfont.woff") format("woff"); + src: url("../font/mnmliconsv21-webfont.ttf") format("truetype"); + src: url("../font/mnmliconsv21-webfont.svg") format("svg") active; + font-weight: normal; + font-style: normal; } + + .fields { margin-top: 1px; margin-bottom: 1px; diff --git a/addons/project/static/src/font/mnmliconsv21-webfont.eot b/addons/project/static/src/font/mnmliconsv21-webfont.eot new file mode 100755 index 00000000000..433ebb82e4b Binary files /dev/null and b/addons/project/static/src/font/mnmliconsv21-webfont.eot differ diff --git a/addons/project/static/src/font/mnmliconsv21-webfont.svg b/addons/project/static/src/font/mnmliconsv21-webfont.svg new file mode 100755 index 00000000000..34b20ff992f --- /dev/null +++ b/addons/project/static/src/font/mnmliconsv21-webfont.svg @@ -0,0 +1,149 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : MIT License +Designer : Carlos Elas +Foundry : Carlos Elias +Foundry URL : httpcarloseliascl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/project/static/src/font/mnmliconsv21-webfont.ttf b/addons/project/static/src/font/mnmliconsv21-webfont.ttf new file mode 100755 index 00000000000..c38e59cf138 Binary files /dev/null and b/addons/project/static/src/font/mnmliconsv21-webfont.ttf differ diff --git a/addons/project/static/src/font/mnmliconsv21-webfont.woff b/addons/project/static/src/font/mnmliconsv21-webfont.woff new file mode 100755 index 00000000000..3ddf14fb814 Binary files /dev/null and b/addons/project/static/src/font/mnmliconsv21-webfont.woff differ -- cgit v1.2.3 From 43b46a1623afa8d17601e0bd7965048e16db1f0f Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 11:39:33 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404060933-ejaapcvswhrisoou --- addons/project/static/src/css/project.css | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index ff99ed53207..4d695424e45 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -8,7 +8,7 @@ font-style: normal; } .project_fields { - margin-top: 1px; + margin-top: 10px; margin-bottom: 1px; } .project_fields td { @@ -30,9 +30,9 @@ table { .project_vignettes li { float: left; } .project_vignettes .project_avatar { - margin-right: 2px; - width: 32px; - height: 32px; } + margin-top: 20px; + width: 30px; + height: 30px; } .project_vignettes .project_fields { width: 100%; } .project_vignettes .project_fields th { @@ -59,6 +59,10 @@ table { } +.oe_project_buttons:hover { + cursor: pointer; +} + .project_avatar { -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -215,4 +219,4 @@ a.oe_project_kanban_action { .oe_project_kanban_vignette .dropdown-menu .color-chooser li { float: left; } .oe_project_kanban_vignette .dropdown-menu .color-chooser li a { - padding: 2px; } \ No newline at end of file + padding: 2px; } -- cgit v1.2.3 From 0d201ad04be4e54e3bd3e037281cae5d63ee33f6 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 12:00:11 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404063011-0dduyosdzckpzt39 --- addons/project/static/src/css/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 4d695424e45..7e67f12b594 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -30,7 +30,7 @@ table { .project_vignettes li { float: left; } .project_vignettes .project_avatar { - margin-top: 20px; + /*margin-top: 20px;*/ width: 30px; height: 30px; } .project_vignettes .project_fields { -- cgit v1.2.3 From 5e8bf6b506a807356a6bbd17ccc6a14c02297dc6 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 12:22:08 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404065208-iab1fi19ceo0l4mc --- addons/project/static/src/css/project.css | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 7e67f12b594..60548cb578d 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -30,7 +30,10 @@ table { .project_vignettes li { float: left; } .project_vignettes .project_avatar { - /*margin-top: 20px;*/ + width: 30px; + height: 30px; } + .project_vignettes .project_avatar1 { + padding-top: 4px; width: 30px; height: 30px; } .project_vignettes .project_fields { @@ -64,14 +67,20 @@ table { } .project_avatar { - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } - +.project_avatar1 { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } .i { font-family: "mnmliconsRegular" !important; font-size: 21px; -- cgit v1.2.3 From a26daf0d129855bdf332c3602afc5b4afa21020f Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 12:37:21 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404070721-vwv7bn696x73s3ci --- addons/project/static/src/css/project.css | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 60548cb578d..b17094902ca 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -8,8 +8,9 @@ font-style: normal; } .project_fields { - margin-top: 10px; + margin-top: 1px; margin-bottom: 1px; + font-size: 11px; } .project_fields td { border: none; @@ -30,12 +31,8 @@ table { .project_vignettes li { float: left; } .project_vignettes .project_avatar { - width: 30px; - height: 30px; } - .project_vignettes .project_avatar1 { - padding-top: 4px; - width: 30px; - height: 30px; } + width: 28px; + height: 28px; } .project_vignettes .project_fields { width: 100%; } .project_vignettes .project_fields th { @@ -56,6 +53,7 @@ table { .oe_project_buttons { display: inline-block; padding: 0px 0px; + font-size: 13px; background-color: transparent; border: hidden; color: #8A89BA; @@ -74,13 +72,6 @@ table { -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.project_avatar1 { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } .i { font-family: "mnmliconsRegular" !important; font-size: 21px; -- cgit v1.2.3 From 5c5edd965f7db39e8657cde66a5d3393cda2c829 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 4 Apr 2012 14:11:44 +0530 Subject: [IMP]kannban view extends bzr revid: kbh@tinyerp.com-20120404084144-1t9fs970zbztpv7p --- addons/project/static/src/js/project.js | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 addons/project/static/src/js/project.js (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js new file mode 100644 index 00000000000..ba9372ba937 --- /dev/null +++ b/addons/project/static/src/js/project.js @@ -0,0 +1,11 @@ +openerp.project = function(openerp) { + openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ + bind_events: function() { + self = this + self._super() + if(this.view.dataset.model == 'project.project') { + console.log("this"); + } + } + }); +} -- cgit v1.2.3 From 7a42d939a34a5252cbe0e94ecc82ba03524ad111 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 4 Apr 2012 14:25:52 +0530 Subject: [IMP]dropdown menu bzr revid: kbh@tinyerp.com-20120404085552-5ykkcivzdpowarnn --- addons/project/static/src/js/project.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index ba9372ba937..ae1ecbaaa91 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -4,7 +4,14 @@ openerp.project = function(openerp) { self = this self._super() if(this.view.dataset.model == 'project.project') { - console.log("this"); + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); + }); + $('.oe_project_kanban_action').click(function(){ + $('.dropdown-toggle').dropdown(); + }) } } }); -- cgit v1.2.3 From 4aa31f8f13cc84fa59dab9184f4619a362c87f31 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 15:02:54 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404093254-uuxban3da1sugg1w --- addons/project/static/src/css/project.css | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index b17094902ca..2fd4e2bd369 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -111,6 +111,7 @@ table { a.oe_project_kanban_action { position: absolute; right: 0; + display: none; } a.oe_project_kanban_action:hover { text-decoration: none; } -- cgit v1.2.3 From 419b4cb926cbc6b35bb5bb6ec568d5460e386bb1 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 15:05:39 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404093539-6zvauic4qy4v11l6 --- addons/project/static/src/js/project.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index ae1ecbaaa91..1a5f3088a9a 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -9,6 +9,7 @@ openerp.project = function(openerp) { }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); + $('.dropdown-toggle').dropdown(); $('.oe_project_kanban_action').click(function(){ $('.dropdown-toggle').dropdown(); }) -- cgit v1.2.3 From a8f8ad68229b3ca0d8badac922f637dc3b3294e0 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 15:06:20 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404093620-pspxexidgf2jy21d --- addons/project/static/src/js/project.js | 3 --- 1 file changed, 3 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 1a5f3088a9a..8ce27661788 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -10,9 +10,6 @@ openerp.project = function(openerp) { return $(this).find('.oe_project_kanban_action').hide(); }); $('.dropdown-toggle').dropdown(); - $('.oe_project_kanban_action').click(function(){ - $('.dropdown-toggle').dropdown(); - }) } } }); -- cgit v1.2.3 From 9cee7d8b8e3fcc63a7d86df535173bc2b868bb35 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 17:54:35 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404122435-321j5dapi882s830 --- addons/project/static/src/js/project.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 8ce27661788..eb69002d28e 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,16 +1,14 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { - self = this - self._super() - if(this.view.dataset.model == 'project.project') { - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - $('.dropdown-toggle').dropdown(); - } + self = this; + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); + }); + $('.dropdown-toggle').dropdown(); + self._super(); } }); } -- cgit v1.2.3 From 9c0f7a28360b04c831583c7279d4853bc36c4982 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 18:01:05 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404123105-oe7jqrs7ym2uy2r7 --- addons/project/static/src/js/project.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index eb69002d28e..e23e873a05f 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -2,12 +2,14 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { self = this; - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - $('.dropdown-toggle').dropdown(); + if(this.view.dataset.model == 'project.project') { + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); + }); + $('.dropdown-toggle').dropdown(); + } self._super(); } }); -- cgit v1.2.3 From d81e6c2c531f26b364f5057607bbc8a49e3b9601 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 18:43:30 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404131330-w2kzw1tz2gdh407b --- addons/project/static/src/js/project.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index e23e873a05f..1a444441016 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,16 +1,13 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { - self = this; - if(this.view.dataset.model == 'project.project') { - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - $('.dropdown-toggle').dropdown(); - } - self._super(); + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); + }); + $('.dropdown-toggle').dropdown(); + this._super(); } }); } -- cgit v1.2.3 From 47811aeb883d679572981775e53fc92600283775 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 18:46:39 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120404131639-cmaibsfn7wj2kkx5 --- addons/project/static/src/js/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 1a444441016..ea30b556f46 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,12 +1,12 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { + $('.dropdown-toggle').dropdown(); $('.oe_project_kanban_vignette').mouseover(function() { return $(this).find('.oe_project_kanban_action').show(); }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - $('.dropdown-toggle').dropdown(); this._super(); } }); -- cgit v1.2.3 From 161633386248bfeab3c09dd97061564fc9f22688 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 5 Apr 2012 13:01:08 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120405073108-yhlqao1nrm3casck --- addons/project/static/src/js/project.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index ea30b556f46..6fcb9586222 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,13 +1,24 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { + self = this; + self._super(); $('.dropdown-toggle').dropdown(); $('.oe_project_kanban_vignette').mouseover(function() { return $(this).find('.oe_project_kanban_action').show(); }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - this._super(); + _.each($('.oe_project_kanban_vignette'),function(record){ + _.each(record.getElementsByTagName('img'),function(img){ + var domain = [['id','=',img.getAttribute("id")]]; + var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, domain); + dataset.read_slice([]).then(function(result){ + img.setAttribute("title",result[0].name) + }); + }); + + }); } }); } -- cgit v1.2.3 From d3c4b80fb86b43c8e9aed022548e6241a092204f Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Thu, 5 Apr 2012 15:12:53 +0530 Subject: [IMP]click on kanban opens tasks bzr revid: sgo@tinyerp.com-20120405094253-f0fzyua28m5opuoy --- addons/project/static/src/css/project.css | 11 +++++++++++ addons/project/static/src/js/project.js | 3 +++ 2 files changed, 14 insertions(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 2fd4e2bd369..9cf5de3bf03 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -76,6 +76,17 @@ table { font-family: "mnmliconsRegular" !important; font-size: 21px; font-weight: 300 !important; } + +.test { + display: inline-block; + background-color: transparent; + min-height: 120px; + min-width: 250px; + border: hidden; + text-align: left; + color: #8A89BA; + +} .dropdown-menu { display: none; diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 6fcb9586222..d2c577067dd 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -9,6 +9,9 @@ openerp.project = function(openerp) { }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); + $('.test').click(function(){ + $('#open_tasks').click() + }); _.each($('.oe_project_kanban_vignette'),function(record){ _.each(record.getElementsByTagName('img'),function(img){ var domain = [['id','=',img.getAttribute("id")]]; -- cgit v1.2.3 From ce822419f418e86a8f38ddf5109cc78a4eef78fe Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Thu, 5 Apr 2012 16:14:05 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120405104405-vwymux3s0pxepe86 --- addons/project/static/src/js/project.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 022b2b78ae9..c08a96ff92c 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -9,6 +9,8 @@ openerp.project = function(openerp) { }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); + if(self.record.task.raw_value)$('.click_button').attr('data-name','open_tasks'); + _.each($('.oe_project_kanban_vignette'),function(record){ _.each(record.getElementsByTagName('img'),function(img){ var domain = [['id','=',img.getAttribute("id")]]; @@ -19,7 +21,7 @@ openerp.project = function(openerp) { }); }); - $('.click_button').attr('data-name','open_tasks'); + } }); } -- cgit v1.2.3 From c8d952e725a36c897d8ca3a94aa1d66f3c380517 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 5 Apr 2012 16:34:26 +0530 Subject: [MERGE] bzr revid: apa@tinyerp.com-20120405110426-sq3inlu6p7wx5m4a --- addons/project/static/src/js/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index c08a96ff92c..48fbb6103c3 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -9,7 +9,7 @@ openerp.project = function(openerp) { }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - if(self.record.task.raw_value)$('.click_button').attr('data-name','open_tasks'); + $('.click_button').attr('data-name','open_tasks'); _.each($('.oe_project_kanban_vignette'),function(record){ _.each(record.getElementsByTagName('img'),function(img){ -- cgit v1.2.3 From 8e72fa6718f04f9e72408cc35893578438131448 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 5 Apr 2012 17:48:26 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120405121826-7frj7ojs918hrufk --- addons/project/static/src/css/project.css | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index aed628dfc9e..250b289ee5c 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -62,6 +62,7 @@ table { .oe_project_buttons:hover { cursor: pointer; + color: #0000FF; } .project_avatar { -- cgit v1.2.3 From 3c918d2b94010843ed56f9d5b21fbaccf8b18165 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 5 Apr 2012 18:47:01 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120405131701-0hy1wxy7ij8940v9 --- addons/project/static/src/css/project.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 250b289ee5c..9ceb35b33d8 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -43,7 +43,7 @@ table { color: #4c4c4c; } .project_vignettes > li { - height: 170px; + height: 175px; width: 250px; padding: 8px; margin: 4px; } @@ -81,8 +81,8 @@ table { .click_button { display: inline-block; background-color: transparent; - min-height: 140px; - min-width: 265px; + min-height: 145px; + min-width: 260px; border: hidden; margin-left: -6px !important; margin-top: -3px !important; -- cgit v1.2.3 From fb994730974ca1e0ac17864387ed9bad52281f51 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 6 Apr 2012 12:50:40 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120406072040-kzcd9fql1if5vyz9 --- addons/project/static/src/js/project.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 48fbb6103c3..74f0fae3fc9 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -2,26 +2,20 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { self = this; - self._super(); $('.dropdown-toggle').dropdown(); $('.oe_project_kanban_vignette').mouseover(function() { return $(this).find('.oe_project_kanban_action').show(); }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - $('.click_button').attr('data-name','open_tasks'); - - _.each($('.oe_project_kanban_vignette'),function(record){ - _.each(record.getElementsByTagName('img'),function(img){ - var domain = [['id','=',img.getAttribute("id")]]; - var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, domain); - dataset.read_slice([]).then(function(result){ - img.setAttribute("title",result[0].name) - }); + $('.project_avatar').mouseover(function() { + avatar = this + var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.getAttribute("id")]]); + dataset.read_slice([]).then(function(result){ + avatar.setAttribute("title",result[0].name) }); - }); - + self._super(); } }); } -- cgit v1.2.3 From e6f47e03ea42df2d636cb52459cb8f0bd9318b21 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Fri, 6 Apr 2012 13:54:58 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120406082458-zd2qrvy3i9yd071o --- addons/project/static/src/js/project.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 48fbb6103c3..2a61f89cce4 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -9,7 +9,22 @@ openerp.project = function(openerp) { }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - $('.click_button').attr('data-name','open_tasks'); + + + $('.click_button').mouseover(function() { + click_button = this + var domain = [['id','=',this.getAttribute("id")]]; + var dataset = new openerp.web.DataSetSearch(self, 'project.project', self.session.context, domain); + dataset.read_slice([]).then(function(result){ + if(result[0].task){ + click_button.setAttribute('data-name','open_tasks'); + } + else + { + click_button.setAttribute('data-name','dummy'); + } + }); + }); _.each($('.oe_project_kanban_vignette'),function(record){ _.each(record.getElementsByTagName('img'),function(img){ -- cgit v1.2.3 From 715dcf10b7d6902d5c8da3e549b1c2a34d909678 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 6 Apr 2012 16:35:47 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120406110547-8y1s1vx1v7j04p78 --- addons/project/static/src/js/project.js | 55 ++++++++++++++------------------- 1 file changed, 24 insertions(+), 31 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index a688d69de6d..0cd0ae7f4b5 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -2,38 +2,31 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { self = this; - self._super(); - $('.dropdown-toggle').dropdown(); - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - - - $('.click_button').mouseover(function() { - click_button = this - var domain = [['id','=',this.getAttribute("id")]]; - var dataset = new openerp.web.DataSetSearch(self, 'project.project', self.session.context, domain); - dataset.read_slice([]).then(function(result){ - if(result[0].task){ - click_button.setAttribute('data-name','open_tasks'); - } - else - { - click_button.setAttribute('data-name','dummy'); - } - }); - }); - - $('.project_avatar').mouseover(function() { - avatar = this - var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.getAttribute("id")]]); - dataset.read_slice([]).then(function(result){ - avatar.setAttribute("title",result[0].name) + if(this.view.dataset.model == 'project.project') { + //open dropdwon when click on the icon. + $('.dropdown-toggle').dropdown(); + + //show and hide the dropdown icon when mouseover and mouseour. + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); }); - }); - + + //set avatar title for members. + _.each($(this.$element).find('.project_avatar'),function(avatar){ + console.log(avatar.id) + var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]); + dataset.read_slice([]).then(function(result){ + avatar.setAttribute("title",result[0].name) + }); + }); + + //if task is true , then open the task when clickd on the anywhere in the box. + if(this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); + if(!this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); + }; + self._super(); } }); } -- cgit v1.2.3 From 2fc51533ad4278da75c666b00be874860ea5a314 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 6 Apr 2012 16:38:05 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120406110805-dn421xsf2kja73ye --- addons/project/static/src/js/project.js | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 0cd0ae7f4b5..38fc90893b5 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -15,7 +15,6 @@ openerp.project = function(openerp) { //set avatar title for members. _.each($(this.$element).find('.project_avatar'),function(avatar){ - console.log(avatar.id) var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]); dataset.read_slice([]).then(function(result){ avatar.setAttribute("title",result[0].name) -- cgit v1.2.3 From b4bbbaf737391459ecccf2247fe83466a8f22b1d Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 6 Apr 2012 17:01:36 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120406113136-29azyqnkdb9ifhys --- addons/project/static/src/css/project.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 9ceb35b33d8..88afefdd9a3 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -82,11 +82,12 @@ table { display: inline-block; background-color: transparent; min-height: 145px; - min-width: 260px; + min-width: 265px; border: hidden; margin-left: -6px !important; margin-top: -3px !important; text-align: left; + vertical-align: super; font-size: 11px; } -- cgit v1.2.3 From 36a433ddcd0371d2aa4a318d7ed5006558050060 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Fri, 6 Apr 2012 17:53:07 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120406122307-iqdyfnqsyljy17rs --- addons/project/static/src/js/project.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 38fc90893b5..5096817f8a6 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -16,12 +16,12 @@ openerp.project = function(openerp) { //set avatar title for members. _.each($(this.$element).find('.project_avatar'),function(avatar){ var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]); - dataset.read_slice([]).then(function(result){ - avatar.setAttribute("title",result[0].name) + dataset.read_slice([]).then(function(result){ + avatar.setAttribute("title",result[0].name) }); }); - //if task is true , then open the task when clickd on the anywhere in the box. + //if task is true , then open the task when click on the anywhere in the box. if(this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); if(!this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); }; -- cgit v1.2.3 From 89194da727ebb8cc3d9a0f7d7aeca7741338fd9a Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 9 Apr 2012 15:01:32 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120409093132-lxrojybxcy3u4bb1 --- addons/project/static/src/js/project.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 5096817f8a6..abe2b1c8da1 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -24,6 +24,18 @@ openerp.project = function(openerp) { //if task is true , then open the task when click on the anywhere in the box. if(this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); if(!this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); + + // set sequence like Tasks,Issues,Timesheets and Phases + my_list = $("#list a") + my_list.sort(function (a, b) { + var aValue = parseInt(a.id); + var bValue = parseInt(b.id); + // ASC + //return aValue == bValue ? 0 : aValue < bValue ? -1 : 1; + // DESC + return aValue == bValue ? 0 : aValue < bValue ? -1 : 1; + }); + $('#list').replaceWith(my_list); }; self._super(); } -- cgit v1.2.3 From 5cb201f5eb634d976dc353f2ece2f518f1c5a599 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 9 Apr 2012 16:28:30 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120409105830-9xg6ikpqshravpdf --- addons/project/static/src/css/project.css | 12 ++++++++---- addons/project/static/src/js/project.js | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 88afefdd9a3..6f4153659d8 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -136,6 +136,11 @@ a.oe_project_kanban_action { width: 18px; height: 18px; } +.oe_kanban_color_2 { + background: steelblue; +} + + .steelblue { background: steelblue; } @@ -152,7 +157,7 @@ a.oe_project_kanban_action { background: orange; } .open { display: block; - background: #333333; } + } .open .dropdown-menu { display: block; } @@ -170,14 +175,13 @@ a.oe_project_kanban_action { .oe_project_kanban_vignette { position: relative; - display: block; min-height: 50px; - background: white; + /*background: white;*/ border: 1px solid #d8d8d8; border-bottom-color: #b9b9b9; padding: 6px; margin: 6px 0; - display: block; + display: inline-block; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; } diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index abe2b1c8da1..be44580f7a5 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,5 +1,6 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ + bind_events: function() { self = this; if(this.view.dataset.model == 'project.project') { @@ -36,6 +37,19 @@ openerp.project = function(openerp) { return aValue == bValue ? 0 : aValue < bValue ? -1 : 1; }); $('#list').replaceWith(my_list); + + + $('.steelblue').click(function(){ + //$(this).closest('.oe_project_kanban_vignette').css('background-color', 'steelblue'); + $action = $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); + //var data = {}; + //data[$action.data('name')] = $(this).data('color'); + //self.view.dataset.write(2, {'color':2}, {}, function() { + // //self.record[$action.data('name')] = $(this).data('color'); + // self.do_reload(); + //}); + + }); }; self._super(); } -- cgit v1.2.3 From 038bb177a6a1c12fa085e3c8b6e9e75a925b84a4 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 9 Apr 2012 18:47:03 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120409131703-dn3hpa5x5yj4prlo --- addons/project/static/src/css/project.css | 14 +++++++++++++- addons/project/static/src/js/project.js | 22 +++++++++++++--------- 2 files changed, 26 insertions(+), 10 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 6f4153659d8..46e2aa5a99b 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -136,9 +136,21 @@ a.oe_project_kanban_action { width: 18px; height: 18px; } -.oe_kanban_color_2 { +.oe_kanban_color_1 { background: steelblue; } +.oe_kanban_color_2 { + background: firebrick; +} +.oe_kanban_color_3 { + background: khaki; +} +.oe_kanban_color_4 { + background: thistle; +} +.oe_kanban_color_5 { + background: orange; +} .steelblue { diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index be44580f7a5..f80e3b6d91c 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -40,15 +40,19 @@ openerp.project = function(openerp) { $('.steelblue').click(function(){ - //$(this).closest('.oe_project_kanban_vignette').css('background-color', 'steelblue'); - $action = $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); - //var data = {}; - //data[$action.data('name')] = $(this).data('color'); - //self.view.dataset.write(2, {'color':2}, {}, function() { - // //self.record[$action.data('name')] = $(this).data('color'); - // self.do_reload(); - //}); - + $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(1)); + }); + $('.firebrick').click(function(){ + $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); + }); + $('.khaki').click(function(){ + $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(3)); + }); + $('.thistle').click(function(){ + $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(4)); + }); + $('.orange').click(function(){ + $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(5)); }); }; self._super(); -- cgit v1.2.3 From 65da7c41376bfcaa49212eb1fe8f51df5c80610d Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Tue, 10 Apr 2012 10:21:29 +0530 Subject: [IMP] bzr revid: sgo@tinyerp.com-20120410045129-2qqzn0loooa85db0 --- addons/project/static/src/css/project.css | 2 +- addons/project/static/src/js/project.js | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 6f4153659d8..e5c8aa3b6a1 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -142,7 +142,7 @@ a.oe_project_kanban_action { .steelblue { - background: steelblue; } + background: #4682B4; } .firebrick { background: firebrick; } diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index be44580f7a5..bc9643c8efe 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -38,16 +38,14 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); - - $('.steelblue').click(function(){ + console.log("curreeeeeeenttttttttttt",this.$element.find('.steelblue')) + $('#'+ self.id).click(function(){ + console.log("curreeeehsfkiash") //$(this).closest('.oe_project_kanban_vignette').css('background-color', 'steelblue'); $action = $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); //var data = {}; //data[$action.data('name')] = $(this).data('color'); - //self.view.dataset.write(2, {'color':2}, {}, function() { - // //self.record[$action.data('name')] = $(this).data('color'); - // self.do_reload(); - //}); + self.view.dataset.write(self.id, {color:2},self.do_reload()); }); }; -- cgit v1.2.3 From 389c2f9804332655da5ee8814c4fac5eb0979e09 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 12:05:43 +0530 Subject: [IMP]:set bgcolor bzr revid: apa@tinyerp.com-20120410063543-kmw7fkbht8d7s3qe --- addons/project/static/src/js/project.js | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index f80e3b6d91c..9c2f546423e 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -38,22 +38,38 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); + console.log(this.$element.find('.steelblue')) - $('.steelblue').click(function(){ + this.$element.find('.bgcolor_steelblue').click(function(){ + console.log(this) $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(1)); + self.view.dataset.write(parseInt(this.id), {color:1},self.do_reload()); }); - $('.firebrick').click(function(){ + + this.$element.find('.bgcolor_firebrick').click(function(){ + console.log(this) $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); + self.view.dataset.write(parseInt(this.id), {color:2},self.do_reload()); }); - $('.khaki').click(function(){ + + this.$element.find('.bgcolor_khaki').click(function(){ + console.log(this) $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(3)); + self.view.dataset.write(parseInt(this.id), {color:3},self.do_reload()); }); - $('.thistle').click(function(){ + + this.$element.find('.bgcolor_thistle').click(function(){ + console.log(this) $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(4)); + self.view.dataset.write(parseInt(this.id), {color:4},self.do_reload()); }); - $('.orange').click(function(){ + + this.$element.find('.bgcolor_orange').click(function(){ + console.log(this) $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(5)); + self.view.dataset.write(parseInt(this.id), {color:5},self.do_reload()); }); + }; self._super(); } -- cgit v1.2.3 From 4916d46cf9f1935393c693f568709fb9fe3c7f78 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 15:03:17 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120410093317-yufo0pu7grib5ksw --- addons/project/static/src/js/project.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 9c2f546423e..219838e08c6 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -38,36 +38,34 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); - console.log(this.$element.find('.steelblue')) this.$element.find('.bgcolor_steelblue').click(function(){ - console.log(this) - $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(1)); + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:1},self.do_reload()); }); this.$element.find('.bgcolor_firebrick').click(function(){ - console.log(this) - $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:2},self.do_reload()); + }); this.$element.find('.bgcolor_khaki').click(function(){ - console.log(this) - $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(3)); + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:3},self.do_reload()); + }); this.$element.find('.bgcolor_thistle').click(function(){ - console.log(this) - $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(4)); + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:4},self.do_reload()); + }); this.$element.find('.bgcolor_orange').click(function(){ - console.log(this) - $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(5)); + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:5},self.do_reload()); + }); }; -- cgit v1.2.3 From 86f4ac5277f7bb37b5240d776aa71a157f2841af Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 15:24:43 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120410095443-oeugi1oblh3ugnhx --- addons/project/static/src/css/project.css | 4 ++-- addons/project/static/src/js/project.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 46e2aa5a99b..792e8921c19 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -43,7 +43,7 @@ table { color: #4c4c4c; } .project_vignettes > li { - height: 175px; + height: 165px; width: 250px; padding: 8px; margin: 4px; } @@ -81,7 +81,7 @@ table { .click_button { display: inline-block; background-color: transparent; - min-height: 145px; + min-height: 140px; min-width: 265px; border: hidden; margin-left: -6px !important; diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 219838e08c6..fd86dc7d566 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -38,7 +38,7 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); - + // set background color this.$element.find('.bgcolor_steelblue').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:1},self.do_reload()); -- cgit v1.2.3 From 2279fc7d1f1b99c7fe948aba10689425b83de4a2 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 15:50:15 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120410102015-5c35tsmwkcjfaziw --- addons/project/static/src/css/project.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 792e8921c19..6f437cce70c 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -43,7 +43,7 @@ table { color: #4c4c4c; } .project_vignettes > li { - height: 165px; + height: 170px; width: 250px; padding: 8px; margin: 4px; } @@ -81,7 +81,7 @@ table { .click_button { display: inline-block; background-color: transparent; - min-height: 140px; + min-height: 145px; min-width: 265px; border: hidden; margin-left: -6px !important; -- cgit v1.2.3 From 6cb72a66da942566ed1b10d8743c20c6ed746afe Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 15:52:22 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120410102222-ex1cik0yu11tq2l4 --- addons/project/static/src/js/project.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index fd86dc7d566..5ed8247ff23 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -41,30 +41,30 @@ openerp.project = function(openerp) { // set background color this.$element.find('.bgcolor_steelblue').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:1},self.do_reload()); + self.view.dataset.write(parseInt(this.id), {color:1}); }); this.$element.find('.bgcolor_firebrick').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:2},self.do_reload()); + self.view.dataset.write(parseInt(this.id), {color:2}); }); this.$element.find('.bgcolor_khaki').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:3},self.do_reload()); + self.view.dataset.write(parseInt(this.id), {color:3}); }); this.$element.find('.bgcolor_thistle').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:4},self.do_reload()); + self.view.dataset.write(parseInt(this.id), {color:4}); }); this.$element.find('.bgcolor_orange').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:5},self.do_reload()); + self.view.dataset.write(parseInt(this.id), {color:5}); }); -- cgit v1.2.3 From 7e3496f9c1d315762de4b620afde1258d1a3eab6 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 16:05:57 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120410103557-zrktokx6c0bzw3wy --- addons/project/static/src/js/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 5ed8247ff23..e4a5f817180 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -17,7 +17,7 @@ openerp.project = function(openerp) { //set avatar title for members. _.each($(this.$element).find('.project_avatar'),function(avatar){ var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]); - dataset.read_slice([]).then(function(result){ + dataset.read_slice(['name']).then(function(result){ avatar.setAttribute("title",result[0].name) }); }); -- cgit v1.2.3 From af9a103d1ffcac0e0e744ac1238bb5c2c34ae2fc Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 10 Apr 2012 16:57:06 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120410112706-l59vip42hgnrwlmz --- addons/project/static/src/css/project.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 6f437cce70c..8ca54e020d4 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -43,7 +43,7 @@ table { color: #4c4c4c; } .project_vignettes > li { - height: 170px; + height: 180px; width: 250px; padding: 8px; margin: 4px; } @@ -81,7 +81,7 @@ table { .click_button { display: inline-block; background-color: transparent; - min-height: 145px; + min-height: 155px; min-width: 265px; border: hidden; margin-left: -6px !important; -- cgit v1.2.3 From 3e549b2ca0ab95181658144ac71c2b5e36e930fb Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 11 Apr 2012 06:17:04 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120411004704-8leye7slxiky2cc2 --- addons/project/static/src/css/project.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 8ca54e020d4..1a95b9287d6 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -43,7 +43,7 @@ table { color: #4c4c4c; } .project_vignettes > li { - height: 180px; + height: 205px; width: 250px; padding: 8px; margin: 4px; } @@ -81,7 +81,7 @@ table { .click_button { display: inline-block; background-color: transparent; - min-height: 155px; + min-height: 175px; min-width: 265px; border: hidden; margin-left: -6px !important; -- cgit v1.2.3 From 59e07ee6f05dde3e1916b4a9f195ab29dc7a0781 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Wed, 11 Apr 2012 11:13:56 +0530 Subject: [IMP]add white color background bzr revid: sgo@tinyerp.com-20120411054356-9bfsxnvb4zkfcphm --- addons/project/static/src/css/project.css | 11 ++++++++--- addons/project/static/src/js/project.js | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 106dbc05df3..b7b6e6f840c 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -134,7 +134,9 @@ a.oe_project_kanban_action { .square { display: inline-block; width: 18px; - height: 18px; } + height: 18px; + border:1px solid grey; + } .oe_kanban_color_1 { background: steelblue; @@ -152,9 +154,11 @@ a.oe_project_kanban_action { background: orange; } - +.white { + background: white; } + .steelblue { - background: #4682B4; } + background: steelblue; } .firebrick { background: firebrick; } @@ -167,6 +171,7 @@ a.oe_project_kanban_action { .orange { background: orange; } + .open { display: block; } diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index e4a5f817180..567c381cc27 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -39,6 +39,11 @@ openerp.project = function(openerp) { $('#list').replaceWith(my_list); // set background color + this.$element.find('.bgcolor_white').click(function(){ + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(0) + ' oe_project_kanban_vignette'); + self.view.dataset.write(parseInt(this.id), {color:0}); + }); + this.$element.find('.bgcolor_steelblue').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:1}); @@ -65,7 +70,6 @@ openerp.project = function(openerp) { this.$element.find('.bgcolor_orange').click(function(){ $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:5}); - }); }; -- cgit v1.2.3 From b38ba6637b6832fdd68850591676aefbd39a62b5 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 11 Apr 2012 15:06:52 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120411093652-32fldjnoophainuw --- addons/project/static/src/css/project.css | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 5a5ec38b274..24444df4413 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -8,9 +8,9 @@ font-style: normal; } .project_fields { - margin-top: 1px; - margin-bottom: 1px; - font-size: 11px; + /*margin-top: 1px;*/ + /*margin-bottom: 1px;*/ + font-size: 12px; } .project_fields td { border: none; @@ -23,7 +23,7 @@ table { padding: 0; - font-size: 13px; + font-size: 12px; border-collapse: collapse; } .project_vignettes { @@ -85,10 +85,7 @@ table { min-width: 265px; border: hidden; margin-left: -6px !important; - margin-top: -3px !important; text-align: left; - vertical-align: super; - font-size: 11px; } .dropdown-menu { -- cgit v1.2.3 From 26184dab872c79a35f0990069caaec5eb584a0db Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 11 Apr 2012 16:00:27 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120411103027-s8vqxgx26mmh8r33 --- addons/project/static/src/css/project.css | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 24444df4413..0ec47cd0eac 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -8,8 +8,7 @@ font-style: normal; } .project_fields { - /*margin-top: 1px;*/ - /*margin-bottom: 1px;*/ + font-family:Helvetica; font-size: 12px; } .project_fields td { @@ -20,12 +19,7 @@ border-right: 1px solid #dddddd; vertical-align: top; margin-right: 8px; } - -table { - padding: 0; - font-size: 12px; - border-collapse: collapse; } - + .project_vignettes { margin: 4px; } .project_vignettes li { @@ -84,8 +78,9 @@ table { min-height: 175px; min-width: 265px; border: hidden; - margin-left: -6px !important; + margin-left: -7px !important; text-align: left; + -webkit-box-align: start; } .dropdown-menu { -- cgit v1.2.3 From af2fff8998321ff261ac47070fa32d4136eb67ea Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 11 Apr 2012 16:27:36 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120411105736-tuopbrt86ixifq05 --- addons/project/static/src/css/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 0ec47cd0eac..2fe2372855e 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -80,7 +80,7 @@ border: hidden; margin-left: -7px !important; text-align: left; - -webkit-box-align: start; + -webkit-box-align: baseline; } .dropdown-menu { -- cgit v1.2.3 From 3b5ccc5a77db22f3877894c49baa1baabeca928c Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 12 Apr 2012 11:16:31 +0530 Subject: [IMP]:improved bgcolor code. bzr revid: apa@tinyerp.com-20120412054631-xs2nk19n3w858qpn --- addons/project/static/src/css/project.css | 20 +--------- addons/project/static/src/js/project.js | 63 ++++++++++++++++--------------- 2 files changed, 34 insertions(+), 49 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 2fe2372855e..cc57d7b4660 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -131,7 +131,7 @@ a.oe_project_kanban_action { } .oe_kanban_color_1 { - background: steelblue; + background: #B1DCFE; } .oe_kanban_color_2 { background: firebrick; @@ -146,24 +146,6 @@ a.oe_project_kanban_action { background: orange; } -.white { - background: white; } - -.steelblue { - background: steelblue; } - -.firebrick { - background: firebrick; } - -.khaki { - background: khaki; } - -.thistle { - background: thistle; } - -.orange { - background: orange; } - .open { display: block; } diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 567c381cc27..3dae71e8170 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -39,38 +39,41 @@ openerp.project = function(openerp) { $('#list').replaceWith(my_list); // set background color - this.$element.find('.bgcolor_white').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(0) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:0}); + this.$element.find('.bgcolor').click(function(){ + color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) + color_class = $(this).find('span').attr('class').split(' ')[0] + console.log($(this).find('span').attr('class').split(' ')[0].substring(16)) + $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(color_class + ' oe_project_kanban_vignette'); + self.view.dataset.write(parseInt(this.id), {color:color}); }); - this.$element.find('.bgcolor_steelblue').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:1}); - }); - - this.$element.find('.bgcolor_firebrick').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:2}); - - }); - - this.$element.find('.bgcolor_khaki').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:3}); - - }); - - this.$element.find('.bgcolor_thistle').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:4}); - - }); - - this.$element.find('.bgcolor_orange').click(function(){ - $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); - self.view.dataset.write(parseInt(this.id), {color:5}); - }); + //this.$element.find('.bgcolor_steelblue').click(function(){ + // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); + // self.view.dataset.write(parseInt(this.id), {color:1}); + //}); + // + //this.$element.find('.bgcolor_firebrick').click(function(){ + // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette'); + // self.view.dataset.write(parseInt(this.id), {color:2}); + // + //}); + // + //this.$element.find('.bgcolor_khaki').click(function(){ + // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette'); + // self.view.dataset.write(parseInt(this.id), {color:3}); + // + //}); + // + //this.$element.find('.bgcolor_thistle').click(function(){ + // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette'); + // self.view.dataset.write(parseInt(this.id), {color:4}); + // + //}); + // + //this.$element.find('.bgcolor_orange').click(function(){ + // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); + // self.view.dataset.write(parseInt(this.id), {color:5}); + //}); }; self._super(); -- cgit v1.2.3 From 4804c6f75d2873c1053bf1abeb88921cb9266cd8 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 12 Apr 2012 11:29:21 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120412055921-eo0dumz60cimx62c --- addons/project/static/src/js/project.js | 35 +-------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 3dae71e8170..a7d0c689784 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -3,6 +3,7 @@ openerp.project = function(openerp) { bind_events: function() { self = this; + self._super(); if(this.view.dataset.model == 'project.project') { //open dropdwon when click on the icon. $('.dropdown-toggle').dropdown(); @@ -31,9 +32,6 @@ openerp.project = function(openerp) { my_list.sort(function (a, b) { var aValue = parseInt(a.id); var bValue = parseInt(b.id); - // ASC - //return aValue == bValue ? 0 : aValue < bValue ? -1 : 1; - // DESC return aValue == bValue ? 0 : aValue < bValue ? -1 : 1; }); $('#list').replaceWith(my_list); @@ -42,41 +40,10 @@ openerp.project = function(openerp) { this.$element.find('.bgcolor').click(function(){ color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) color_class = $(this).find('span').attr('class').split(' ')[0] - console.log($(this).find('span').attr('class').split(' ')[0].substring(16)) $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(color_class + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:color}); }); - - //this.$element.find('.bgcolor_steelblue').click(function(){ - // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette'); - // self.view.dataset.write(parseInt(this.id), {color:1}); - //}); - // - //this.$element.find('.bgcolor_firebrick').click(function(){ - // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette'); - // self.view.dataset.write(parseInt(this.id), {color:2}); - // - //}); - // - //this.$element.find('.bgcolor_khaki').click(function(){ - // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette'); - // self.view.dataset.write(parseInt(this.id), {color:3}); - // - //}); - // - //this.$element.find('.bgcolor_thistle').click(function(){ - // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette'); - // self.view.dataset.write(parseInt(this.id), {color:4}); - // - //}); - // - //this.$element.find('.bgcolor_orange').click(function(){ - // $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette'); - // self.view.dataset.write(parseInt(this.id), {color:5}); - //}); - }; - self._super(); } }); } -- cgit v1.2.3 From 7ea9856d0e29907a917f3490c83dc954d920b125 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 24 Apr 2012 17:03:21 +0530 Subject: [IMP] Improve css and py fiel bzr revid: mma@tinyerp.com-20120424113321-n9b5076z7v8pcfu5 --- addons/project/static/src/css/project.css | 71 +++++++++++++++---------------- 1 file changed, 34 insertions(+), 37 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index cc57d7b4660..509bf23abb3 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -1,15 +1,8 @@ -@font-face { - font-family: "mnmliconsRegular"; - src: url("../font/mnmliconsv21-webfont.eot") format("eot"); - src: url("../font/mnmliconsv21-webfont.woff") format("woff"); - src: url("../font/mnmliconsv21-webfont.ttf") format("truetype"); - src: url("../font/mnmliconsv21-webfont.svg") format("svg") active; - font-weight: normal; - font-style: normal; } - .project_fields { - font-family:Helvetica; - font-size: 12px; + margin-top: 1px; + margin-bottom: 1px; + font-size: 11px; + padding-left: 0px; } .project_fields td { border: none; @@ -19,9 +12,7 @@ border-right: 1px solid #dddddd; vertical-align: top; margin-right: 8px; } - -.project_vignettes { - margin: 4px; } + .project_vignettes li { float: left; } .project_vignettes .project_avatar { @@ -35,22 +26,22 @@ color: #888888; } .project_vignettes h4 a { color: #4c4c4c; } + .project_vignettes li div { + padding-left: 2px; } + + -.project_vignettes > li { - height: 205px; - width: 250px; - padding: 8px; - margin: 4px; } .project_vignettes > li h4 { - margin-bottom: 2px; } + margin-bottom: 2px; + padding-left: 2px; } .oe_project_buttons { - display: inline-block; - padding: 0px 0px; - font-size: 13px; - background-color: transparent; - border: hidden; - color: #8A89BA; + padding: 0px 0px !important; + background: none !important; + background-color: transparent !important; + border: hidden !important; + color: #8A89BA !important; + } @@ -67,19 +58,19 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.i { - font-family: "mnmliconsRegular" !important; - font-size: 21px; - font-weight: 300 !important; } .click_button { - display: inline-block; - background-color: transparent; - min-height: 175px; + background: none !important; + background-color: transparent !important; + border: hidden !important; + min-height: 155px; min-width: 265px; border: hidden; - margin-left: -7px !important; + /*margin-left: 6px !important;*/ + margin-top: 3px !important; text-align: left; + vertical-align: super; + font-size: 11px; -webkit-box-align: baseline; } @@ -121,8 +112,9 @@ a.oe_project_kanban_action { } a.oe_project_kanban_action:hover { text-decoration: none; } - a.oe_project_kanban_action .i { + a.oe_project_kanban_action .oe_i { color: #4c4c4c; } + .square { display: inline-block; width: 18px; @@ -130,6 +122,9 @@ a.oe_project_kanban_action { border:1px solid grey; } +.oe_kanban_color_0 { + background: white; +} .oe_kanban_color_1 { background: #B1DCFE; } @@ -160,7 +155,7 @@ a.oe_project_kanban_action { a.oe_project_kanban_action:hover { text-decoration: none; } - a.oe_project_kanban_action .i { + a.oe_project_kanban_action .eo_i { color: #4c4c4c; } @@ -175,7 +170,9 @@ a.oe_project_kanban_action { display: inline-block; -moz-border-radius: 4px; -webkit-border-radius: 4px; - border-radius: 4px; } + border-radius: 4px; + +} .oe_project_kanban_vignette:last-child { margin-bottom: 0; } .oe_project_kanban_vignette:hover { -- cgit v1.2.3 From 50830935dc3b9783363b027c654279768b270960 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 24 Apr 2012 17:54:52 +0530 Subject: [IMP] Improve view file and css bzr revid: mma@tinyerp.com-20120424122452-45phrpqugzax6wbm --- addons/project/static/src/css/project.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 509bf23abb3..bbfc5a9a43d 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -16,8 +16,9 @@ .project_vignettes li { float: left; } .project_vignettes .project_avatar { - width: 28px; - height: 28px; } + width: 30px; + height: 30px; + padding-left: 0px; } .project_vignettes .project_fields { width: 100%; } .project_vignettes .project_fields th { @@ -37,7 +38,7 @@ .oe_project_buttons { padding: 0px 0px !important; - background: none !important; + background: none !important; background-color: transparent !important; border: hidden !important; color: #8A89BA !important; @@ -56,7 +57,8 @@ border-radius: 4px; -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } + -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + } .click_button { -- cgit v1.2.3 From 58ba8b44567d030880839d7bd75ff80ce040d6ed Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 25 Apr 2012 14:40:21 +0530 Subject: [IMP]:improved css bzr revid: apa@tinyerp.com-20120425091021-4r915wuxgfympu2p --- addons/project/static/src/css/project.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index f4324634475..85deb2eff9d 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -12,9 +12,11 @@ border-right: 1px solid #dddddd; vertical-align: top; margin-right: 8px; } - +.project_vignettes{ + padding: 4px !important } .project_vignettes li { - float: left; } + float: left; + } .project_vignettes .project_avatar { width: 30px; height: 30px; -- cgit v1.2.3 From 77032d3dae62594478aa14ef2fe70534a2c4a710 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 25 Apr 2012 17:34:27 +0530 Subject: [REM]:removed unnecessary files. bzr revid: apa@tinyerp.com-20120425120427-89vmuls9faqh6oj5 --- .../static/src/font/mnmliconsv21-webfont.eot | Bin 24173 -> 0 bytes .../static/src/font/mnmliconsv21-webfont.svg | 149 --------------------- .../static/src/font/mnmliconsv21-webfont.ttf | Bin 39912 -> 0 bytes .../static/src/font/mnmliconsv21-webfont.woff | Bin 26348 -> 0 bytes 4 files changed, 149 deletions(-) delete mode 100755 addons/project/static/src/font/mnmliconsv21-webfont.eot delete mode 100755 addons/project/static/src/font/mnmliconsv21-webfont.svg delete mode 100755 addons/project/static/src/font/mnmliconsv21-webfont.ttf delete mode 100755 addons/project/static/src/font/mnmliconsv21-webfont.woff (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/font/mnmliconsv21-webfont.eot b/addons/project/static/src/font/mnmliconsv21-webfont.eot deleted file mode 100755 index 433ebb82e4b..00000000000 Binary files a/addons/project/static/src/font/mnmliconsv21-webfont.eot and /dev/null differ diff --git a/addons/project/static/src/font/mnmliconsv21-webfont.svg b/addons/project/static/src/font/mnmliconsv21-webfont.svg deleted file mode 100755 index 34b20ff992f..00000000000 --- a/addons/project/static/src/font/mnmliconsv21-webfont.svg +++ /dev/null @@ -1,149 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : MIT License -Designer : Carlos Elas -Foundry : Carlos Elias -Foundry URL : httpcarloseliascl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/project/static/src/font/mnmliconsv21-webfont.ttf b/addons/project/static/src/font/mnmliconsv21-webfont.ttf deleted file mode 100755 index c38e59cf138..00000000000 Binary files a/addons/project/static/src/font/mnmliconsv21-webfont.ttf and /dev/null differ diff --git a/addons/project/static/src/font/mnmliconsv21-webfont.woff b/addons/project/static/src/font/mnmliconsv21-webfont.woff deleted file mode 100755 index 3ddf14fb814..00000000000 Binary files a/addons/project/static/src/font/mnmliconsv21-webfont.woff and /dev/null differ -- cgit v1.2.3 From c1e3987744c4eca177354d11177a6a5ff1039045 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 26 Apr 2012 22:55:29 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120426172529-7xeaex0nulxeul1l --- addons/project/static/src/js/project.js | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index a7d0c689784..a1cb503af59 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,6 +1,5 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ - bind_events: function() { self = this; self._super(); -- cgit v1.2.3 From c046b2fb7fabf5e70e0d65c89926faf520e08c2e Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 26 Apr 2012 23:05:41 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120426173541-4p1fk00hdcczelf2 --- addons/project/static/src/css/project.css | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 85deb2eff9d..be87c7c0e17 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -39,15 +39,11 @@ background-color: transparent !important; border: hidden !important; color: #8A89BA !important; - - } - .oe_project_buttons:hover { cursor: pointer; color: #0000FF; } - .project_avatar { -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -56,8 +52,6 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } - - .click_button { background: none !important; background-color: transparent !important; @@ -72,14 +66,11 @@ font-size: 11px; -webkit-box-align: baseline; } - .dropdown-menu { display: none; position: absolute; } - .dropdown { position: relative; } - .dropdown-toggle:after { width: 0; height: 0; @@ -96,8 +87,6 @@ -khtml-opacity: 0.5; -moz-opacity: 0.5; opacity: 0.5; } - - .oe_project_kanban_vignette .dropdown-menu .color-chooser { padding: 0 3px; } .oe_project_kanban_vignette .dropdown-menu .color-chooser li { @@ -146,7 +135,6 @@ a.oe_project_kanban_action { .open .dropdown-menu { display: block; } - a.oe_project_kanban_action { position: absolute; right: 0; @@ -157,7 +145,6 @@ a.oe_project_kanban_action { a.oe_project_kanban_action .eo_i { color: #4c4c4c; } - .oe_project_kanban_vignette { position: relative; min-height: 50px; @@ -181,7 +168,6 @@ a.oe_project_kanban_action { .oe_project_kanban_vignette h4 { margin: 0 0 2px; } - .oe_project_kanban_vignette .dropdown-menu { top: 30px; right: -140px; -- cgit v1.2.3 From f8e076e9a4c1f08d33ab81a33706c645be75739a Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 27 Apr 2012 11:57:25 +0530 Subject: [IMP]:improved code. bzr revid: apa@tinyerp.com-20120427062725-0lpfbxs0xkdmm7zf --- addons/project/static/src/js/project.js | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index a1cb503af59..e2384d50d27 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -4,17 +4,11 @@ openerp.project = function(openerp) { self = this; self._super(); if(this.view.dataset.model == 'project.project') { - //open dropdwon when click on the icon. - $('.dropdown-toggle').dropdown(); - - //show and hide the dropdown icon when mouseover and mouseour. - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - - //set avatar title for members. + + /*set avatar title for members. + In many2many fields, returns only list of ids. + we can implement return value of m2m fields like [(1,"Adminstration"),...]. + */ _.each($(this.$element).find('.project_avatar'),function(avatar){ var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]); dataset.read_slice(['name']).then(function(result){ @@ -35,7 +29,9 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); - // set background color + /* set background color. + we can do other way to implement new widget. + */ this.$element.find('.bgcolor').click(function(){ color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) color_class = $(this).find('span').attr('class').split(' ')[0] -- cgit v1.2.3 From 49eb72d417485457c9ec93570ae3e82739563a30 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 27 Apr 2012 12:01:52 +0530 Subject: [IMP]:improved code. bzr revid: apa@tinyerp.com-20120427063152-9qp4k3mz6dhgz7ho --- addons/project/static/src/js/project.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index e2384d50d27..5365e0b0942 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -31,6 +31,7 @@ openerp.project = function(openerp) { /* set background color. we can do other way to implement new widget. + because we need to rpc call for that. */ this.$element.find('.bgcolor').click(function(){ color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) -- cgit v1.2.3 From d2b70d38c34a4a30f02c8de1c221765d15a153e1 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 30 Apr 2012 16:19:34 +0530 Subject: [IMP]change color and improved as per said bzr revid: sgo@tinyerp.com-20120430104934-34tsnkf24rms9izx --- addons/project/static/src/css/project.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index be87c7c0e17..cfe0559b6ad 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -24,6 +24,7 @@ .project_vignettes .project_fields { width: 100%; } .project_vignettes .project_fields th { + width: 120px; font-weight: normal; } .project_vignettes .project_fields td { color: #888888; } @@ -117,7 +118,7 @@ a.oe_project_kanban_action { background: #B1DCFE; } .oe_kanban_color_2 { - background: firebrick; + background: #FFB8B8; } .oe_kanban_color_3 { background: khaki; -- cgit v1.2.3 From c43e5dfe7e57e73d60d5e3ca2320ea52958726b2 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 3 May 2012 14:32:02 +0530 Subject: [IMP] bzr revid: apa@tinyerp.com-20120503090202-w2ciwyb22endil26 --- addons/project/static/src/css/project.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 08ee57655f5..93437c878ba 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -67,6 +67,11 @@ font-size: 11px; -webkit-box-align: baseline; } + + +.click_button:hover { + cursor: default !important; +} .dropdown-menu { display: none; position: absolute; } -- cgit v1.2.3 From bfd96de42bc942fa24158a8c87b9e905c2460b72 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 7 May 2012 12:50:49 +0530 Subject: [IMP]rename all fields which r required in project and another module and improve code and bzr revid: sgo@tinyerp.com-20120507072049-u00lsqra9x34nf73 --- addons/project/static/src/js/project.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 5365e0b0942..001777103d6 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -17,8 +17,8 @@ openerp.project = function(openerp) { }); //if task is true , then open the task when click on the anywhere in the box. - if(this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); - if(!this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); + if(this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); + if(!this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); // set sequence like Tasks,Issues,Timesheets and Phases my_list = $("#list a") -- cgit v1.2.3 From 38fd7fa19df5d752c05eb21fad9f07daccca4395 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 7 May 2012 18:27:08 +0530 Subject: [IMP]:project:Used a relate action like 'project.act_project_project_2_project_task_all' instead (easier to configure and maintain) and remove default value for project_id. bzr revid: apa@tinyerp.com-20120507125708-7gcxl8915us0xoio --- addons/project/static/src/js/project.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 001777103d6..27874b24f25 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -16,9 +16,6 @@ openerp.project = function(openerp) { }); }); - //if task is true , then open the task when click on the anywhere in the box. - if(this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks'); - if(!this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy'); // set sequence like Tasks,Issues,Timesheets and Phases my_list = $("#list a") @@ -29,6 +26,9 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); + //if task is true , then open the task when click on the anywhere in the box. + if(this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name',my_list[0].getAttribute('data-name')); + /* set background color. we can do other way to implement new widget. because we need to rpc call for that. -- cgit v1.2.3 From a6a7276d890488085bc2eec46f57e44425df3a4b Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Tue, 8 May 2012 14:51:43 +0530 Subject: [IMP]remove open_model method from project related module and add action as per required bzr revid: sgo@tinyerp.com-20120508092143-ah3siaudwp7jixc8 --- addons/project/static/src/js/project.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 27874b24f25..d841734bacf 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -16,7 +16,6 @@ openerp.project = function(openerp) { }); }); - // set sequence like Tasks,Issues,Timesheets and Phases my_list = $("#list a") my_list.sort(function (a, b) { @@ -26,8 +25,16 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); - //if task is true , then open the task when click on the anywhere in the box. - if(this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name',my_list[0].getAttribute('data-name')); + //it opens action in sequence which ever is first. + if (my_list.length!=0){ + $(this.$element).find('.click_button').attr('data-name',my_list[0].getAttribute('data-name')); + } + else{ + $(this.$element).find('.click_button').attr('data-name','dummy'); + } + if(isNaN(parseInt($(this.$element).find('.click_button').attr('data-name')))){ + $(this.$element).find('.click_button').attr('data-type',"object") + } /* set background color. we can do other way to implement new widget. -- cgit v1.2.3 From 5e1413aca654901cdabb93c72e9a32e4da0320da Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 8 May 2012 16:16:07 +0530 Subject: [IMP]:improved js code. bzr revid: apa@tinyerp.com-20120508104607-w3q12gphejt3zauw --- addons/project/static/src/js/project.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index cc228e5e931..d00b0762f86 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -26,10 +26,12 @@ openerp.project = function(openerp) { $('#list').replaceWith(my_list); //it opens action in sequence which ever is first. + if (my_list.length!=0){ - $(this.$element).find('.click_button').attr('data-name',my_list[0].getAttribute('data-name')); - if(isNaN(parseInt($(this.$element).find('.click_button').attr('data-name')))){ - $(this.$element).find('.click_button').attr('data-type',"object") + click_button = $(this.$element).find('.click_button') + click_button.attr('data-name',my_list[0].getAttribute('data-name')); + if(isNaN(parseInt(click_button.attr('data-name')))){ + click_button.attr('data-type',"object") } } /* set background color. -- cgit v1.2.3 From 645d2437e0a3897c9731ba22152c7351c4c5ff52 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 8 May 2012 16:17:05 +0530 Subject: [IMP]:set indentation in js file. bzr revid: apa@tinyerp.com-20120508104705-zri4xvoc4k1d4e9q --- addons/project/static/src/js/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index d00b0762f86..f5e6bdd99d6 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -31,7 +31,7 @@ openerp.project = function(openerp) { click_button = $(this.$element).find('.click_button') click_button.attr('data-name',my_list[0].getAttribute('data-name')); if(isNaN(parseInt(click_button.attr('data-name')))){ - click_button.attr('data-type',"object") + click_button.attr('data-type',"object") } } /* set background color. -- cgit v1.2.3 From abdc6e0383c795190ccffc226a536504d67e9271 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 8 May 2012 16:25:21 +0530 Subject: [IMP]:added def dummy bzr revid: apa@tinyerp.com-20120508105521-1mqur1isvkw0j5n7 --- addons/project/static/src/js/project.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index f5e6bdd99d6..b7c37d9671e 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -26,14 +26,15 @@ openerp.project = function(openerp) { $('#list').replaceWith(my_list); //it opens action in sequence which ever is first. - + click_button = $(this.$element).find('.click_button') if (my_list.length!=0){ - click_button = $(this.$element).find('.click_button') click_button.attr('data-name',my_list[0].getAttribute('data-name')); - if(isNaN(parseInt(click_button.attr('data-name')))){ - click_button.attr('data-type',"object") - } } + else{ + click_button.attr('data-name','dummy'); + } + if(isNaN(parseInt(click_button.attr('data-name'))))click_button.attr('data-type',"object"); + /* set background color. we can do other way to implement new widget. because we need to rpc call for that. -- cgit v1.2.3 From 7dab19c32b6a8303711cdfb6d5da5d96d177e43d Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 9 May 2012 08:55:22 +0200 Subject: [IMP] project: small code cleanup for project kanban view bzr revid: rco@openerp.com-20120509065522-16ouzxqiwqgjdcyd --- addons/project/static/src/js/project.js | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'addons/project/static/src') diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index b7c37d9671e..09a7c9eb256 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,7 +1,7 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { - self = this; + var self = this; self._super(); if(this.view.dataset.model == 'project.project') { @@ -17,7 +17,7 @@ openerp.project = function(openerp) { }); // set sequence like Tasks,Issues,Timesheets and Phases - my_list = $("#list a") + var my_list = $("#list a") my_list.sort(function (a, b) { var aValue = parseInt(a.id); var bValue = parseInt(b.id); @@ -25,27 +25,24 @@ openerp.project = function(openerp) { }); $('#list').replaceWith(my_list); - //it opens action in sequence which ever is first. - click_button = $(this.$element).find('.click_button') - if (my_list.length!=0){ - click_button.attr('data-name',my_list[0].getAttribute('data-name')); + // when vignette is clicked, it opens the first action in sequence + if (my_list.length != 0) { + var click_button = $(this.$element).find('.click_button') + click_button.attr('data-name', my_list[0].getAttribute('data-name')); + click_button.attr('data-type', "action"); } - else{ - click_button.attr('data-name','dummy'); - } - if(isNaN(parseInt(click_button.attr('data-name'))))click_button.attr('data-type',"object"); /* set background color. we can do other way to implement new widget. because we need to rpc call for that. */ this.$element.find('.bgcolor').click(function(){ - color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) - color_class = $(this).find('span').attr('class').split(' ')[0] + var color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16)) + var color_class = $(this).find('span').attr('class').split(' ')[0] $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(color_class + ' oe_project_kanban_vignette'); self.view.dataset.write(parseInt(this.id), {color:color}); }); - }; + } } }); } -- cgit v1.2.3