{%= date_sep || "" %}
-
- 
+
+
{% if (feed_type==="Login") { %}
@@ -15,6 +20,13 @@
{%= __("Commented on {0}: {1}", [link, "" + subject + ""]) %}
{% } else if (doc_type && !feed_type) { %}
{%= __("Updated {0}: {1}", [link, "" + subject + ""]) %}
+ {% } else if (feed_type==="Like" && doc_type) { %}
+ {%= by %}
+ {% if (in_list(["Comment", "Communication"], doc_type)) { %}
+ {%= subject %}
+ {% } else { %}
+ {%= link %}
+ {% } %}
{% } else if (doc_type) { %}
{%= __("{0}: {1}", [link, "" + subject + ""]) %}
{% } else { %}
diff --git a/frappe/desk/page/messages/messages.js b/frappe/desk/page/messages/messages.js
index 897f193b31..e3d2312b9f 100644
--- a/frappe/desk/page/messages/messages.js
+++ b/frappe/desk/page/messages/messages.js
@@ -22,6 +22,8 @@ frappe.pages.messages.on_page_load = function(parent) {
frappe.pages.messages.on_page_show = function() {
// clear title prefix
frappe.utils.set_title_prefix("");
+
+ frappe.breadcrumbs.add("Desk");
}
frappe.desk.pages.Messages = Class.extend({
diff --git a/frappe/desk/star.py b/frappe/desk/star.py
deleted file mode 100644
index e5c4fdf131..0000000000
--- a/frappe/desk/star.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-from __future__ import unicode_literals
-
-"""Allow adding of stars to documents"""
-
-import frappe, json
-from frappe.model.db_schema import add_column
-
-@frappe.whitelist()
-def toggle_star(doctype, name, add=False):
- """Adds / removes the current user in the `__starred_by` property of the given document.
- If column does not exist, will add it in the database.
-
- The `_starred_by` property is always set from this function and is ignored if set via
- Document API
-
- :param doctype: DocType of the document to star
- :param name: Name of the document to star
- :param add: `Yes` if star is to be added. If not `Yes` the star will be removed."""
-
- _toggle_star(doctype, name, add)
-
-def _toggle_star(doctype, name, add=False, user=None):
- """Same as toggle_star but hides param `user` from API"""
-
- if not user:
- user = frappe.session.user
-
- try:
- starred_by = frappe.db.get_value(doctype, name, "_starred_by")
- if starred_by:
- starred_by = json.loads(starred_by)
- else:
- starred_by = []
-
- if add=="Yes":
- if user not in starred_by:
- starred_by.append(user)
- else:
- if user in starred_by:
- starred_by.remove(user)
-
- frappe.db.sql("""update `tab{0}` set `_starred_by`=%s where name=%s""".format(doctype),
- (json.dumps(starred_by), name))
-
- except Exception, e:
- if e.args[0]==1054:
- add_column(doctype, "_starred_by", "Text")
- _toggle_star(doctype, name, add, user)
- else:
- raise
diff --git a/frappe/docs/current/api/desk/frappe.desk.star.html b/frappe/docs/current/api/desk/frappe.desk.star.html
deleted file mode 100644
index 94ce433135..0000000000
--- a/frappe/docs/current/api/desk/frappe.desk.star.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
- - - - - - -
-
- - - - - - \ No newline at end of file diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index 66522d1d7f..56d2c9f55c 100644 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe from frappe.utils.pdf import get_pdf from frappe.email.smtp import get_outgoing_email_account -from frappe.utils import get_url, scrub_urls, strip, expand_relative_urls, cint, split_emails +from frappe.utils import get_url, scrub_urls, strip, expand_relative_urls, cint, split_emails, to_markdown import email.utils from markdown2 import markdown @@ -89,12 +89,7 @@ class EMail: def set_html_as_text(self, html): """return html2text""" - import HTMLParser - from html2text import html2text - try: - self.set_text(html2text(html)) - except HTMLParser.HTMLParseError: - pass + self.set_text(to_markdown(html)) def set_message(self, message, mime_type='text/html', as_attachment=0, filename='attachment.html'): """Append the message with MIME content to the root node (as attachment)""" diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 0560043894..64b40502e9 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -14,7 +14,7 @@ default_fields = ('doctype','name','owner','creation','modified','modified_by', integer_docfield_properties = ("reqd", "search_index", "in_list_view", "permlevel", "hidden", "read_only", "ignore_user_permissions", "allow_on_submit", "report_hide", "in_filter", "no_copy", "print_hide", "unique") -optional_fields = ("_user_tags", "_comments", "_assign", "_starred_by") +optional_fields = ("_user_tags", "_comments", "_assign", "_liked_by") def rename(doctype, old, new, debug=False): import frappe.model.rename_doc diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index ab33d4b8c3..c660acb606 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -239,7 +239,7 @@ class BaseDocument(object): if k in default_fields: del doc[k] - for key in ("_user_tags", "__islocal", "__onload", "_starred_by", "__run_link_triggers"): + for key in ("_user_tags", "__islocal", "__onload", "_liked_by", "__run_link_triggers"): if self.get(key): doc[key] = self.get(key) diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index e69758396a..3507daa9e3 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -25,7 +25,7 @@ class DatabaseQuery(object): def execute(self, query=None, fields=None, filters=None, or_filters=None, docstatus=None, group_by=None, order_by=None, limit_start=False, limit_page_length=None, as_list=False, with_childnames=False, debug=False, - ignore_permissions=False, user=None): + ignore_permissions=False, user=None, with_comment_count=False): if not ignore_permissions and not frappe.has_permission(self.doctype, "read", user=user): raise frappe.PermissionError, self.doctype @@ -45,9 +45,14 @@ class DatabaseQuery(object): self.user = user or frappe.session.user if query: - return self.run_custom_query(query) + result = self.run_custom_query(query) else: - return self.build_and_run() + result = self.build_and_run() + + if with_comment_count and not as_list and self.doctype: + self.add_comment_count(result) + + return result def build_and_run(self): args = self.prepare_args() @@ -444,3 +449,21 @@ class DatabaseQuery(object): return 'limit %s, %s' % (self.limit_start, self.limit_page_length) else: return '' + + def add_comment_count(self, result): + for r in result: + if not r.name: + continue + + if "_comments" in r: + comment_count = len(json.loads(r._comments or "[]")) + else: + comment_count = cint(frappe.db.get_value("Comment", + filters={"comment_doctype": self.doctype, "comment_docname": r.name, "comment_type": "Comment"}, + fieldname="count(name)")) + + communication_count = cint(frappe.db.get_value("Communication", + filters={"reference_doctype": self.doctype, "reference_name": r.name}, + fieldname="count(name)")) + + r._comment_count = comment_count + communication_count diff --git a/frappe/model/document.py b/frappe/model/document.py index 3c308f1b8a..9ea6569d11 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -764,7 +764,7 @@ class Document(BaseDocument): """Returns Desk URL for this document. `/desk#Form/{doctype}/{name}`""" return "/desk#Form/{doctype}/{name}".format(doctype=self.doctype, name=self.name) - def add_comment(self, comment_type, text=None, comment_by=None): + def add_comment(self, comment_type, text=None, comment_by=None, reference_doctype=None, reference_name=None): """Add a comment to this document. :param comment_type: e.g. `Comment`. See Comment for more info.""" @@ -774,7 +774,9 @@ class Document(BaseDocument): "comment_type": comment_type, "comment_doctype": self.doctype, "comment_docname": self.name, - "comment": text or _(comment_type) + "comment": text or _(comment_type), + "reference_doctype": reference_doctype, + "reference_name": reference_name }).insert(ignore_permissions=True) return comment @@ -782,10 +784,10 @@ class Document(BaseDocument): """Returns signature (hash) for private URL.""" return hashlib.sha224(get_datetime_str(self.creation)).hexdigest() - def get_starred_by(self): - starred_by = getattr(self, "_starred_by", None) - if starred_by: - return json.loads(starred_by) + def get_liked_by(self): + liked_by = getattr(self, "_liked_by", None) + if liked_by: + return json.loads(liked_by) else: return [] diff --git a/frappe/patches.txt b/frappe/patches.txt index 5d0cb6f1f9..60780d2ff1 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -75,6 +75,7 @@ execute:frappe.db.sql("""update tabComment set comment = substr(comment, 6, loca frappe.patches.v5_0.fix_feed frappe.patches.v5_0.update_shared execute:frappe.reload_doc("core", "doctype", "docshare") #2015-07-21 +frappe.patches.v6_16.star_to_like frappe.patches.v5_0.bookmarks_to_stars frappe.patches.v5_0.style_settings_to_website_theme frappe.patches.v5_0.rename_ref_type_fieldnames @@ -112,3 +113,5 @@ execute:frappe.create_folder(os.path.join(frappe.local.site_path, 'private', 'fi frappe.patches.v6_15.remove_property_setter_for_previous_field #2015-12-29 frappe.patches.v6_15.set_username execute:frappe.permissions.reset_perms("Error Snapshot") +frappe.patches.v6_16.feed_doc_owner + diff --git a/frappe/patches/v5_0/bookmarks_to_stars.py b/frappe/patches/v5_0/bookmarks_to_stars.py index 4f25cf00f7..603697a1b7 100644 --- a/frappe/patches/v5_0/bookmarks_to_stars.py +++ b/frappe/patches/v5_0/bookmarks_to_stars.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import json import frappe import frappe.defaults -from frappe.desk.star import _toggle_star +from frappe.desk.like import _toggle_like def execute(): for user in frappe.get_all("User"): @@ -29,4 +29,4 @@ def execute(): or int(frappe.db.get_value("DocType", doctype, "issingle") or 0) or not frappe.db.table_exists(doctype)): continue - _toggle_star(doctype, docname, add="Yes", user=username) + _toggle_like(doctype, docname, add="Yes", user=username) diff --git a/frappe/patches/v6_16/__init__.py b/frappe/patches/v6_16/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/patches/v6_16/feed_doc_owner.py b/frappe/patches/v6_16/feed_doc_owner.py new file mode 100644 index 0000000000..163482a1dc --- /dev/null +++ b/frappe/patches/v6_16/feed_doc_owner.py @@ -0,0 +1,30 @@ +from __future__ import unicode_literals +import frappe + +def execute(): + frappe.reload_doctype("Feed") + + frappe.db.sql("update `tabFeed` set seen=1") + + for doctype, name in frappe.db.sql("""select distinct doc_type, doc_name from `tabFeed` + where + (doc_type is not null and doc_type != '') + and (doc_name is not null and doc_name != '') + and doc_type != 'Feed' + for update"""): + + owner = frappe.db.get_value(doctype, name, "owner") + + if not owner: + continue + + frappe.db.sql("""update `tabFeed` + set doc_owner=%(owner)s + where + doc_type=%(doctype)s + and doc_name=%(name)s + and (doc_owner is null or doc_owner = '')""".format(doctype=doctype), { + "doctype": doctype, + "name": name, + "owner": owner + }) diff --git a/frappe/patches/v6_16/star_to_like.py b/frappe/patches/v6_16/star_to_like.py new file mode 100644 index 0000000000..5e568e4931 --- /dev/null +++ b/frappe/patches/v6_16/star_to_like.py @@ -0,0 +1,18 @@ +from __future__ import unicode_literals +import frappe +from frappe.model.db_schema import add_column + +def execute(): + frappe.reload_doctype("Feed") + + frappe.db.sql("""update `tabSingles` set field='_liked_by' where field='_starred_by'""") + frappe.db.commit() + + for table in frappe.db.get_tables(): + columns = [r[0] for r in frappe.db.sql("DESC `{0}`".format(table))] + if "_starred_by" in columns: + frappe.db.sql_ddl("""alter table `{0}` change `_starred_by` `_liked_by` Text """.format(table)) + + for doctype in ("Comment", "Communication"): + if not frappe.db.has_column(doctype, "_liked_by"): + add_column(doctype, "_liked_by", "Text") diff --git a/frappe/public/build.json b/frappe/public/build.json index 9f6241b56b..17cc177f51 100644 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -16,6 +16,7 @@ "public/js/lib/highlight.pack.js", "public/js/frappe/class.js", "public/js/lib/microtemplate.js", + "public/js/frappe/query_string.js", "website/js/website.js", "public/js/lib/socket.io.min.js" ], @@ -121,6 +122,7 @@ "public/js/frappe/change_log.html", "public/js/frappe/desk.js", + "public/js/frappe/query_string.js", "public/html/error_object.html", "public/html/error_snapshot.html" @@ -180,7 +182,8 @@ "public/js/frappe/ui/filters/filters.js", "public/js/frappe/ui/filters/edit_filter.html", "public/js/frappe/ui/tags.js", - "public/js/frappe/ui/star.js", + "public/js/frappe/ui/like.js", + "public/js/frappe/ui/liked_by.html", "public/html/print_template.html", "public/js/frappe/list/doclistview.js", "public/js/frappe/list/list_sidebar.js", diff --git a/frappe/public/css/avatar.css b/frappe/public/css/avatar.css index 7bc44cacd9..952a706bd0 100644 --- a/frappe/public/css/avatar.css +++ b/frappe/public/css/avatar.css @@ -43,3 +43,12 @@ height: 0; padding-bottom: 100%; } +.avatar-frame { + width: 100%; + height: 0; + padding: 50% 0px; + background-size: cover; + background-repeat: no-repeat; + background-position: center center; + border-radius: 4px; +} diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index e19fbbb788..2d469fbbe1 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -546,3 +546,11 @@ ul.linked-with-list li { border-bottom: 1px solid #d1d8dd; border-radius: 0px; } +.liked-by-popover { + min-width: 200px; + margin-top: -10px; + margin-bottom: -10px; +} +.liked-by-popover li { + margin: 15px 0px; +} diff --git a/frappe/public/css/form.css b/frappe/public/css/form.css index 53012a4dce..32970563f8 100644 --- a/frappe/public/css/form.css +++ b/frappe/public/css/form.css @@ -61,8 +61,7 @@ .empty-section { display: none !important; } -.shaded-section, -.timeline-item:nth-child(even) { +.shaded-section { background-color: #fafbfc; } .modal .form-layout { @@ -87,37 +86,165 @@ background-color: #e74c3c; } .timeline { - border: 1px solid #d1d8dd; margin: 30px 0px; } +.timeline .timeline-head .comment-input { + height: auto; +} .timeline-item { margin-top: 0px; - padding: 15px 30px 7px; - border-bottom: 1px solid #d1d8dd; -} -.timeline-item .icon-fixed-width { - text-align: center; } .timeline-item blockquote { font-size: inherit; } -.timeline-item:last-child { - border-bottom: 0px; +.timeline-items { + position: relative; } -.timeline-item .reply { - margin-top: 5px; +.timeline { + position: relative; +} +.timeline::before { + content: " "; + border-left: 1px solid #d1d8dd; + position: absolute; + top: 0px; + bottom: -124px; + left: 43px; + z-index: -1; +} +@media (max-width: 991px) { + .timeline::before { + bottom: -64px; + } +} +.timeline-item.user-content { + margin: 30px 0px 30px 30px; +} +.timeline-item.user-content .media-body { + border: 1px solid #d1d8dd; + border-radius: 2px; + margin-left: -7px; + position: relative; + overflow: visible; +} +.timeline-item.user-content .comment-header { + background-color: #fafbfc; + padding: 7px 15px; + margin: 0px; + color: #8D99A6; + border-bottom: 1px solid #EBEFF2; +} +.timeline-item.user-content .comment-header .octicon-heart { + color: #ff5858; + cursor: pointer; +} +.timeline-item.user-content .reply { + padding: 10px 15px; +} +.timeline-item.user-content .reply > div > p:first-child { + margin-top: 0px; +} +.timeline-item.user-content .reply > div > p:last-child { + margin-bottom: 0px; +} +.timeline-item.user-content .close-btn-container { + padding: 2px 15px; +} +.timeline-item.user-content .comment-likes { + margin-left: 5px; +} +.timeline-item.user-content .media-body:after, +.timeline-item.user-content .media-body:before { + right: 100%; + top: 15px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} +.timeline-item.user-content .media-body:after { + border-color: rgba(136, 183, 213, 0); + border-right-color: #fafbfc; + border-width: 6px; + margin-top: -6px; +} +.timeline-item.user-content .media-body:before { + border-color: rgba(194, 225, 245, 0); + border-right-color: #d1d8dd; + border-width: 7px; + margin-top: -7px; +} +.timeline-item.notification-content { + padding-left: 30px; + margin: 30px 0px; + position: relative; + color: #8D99A6; +} +.timeline-item.notification-content * { + color: #8D99A6; +} +.timeline-item.notification-content .icon-fixed-width { + margin-left: 36px; +} +.timeline-item.notification-content .octicon-heart { + color: #ff5858 !important; +} +.timeline-item.notification-content::before { + content: " "; + width: 7px; + height: 7px; + background-color: #d1d8dd; + position: absolute; + left: 40px; + border-radius: 50%; + top: 5px; } .timeline-item .reply-link { - padding: 0px 7px; -} -.timeline-item h6, -.timeline-head h6 { - margin-top: 6px; + padding-left: 7px; } .timeline-head { + background-color: white; + border: 1px solid #d1d8dd; + border-radius: 2px; +} +.timeline-head .comment-input-header { background-color: #fafbfc; - padding: 15px 30px; - border-bottom: 1px solid #d1d8dd; + padding: 7px 15px; + border-bottom: 1px solid #EBEFF2; +} +.timeline-head .comment-input-container { + padding: 15px; +} +.timeline-head .comment-input { + border-color: #EBEFF2; + max-width: 100%; +} +.timeline-head .comment-input:focus { + box-shadow: none; +} +@media (max-width: 767px) { + .timeline-head { + border-left: none; + border-right: none; + border-radius: 0px; + } +} +.timeline-new-email { + margin: 30px 0px; + padding: 0px 65px; + position: relative; +} +.timeline-new-email::before { + content: " "; + width: 7px; + height: 7px; + background-color: #d1d8dd; + position: absolute; + left: 40px; + border-radius: 50%; + top: 5px; } .form-footer h5 { margin: 15px 0px; diff --git a/frappe/public/css/indicator.css b/frappe/public/css/indicator.css index 80ce0872f4..711df4d87a 100644 --- a/frappe/public/css/indicator.css +++ b/frappe/public/css/indicator.css @@ -48,3 +48,11 @@ .indicator-right.darkgrey::after { background: #b8c2cc; } +.indicator.yellow::before, +.indicator-right.yellow::after { + background: #FEEF72; +} +.indicator.light-blue::before, +.indicator-right.light-blue::after { + background: #7CD6FD; +} diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css index 38cc4ccd3d..2ed7e89401 100644 --- a/frappe/public/css/list.css +++ b/frappe/public/css/list.css @@ -98,6 +98,13 @@ .doclist-row { font-size: 12px; } +.doclist-row .likes-count { + display: inline-block; + width: 15px; + margin-left: -5px; + color: #8D99A6; + font-size: 12px; +} .doclist-row .docstatus .octicon { font-size: 12px; } @@ -134,14 +141,14 @@ margin: 0px -15px; padding: 5px 15px; } -.listview-main-section .icon-star { +.listview-main-section .octicon-heart { cursor: pointer; } -.list-row-head .icon-star { - vertical-align: middle; +.list-row-head .octicon-heart { + margin-right: 13px; } -.star-action.icon-star { - color: #ffdb4c; +.like-action.octicon-heart { + color: #ff5858; } .list-id { font-weight: bold; @@ -163,3 +170,8 @@ display: none; } } +.list-comment-count { + display: inline-block; + width: 37px; + text-align: left; +} diff --git a/frappe/public/css/mobile.css b/frappe/public/css/mobile.css index 9334d975f3..70886c5120 100644 --- a/frappe/public/css/mobile.css +++ b/frappe/public/css/mobile.css @@ -330,20 +330,6 @@ body { border-left-color: transparent !important; border-right-color: transparent !important; } - .timeline { - border-left: none !important; - border-right: none !important; - } - .timeline .timeline-head { - padding: 7px 15px; - } - .timeline .timeline-item { - padding: 15px; - border-bottom: 1px dashed #d1d8dd; - } - .timeline .timeline-item:last-child { - border-bottom: none; - } .list-row { padding: 13px 15px !important; } diff --git a/frappe/public/css/sidebar.css b/frappe/public/css/sidebar.css index 9431506c26..e198520e99 100644 --- a/frappe/public/css/sidebar.css +++ b/frappe/public/css/sidebar.css @@ -161,6 +161,10 @@ body[data-route^="Module"] .main-menu .form-sidebar { .form-sidebar .form-viewers .shared-with-everyone .octicon { color: #36414C !important; } +.form-sidebar .liked-by .octicon-heart { + font-size: 16px; + cursor: pointer; +} .form-sidebar .form-shared .share-doc-btn:hover, .form-sidebar .form-shared .share-doc-btn:focus, .form-sidebar .form-shared .share-doc-btn:active { @@ -174,6 +178,7 @@ body[data-route^="Module"] .main-menu .form-sidebar { .sidebar-left .form-sidebar .form-tags, .sidebar-left .form-sidebar .assignment-row, .sidebar-left .form-sidebar .form-shared, +.sidebar-left .form-sidebar .liked-by, .sidebar-left .form-sidebar .modified-by, .sidebar-left .form-sidebar .created-by, .sidebar-left .form-sidebar .tags-label, diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index c210b316a5..fe2b3635da 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -264,6 +264,16 @@ a.no-decoration:active { height: 0; padding-bottom: 100%; } +.avatar-frame { + width: 100%; + height: 0; + padding: 50% 0px; + background-size: cover; + background-repeat: no-repeat; + background-position: center top; + border-radius: 0.5em; + border: 1px solid #EBEFF2; +} .indicator, .indicator-right { background: none; @@ -314,6 +324,14 @@ a.no-decoration:active { .indicator-right.darkgrey::after { background: #b8c2cc; } +.indicator.yellow::before, +.indicator-right.yellow::after { + background: #FEEF72; +} +.indicator.light-blue::before, +.indicator-right.light-blue::after { + background: #7CD6FD; +} .navbar-brand { max-width: none; } diff --git a/frappe/public/js/frappe/form/footer/timeline.html b/frappe/public/js/frappe/form/footer/timeline.html index 833d99a3c0..2615cb5c54 100644 --- a/frappe/public/js/frappe/form/footer/timeline.html +++ b/frappe/public/js/frappe/form/footer/timeline.html @@ -1,37 +1,21 @@
-
-
- Version 6.x.x
-
-
- Source
-
-
-
-
-
-
-
-
-
-
-
- - - - frappe.desk.star._toggle_star - (doctype, name, add=False, user=None) -
-Same as toggle_star but hides param user from API
- - - - - - -
Public API
- /api/method/frappe.desk.star.toggle_star
-
- - - frappe.desk.star.toggle_star - (doctype, name, add=False) -
-Adds / removes the current user in the __starred_by property of the given document.
-If column does not exist, will add it in the database.
The _starred_by property is always set from this function and is ignored if set via
-Document API
Parameters:
- --
-
doctype- DocType of the document to star
-name- Name of the document to star
-add-Yesif star is to be added. If notYesthe star will be removed.
-
- - - - - - \ No newline at end of file diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index 66522d1d7f..56d2c9f55c 100644 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe from frappe.utils.pdf import get_pdf from frappe.email.smtp import get_outgoing_email_account -from frappe.utils import get_url, scrub_urls, strip, expand_relative_urls, cint, split_emails +from frappe.utils import get_url, scrub_urls, strip, expand_relative_urls, cint, split_emails, to_markdown import email.utils from markdown2 import markdown @@ -89,12 +89,7 @@ class EMail: def set_html_as_text(self, html): """return html2text""" - import HTMLParser - from html2text import html2text - try: - self.set_text(html2text(html)) - except HTMLParser.HTMLParseError: - pass + self.set_text(to_markdown(html)) def set_message(self, message, mime_type='text/html', as_attachment=0, filename='attachment.html'): """Append the message with MIME content to the root node (as attachment)""" diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 0560043894..64b40502e9 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -14,7 +14,7 @@ default_fields = ('doctype','name','owner','creation','modified','modified_by', integer_docfield_properties = ("reqd", "search_index", "in_list_view", "permlevel", "hidden", "read_only", "ignore_user_permissions", "allow_on_submit", "report_hide", "in_filter", "no_copy", "print_hide", "unique") -optional_fields = ("_user_tags", "_comments", "_assign", "_starred_by") +optional_fields = ("_user_tags", "_comments", "_assign", "_liked_by") def rename(doctype, old, new, debug=False): import frappe.model.rename_doc diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index ab33d4b8c3..c660acb606 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -239,7 +239,7 @@ class BaseDocument(object): if k in default_fields: del doc[k] - for key in ("_user_tags", "__islocal", "__onload", "_starred_by", "__run_link_triggers"): + for key in ("_user_tags", "__islocal", "__onload", "_liked_by", "__run_link_triggers"): if self.get(key): doc[key] = self.get(key) diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index e69758396a..3507daa9e3 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -25,7 +25,7 @@ class DatabaseQuery(object): def execute(self, query=None, fields=None, filters=None, or_filters=None, docstatus=None, group_by=None, order_by=None, limit_start=False, limit_page_length=None, as_list=False, with_childnames=False, debug=False, - ignore_permissions=False, user=None): + ignore_permissions=False, user=None, with_comment_count=False): if not ignore_permissions and not frappe.has_permission(self.doctype, "read", user=user): raise frappe.PermissionError, self.doctype @@ -45,9 +45,14 @@ class DatabaseQuery(object): self.user = user or frappe.session.user if query: - return self.run_custom_query(query) + result = self.run_custom_query(query) else: - return self.build_and_run() + result = self.build_and_run() + + if with_comment_count and not as_list and self.doctype: + self.add_comment_count(result) + + return result def build_and_run(self): args = self.prepare_args() @@ -444,3 +449,21 @@ class DatabaseQuery(object): return 'limit %s, %s' % (self.limit_start, self.limit_page_length) else: return '' + + def add_comment_count(self, result): + for r in result: + if not r.name: + continue + + if "_comments" in r: + comment_count = len(json.loads(r._comments or "[]")) + else: + comment_count = cint(frappe.db.get_value("Comment", + filters={"comment_doctype": self.doctype, "comment_docname": r.name, "comment_type": "Comment"}, + fieldname="count(name)")) + + communication_count = cint(frappe.db.get_value("Communication", + filters={"reference_doctype": self.doctype, "reference_name": r.name}, + fieldname="count(name)")) + + r._comment_count = comment_count + communication_count diff --git a/frappe/model/document.py b/frappe/model/document.py index 3c308f1b8a..9ea6569d11 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -764,7 +764,7 @@ class Document(BaseDocument): """Returns Desk URL for this document. `/desk#Form/{doctype}/{name}`""" return "/desk#Form/{doctype}/{name}".format(doctype=self.doctype, name=self.name) - def add_comment(self, comment_type, text=None, comment_by=None): + def add_comment(self, comment_type, text=None, comment_by=None, reference_doctype=None, reference_name=None): """Add a comment to this document. :param comment_type: e.g. `Comment`. See Comment for more info.""" @@ -774,7 +774,9 @@ class Document(BaseDocument): "comment_type": comment_type, "comment_doctype": self.doctype, "comment_docname": self.name, - "comment": text or _(comment_type) + "comment": text or _(comment_type), + "reference_doctype": reference_doctype, + "reference_name": reference_name }).insert(ignore_permissions=True) return comment @@ -782,10 +784,10 @@ class Document(BaseDocument): """Returns signature (hash) for private URL.""" return hashlib.sha224(get_datetime_str(self.creation)).hexdigest() - def get_starred_by(self): - starred_by = getattr(self, "_starred_by", None) - if starred_by: - return json.loads(starred_by) + def get_liked_by(self): + liked_by = getattr(self, "_liked_by", None) + if liked_by: + return json.loads(liked_by) else: return [] diff --git a/frappe/patches.txt b/frappe/patches.txt index 5d0cb6f1f9..60780d2ff1 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -75,6 +75,7 @@ execute:frappe.db.sql("""update tabComment set comment = substr(comment, 6, loca frappe.patches.v5_0.fix_feed frappe.patches.v5_0.update_shared execute:frappe.reload_doc("core", "doctype", "docshare") #2015-07-21 +frappe.patches.v6_16.star_to_like frappe.patches.v5_0.bookmarks_to_stars frappe.patches.v5_0.style_settings_to_website_theme frappe.patches.v5_0.rename_ref_type_fieldnames @@ -112,3 +113,5 @@ execute:frappe.create_folder(os.path.join(frappe.local.site_path, 'private', 'fi frappe.patches.v6_15.remove_property_setter_for_previous_field #2015-12-29 frappe.patches.v6_15.set_username execute:frappe.permissions.reset_perms("Error Snapshot") +frappe.patches.v6_16.feed_doc_owner + diff --git a/frappe/patches/v5_0/bookmarks_to_stars.py b/frappe/patches/v5_0/bookmarks_to_stars.py index 4f25cf00f7..603697a1b7 100644 --- a/frappe/patches/v5_0/bookmarks_to_stars.py +++ b/frappe/patches/v5_0/bookmarks_to_stars.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import json import frappe import frappe.defaults -from frappe.desk.star import _toggle_star +from frappe.desk.like import _toggle_like def execute(): for user in frappe.get_all("User"): @@ -29,4 +29,4 @@ def execute(): or int(frappe.db.get_value("DocType", doctype, "issingle") or 0) or not frappe.db.table_exists(doctype)): continue - _toggle_star(doctype, docname, add="Yes", user=username) + _toggle_like(doctype, docname, add="Yes", user=username) diff --git a/frappe/patches/v6_16/__init__.py b/frappe/patches/v6_16/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/patches/v6_16/feed_doc_owner.py b/frappe/patches/v6_16/feed_doc_owner.py new file mode 100644 index 0000000000..163482a1dc --- /dev/null +++ b/frappe/patches/v6_16/feed_doc_owner.py @@ -0,0 +1,30 @@ +from __future__ import unicode_literals +import frappe + +def execute(): + frappe.reload_doctype("Feed") + + frappe.db.sql("update `tabFeed` set seen=1") + + for doctype, name in frappe.db.sql("""select distinct doc_type, doc_name from `tabFeed` + where + (doc_type is not null and doc_type != '') + and (doc_name is not null and doc_name != '') + and doc_type != 'Feed' + for update"""): + + owner = frappe.db.get_value(doctype, name, "owner") + + if not owner: + continue + + frappe.db.sql("""update `tabFeed` + set doc_owner=%(owner)s + where + doc_type=%(doctype)s + and doc_name=%(name)s + and (doc_owner is null or doc_owner = '')""".format(doctype=doctype), { + "doctype": doctype, + "name": name, + "owner": owner + }) diff --git a/frappe/patches/v6_16/star_to_like.py b/frappe/patches/v6_16/star_to_like.py new file mode 100644 index 0000000000..5e568e4931 --- /dev/null +++ b/frappe/patches/v6_16/star_to_like.py @@ -0,0 +1,18 @@ +from __future__ import unicode_literals +import frappe +from frappe.model.db_schema import add_column + +def execute(): + frappe.reload_doctype("Feed") + + frappe.db.sql("""update `tabSingles` set field='_liked_by' where field='_starred_by'""") + frappe.db.commit() + + for table in frappe.db.get_tables(): + columns = [r[0] for r in frappe.db.sql("DESC `{0}`".format(table))] + if "_starred_by" in columns: + frappe.db.sql_ddl("""alter table `{0}` change `_starred_by` `_liked_by` Text """.format(table)) + + for doctype in ("Comment", "Communication"): + if not frappe.db.has_column(doctype, "_liked_by"): + add_column(doctype, "_liked_by", "Text") diff --git a/frappe/public/build.json b/frappe/public/build.json index 9f6241b56b..17cc177f51 100644 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -16,6 +16,7 @@ "public/js/lib/highlight.pack.js", "public/js/frappe/class.js", "public/js/lib/microtemplate.js", + "public/js/frappe/query_string.js", "website/js/website.js", "public/js/lib/socket.io.min.js" ], @@ -121,6 +122,7 @@ "public/js/frappe/change_log.html", "public/js/frappe/desk.js", + "public/js/frappe/query_string.js", "public/html/error_object.html", "public/html/error_snapshot.html" @@ -180,7 +182,8 @@ "public/js/frappe/ui/filters/filters.js", "public/js/frappe/ui/filters/edit_filter.html", "public/js/frappe/ui/tags.js", - "public/js/frappe/ui/star.js", + "public/js/frappe/ui/like.js", + "public/js/frappe/ui/liked_by.html", "public/html/print_template.html", "public/js/frappe/list/doclistview.js", "public/js/frappe/list/list_sidebar.js", diff --git a/frappe/public/css/avatar.css b/frappe/public/css/avatar.css index 7bc44cacd9..952a706bd0 100644 --- a/frappe/public/css/avatar.css +++ b/frappe/public/css/avatar.css @@ -43,3 +43,12 @@ height: 0; padding-bottom: 100%; } +.avatar-frame { + width: 100%; + height: 0; + padding: 50% 0px; + background-size: cover; + background-repeat: no-repeat; + background-position: center center; + border-radius: 4px; +} diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index e19fbbb788..2d469fbbe1 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -546,3 +546,11 @@ ul.linked-with-list li { border-bottom: 1px solid #d1d8dd; border-radius: 0px; } +.liked-by-popover { + min-width: 200px; + margin-top: -10px; + margin-bottom: -10px; +} +.liked-by-popover li { + margin: 15px 0px; +} diff --git a/frappe/public/css/form.css b/frappe/public/css/form.css index 53012a4dce..32970563f8 100644 --- a/frappe/public/css/form.css +++ b/frappe/public/css/form.css @@ -61,8 +61,7 @@ .empty-section { display: none !important; } -.shaded-section, -.timeline-item:nth-child(even) { +.shaded-section { background-color: #fafbfc; } .modal .form-layout { @@ -87,37 +86,165 @@ background-color: #e74c3c; } .timeline { - border: 1px solid #d1d8dd; margin: 30px 0px; } +.timeline .timeline-head .comment-input { + height: auto; +} .timeline-item { margin-top: 0px; - padding: 15px 30px 7px; - border-bottom: 1px solid #d1d8dd; -} -.timeline-item .icon-fixed-width { - text-align: center; } .timeline-item blockquote { font-size: inherit; } -.timeline-item:last-child { - border-bottom: 0px; +.timeline-items { + position: relative; } -.timeline-item .reply { - margin-top: 5px; +.timeline { + position: relative; +} +.timeline::before { + content: " "; + border-left: 1px solid #d1d8dd; + position: absolute; + top: 0px; + bottom: -124px; + left: 43px; + z-index: -1; +} +@media (max-width: 991px) { + .timeline::before { + bottom: -64px; + } +} +.timeline-item.user-content { + margin: 30px 0px 30px 30px; +} +.timeline-item.user-content .media-body { + border: 1px solid #d1d8dd; + border-radius: 2px; + margin-left: -7px; + position: relative; + overflow: visible; +} +.timeline-item.user-content .comment-header { + background-color: #fafbfc; + padding: 7px 15px; + margin: 0px; + color: #8D99A6; + border-bottom: 1px solid #EBEFF2; +} +.timeline-item.user-content .comment-header .octicon-heart { + color: #ff5858; + cursor: pointer; +} +.timeline-item.user-content .reply { + padding: 10px 15px; +} +.timeline-item.user-content .reply > div > p:first-child { + margin-top: 0px; +} +.timeline-item.user-content .reply > div > p:last-child { + margin-bottom: 0px; +} +.timeline-item.user-content .close-btn-container { + padding: 2px 15px; +} +.timeline-item.user-content .comment-likes { + margin-left: 5px; +} +.timeline-item.user-content .media-body:after, +.timeline-item.user-content .media-body:before { + right: 100%; + top: 15px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} +.timeline-item.user-content .media-body:after { + border-color: rgba(136, 183, 213, 0); + border-right-color: #fafbfc; + border-width: 6px; + margin-top: -6px; +} +.timeline-item.user-content .media-body:before { + border-color: rgba(194, 225, 245, 0); + border-right-color: #d1d8dd; + border-width: 7px; + margin-top: -7px; +} +.timeline-item.notification-content { + padding-left: 30px; + margin: 30px 0px; + position: relative; + color: #8D99A6; +} +.timeline-item.notification-content * { + color: #8D99A6; +} +.timeline-item.notification-content .icon-fixed-width { + margin-left: 36px; +} +.timeline-item.notification-content .octicon-heart { + color: #ff5858 !important; +} +.timeline-item.notification-content::before { + content: " "; + width: 7px; + height: 7px; + background-color: #d1d8dd; + position: absolute; + left: 40px; + border-radius: 50%; + top: 5px; } .timeline-item .reply-link { - padding: 0px 7px; -} -.timeline-item h6, -.timeline-head h6 { - margin-top: 6px; + padding-left: 7px; } .timeline-head { + background-color: white; + border: 1px solid #d1d8dd; + border-radius: 2px; +} +.timeline-head .comment-input-header { background-color: #fafbfc; - padding: 15px 30px; - border-bottom: 1px solid #d1d8dd; + padding: 7px 15px; + border-bottom: 1px solid #EBEFF2; +} +.timeline-head .comment-input-container { + padding: 15px; +} +.timeline-head .comment-input { + border-color: #EBEFF2; + max-width: 100%; +} +.timeline-head .comment-input:focus { + box-shadow: none; +} +@media (max-width: 767px) { + .timeline-head { + border-left: none; + border-right: none; + border-radius: 0px; + } +} +.timeline-new-email { + margin: 30px 0px; + padding: 0px 65px; + position: relative; +} +.timeline-new-email::before { + content: " "; + width: 7px; + height: 7px; + background-color: #d1d8dd; + position: absolute; + left: 40px; + border-radius: 50%; + top: 5px; } .form-footer h5 { margin: 15px 0px; diff --git a/frappe/public/css/indicator.css b/frappe/public/css/indicator.css index 80ce0872f4..711df4d87a 100644 --- a/frappe/public/css/indicator.css +++ b/frappe/public/css/indicator.css @@ -48,3 +48,11 @@ .indicator-right.darkgrey::after { background: #b8c2cc; } +.indicator.yellow::before, +.indicator-right.yellow::after { + background: #FEEF72; +} +.indicator.light-blue::before, +.indicator-right.light-blue::after { + background: #7CD6FD; +} diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css index 38cc4ccd3d..2ed7e89401 100644 --- a/frappe/public/css/list.css +++ b/frappe/public/css/list.css @@ -98,6 +98,13 @@ .doclist-row { font-size: 12px; } +.doclist-row .likes-count { + display: inline-block; + width: 15px; + margin-left: -5px; + color: #8D99A6; + font-size: 12px; +} .doclist-row .docstatus .octicon { font-size: 12px; } @@ -134,14 +141,14 @@ margin: 0px -15px; padding: 5px 15px; } -.listview-main-section .icon-star { +.listview-main-section .octicon-heart { cursor: pointer; } -.list-row-head .icon-star { - vertical-align: middle; +.list-row-head .octicon-heart { + margin-right: 13px; } -.star-action.icon-star { - color: #ffdb4c; +.like-action.octicon-heart { + color: #ff5858; } .list-id { font-weight: bold; @@ -163,3 +170,8 @@ display: none; } } +.list-comment-count { + display: inline-block; + width: 37px; + text-align: left; +} diff --git a/frappe/public/css/mobile.css b/frappe/public/css/mobile.css index 9334d975f3..70886c5120 100644 --- a/frappe/public/css/mobile.css +++ b/frappe/public/css/mobile.css @@ -330,20 +330,6 @@ body { border-left-color: transparent !important; border-right-color: transparent !important; } - .timeline { - border-left: none !important; - border-right: none !important; - } - .timeline .timeline-head { - padding: 7px 15px; - } - .timeline .timeline-item { - padding: 15px; - border-bottom: 1px dashed #d1d8dd; - } - .timeline .timeline-item:last-child { - border-bottom: none; - } .list-row { padding: 13px 15px !important; } diff --git a/frappe/public/css/sidebar.css b/frappe/public/css/sidebar.css index 9431506c26..e198520e99 100644 --- a/frappe/public/css/sidebar.css +++ b/frappe/public/css/sidebar.css @@ -161,6 +161,10 @@ body[data-route^="Module"] .main-menu .form-sidebar { .form-sidebar .form-viewers .shared-with-everyone .octicon { color: #36414C !important; } +.form-sidebar .liked-by .octicon-heart { + font-size: 16px; + cursor: pointer; +} .form-sidebar .form-shared .share-doc-btn:hover, .form-sidebar .form-shared .share-doc-btn:focus, .form-sidebar .form-shared .share-doc-btn:active { @@ -174,6 +178,7 @@ body[data-route^="Module"] .main-menu .form-sidebar { .sidebar-left .form-sidebar .form-tags, .sidebar-left .form-sidebar .assignment-row, .sidebar-left .form-sidebar .form-shared, +.sidebar-left .form-sidebar .liked-by, .sidebar-left .form-sidebar .modified-by, .sidebar-left .form-sidebar .created-by, .sidebar-left .form-sidebar .tags-label, diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index c210b316a5..fe2b3635da 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -264,6 +264,16 @@ a.no-decoration:active { height: 0; padding-bottom: 100%; } +.avatar-frame { + width: 100%; + height: 0; + padding: 50% 0px; + background-size: cover; + background-repeat: no-repeat; + background-position: center top; + border-radius: 0.5em; + border: 1px solid #EBEFF2; +} .indicator, .indicator-right { background: none; @@ -314,6 +324,14 @@ a.no-decoration:active { .indicator-right.darkgrey::after { background: #b8c2cc; } +.indicator.yellow::before, +.indicator-right.yellow::after { + background: #FEEF72; +} +.indicator.light-blue::before, +.indicator-right.light-blue::after { + background: #7CD6FD; +} .navbar-brand { max-width: none; } diff --git a/frappe/public/js/frappe/form/footer/timeline.html b/frappe/public/js/frappe/form/footer/timeline.html index 833d99a3c0..2615cb5c54 100644 --- a/frappe/public/js/frappe/form/footer/timeline.html +++ b/frappe/public/js/frappe/form/footer/timeline.html @@ -1,37 +1,21 @@
-
diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index 3482d445ac..7909cb38a0 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -14,33 +14,31 @@ frappe.ui.form.Comments = Class.extend({
this.list = this.wrapper.find(".timeline-items");
this.input = this.wrapper.find(".form-control");
- this.button = this.wrapper.find(".btn-go")
+ this.comment_button = this.wrapper.find(".btn-comment")
.on("click", function() {
- if(me.wrapper.find(".is-email").prop("checked")) {
- new frappe.views.CommunicationComposer({
- doc: me.frm.doc,
- txt: frappe.markdown(me.input.val()),
- frm: me.frm,
- recipients: me.get_recipient()
- })
- } else {
- me.add_comment(this);
- }
+ me.add_comment(this);
});
this.input.keydown("meta+return ctrl+return", function(e) {
- me.button.trigger("click");
+ me.comment_button.trigger("click");
});
- this.email_check = this.wrapper.find(".timeline-head input[type='checkbox']")
- .on("change", function() {
- me.button.html($(this).prop("checked") ? __("Compose") : __("Comment"));
+ this.email_button = this.wrapper.find(".btn-new-email")
+ .on("click", function() {
+ new frappe.views.CommunicationComposer({
+ doc: me.frm.doc,
+ txt: frappe.markdown(me.input.val()),
+ frm: me.frm,
+ recipients: me.get_recipient()
+ })
});
this.list.on("click", ".toggle-blockquote", function() {
$(this).parent().siblings("blockquote").toggleClass("hidden");
});
+ this.setup_comment_like();
+
this.setup_mentions();
},
@@ -116,7 +114,7 @@ frappe.ui.form.Comments = Class.extend({
prepare_comment: function(c) {
if((c.comment_type || "Comment") === "Comment" && frappe.model.can_delete("Comment")) {
- c["delete"] = '×';
+ c["delete"] = '';
} else {
c["delete"] = "";
}
@@ -130,7 +128,7 @@ frappe.ui.form.Comments = Class.extend({
c.image = frappe.user_info(c.comment_by).image
|| frappe.get_gravatar(c.comment_by);
c.comment_on = comment_when(c.creation);
- c.fullname = frappe.user_info(c.comment_by).fullname;
+ c.fullname = frappe.user.full_name(c.comment_by);
if(c.attachments && typeof c.attachments==="string")
c.attachments = JSON.parse(c.attachments);
@@ -167,6 +165,15 @@ frappe.ui.form.Comments = Class.extend({
if(c.comment_type==="Comment") {
c.comment_html = c.comment_html.replace(/(^|\W)(@\w+)/g, "$1$2");
}
+
+ if (in_list(["Comment", "Email"], c.comment_type)) {
+ c.user_content = true;
+ if (!$.isArray(c._liked_by)) {
+ c._liked_by = JSON.parse(c._liked_by || "[]");
+ }
+
+ c.liked_by_user = c._liked_by.indexOf(user)!==-1;
+ }
}
},
set_icon_and_color: function(c) {
@@ -186,7 +193,8 @@ frappe.ui.form.Comments = Class.extend({
"Attachment": "octicon octicon-cloud-upload",
"Attachment Removed": "octicon octicon-trashcan",
"Shared": "octicon octicon-eye",
- "Unshared": "octicon octicon-circle-slash"
+ "Unshared": "octicon octicon-circle-slash",
+ "Like": "octicon octicon-heart"
}[c.comment_type]
c.color = {
@@ -348,10 +356,13 @@ frappe.ui.form.Comments = Class.extend({
this.mention_input = this.wrapper.find(".mention-input");
+ var source = Object.keys(username_user_map);
+ source.sort();
+
this.mention_input.autocomplete({
minLength: 0,
autoFocus: true,
- source: Object.keys(username_user_map),
+ source: source,
select: function(event, ui) {
var value = ui.item.value;
var textarea_value = me.input.val();
@@ -467,9 +478,21 @@ frappe.ui.form.Comments = Class.extend({
me.mention_widget.trigger(me.enter);
// prevent default
+ return false;
+ }
+ } else {
+ if (e.which==me.codes.TAB) {
+ me.comment_button.focus();
+
return false;
}
}
});
+ },
+
+ setup_comment_like: function() {
+ this.wrapper.on("click", ".comment-likes .octicon-heart", frappe.ui.click_toggle_like);
+
+ frappe.ui.setup_like_popover(this.wrapper, ".comment-likes");
}
});
diff --git a/frappe/public/js/frappe/form/footer/timeline_item.html b/frappe/public/js/frappe/form/footer/timeline_item.html
index e8bcfa6cae..0d4b9e6cc4 100644
--- a/frappe/public/js/frappe/form/footer/timeline_item.html
+++ b/frappe/public/js/frappe/form/footer/timeline_item.html
@@ -1,16 +1,19 @@
-
{%= __("Add a comment") %}
-
-
+
+
+ {%= __("Add a comment") %}
+
+
+
+
-
-
- 
-
-
-
-
-
-
-
-
- {%= __("You") %}
-
-
-
-
-
-
-
+
+
+
+ {% if (data.user_content) { %}
- 
+
-
-
-
+ {% } %}
+
+
+
+
+
{%= data.delete %}
{% if(data.doctype=="Communication" || data.comment_type=="Comment") { %}
-
+
{%= data.fullname %}
@@ -47,14 +50,23 @@
{%= __("Reply") %}
{% } %}
-
+
+
+ {{ data._liked_by.length }}
+
+
{%= data.comment_html %}
{% } else if(in_list(["Assignment Completed", "Assigned", "Shared", "Unshared"], data.comment_type)) { %}
-
+
{% if(data.reference_doctype && data.reference_name) { %}
@@ -65,14 +77,19 @@
{% } %}
– {%= data.comment_on %}
-
+
{% } else { %}
-
+
- {%= data.fullname %} {%= data.comment %}
-
- – {%= data.comment_on %}
-
+ {% if (data.comment_type == "Like") { %}
+ {%= __("Liked by {0}", [data.fullname]) %}
+ {% } else { %}
+ {%= data.fullname %}
+ {%= data.comment %}
+ {% } %}
+
+ – {%= data.comment_on %}
+
{% } %}
{% if(data.attachments && data.attachments.length) { %}
diff --git a/frappe/public/js/frappe/form/form_sidebar.html b/frappe/public/js/frappe/form/form_sidebar.html
index 53acbf0384..856be2d9be 100644
--- a/frappe/public/js/frappe/form/form_sidebar.html
+++ b/frappe/public/js/frappe/form/form_sidebar.html
@@ -45,6 +45,12 @@
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index d3fa5c1d56..588f279848 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -117,7 +117,7 @@ frappe.form.formatters = {
return frappe.form.formatters.Data(value);
},
- StarredBy: function(value) {
+ LikedBy: function(value) {
var html = "";
$.each(JSON.parse(value || "[]"), function(i, v) {
if(v) html+= '" + frappe.user.full_name(this.frm.doc.owner) + "",
"
" + comment_when(this.frm.doc.creation)]));
+
+ this.refresh_like();
}
},
@@ -113,4 +122,26 @@ frappe.ui.form.Sidebar = Class.extend({
this.user_actions.addClass("hide")
this.user_actions.find(".user-action-row").remove();
},
+
+ make_like: function() {
+ this.like_wrapper = this.sidebar.find(".liked-by");
+ this.like_icon = this.sidebar.find(".liked-by .octicon-heart");
+ this.like_count = this.sidebar.find(".liked-by .like-count");
+ frappe.ui.setup_like_popover(this.sidebar.find(".liked-by-parent"), ".liked-by");
+ },
+
+ refresh_like: function() {
+ if (!this.like_icon) {
+ return;
+ }
+
+ this.like_wrapper.attr("data-liked-by", this.frm.doc._liked_by);
+
+ this.like_icon.toggleClass("text-extra-muted not-liked",
+ !frappe.ui.is_liked(this.frm.doc))
+ .attr("data-doctype", this.frm.doctype)
+ .attr("data-name", this.frm.doc.name);
+
+ this.like_count.text(JSON.parse(this.frm.doc._liked_by || "[]").length);
+ },
});
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index 17ac8d6994..c852dc222b 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -15,7 +15,6 @@ frappe.ui.form.Toolbar = Class.extend({
this.page.clear_user_actions();
this.show_title_as_dirty();
this.set_primary_action();
- this.refresh_star();
if(this.frm.meta.hide_toolbar) {
this.page.hide_menu();
@@ -23,11 +22,9 @@ frappe.ui.form.Toolbar = Class.extend({
if(this.frm.doc.__islocal) {
this.page.hide_menu();
this.print_icon && this.print_icon.addClass("hide");
- this.star_icon && this.star_icon.addClass("hide");
} else {
this.page.show_menu();
this.print_icon && this.print_icon.removeClass("hide");
- this.star_icon && this.star_icon.removeClass("hide");
}
}
},
@@ -97,13 +94,6 @@ frappe.ui.form.Toolbar = Class.extend({
this.page.clear_indicator();
}
},
- refresh_star: function() {
- this.star_icon &&
- this.star_icon.toggleClass("text-extra-muted not-starred",
- !frappe.ui.is_starred(this.frm.doc))
- .attr("data-doctype", this.frm.doctype)
- .attr("data-name", this.frm.doc.name);
- },
make_menu: function() {
var me = this;
var p = this.frm.perm[0];
@@ -117,13 +107,6 @@ frappe.ui.form.Toolbar = Class.extend({
me.frm.print_doc();});
}
- // star
- if(!this.frm.meta.issingle) {
- this.star_icon = this.page.add_action_icon("icon-star", function() {
- frappe.ui.toggle_star(me.star_icon, me.frm.doctype, me.frm.doc.name);
- }).removeClass("text-muted").find(".icon-star").addClass("star-action");
- }
-
// email
if(frappe.model.can_email(null, me.frm) && me.frm.doc.docstatus < 2) {
this.page.add_menu_item(__("Email"), function() {
diff --git a/frappe/public/js/frappe/list/doclistview.js b/frappe/public/js/frappe/list/doclistview.js
index e53667234f..6ab74f7aab 100644
--- a/frappe/public/js/frappe/list/doclistview.js
+++ b/frappe/public/js/frappe/list/doclistview.js
@@ -116,7 +116,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
this.setup_filterable();
this.init_filters();
this.init_headers();
- this.init_star();
+ this.init_like();
this.init_select_all();
},
@@ -168,9 +168,9 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
}
});
this.$page.find(".result-list").on("click", ".list-row-left", function(e) {
- // don't open in case of checkbox, star, filterable
+ // don't open in case of checkbox, like, filterable
if ((e.target.className || "").indexOf("filterable")!==-1
- || (e.target.className || "").indexOf("icon-star")!==-1
+ || (e.target.className || "").indexOf("octicon-heart")!==-1
|| e.target.type==="checkbox") {
return;
}
@@ -307,8 +307,8 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
}
}
- this.list_header.find(".list-starred-by-me")
- .toggleClass("text-extra-muted not-starred", !this.is_star_filtered());
+ this.list_header.find(".list-liked-by-me")
+ .toggleClass("text-extra-muted not-liked", !this.is_star_filtered());
this.last_updated_on = new Date();
this.dirty = false;
@@ -355,6 +355,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
filters: this.filter_list.get_filters(),
order_by: this.listview.order_by || undefined,
group_by: this.listview.group_by || undefined,
+ with_comment_count: true
}
// apply default filters, if specified for a listing
@@ -368,15 +369,15 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
this.filter_list.add_filter(this.doctype, "_assign", 'like', '%' + user + '%');
this.run();
},
- starred_by_me: function() {
- this.filter_list.add_filter(this.doctype, "_starred_by", 'like', '%' + user + '%');
+ liked_by_me: function() {
+ this.filter_list.add_filter(this.doctype, "_liked_by", 'like', '%' + user + '%');
this.run();
},
- remove_starred_by_me: function() {
- this.filter_list.get_filter("_starred_by").remove();
+ remove_liked_by_me: function() {
+ this.filter_list.get_filter("_liked_by").remove();
},
is_star_filtered: function() {
- return this.filter_list.filter_exists(this.doctype, "_starred_by", 'like', '%' + user + '%');
+ return this.filter_list.filter_exists(this.doctype, "_liked_by", 'like', '%' + user + '%');
},
init_menu: function() {
var me = this;
@@ -453,19 +454,20 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
}, true)
},
- init_star: function() {
+ init_like: function() {
var me = this;
- this.$page.find(".result-list").on("click", ".star-action", function() {
- frappe.ui.toggle_star($(this), me.doctype, $(this).attr("data-name"));
- return false;
- });
- this.list_header.find(".list-starred-by-me").on("click", function() {
+ this.$page.find(".result-list").on("click", ".like-action", frappe.ui.click_toggle_like);
+ this.list_header.find(".list-liked-by-me").on("click", function() {
if (me.is_star_filtered()) {
- me.remove_starred_by_me();
+ me.remove_liked_by_me();
} else {
- me.starred_by_me();
+ me.liked_by_me();
}
});
+
+ if (!frappe.dom.is_touchscreen()) {
+ frappe.ui.setup_like_popover(this.$page.find(".result-list"), ".liked-by");
+ }
},
init_select_all: function() {
@@ -576,7 +578,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
return false;
} else {
// second filter set for this field
- if(fieldname=='_user_tags' || fieldname=="_starred_by") {
+ if(fieldname=='_user_tags' || fieldname=="_liked_by") {
// and for tags
this.filter_list.add_filter(this.doctype, fieldname, 'like', '%' + label);
} else {
@@ -587,7 +589,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
} else {
// no filter for this item,
// setup one
- if(fieldname=='_user_tags' || fieldname=="_starred_by") {
+ if(fieldname=='_user_tags' || fieldname=="_liked_by") {
this.filter_list.add_filter(this.doctype, fieldname, 'like', '%' + label);
} else {
this.filter_list.add_filter(this.doctype, fieldname, '=', label);
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 aa3a4a2189..f51c095ab5 100644
--- a/frappe/public/js/frappe/list/list_item_main_head.html
+++ b/frappe/public/js/frappe/list/list_item_main_head.html
@@ -23,8 +23,8 @@
title="{%= __("Select All") %}">
{% } %}
-
+
{% } %}
diff --git a/frappe/public/js/frappe/list/list_item_row.html b/frappe/public/js/frappe/list/list_item_row.html
index d03ac45f64..4dee4f1110 100644
--- a/frappe/public/js/frappe/list/list_item_row.html
+++ b/frappe/public/js/frappe/list/list_item_row.html
@@ -33,9 +33,10 @@
{% } else { %}
{% } %}
-
+
- {%= data._comments_list.length || 0 %}
+ {%= (data._comment_count > 99 ? "99+" : data._comment_count) || 0 %}
{%= data.comment_html %}
{% if(data.reference_doctype && data.reference_name) { %}
@@ -65,14 +77,19 @@
{% } %}
– {%= data.comment_on %}
-
+
{% } else { %}
-
+
- {%= data.fullname %} {%= data.comment %}
-
- – {%= data.comment_on %}
-
+ {% if (data.comment_type == "Like") { %}
+ {%= __("Liked by {0}", [data.fullname]) %}
+ {% } else { %}
+ {%= data.fullname %}
+ {%= data.comment %}
+ {% } %}
+
+ – {%= data.comment_on %}
+
{% } %}
{% if(data.attachments && data.attachments.length) { %}
diff --git a/frappe/public/js/frappe/form/form_sidebar.html b/frappe/public/js/frappe/form/form_sidebar.html
index 53acbf0384..856be2d9be 100644
--- a/frappe/public/js/frappe/form/form_sidebar.html
+++ b/frappe/public/js/frappe/form/form_sidebar.html
@@ -45,6 +45,12 @@
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index d3fa5c1d56..588f279848 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -117,7 +117,7 @@ frappe.form.formatters = {
return frappe.form.formatters.Data(value);
},
- StarredBy: function(value) {
+ LikedBy: function(value) {
var html = "";
$.each(JSON.parse(value || "[]"), function(i, v) {
if(v) html+= '" + frappe.user.full_name(this.frm.doc.owner) + "",
"
" + comment_when(this.frm.doc.creation)]));
+
+ this.refresh_like();
}
},
@@ -113,4 +122,26 @@ frappe.ui.form.Sidebar = Class.extend({
this.user_actions.addClass("hide")
this.user_actions.find(".user-action-row").remove();
},
+
+ make_like: function() {
+ this.like_wrapper = this.sidebar.find(".liked-by");
+ this.like_icon = this.sidebar.find(".liked-by .octicon-heart");
+ this.like_count = this.sidebar.find(".liked-by .like-count");
+ frappe.ui.setup_like_popover(this.sidebar.find(".liked-by-parent"), ".liked-by");
+ },
+
+ refresh_like: function() {
+ if (!this.like_icon) {
+ return;
+ }
+
+ this.like_wrapper.attr("data-liked-by", this.frm.doc._liked_by);
+
+ this.like_icon.toggleClass("text-extra-muted not-liked",
+ !frappe.ui.is_liked(this.frm.doc))
+ .attr("data-doctype", this.frm.doctype)
+ .attr("data-name", this.frm.doc.name);
+
+ this.like_count.text(JSON.parse(this.frm.doc._liked_by || "[]").length);
+ },
});
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index 17ac8d6994..c852dc222b 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -15,7 +15,6 @@ frappe.ui.form.Toolbar = Class.extend({
this.page.clear_user_actions();
this.show_title_as_dirty();
this.set_primary_action();
- this.refresh_star();
if(this.frm.meta.hide_toolbar) {
this.page.hide_menu();
@@ -23,11 +22,9 @@ frappe.ui.form.Toolbar = Class.extend({
if(this.frm.doc.__islocal) {
this.page.hide_menu();
this.print_icon && this.print_icon.addClass("hide");
- this.star_icon && this.star_icon.addClass("hide");
} else {
this.page.show_menu();
this.print_icon && this.print_icon.removeClass("hide");
- this.star_icon && this.star_icon.removeClass("hide");
}
}
},
@@ -97,13 +94,6 @@ frappe.ui.form.Toolbar = Class.extend({
this.page.clear_indicator();
}
},
- refresh_star: function() {
- this.star_icon &&
- this.star_icon.toggleClass("text-extra-muted not-starred",
- !frappe.ui.is_starred(this.frm.doc))
- .attr("data-doctype", this.frm.doctype)
- .attr("data-name", this.frm.doc.name);
- },
make_menu: function() {
var me = this;
var p = this.frm.perm[0];
@@ -117,13 +107,6 @@ frappe.ui.form.Toolbar = Class.extend({
me.frm.print_doc();});
}
- // star
- if(!this.frm.meta.issingle) {
- this.star_icon = this.page.add_action_icon("icon-star", function() {
- frappe.ui.toggle_star(me.star_icon, me.frm.doctype, me.frm.doc.name);
- }).removeClass("text-muted").find(".icon-star").addClass("star-action");
- }
-
// email
if(frappe.model.can_email(null, me.frm) && me.frm.doc.docstatus < 2) {
this.page.add_menu_item(__("Email"), function() {
diff --git a/frappe/public/js/frappe/list/doclistview.js b/frappe/public/js/frappe/list/doclistview.js
index e53667234f..6ab74f7aab 100644
--- a/frappe/public/js/frappe/list/doclistview.js
+++ b/frappe/public/js/frappe/list/doclistview.js
@@ -116,7 +116,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
this.setup_filterable();
this.init_filters();
this.init_headers();
- this.init_star();
+ this.init_like();
this.init_select_all();
},
@@ -168,9 +168,9 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
}
});
this.$page.find(".result-list").on("click", ".list-row-left", function(e) {
- // don't open in case of checkbox, star, filterable
+ // don't open in case of checkbox, like, filterable
if ((e.target.className || "").indexOf("filterable")!==-1
- || (e.target.className || "").indexOf("icon-star")!==-1
+ || (e.target.className || "").indexOf("octicon-heart")!==-1
|| e.target.type==="checkbox") {
return;
}
@@ -307,8 +307,8 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
}
}
- this.list_header.find(".list-starred-by-me")
- .toggleClass("text-extra-muted not-starred", !this.is_star_filtered());
+ this.list_header.find(".list-liked-by-me")
+ .toggleClass("text-extra-muted not-liked", !this.is_star_filtered());
this.last_updated_on = new Date();
this.dirty = false;
@@ -355,6 +355,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
filters: this.filter_list.get_filters(),
order_by: this.listview.order_by || undefined,
group_by: this.listview.group_by || undefined,
+ with_comment_count: true
}
// apply default filters, if specified for a listing
@@ -368,15 +369,15 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
this.filter_list.add_filter(this.doctype, "_assign", 'like', '%' + user + '%');
this.run();
},
- starred_by_me: function() {
- this.filter_list.add_filter(this.doctype, "_starred_by", 'like', '%' + user + '%');
+ liked_by_me: function() {
+ this.filter_list.add_filter(this.doctype, "_liked_by", 'like', '%' + user + '%');
this.run();
},
- remove_starred_by_me: function() {
- this.filter_list.get_filter("_starred_by").remove();
+ remove_liked_by_me: function() {
+ this.filter_list.get_filter("_liked_by").remove();
},
is_star_filtered: function() {
- return this.filter_list.filter_exists(this.doctype, "_starred_by", 'like', '%' + user + '%');
+ return this.filter_list.filter_exists(this.doctype, "_liked_by", 'like', '%' + user + '%');
},
init_menu: function() {
var me = this;
@@ -453,19 +454,20 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
}, true)
},
- init_star: function() {
+ init_like: function() {
var me = this;
- this.$page.find(".result-list").on("click", ".star-action", function() {
- frappe.ui.toggle_star($(this), me.doctype, $(this).attr("data-name"));
- return false;
- });
- this.list_header.find(".list-starred-by-me").on("click", function() {
+ this.$page.find(".result-list").on("click", ".like-action", frappe.ui.click_toggle_like);
+ this.list_header.find(".list-liked-by-me").on("click", function() {
if (me.is_star_filtered()) {
- me.remove_starred_by_me();
+ me.remove_liked_by_me();
} else {
- me.starred_by_me();
+ me.liked_by_me();
}
});
+
+ if (!frappe.dom.is_touchscreen()) {
+ frappe.ui.setup_like_popover(this.$page.find(".result-list"), ".liked-by");
+ }
},
init_select_all: function() {
@@ -576,7 +578,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
return false;
} else {
// second filter set for this field
- if(fieldname=='_user_tags' || fieldname=="_starred_by") {
+ if(fieldname=='_user_tags' || fieldname=="_liked_by") {
// and for tags
this.filter_list.add_filter(this.doctype, fieldname, 'like', '%' + label);
} else {
@@ -587,7 +589,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
} else {
// no filter for this item,
// setup one
- if(fieldname=='_user_tags' || fieldname=="_starred_by") {
+ if(fieldname=='_user_tags' || fieldname=="_liked_by") {
this.filter_list.add_filter(this.doctype, fieldname, 'like', '%' + label);
} else {
this.filter_list.add_filter(this.doctype, fieldname, '=', label);
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 aa3a4a2189..f51c095ab5 100644
--- a/frappe/public/js/frappe/list/list_item_main_head.html
+++ b/frappe/public/js/frappe/list/list_item_main_head.html
@@ -23,8 +23,8 @@
title="{%= __("Select All") %}">
{% } %}
-
+
{% } %}
diff --git a/frappe/public/js/frappe/list/list_item_row.html b/frappe/public/js/frappe/list/list_item_row.html
index d03ac45f64..4dee4f1110 100644
--- a/frappe/public/js/frappe/list/list_item_row.html
+++ b/frappe/public/js/frappe/list/list_item_row.html
@@ -33,9 +33,10 @@
{% } else { %}
{% } %}
-
+
- {%= data._comments_list.length || 0 %}
+ {%= (data._comment_count > 99 ? "99+" : data._comment_count) || 0 %}
" + comment_when(this.frm.doc.creation)])); + + this.refresh_like(); } }, @@ -113,4 +122,26 @@ frappe.ui.form.Sidebar = Class.extend({ this.user_actions.addClass("hide") this.user_actions.find(".user-action-row").remove(); }, + + make_like: function() { + this.like_wrapper = this.sidebar.find(".liked-by"); + this.like_icon = this.sidebar.find(".liked-by .octicon-heart"); + this.like_count = this.sidebar.find(".liked-by .like-count"); + frappe.ui.setup_like_popover(this.sidebar.find(".liked-by-parent"), ".liked-by"); + }, + + refresh_like: function() { + if (!this.like_icon) { + return; + } + + this.like_wrapper.attr("data-liked-by", this.frm.doc._liked_by); + + this.like_icon.toggleClass("text-extra-muted not-liked", + !frappe.ui.is_liked(this.frm.doc)) + .attr("data-doctype", this.frm.doctype) + .attr("data-name", this.frm.doc.name); + + this.like_count.text(JSON.parse(this.frm.doc._liked_by || "[]").length); + }, }); diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index 17ac8d6994..c852dc222b 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -15,7 +15,6 @@ frappe.ui.form.Toolbar = Class.extend({ this.page.clear_user_actions(); this.show_title_as_dirty(); this.set_primary_action(); - this.refresh_star(); if(this.frm.meta.hide_toolbar) { this.page.hide_menu(); @@ -23,11 +22,9 @@ frappe.ui.form.Toolbar = Class.extend({ if(this.frm.doc.__islocal) { this.page.hide_menu(); this.print_icon && this.print_icon.addClass("hide"); - this.star_icon && this.star_icon.addClass("hide"); } else { this.page.show_menu(); this.print_icon && this.print_icon.removeClass("hide"); - this.star_icon && this.star_icon.removeClass("hide"); } } }, @@ -97,13 +94,6 @@ frappe.ui.form.Toolbar = Class.extend({ this.page.clear_indicator(); } }, - refresh_star: function() { - this.star_icon && - this.star_icon.toggleClass("text-extra-muted not-starred", - !frappe.ui.is_starred(this.frm.doc)) - .attr("data-doctype", this.frm.doctype) - .attr("data-name", this.frm.doc.name); - }, make_menu: function() { var me = this; var p = this.frm.perm[0]; @@ -117,13 +107,6 @@ frappe.ui.form.Toolbar = Class.extend({ me.frm.print_doc();}); } - // star - if(!this.frm.meta.issingle) { - this.star_icon = this.page.add_action_icon("icon-star", function() { - frappe.ui.toggle_star(me.star_icon, me.frm.doctype, me.frm.doc.name); - }).removeClass("text-muted").find(".icon-star").addClass("star-action"); - } - // email if(frappe.model.can_email(null, me.frm) && me.frm.doc.docstatus < 2) { this.page.add_menu_item(__("Email"), function() { diff --git a/frappe/public/js/frappe/list/doclistview.js b/frappe/public/js/frappe/list/doclistview.js index e53667234f..6ab74f7aab 100644 --- a/frappe/public/js/frappe/list/doclistview.js +++ b/frappe/public/js/frappe/list/doclistview.js @@ -116,7 +116,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ this.setup_filterable(); this.init_filters(); this.init_headers(); - this.init_star(); + this.init_like(); this.init_select_all(); }, @@ -168,9 +168,9 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ } }); this.$page.find(".result-list").on("click", ".list-row-left", function(e) { - // don't open in case of checkbox, star, filterable + // don't open in case of checkbox, like, filterable if ((e.target.className || "").indexOf("filterable")!==-1 - || (e.target.className || "").indexOf("icon-star")!==-1 + || (e.target.className || "").indexOf("octicon-heart")!==-1 || e.target.type==="checkbox") { return; } @@ -307,8 +307,8 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ } } - this.list_header.find(".list-starred-by-me") - .toggleClass("text-extra-muted not-starred", !this.is_star_filtered()); + this.list_header.find(".list-liked-by-me") + .toggleClass("text-extra-muted not-liked", !this.is_star_filtered()); this.last_updated_on = new Date(); this.dirty = false; @@ -355,6 +355,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ filters: this.filter_list.get_filters(), order_by: this.listview.order_by || undefined, group_by: this.listview.group_by || undefined, + with_comment_count: true } // apply default filters, if specified for a listing @@ -368,15 +369,15 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ this.filter_list.add_filter(this.doctype, "_assign", 'like', '%' + user + '%'); this.run(); }, - starred_by_me: function() { - this.filter_list.add_filter(this.doctype, "_starred_by", 'like', '%' + user + '%'); + liked_by_me: function() { + this.filter_list.add_filter(this.doctype, "_liked_by", 'like', '%' + user + '%'); this.run(); }, - remove_starred_by_me: function() { - this.filter_list.get_filter("_starred_by").remove(); + remove_liked_by_me: function() { + this.filter_list.get_filter("_liked_by").remove(); }, is_star_filtered: function() { - return this.filter_list.filter_exists(this.doctype, "_starred_by", 'like', '%' + user + '%'); + return this.filter_list.filter_exists(this.doctype, "_liked_by", 'like', '%' + user + '%'); }, init_menu: function() { var me = this; @@ -453,19 +454,20 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ }, true) }, - init_star: function() { + init_like: function() { var me = this; - this.$page.find(".result-list").on("click", ".star-action", function() { - frappe.ui.toggle_star($(this), me.doctype, $(this).attr("data-name")); - return false; - }); - this.list_header.find(".list-starred-by-me").on("click", function() { + this.$page.find(".result-list").on("click", ".like-action", frappe.ui.click_toggle_like); + this.list_header.find(".list-liked-by-me").on("click", function() { if (me.is_star_filtered()) { - me.remove_starred_by_me(); + me.remove_liked_by_me(); } else { - me.starred_by_me(); + me.liked_by_me(); } }); + + if (!frappe.dom.is_touchscreen()) { + frappe.ui.setup_like_popover(this.$page.find(".result-list"), ".liked-by"); + } }, init_select_all: function() { @@ -576,7 +578,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ return false; } else { // second filter set for this field - if(fieldname=='_user_tags' || fieldname=="_starred_by") { + if(fieldname=='_user_tags' || fieldname=="_liked_by") { // and for tags this.filter_list.add_filter(this.doctype, fieldname, 'like', '%' + label); } else { @@ -587,7 +589,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ } else { // no filter for this item, // setup one - if(fieldname=='_user_tags' || fieldname=="_starred_by") { + if(fieldname=='_user_tags' || fieldname=="_liked_by") { this.filter_list.add_filter(this.doctype, fieldname, 'like', '%' + label); } else { this.filter_list.add_filter(this.doctype, fieldname, '=', label); 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 aa3a4a2189..f51c095ab5 100644 --- a/frappe/public/js/frappe/list/list_item_main_head.html +++ b/frappe/public/js/frappe/list/list_item_main_head.html @@ -23,8 +23,8 @@ title="{%= __("Select All") %}"> {% } %} - + {% } %} diff --git a/frappe/public/js/frappe/list/list_item_row.html b/frappe/public/js/frappe/list/list_item_row.html index d03ac45f64..4dee4f1110 100644 --- a/frappe/public/js/frappe/list/list_item_row.html +++ b/frappe/public/js/frappe/list/list_item_row.html @@ -33,9 +33,10 @@ {% } else { %} {% } %} - + - {%= data._comments_list.length || 0 %} + {%= (data._comment_count > 99 ? "99+" : data._comment_count) || 0 %}