odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] 

bzr revid: sgo@tinyerp.com-20120404054204-vlkhhvrxp0ka15d7
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-04-04 11:12:04 +05:30
parent 96c334b5ac
commit fddbe73881
3 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/project/project_view.xml
View File

@ -182,9 +182,9 @@
} }
</script> </script>
<!--<div class="content">--> <!--<div class="content">-->
<div class="vignettes"> <div class="project_vignettes">
<li class="oe_kanban_vignette"> <li class="oe_project_kanban_vignette">
<a href="#" class="oe_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a> <a href="#" class="oe_project_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li ><a type="edit" >Edit...</a></li> <li ><a type="edit" >Edit...</a></li>
<li ><a type="delete">Delete</a></li> <li ><a type="delete">Delete</a></li>
@ -202,13 +202,13 @@
<h4 id="list" height="10px"><a><t t-if="record.task.raw_value"> <h4 id="list" height="10px"><a><t t-if="record.task.raw_value">
<button name="open_tasks" class="oe_project_buttons" type="object"><field name="open_task"/> Tasks</button> <button name="open_tasks" class="oe_project_buttons" type="object"><field name="open_task"/> Tasks</button>
</t></a></h4> </t></a></h4>
<table class="fields"> <table class="project_fields">
<tr t-if="record.date.raw_value"> <th align="left">Deadline</th><td align="left"><t t-esc="record.date.raw_value.toString('MMMM')"/> <tr t-if="record.date.raw_value"> <th align="left">Deadline</th><td align="left"><t t-esc="record.date.raw_value.toString('MMMM')"/>
<t t-esc="record.date.raw_value.getDate()"/>, <t t-esc="record.date.raw_value.getDate()"/>,
<t t-esc="record.date.raw_value.getFullYear()"/></td> </tr> <t t-esc="record.date.raw_value.getFullYear()"/></td> </tr>
<tr> <th align="left">Progress</th><td align="left"><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days</td> </tr> <tr> <th align="left">Progress</th><td align="left"><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days</td> </tr>
</table> </table>
<t t-foreach="record.members.raw_value" t-as="member"><img t-att-src="kanban_image('res.users', 'avatar', member)" class="avatar"/></t> <t t-foreach="record.members.raw_value" t-as="member"><img t-att-src="kanban_image('res.users', 'avatar', member)" class="project_avatar"/></t>
</li> </li>
</div> </div>
<!--</div>--> <!--</div>-->

68
addons/project/static/src/css/project.css
View File

@ -1,11 +1,11 @@
.fields { .project_fields {
margin-top: 1px; margin-top: 1px;
margin-bottom: 1px; margin-bottom: 1px;
} }
.fields td { .project_fields td {
border: none; border: none;
padding: 2px 0 2px 8px; } padding: 2px 0 2px 8px; }
.fields th { .project_fields th {
padding: 0; padding: 0;
border-right: 1px solid #dddddd; border-right: 1px solid #dddddd;
vertical-align: top; vertical-align: top;
@ -16,29 +16,29 @@ table {
font-size: 13px; font-size: 13px;
border-collapse: collapse; } border-collapse: collapse; }
.vignettes { .project_vignettes {
margin: 4px; } margin: 4px; }
.vignettes li { .project_vignettes li {
float: left; } float: left; }
.vignettes .avatar { .project_vignettes .project_avatar {
margin-right: 2px; margin-right: 2px;
width: 32px; width: 32px;
height: 32px; } height: 32px; }
.vignettes .fields { .project_vignettes .project_fields {
width: 100%; } width: 100%; }
.vignettes .fields th { .project_vignettes .project_fields th {
font-weight: normal; } font-weight: normal; }
.vignettes .fields td { .project_vignettes .project_fields td {
color: #888888; } color: #888888; }
.vignettes h4 a { .project_vignettes h4 a {
color: #4c4c4c; } color: #4c4c4c; }
.vignettes > li { .project_vignettes > li {
height: 160px; height: 160px;
width: 250px; width: 250px;
padding: 8px; padding: 8px;
margin: 4px; } margin: 4px; }
.vignettes > li h4 { .project_vignettes > li h4 {
margin-bottom: 2px; } margin-bottom: 2px; }
.oe_project_buttons { .oe_project_buttons {
@ -50,7 +50,7 @@ table {
} }
.avatar { .project_avatar {
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
@ -89,19 +89,19 @@ table {
opacity: 0.5; } opacity: 0.5; }
.oe_kanban_vignette .dropdown-menu .color-chooser { .oe_project_kanban_vignette .dropdown-menu .color-chooser {
padding: 0 3px; } padding: 0 3px; }
.oe_kanban_vignette .dropdown-menu .color-chooser li { .oe_project_kanban_vignette .dropdown-menu .color-chooser li {
float: left; } float: left; }
.oe_kanban_vignette .dropdown-menu .color-chooser li a { .oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
padding: 2px; } padding: 2px; }
a.oe_kanban_action { a.oe_project_kanban_action {
position: absolute; position: absolute;
right: 0; right: 0;
} }
a.oe_kanban_action:hover { a.oe_project_kanban_action:hover {
text-decoration: none; } text-decoration: none; }
a.oe_kanban_action .i { a.oe_project_kanban_action .i {
color: #4c4c4c; } color: #4c4c4c; }
.square { .square {
display: inline-block; display: inline-block;
@ -129,18 +129,18 @@ a.oe_kanban_action {
display: block; } display: block; }
a.oe_kanban_action { a.oe_project_kanban_action {
position: absolute; position: absolute;
right: 0; right: 0;
} }
a.oe_kanban_action:hover { a.oe_project_kanban_action:hover {
text-decoration: none; text-decoration: none;
} }
a.oe_kanban_action .i { a.oe_project_kanban_action .i {
color: #4c4c4c; } color: #4c4c4c; }
.oe_kanban_vignette { .oe_project_kanban_vignette {
position: relative; position: relative;
display: block; display: block;
min-height: 50px; min-height: 50px;
@ -153,17 +153,17 @@ a.oe_kanban_action {
-moz-border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
border-radius: 4px; } border-radius: 4px; }
.oe_kanban_vignette:last-child { .oe_project_kanban_vignette:last-child {
margin-bottom: 0; } margin-bottom: 0; }
.oe_kanban_vignette:hover { .oe_project_kanban_vignette:hover {
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
-webkit-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); } -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); }
.oe_kanban_vignette h4 { .oe_project_kanban_vignette h4 {
margin: 0 0 2px; } margin: 0 0 2px; }
.oe_kanban_vignette .dropdown-menu { .oe_project_kanban_vignette .dropdown-menu {
top: 30px; top: 30px;
right: -140px; right: -140px;
padding: 4px; padding: 4px;
@ -178,13 +178,13 @@ a.oe_kanban_action {
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-webkit-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); } -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; } margin-left: 12px; }
.oe_kanban_vignette .dropdown-menu li { .oe_project_kanban_vignette .dropdown-menu li {
float: none; float: none;
display: block; display: block;
background-color: none; } background-color: none; }
.oe_kanban_vignette .dropdown-menu li a { .oe_project_kanban_vignette .dropdown-menu li a {
display: block; display: block;
padding: 3px 6px; padding: 3px 6px;
clear: both; clear: both;
@ -192,7 +192,7 @@ a.oe_kanban_action {
line-height: 14px; line-height: 14px;
color: #4c4c4c; color: #4c4c4c;
text-decoration: none; } text-decoration: none; }
.oe_kanban_vignette .dropdown-menu li a:hover { .oe_project_kanban_vignette .dropdown-menu li a:hover {
background: #f0f0fa; background: #f0f0fa;
background: -moz-linear-gradient(#f0f0fa, #eeeef6); background: -moz-linear-gradient(#f0f0fa, #eeeef6);
background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#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; -webkit-box-shadow: none;
-box-shadow: none; } -box-shadow: none; }
.oe_kanban_vignette .dropdown-menu .color-chooser { .oe_project_kanban_vignette .dropdown-menu .color-chooser {
padding: 0 3px; } padding: 0 3px; }
.oe_kanban_vignette .dropdown-menu .color-chooser li { .oe_project_kanban_vignette .dropdown-menu .color-chooser li {
float: left; } float: left; }
.oe_kanban_vignette .dropdown-menu .color-chooser li a { .oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
padding: 2px; } padding: 2px; }

2
addons/project_timesheet/project_timesheet_view.xml
View File

@ -42,7 +42,7 @@
</t> </t>
</a> </a>
</xpath> </xpath>
<xpath expr="//table[@class='fields']" position="inside"> <xpath expr="//table[@class='project_fields']" position="inside">
<tr ><th align="left">To invoiced</th> <tr ><th align="left">To invoiced</th>
<td align="left"> <td align="left">
<field name="amt_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/> <field name="amt_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/>