pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: sgo@tinyerp.com-20120411120500-3rbfnk8mp1gmtuwy
This commit is contained in:
Sanjay Gohel (Open ERP)
2012-04-11 17:35:00 +05:30
parent 490cc4a0cf af2fff8998
commit 36fddc6595
5 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
+4 -7
View File
@@ -187,7 +187,7 @@
<li ><a type="delete">Delete</a></li>
<li>
<ul class="color-chooser">
<li><a t-att-id="record.id.value" class="bgcolor_white"><span class="white square"></span></a></li>
<li><a t-att-id="record.id.value" class="bgcolor_white"><span class="white square"></span></a></li>
<li><a t-att-id="record.id.value" class="bgcolor_steelblue"><span class="steelblue square"></span></a></li>
<li><a t-att-id="record.id.value" class="bgcolor_firebrick"><span class="firebrick square"></span></a></li>
<li><a t-att-id="record.id.value" class="bgcolor_khaki"><span class="khaki square"></span></a></li>
@@ -197,13 +197,13 @@
</li>
</ul>
<h4><t t-esc="record.name.value.substr(0,32)"/><t t-if="record.name.value.length > 32">...</t></h4>
<h4 id="list" height="10px">
<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 &lt;= 1"> Task</t><t t-if="record.open_task.value &gt; 1"> Tasks</t>(<t t-esc="record.open_task.value"/>)</div></button>
</t>
</a>
</h4>
</div>
<button class="click_button" type="object">
<table class="project_fields">
<tr id="deadline" t-if="record.date.raw_value">
@@ -222,13 +222,10 @@
</tr>
</table>
<t t-if="record.members.raw_value.length &lt;= 7"><br/><br/><br/></t>
<t t-if="record.members.raw_value.length &gt; 7 and record.members.raw_value.length &lt;= 14"><br/><br/></t>
<t t-if="record.members.raw_value.length &gt; 7 and record.members.raw_value.length &lt;= 14"><br/></t>
<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>
</button>
</li>
</div>
addons/project/static/src/css/project.css
+6 -14
View File
@@ -8,10 +8,9 @@
font-style: normal; }
.project_fields {
margin-top: 1px;
margin-bottom: 1px;
/* font-size: 11px;
*/ }
font-family:Helvetica;
font-size: 12px;
}
.project_fields td {
border: none;
padding: 2px 0 2px 8px; }
@@ -20,12 +19,7 @@
border-right: 1px solid #dddddd;
vertical-align: top;
margin-right: 8px; }
table {
padding: 0;
font-size: 13px;
border-collapse: collapse; }
.project_vignettes {
margin: 4px; }
.project_vignettes li {
@@ -84,11 +78,9 @@ table {
min-height: 175px;
min-width: 265px;
border: hidden;
margin-left: -6px !important;
margin-top: -3px !important;
margin-left: -7px !important;
text-align: left;
vertical-align: super;
font-size: 11px;
-webkit-box-align: baseline;
}
.dropdown-menu {
addons/project_issue/project_issue_view.xml
+1 -1
View File
@@ -363,7 +363,7 @@
<field name="issues"/>
<field name="total_issues" invisible="1"/>
</field>
<xpath expr="//h4[@id='list']" position="inside">
<xpath expr="//div[@id='list']" position="inside">
<a id="2">
<t t-if="record.issues.raw_value">
<button name="open_issues" class="oe_project_buttons" type="object"><div class="fontsize"><t t-if="record.total_issues.value &lt;= 1"> Issue</t><t t-if="record.total_issues.value > 1"> Issues</t>(<t t-esc="record.total_issues.value"/>)</div></button>
addons/project_long_term/project_long_term_view.xml
+1 -1
View File
@@ -120,7 +120,7 @@
<field name="phases"/>
<field name="open_phases"/>
</field>
<xpath expr="//h4[@id='list']" position="inside">
<xpath expr="//div[@id='list']" position="inside">
<a id="4">
<t t-if="record.phases.raw_value">
<button name="open_phase" class="oe_project_buttons" type="object"><div class="fontsize"><t t-if="record.open_phases.value &lt;= 1"> Phase</t><t t-if="record.open_phases.value > 1"> Phases</t>(<t t-esc="record.open_phases.value"/>)</div></button>
addons/project_timesheet/project_timesheet_view.xml
+1 -1
View File
@@ -36,7 +36,7 @@
<field name="total_timesheet"/>
<field name="currency_id"/>
</field>
<xpath expr="//h4[@id='list']" position="inside">
<xpath expr="//div[@id='list']" position="inside">
<a id="3">
<t t-if="record.timesheets.raw_value">
<button name="open_timesheets" class="oe_project_buttons" type="object"><div class="fontsize"><t t-if="record.total_timesheet.value &lt;= 1"> Timesheet</t><t t-if="record.total_timesheet.value &gt; 1"> Timesheets</t>(<t t-esc="record.total_timesheet.value"/>)</div></button>