UI Changes
diff --git a/erpnext/templates/includes/project_row.html b/erpnext/templates/includes/project_row.html
index 3c7331b..fc264c1 100644
--- a/erpnext/templates/includes/project_row.html
+++ b/erpnext/templates/includes/project_row.html
@@ -8,11 +8,10 @@
</div>
<div class="col-xs-4">
{% if doc.percent_complete %}
- <div class="progress" style="margin-bottom: 0!important;">
+ <div class="progress" style="margin-bottom: 0!important; margin-top: 10px!important; height:5px;">
<div class="progress-bar progress-bar-warning" role="progressbar"
aria-valuenow="{{ doc.percent_complete|round|int }}"
aria-valuemin="0" aria-valuemax="100" style="width:{{ doc.percent_complete|round|int }}%;">
- {{ doc.percent_complete|round|int }}% Complete
</div>
</div>
{% else %}
diff --git a/erpnext/templates/includes/projects.css b/erpnext/templates/includes/projects.css
index 99ec4c8..8c83e17 100644
--- a/erpnext/templates/includes/projects.css
+++ b/erpnext/templates/includes/projects.css
@@ -4,24 +4,46 @@
text-decoration: underline;
}
-.page-container .indicator {
+.page-container {
font-weight: normal;
+ margin: 50px auto;
+ max-width: 700px;
}
+.project-item:hover {
+ background-color: #f7f7f7;
+}
+
+.project-item {
+ color: #6c7680;
+ font-size: 14px;
+}
+
+.task-subject
+{
+ margin: 0px;
+}
+
+.item-timestamp
+{
+ font-size: 10px;
+}
.page-container .project-item {
padding-top: 5px;
padding-bottom: 5px;
}
#project-search {
- border: none;
+ position: relative;
+ outline:none;
+ border:none;
}
-.task-link {
+.task-link, .timelog-link {
font-weight: bold;
}
-.task-link.seen {
+.task-link.seen, .timelog-link.seen {
font-weight: normal;
}
@@ -62,116 +84,12 @@
padding: 8px;
}
-.timeline-centered {
- position: relative;
- margin-bottom: 10px;
+.gravatar-top{
+ margin-top:8px;
}
-.timeline-centered:before {
- content: '';
- position: absolute;
- display: block;
- width: 3px;
- background: #f5f5f6;
- /*left: 50%;*/
- top: 0px;
- bottom: 0px;
- margin-left: 10px;
-}
-
-.timeline-centered .timeline-entry {
- position: relative;
- /*width: 50%;
-float: right;*/
- margin-top: 5px;
- margin-left: 10px;
- margin-bottom: 5px;
- clear: both;
-}
-
-
-.timeline-centered .timeline-entry .timeline-entry-inner {
- position: relative;
- margin-left: -3px;
-}
-
-
-.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon {
- margin-top:14px;
- background: #fff;
- color: #737881;
- display: block;
- width: 10px;
- height: 10px;
- -webkit-background-clip: padding-box;
- -moz-background-clip: padding;
- background-clip: padding-box;
- -webkit-border-radius: 20px;
- -moz-border-radius: 20px;
- border-radius: 20px;
- text-align: center;
- -moz-box-shadow: 0 0 0 2px #f5f5f6;
- -webkit-box-shadow: 0 0 0 2px #f5f5f6;
- box-shadow: 0 0 0 2px #f5f5f6;
- line-height: 30px;
- float: left;
-}
-
-
-.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-primary {
- background-color: #303641;
- color: #fff;
-}
-
-.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-secondary {
- background-color: #ee4749;
- color: #fff;
-}
-
-.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-success {
- background-color: #98d85b;
- color: #fff;
-}
-
-.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-info {
- background-color: #21a9e1;
- color: #fff;
-}
-
-.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-warning {
- background-color: #ffa00a;
- color: #fff;
-}
-
-.timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-danger {
- background-color: #ff5858;
- color: #fff;
-}
-
-
-.timeline-centered .timeline-entry .timeline-entry-inner .timeline-label {
- position: relative;
- background: #f5f5f6;
- padding: 1em;
- margin-left: 40px;
- -webkit-background-clip: padding-box;
- -moz-background-clip: padding;
- background-clip: padding-box;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
-}
-
-.timeline-centered .timeline-entry .timeline-entry-inner .timeline-label:after {
- content: '';
- display: block;
- position: absolute;
- width: 0;
- height: 0;
- border-style: solid;
- border-width: 9px 9px 9px 0;
- border-color: transparent #f5f5f6 transparent transparent;
- left: 0;
- top: 10px;
- margin-left: -9px;
-}
+.progress-hg{
+ margin-bottom: 0!important;
+ margin-top: 30px!important;
+ height:5px;
+}
\ No newline at end of file
diff --git a/erpnext/templates/includes/projects/project_issues.html b/erpnext/templates/includes/projects/project_issues.html
deleted file mode 100644
index f8924f5..0000000
--- a/erpnext/templates/includes/projects/project_issues.html
+++ /dev/null
@@ -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 %}
\ No newline at end of file
diff --git a/erpnext/templates/includes/projects/project_search_box.html b/erpnext/templates/includes/projects/project_search_box.html
index 59ebaa4..ab02f0c 100644
--- a/erpnext/templates/includes/projects/project_search_box.html
+++ b/erpnext/templates/includes/projects/project_search_box.html
@@ -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;
diff --git a/erpnext/templates/includes/projects/project_tasks.html b/erpnext/templates/includes/projects/project_tasks.html
index 3db5a68..b4e5cec 100644
--- a/erpnext/templates/includes/projects/project_tasks.html
+++ b/erpnext/templates/includes/projects/project_tasks.html
@@ -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 %}
\ No newline at end of file
+{% endfor %}
diff --git a/erpnext/templates/includes/projects/project_timelogs.html b/erpnext/templates/includes/projects/project_timelogs.html
index 7b5913b..c9a40b3 100644
--- a/erpnext/templates/includes/projects/project_timelogs.html
+++ b/erpnext/templates/includes/projects/project_timelogs.html
@@ -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 %}
\ No newline at end of file