nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-02 16:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI Changes

Browse Source
This commit is contained in:
Kanchan Chauhan
2016-03-29 11:21:42 +05:30
parent c20c536f28
commit b566d42d37
12 changed files with 206 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,28 +0,0 @@
{%- from "templates/includes/projects/macros.html" import back_link -%}
{% for issue in doc.issues %}
<div class='issue'>
<div class='row project-item'>
<div class='col-xs-9'>
<a class="no-decoration" href="/issues?name={{ issue.name}}{{ back_link(doc) }}">
<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 %}
{{ issue.subject }} raised on {{ issue.opening_date }}
{% endif %}
</span>
</a>
</div>
<div class='col-xs-3'>
<div class='pull-right'>
{% if issue.todo %}
<span class="avatar avatar-small" title="{{ issue.todo.owner }}"> <img src="{{ issue.todo.user_image }}"></span>
{% else %}
<span class="avatar avatar-small avatar-empty"></span>
{% endif %}
</div>
</div>
</div>
</div>
{% endfor %}

19
erpnext/templates/includes/projects/project_search_box.html
View File

@@ -1,12 +1,21 @@
<div class="project-search">
<input type="text" id="project-search"
placeholder="Search...">
<span style="position:relative;
left:-19px;"> <a href="/projects?project={{doc.name}}" class="octicon octicon-x text-extra-muted" title="Clear" ></a> </span>
<div class="project-search text-muted pull-right">
<input type="text" id="project-search" placeholder="Quick Search">
<i class="octicon octicon-search"></i>
</div>
<div class="clearfix pull-right" style="width:300px;">
<h4 class="project-search-results pull-left"></h4>
<p class="pull-right">
<a style="display: none; padding-left:5px;" href="/projects?project={{doc.name}}" class="octicon octicon-x text-extra-muted clear" title="Clear Search" ></a>
</p>
</div>
<script>
frappe.ready(function() {
if(get_url_arg("q")){
var txt = get_url_arg("q");
$(".project-search-results").html("Search results for : " + txt);
$(".clear").toggle(true);
}
var thread = null;
function findResult(t) {
window.location.href="/projects?project={{doc.name}}&q=" + t;

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

@@ -3,22 +3,25 @@
{% for task in doc.tasks %}
<div class='task'>
<div class='row project-item'>
<div class='col-xs-9'>
<div class='col-xs-1 gravatar-top'>
{% if task.todo %}
<span class="avatar avatar-small" title="{{ task.todo.owner }}">
<img src="{{ task.todo.user_image }}">
</span>
{% else %}
<span class="avatar avatar-small avatar-empty"></span>
{% endif %}
{% endif %}
</div>
<div class='col-xs-11'>
<a class="no-decoration task-link {{ task.css_seen }}" href="/tasks?name={{ task.name }}{{ back_link(doc) }}">
{% if task.status == "Closed" %}
{{ task.subject }} completed on {{ task.closing_date }}
{% else %}
{{ task.subject }}
{% endif %}
<div class="task-subject">{{ task.subject }}</div>
<span class="item-timestamp">modified {{ frappe.utils.pretty_date(task.modified) }}</span>
</a>
<span class="pull-right list-comment-count small {{ "text-extra-muted" if task.comment_count==0 else "text-muted" }}">
<i class="octicon octicon-comment-discussion"></i>
{{ task.comment_count }}
</span>
</div>
</div>
</div>
{% endfor %}
{% endfor %}

27
erpnext/templates/includes/projects/project_timelogs.html
View File

@@ -3,20 +3,19 @@
{% for timelog in doc.timelogs %}
<div class='timelog'>
<div class='row project-item'>
<div class='col-xs-9'>
<a class="no-decoration" href="/timelog_info?timelog={{ timelog.name}}">
<span class="indicator {{ "green" if timelog.status=="Draft" else "blue" if timelog.status=="Submitted" else "darkgrey"}}">
{{ timelog.title }}: From {{ frappe.format_date(timelog.from_time) }} to {{ frappe.format_date(timelog.to_time) }}
</span>
</a>
</div>
<div class='col-xs-3'>
<div class='pull-right'>
<span class="avatar avatar-small" title="{{ timelog.modified_by }}"> <img src="{{ timelog.user_image }}"></span>
</div>
</div>
<div class='col-xs-1 gravatar-top'>
<span class="avatar avatar-small" title="{{ timelog.modified_by }}"> <img src="{{ timelog.user_image }}"></span>
</div>
<div class='col-xs-11'>
<a class="no-decoration timelog-link {{ timelog.css_seen }}" href="/time-log?name={{ timelog.name}}{{ back_link(doc) }}">
<div class="timelog-subject">{{ timelog.title }}</div>
<span class="item-timestamp">From {{ frappe.format_date(timelog.from_time) }} to {{ frappe.format_date(timelog.to_time) }}</span>
</a>
<span class="pull-right list-comment-count small {{ "text-extra-muted" if timelog.comment_count==0 else "text-muted" }}">
<i class="octicon octicon-comment-discussion"></i>
{{ timelog.comment_count }}
</span>
</div>
</div>
</div>
{% endfor %}