nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 10:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor Updates

Browse Source
This commit is contained in:
Kanchan Chauhan
2016-03-22 16:00:41 +05:30
parent b3fe6a45a7
commit 2ad801cfd8
7 changed files with 172 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/templates/includes/projects/project_issues.html
View File

@@ -3,7 +3,7 @@
<div class='row project-item'>
<div class='col-xs-9'>
<a class="no-decoration" href="/issues-view?name={{ issue.name}}">
<span class="indicator {{ "green" if issue.status=="Open" else "darkgrey" }}">
<span class="indicator {{ "red" if issue.status=="Open" else "green" }}">
{% if issue.status == "Closed" %}
{{ issue.subject }} resolved {{ frappe.utils.pretty_date(issue.resolution_date) }}
{% else %}

2
erpnext/templates/includes/projects/project_tasks.html
View File

@@ -3,7 +3,7 @@
<div class='row project-item'>
<div class='col-xs-9'>
<a class="no-decoration" href="/tasks-view?name={{ task.name}}">
<span class="indicator {{ "green" if task.status=="Open" else "darkgrey" }}">
<span class="indicator {{ "orange" if task.status=="Open" else "green" }}">
{% if task.status == "Closed" %}
{{ task.subject }} completed on {{ task.closing_date }}
{% else %}

57
erpnext/templates/includes/projects/timeline.html
View File

@@ -1,44 +1,17 @@
{% for timeline in doc.timelines %}
<div class='timeline'>
<div class="row project-item">
<div class="col-xs-12">
<span class="avatar avatar-small" title="{{ timeline.modified_by }}"> <img src="{{ timeline.user_image }}"></span>
<span class='indicator'>
{{timeline.reference_name}} {{timeline.subject }}
</span>
<span class='indicator pull-right'>
{{ frappe.utils.pretty_date(timeline.creation) }}
</span>
<article class="timeline-entry">
<div class="timeline-entry-inner">
<div class="timeline-icon {{ "bg-danger" if ((timeline.reference_name).startswith('ISS') and (timeline.subject).startswith('Open')) else "bg-warning" if ((timeline.reference_name).startswith('TASK') and (timeline.subject).startswith('Open')) else "bg-success" if (timeline.subject).startswith('Closed') else "bg-info"}}">
</div>
<div class="timeline-label">
<span class="avatar avatar-small" title="{{ timeline.modified_by }}"> <img src="{{ timeline.user_image }}"></span>
<span class='indicator'>
{{timeline.reference_name}} {{timeline.subject }}
</span>
<span class='indicator pull-right'>
{{ frappe.utils.pretty_date(timeline.creation) }}
</span>
</div>
</div>
</div>
</div>
{% endfor %}
<!-- <div class="timeline-centered">
{% for timeline in doc.timelines %}
<article class="timeline-entry">
<div class="timeline-entry-inner">
<div class="timeline-icon bg-warning">
<i class="entypo-camera"></i>
</div>
<div class="timeline-label">
<span class="avatar avatar-small" title="{{ timeline.modified_by }}"> <img src="{{ timeline.user_image }}"></span>
<span class='indicator'>
{{timeline.reference_name}} {{timeline.subject }}
</span>
<span class='indicator pull-right'>
{{ frappe.utils.pretty_date(timeline.creation) }}
</span>
</div>
</div>
</article>
{% endfor %}
</div> -->
</article>
{% endfor %}