Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-project-gallery-apa-kanban-mma into
lp:~openerp-dev/openobject-addons/trunk-project-gallery-apa.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project-gallery-apa-kanban-mma/+merge/103266
Hello Sir,
I have Improved CSS and related code
Thanks.
mma
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project-gallery-apa-kanban-mma/+merge/103266
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-project-gallery-apa-kanban-mma into
lp:~openerp-dev/openobject-addons/trunk-project-gallery-apa.
=== modified file 'project/project.py'
--- project/project.py 2012-04-12 06:37:02 +0000
+++ project/project.py 2012-04-24 12:32:21 +0000
@@ -222,35 +222,19 @@
"""
if context is None:
context = {}
- value = {}
- data_obj = self.pool.get('ir.model.data')
- for project in self.browse(cr, uid, ids, context=context):
- # Get Task views
- tree_view = data_obj.get_object_reference(cr, uid, 'project', 'view_task_tree2')
- form_view = data_obj.get_object_reference(cr, uid, 'project', 'view_task_form2')
- calander_view = data_obj.get_object_reference(cr, uid, 'project', 'view_task_calendar')
- search_view = data_obj.get_object_reference(cr, uid, 'project', 'view_task_search_form')
- kanban_view = data_obj.get_object_reference(cr, uid, 'project', 'view_task_kanban')
- context.update({
- #'search_default_user_id': uid,
- 'search_default_project_id':project.id,
- #'search_default_open':1,
- })
- value = {
- 'name': _('Task'),
- 'context': context,
- 'view_type': 'form',
- 'view_mode': 'form,tree',
- 'res_model': 'project.task',
- 'view_id': False,
- 'domain':[('project_id','in',ids)],
- 'context': context,
- 'views': [(kanban_view and kanban_view[1] or False, 'kanban'),(tree_view and tree_view[1] or False, 'tree'),(calander_view and calander_view[1] or False, 'calendar'),(form_view and form_view[1] or False, 'form')],
- 'type': 'ir.actions.act_window',
- 'search_view_id': search_view and search_view[1] or False,
- 'nodestroy': True
- }
- return value
+ if ids:
+ context = dict(context, search_default_project_id=ids[0])
+ return {
+ 'name': _('Task'),
+ 'context': context,
+ 'view_type': 'form',
+ 'view_mode': 'kanban,tree,calendar,form',
+ 'res_model': 'project.task',
+ 'view_id': False,
+ 'domain':[('project_id','in',ids)],
+ 'type': 'ir.actions.act_window',
+ 'nodestroy': True
+ }
def _get_type_common(self, cr, uid, context):
ids = self.pool.get('project.task.type').search(cr, uid, [('project_default','=',1)], context=context)
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-04-23 05:34:00 +0000
+++ project/project_view.xml 2012-04-24 12:32:21 +0000
@@ -182,7 +182,7 @@
<t t-name="kanban-box">
<div class="project_vignettes">
<li t-attf-class="#{kanban_color(record.color.raw_value)} oe_project_kanban_vignette" id="oe_project_kanban_vignette">
- <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="i">B</span></a>
+ <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="oe_i">B</span></a>
<ul class="dropdown-menu">
<li ><a type="edit" >Edit...</a></li>
<li ><a type="delete">Delete</a></li>
@@ -201,10 +201,11 @@
<div id="list">
<a id="1">
<t t-if="record.task.raw_value">
- <button name="open_tasks" id = "open_tasks" class="oe_project_buttons" type="object"><div class="fontsize"><t t-if="record.open_task.value <= 1"> Task</t><t t-if="record.open_task.value > 1"> Tasks</t>(<t t-esc="record.open_task.value"/>)</div></button>
+ <button name="open_tasks" id = "open_tasks" class="oe_project_buttons" type="object"><t t-if="record.open_task.value <= 1"> Task</t><t t-if="record.open_task.value > 1"> Tasks</t>(<t t-esc="record.open_task.value"/>)</button>
</t>
</a>
</div>
+ <br/>
<button class="click_button" type="object">
<table class="project_fields">
<tr id="deadline" t-if="record.date.raw_value">
@@ -222,8 +223,7 @@
</td>
</tr>
</table>
- <t t-if="record.members.raw_value.length <=8"><br/><br/><br/></t>
- <t t-if="record.members.raw_value.length >8 and record.members.raw_value.length <= 16"><br/></t>
+ <br/>
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-id="member" class="project_avatar"/>
</t>
=== modified file 'project/static/src/css/project.css'
--- project/static/src/css/project.css 2012-04-12 05:46:31 +0000
+++ project/static/src/css/project.css 2012-04-24 12:32:21 +0000
@@ -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,14 +12,13 @@
border-right: 1px solid #dddddd;
vertical-align: top;
margin-right: 8px; }
-
-.project_vignettes {
- margin: 4px; }
+
.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 {
@@ -35,22 +27,22 @@
color: #888888; }
.project_vignettes h4 a {
color: #4c4c4c; }
-
-.project_vignettes > li {
- height: 205px;
- width: 250px;
- padding: 8px;
- margin: 4px; }
+ .project_vignettes li div {
+ padding-left: 2px; }
+
+
+
.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;
+
}
@@ -65,21 +57,22 @@
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);
+ }
-.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 +114,9 @@
}
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 +124,9 @@
border:1px solid grey;
}
+.oe_kanban_color_0 {
+ background: white;
+}
.oe_kanban_color_1 {
background: #B1DCFE;
}
@@ -160,7 +157,7 @@
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 +172,9 @@
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 {
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py 2012-04-09 05:17:14 +0000
+++ project_issue/project_issue.py 2012-04-24 12:32:21 +0000
@@ -544,34 +544,19 @@
"""
if context is None:
context = {}
- value = {}
- data_obj = self.pool.get('ir.model.data')
- for project in self.browse(cr, uid, ids, context=context):
- # Get Task views
- tree_view = data_obj.get_object_reference(cr, uid, 'project_issue', 'project_issue_tree_view')
- form_view = data_obj.get_object_reference(cr, uid, 'project_issue', 'project_issue_form_view')
- calander_view = data_obj.get_object_reference(cr, uid, 'project_issue', 'project_issue_calendar_view')
- search_view = data_obj.get_object_reference(cr, uid, 'project_issue', 'view_project_issue_filter')
- kanban_view = data_obj.get_object_reference(cr, uid, 'project_issue', 'project_issue_kanban_view')
- context.update({
- #'search_default_user_id': uid,
- 'search_default_project_id':project.id
- })
- value = {
- 'name': _('Issue'),
- 'context': context,
- 'view_type': 'form',
- 'view_mode': 'form,tree',
- 'res_model': 'project.issue',
- 'view_id': False,
- 'domain':[('project_id','in',ids)],
- 'context': context,
- 'views': [(kanban_view and kanban_view[1] or False, 'kanban'),(tree_view and tree_view[1] or False, 'tree'),(calander_view and calander_view[1] or False, 'calendar'),(form_view and form_view[1] or False, 'form')],
- 'type': 'ir.actions.act_window',
- 'search_view_id': search_view and search_view[1] or False,
- 'nodestroy': True
- }
- return value
+ if ids:
+ context = dict(context, search_default_project_id=ids[0])
+ return {
+ 'name': _('Issue'),
+ 'view_type': 'form',
+ 'view_mode': 'kanban,tree,calendar,form',
+ 'res_model': 'project.issue',
+ 'view_id': False,
+ 'domain':[('project_id','in',ids)],
+ 'context': context,
+ 'type': 'ir.actions.act_window',
+ 'nodestroy': True
+ }
def _check_escalation(self, cr, uid, ids, context=None):
project_obj = self.browse(cr, uid, ids[0], context=context)
=== modified file 'project_long_term/project_long_term.py'
--- project_long_term/project_long_term.py 2012-03-30 12:43:12 +0000
+++ project_long_term/project_long_term.py 2012-04-24 12:32:21 +0000
@@ -242,34 +242,19 @@
"""
if context is None:
context = {}
- value = {}
- data_obj = self.pool.get('ir.model.data')
- for project in self.browse(cr, uid, ids, context=context):
- # Get Task views
- tree_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_list')
- form_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_form')
- calander_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_calendar')
- search_view = data_obj.get_object_reference(cr, uid, 'project_long_term', 'view_project_phase_search')
- context.update({
- #'search_default_user_id': uid,
- 'search_default_project_id':project.id,
- #'search_default_open':1,
- })
- value = {
+ if ids:
+ context = dict(context, search_default_project_id=ids[0])
+ return {
'name': _('Phase'),
- 'context': context,
'view_type': 'form',
- 'view_mode': 'form,tree',
+ 'view_mode': 'tree,calendar,form',
'res_model': 'project.phase',
'view_id': False,
'domain':[('project_id','in',ids)],
'context': context,
- 'views': [(tree_view and tree_view[1] or False, 'tree'),(calander_view and calander_view[1] or False, 'calendar'),(form_view and form_view[1] or False, 'form')],
'type': 'ir.actions.act_window',
- 'search_view_id': search_view and search_view[1] or False,
'nodestroy': True
}
- return value
def schedule_phases(self, cr, uid, ids, context=None):
context = context or {}
=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py 2012-04-04 06:16:17 +0000
+++ project_timesheet/project_timesheet.py 2012-04-24 12:32:21 +0000
@@ -85,30 +85,19 @@
"""
if context is None:
context = {}
- value = {}
- data_obj = self.pool.get('ir.model.data')
-
- for project in self.browse(cr, uid, ids, context=context):
- # Get Timesheet views
- tree_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_tree_inherit_account_id')
- form_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_form_inherit_account_id')
- search_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_search_account_inherit')
- context.update({
- 'search_default_account_id':project.analytic_account_id.id,
- })
- value = {
+ if ids:
+ project = self.browse(cr, uid, ids[0], context=context)
+ context = dict(context, search_default_account_id=project.analytic_account_id.id)
+ return {
'name': _('Bill Tasks Works'),
'context': context,
'view_type': 'form',
- 'view_mode': 'form,tree',
+ 'view_mode': 'tree,form',
'res_model': 'account.analytic.line',
'view_id': False,
- 'views': [(tree_view and tree_view[1] or False, 'tree'),(form_view and form_view[1] or False, 'form')],
'type': 'ir.actions.act_window',
- 'search_view_id': search_view and search_view[1] or False,
'nodestroy': True
}
- return value
project_project()
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
