diff --git a/frappe/public/build.json b/frappe/public/build.json index fdb6da93c5..1eb86dc32a 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -251,7 +251,6 @@ "public/js/frappe/views/treeview.js", "public/js/frappe/views/image/image_view_item_row.html", - "public/js/frappe/views/image/image_view_item_main_head.html", "public/js/frappe/views/image/photoswipe_dom.html", "public/js/frappe/views/inbox/inbox_no_result.html", diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css index c8866da49c..8e88423d78 100644 --- a/frappe/public/css/list.css +++ b/frappe/public/css/list.css @@ -152,14 +152,6 @@ } .filterable { cursor: pointer; - display: inline-block; - text-overflow: ellipsis; -} -.col-sm-2:not(.list-row-right) .filterable, -.col-sm-3:not(.list-row-right) .filterable { - max-width: 145px; - overflow: hidden; - width: 100%; } .doclist-row .label { margin-right: 8px; @@ -392,3 +384,73 @@ .inbox-value { padding-top: 2px; } +.list-items { + width: 100%; +} +.list-item-container { + border-bottom: 1px solid #d1d8dd; +} +.list-item-container:last-child { + border-bottom: none; +} +.list-item { + display: flex; + align-items: center; + cursor: pointer; + height: 40px; + padding-left: 15px; + font-size: 12px; +} +.list-item:hover { + background-color: #F7FAFC; +} +@media (max-width: 767px) { + .list-item { + height: 50px; + padding-left: 10px; + font-size: 14px; + font-weight: normal; + } +} +.list-item--head { + background-color: #F7FAFC; + border-bottom: 1px solid #d1d8dd; + cursor: auto; +} +.list-item input[type=checkbox] { + margin: 0; + margin-right: 5px; +} +.list-item .liked-by, +.list-item .liked-by-filter-button { + display: inline-block; + width: 20px; + margin-right: 10px; +} +.list-item__content { + flex: 1; + margin-right: 15px; + display: flex; + align-items: center; +} +.list-item__content--flex-2 { + flex: 2; +} +.list-item__content--activity { + justify-content: flex-end; + margin-right: 5px; +} +.list-item__content--activity .list-row-modified, +.list-item__content--activity .avatar-small { + margin-right: 10px; +} +.list-item__content--indicator span::before { + height: 12px; + width: 12px; +} +.list-item__content--id { + justify-content: flex-end; +} +.frappe-timestamp { + white-space: nowrap; +} diff --git a/frappe/public/js/frappe/list/header_select_all_like_filter.html b/frappe/public/js/frappe/list/header_select_all_like_filter.html index 324f8cb71f..1cb81c9dc9 100644 --- a/frappe/public/js/frappe/list/header_select_all_like_filter.html +++ b/frappe/public/js/frappe/list/header_select_all_like_filter.html @@ -1,8 +1,8 @@ {% if (_checkbox) { %} - {% } %} - + \ No newline at end of file diff --git a/frappe/public/js/frappe/list/item_assigned_to_comment_count.html b/frappe/public/js/frappe/list/item_assigned_to_comment_count.html index 676fab1457..91df275ac9 100644 --- a/frappe/public/js/frappe/list/item_assigned_to_comment_count.html +++ b/frappe/public/js/frappe/list/item_assigned_to_comment_count.html @@ -1,17 +1,15 @@ - + + {%= comment_when(data.modified, true) %} + +{% if (data._assign_list.length) { %} + + {%= frappe.avatar(data._assign_list[data._assign_list.length - 1]) %} +{% } else { %} + +{% } %} + + + {%= (data._comment_count > 99 ? "99+" : data._comment_count) || 0 %} + diff --git a/frappe/public/js/frappe/list/list_item_main.html b/frappe/public/js/frappe/list/list_item_main.html index 42f00765ea..928943abcd 100644 --- a/frappe/public/js/frappe/list/list_item_main.html +++ b/frappe/public/js/frappe/list/list_item_main.html @@ -1,49 +1,40 @@ -
- {% var total_cols=0; for (var i=0, l=columns.length; i < l; i++ ) { - var col = columns[i], value=data[col.fieldname]; total_cols += parseInt(col.colspan); %} - {% if (total_cols <= 12) { %} -
- {% if(col.type!=="Indicator") { %}{% } %} - {% if (col.type==="Subject") { %} - {%= subject %} - {% } else if (col.type==="Indicator") { %} - {%= indicator %} - {% } else if (col.render) { %} - {%= col.render(data) %} - {% } else if (col.fieldtype==="Image") { %} - {% if(data[col.df.options]) { %} - - {% } else { %} -
- {% } %} - {% } else if(col.fieldtype==="Select") { %} - {%= __(value) %} - {% } else if(col.fieldtype==="Link") { %} - {%= value %} - {% } else { %} - {% if(formatters && formatters[col.fieldname]) { %} - {{ formatters[col.fieldname](value, col.df, data) }} - {% } else { %} - {{ frappe.format(value, col.df, null, data) }} - {% } %} - {% } %} - {% if(col.type!=="Indicator") { %}
{% } %} -
+
+ {% if (col.type==="Subject") { %} + {%= subject %} + {% } else if (col.type==="Indicator") { %} + {%= indicator %} + {% } else if (col.render) { %} + {%= col.render(data) %} + {% } else if (col.fieldtype==="Image") { %} + {% if(data[col.df.options]) { %} + + {% } else { %} +
+ {% } %} + {% } else if(col.fieldtype==="Select") { %} + {%= __(value) %} + {% } else if(col.fieldtype==="Link") { %} + {%= value %} + {% } else { %} + + {% if(formatters && formatters[col.fieldname]) { %} + {{ formatters[col.fieldname](value, col.df, data) }} + {% } else { %} + {{ frappe.format(value, col.df, null, data) }} {% } %} + {% } %} -
+
\ No newline at end of file diff --git a/frappe/public/js/frappe/list/list_item_main_head.html b/frappe/public/js/frappe/list/list_item_main_head.html index d8fb694ca9..9dc8f16b58 100644 --- a/frappe/public/js/frappe/list/list_item_main_head.html +++ b/frappe/public/js/frappe/list/list_item_main_head.html @@ -1,29 +1,15 @@ -
- {% var total_cols=0; for (var i=0, l=columns.length; i < l; i++ ) { - var col = columns[i]; total_cols += parseInt(col.colspan); %} - {% if (total_cols <= 12) { %} -
+
- - {% if (col.type==="Subject") { %} - {%= frappe.render_template("header_select_all_like_filter", { _checkbox: _checkbox }) %} - {% } %} - {{ __(col.title) || __(col.label) || "" }} - + {% if (col.type==="Subject") { %} + {%= frappe.render_template("header_select_all_like_filter", { _checkbox: _checkbox }) %} + {% } %} + {{ __(col.title) || __(col.label) || "" }} -
- {% } %} - {% } %} -
+
\ No newline at end of file diff --git a/frappe/public/js/frappe/list/list_item_row.html b/frappe/public/js/frappe/list/list_item_row.html index 0db51d0a25..d67feabf3b 100644 --- a/frappe/public/js/frappe/list/list_item_row.html +++ b/frappe/public/js/frappe/list/list_item_row.html @@ -1,31 +1,24 @@ -
-
- - {%= main %} -
+
+ {%= main %} {% if (meta.title_field && !settings.hide_name_column) { - var is_different = data.name !== data[meta.title_field]; - %} -