{%= 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/applications/applications.py b/frappe/desk/page/applications/applications.py
index bdc43e056b..680cabadf0 100644
--- a/frappe/desk/page/applications/applications.py
+++ b/frappe/desk/page/applications/applications.py
@@ -74,12 +74,12 @@ def install_app(name):
frappe.throw(_("You cannot install this app"))
frappe.publish_realtime("install_app_progress", {"status": _("Installing App {0}").format(name)},
- user=frappe.session.user, now=True)
+ user=frappe.session.user)
frappe.installer.install_app(name)
frappe.publish_realtime("install_app_progress", {"status": _("{0} Installed").format(name)},
- user=frappe.session.user, now=True)
+ user=frappe.session.user)
def get_app(name):
"""Get app using git clone and install it in bench environment"""
@@ -89,7 +89,7 @@ def get_app(name):
raise frappe.ValidationError
frappe.publish_realtime("install_app_progress", {"status": _("Downloading App {0}").format(name)},
- user=frappe.session.user, now=True)
+ user=frappe.session.user)
args = [find_executable('bench'), 'get-app', name, app_listing[name]['repo_url']]
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/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js
index b513dc263e..52092c1c1d 100644
--- a/frappe/desk/page/setup_wizard/setup_wizard.js
+++ b/frappe/desk/page/setup_wizard/setup_wizard.js
@@ -262,9 +262,14 @@ function load_frappe_slides() {
frappe.wiz.welcome.data = r.message;
frappe.wiz.welcome.setup_fields(slide);
- slide.get_field("language")
- .set_input(frappe.wiz.welcome.data.default_language || "english")
- .trigger("change");
+ var language_field = slide.get_field("language");
+ language_field.set_input(frappe.wiz.welcome.data.default_language || "english");
+
+ if (!frappe.wiz._from_load_messages) {
+ language_field.$input.trigger("change");
+ }
+
+ delete frappe.wiz._from_load_messages;
moment.locale("en");
}
@@ -289,6 +294,7 @@ function load_frappe_slides() {
},
callback: function(r) {
// TODO save values!
+ frappe.wiz._from_load_messages = true;
// reset all slides so that labels are translated
frappe.wiz.slides = [];
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/assets/img/add-vat-number-in-purchase-order.png b/frappe/docs/assets/img/add-vat-number-in-purchase-order.png
new file mode 100644
index 0000000000..843974812a
Binary files /dev/null and b/frappe/docs/assets/img/add-vat-number-in-purchase-order.png differ
diff --git a/frappe/docs/assets/img/add-vat-number-in-supplier.png b/frappe/docs/assets/img/add-vat-number-in-supplier.png
new file mode 100644
index 0000000000..024d48f43a
Binary files /dev/null and b/frappe/docs/assets/img/add-vat-number-in-supplier.png differ
diff --git a/frappe/docs/assets/img/vat-number-fetched.png b/frappe/docs/assets/img/vat-number-fetched.png
new file mode 100644
index 0000000000..d540b20621
Binary files /dev/null and b/frappe/docs/assets/img/vat-number-fetched.png differ
diff --git a/frappe/docs/current/api/core/frappe.core.notifications.html b/frappe/docs/current/api/core/frappe.core.notifications.html
index c2e7eb0794..a8fe2071e3 100644
--- a/frappe/docs/current/api/core/frappe.core.notifications.html
+++ b/frappe/docs/current/api/core/frappe.core.notifications.html
@@ -77,6 +77,22 @@
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/frappe/docs/current/api/desk/frappe.desk.like.html b/frappe/docs/current/api/desk/frappe.desk.like.html new file mode 100644 index 0000000000..d1b364d46a --- /dev/null +++ b/frappe/docs/current/api/desk/frappe.desk.like.html @@ -0,0 +1,96 @@ +
+
+ + + + + + + +
+
+ + + + + + + +
+
+ + + + + + +
+
+ + + + + + \ No newline at end of file diff --git a/frappe/docs/current/api/desk/frappe.desk.notifications.html b/frappe/docs/current/api/desk/frappe.desk.notifications.html index 799d78174c..81727789f3 100644 --- a/frappe/docs/current/api/desk/frappe.desk.notifications.html +++ b/frappe/docs/current/api/desk/frappe.desk.notifications.html @@ -131,6 +131,22 @@ +
+
+ + + + + + +
+
+ + + \ No newline at end of file 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/docs/current/api/desk/index.txt b/frappe/docs/current/api/desk/index.txt index 439207c279..dba8734feb 100644 --- a/frappe/docs/current/api/desk/index.txt +++ b/frappe/docs/current/api/desk/index.txt @@ -1,6 +1,7 @@ frappe.desk.calendar frappe.desk.desk_page frappe.desk +frappe.desk.like frappe.desk.moduleview frappe.desk.notifications frappe.desk.query_builder @@ -8,5 +9,4 @@ frappe.desk.query_report frappe.desk.report_dump frappe.desk.reportview frappe.desk.search -frappe.desk.star frappe.desk.tags \ No newline at end of file diff --git a/frappe/docs/current/api/frappe.sessions.html b/frappe/docs/current/api/frappe.sessions.html index 84690315b5..21f51c17c9 100644 --- a/frappe/docs/current/api/frappe.sessions.html +++ b/frappe/docs/current/api/frappe.sessions.html @@ -284,7 +284,7 @@ frappe.sessions.clear_sessions - (user=None, keep_current=False) + (user=None, keep_current=False, device=None)
diff --git a/frappe/docs/current/api/model/frappe.model.db_query.html b/frappe/docs/current/api/model/frappe.model.db_query.html
index 25bc99f50f..f71e6a54c9 100644
--- a/frappe/docs/current/api/model/frappe.model.db_query.html
+++ b/frappe/docs/current/api/model/frappe.model.db_query.html
@@ -40,6 +40,20 @@
+
+
+ + + + +
diff --git a/frappe/docs/current/api/model/frappe.model.document.html b/frappe/docs/current/api/model/frappe.model.document.html
index 970a493bd6..73bcd32ea0 100644
--- a/frappe/docs/current/api/model/frappe.model.document.html
+++ b/frappe/docs/current/api/model/frappe.model.document.html
@@ -110,7 +110,7 @@ all values (including child documents) from the database.
add_comment
- (self, comment_type, text=None, comment_by=None)
+ (self, comment_type, text=None, comment_by=None, reference_doctype=None, reference_name=None)
+
+ + + + +
-
- - - - -
diff --git a/frappe/docs/current/api/utils/frappe.utils.data.html b/frappe/docs/current/api/utils/frappe.utils.data.html
index 0198f26d61..d0b5eabc2e 100644
--- a/frappe/docs/current/api/utils/frappe.utils.data.html
+++ b/frappe/docs/current/api/utils/frappe.utils.data.html
@@ -926,6 +926,22 @@ Ported from PrettyDate by John Resig
+
+
+ + + + + + +
-
- - - - - - -
-
- - - - - - -
-
- - - - - - - -
-
- - - - - - - -
-
- - - - - - - -
-
- - - - - - - -
-
- - - - - - - -
-
- - - - - - - -
-
- - - - - - - -
-
- - - - - - \ No newline at end of file diff --git a/frappe/docs/current/api/website/index.txt b/frappe/docs/current/api/website/index.txt index 45ac658638..991920d20a 100644 --- a/frappe/docs/current/api/website/index.txt +++ b/frappe/docs/current/api/website/index.txt @@ -3,6 +3,5 @@ frappe.website frappe.website.render frappe.website.router frappe.website.statics -frappe.website.template frappe.website.utils frappe.website.website_generator \ No newline at end of file diff --git a/frappe/docs/current/index.html b/frappe/docs/current/index.html index 0ac6840f4f..ab1f93dff9 100644 --- a/frappe/docs/current/index.html +++ b/frappe/docs/current/index.html @@ -35,7 +35,7 @@ Version
-
diff --git a/frappe/docs/current/models/core/comment.html b/frappe/docs/current/models/core/comment.html
index 96eec2e578..182e0ed6ab 100644
--- a/frappe/docs/current/models/core/comment.html
+++ b/frappe/docs/current/models/core/comment.html
@@ -73,7 +73,8 @@ Comment
Workflow
Label
Attachment
-Attachment Removed
+Attachment Removed
+Like
diff --git a/frappe/docs/current/models/core/communication.html b/frappe/docs/current/models/core/communication.html
index a754c28889..b89c1b07dc 100644
--- a/frappe/docs/current/models/core/communication.html
+++ b/frappe/docs/current/models/core/communication.html
@@ -571,20 +571,6 @@ Recipient Unsubscribed
-
-
- - - - -
+ 7
+
+ Data
+
+ Doc Owner
+
+
+
+
+
+ 8
+
+ Check
+
+ Seen
+
+
+
+
+
+ 9
+
+ Data
+
+ Reference DocType
+
+
+
+
+ 10
+
+ Data
+
+ Reference Name
+
+
+
+
@@ -138,6 +188,20 @@ Info
diff --git a/frappe/docs/current/models/website/web_page.html b/frappe/docs/current/models/website/web_page.html index d7acc0e721..215b7e2a14 100644 --- a/frappe/docs/current/models/website/web_page.html +++ b/frappe/docs/current/models/website/web_page.html @@ -423,6 +423,35 @@ Right +
+
+ + + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+1. Create another Custom Field **VAT Number** for *Purchase Order* document, but in this case with *Field Type* as **Read Only** or check **Read Only** checkbox. Set the **Options** as `supplier.vat_number`.
+ 
+
+1. Go to the user menu and click "Reload".
+1. Now, on selection of Supplier in a new Purchase Order, **VAT Number** will be fetched automatically from the selected Supplier.
+ 
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/hooks.py b/frappe/hooks.py
index 76d975d919..c86744f157 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
app_icon = "octicon octicon-circuit-board"
-app_version = "6.16.4"
+app_version = "6.17.6"
app_color = "orange"
source_link = "https://github.com/frappe/frappe"
app_license = "MIT"
@@ -45,12 +45,6 @@ website_route_rules = [
{"from_route": "/blog/", "to_route": "Blog Post"}
]
-website_context = {
- "hero": {
- "blog": "templates/includes/blog/hero.html"
- }
-}
-
write_file_keys = ["file_url", "file_name"]
notification_config = "frappe.core.notifications.get_notification_config"
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..bac64c1dba 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)
@@ -372,6 +372,12 @@ class BaseDocument(object):
if self.get(df.fieldname) in (None, []) or not strip_html(cstr(self.get(df.fieldname))).strip():
missing.append((df.fieldname, get_msg(df)))
+ # check for missing parent and parenttype
+ if self.meta.istable:
+ for fieldname in ("parent", "parenttype"):
+ if not self.get(fieldname):
+ missing.append((fieldname, get_msg(frappe._dict(label=fieldname))))
+
return missing
def get_invalid_links(self, is_submittable=False):
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..08b61baade 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -649,11 +649,11 @@ class Document(BaseDocument):
def notify_update(self):
"""Publish realtime that the current document is modified"""
frappe.publish_realtime("doc_update", {"modified": self.modified, "doctype": self.doctype, "name": self.name},
- doctype=self.doctype, docname=self.name)
+ doctype=self.doctype, docname=self.name, after_commit=True)
if not self.meta.get("read_only") and not self.meta.get("issingle") and \
not self.meta.get("istable"):
- frappe.publish_realtime("list_update", {"doctype": self.doctype})
+ frappe.publish_realtime("list_update", {"doctype": self.doctype}, after_commit=True)
def check_no_back_links_exist(self):
@@ -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/model/utils/rename_field.py b/frappe/model/utils/rename_field.py
index 03b39414c3..3c10315dd3 100644
--- a/frappe/model/utils/rename_field.py
+++ b/frappe/model/utils/rename_field.py
@@ -119,7 +119,7 @@ def update_property_setters(doctype, old_fieldname, new_fieldname):
where doc_type=%s and field_name=%s""", (new_fieldname, doctype, old_fieldname))
idx_property = frappe.db.sql("""select name, value from `tabProperty Setter`
- where doc_type=%s and property = '_idx' and value like '%%%s%%'""",
+ where doc_type='%s' and property = '_idx' and value like '%%%s%%'""" %
(doctype, old_fieldname), as_dict=1)
if idx_property:
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..a1dc5df091
--- /dev/null
+++ b/frappe/patches/v6_16/feed_doc_owner.py
@@ -0,0 +1,32 @@
+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
+ })
+
+ frappe.db.commit()
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..131e8d5576 100644
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -2,20 +2,19 @@
"css/frappe-web.css": [
"public/css/font-awesome.css",
"public/css/octicons/octicons.css",
- "public/css/nprogress.css",
"public/css/website.css"
],
"js/frappe-web.min.js": [
"public/js/lib/bootstrap.min.js",
"public/js/frappe/provide.js",
"public/js/frappe/misc/number_format.js",
- "public/js/lib/nprogress.js",
"public/js/frappe/translate.js",
"public/js/frappe/misc/pretty_date.js",
"public/js/lib/moment/moment.min.js",
"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"
],
@@ -25,6 +24,16 @@
"public/js/frappe/ui/editor.html",
"public/js/frappe/ui/editor.js"
],
+ "js/dialog.min.js": [
+ "public/js/frappe/dom.js",
+ "public/js/frappe/ui/modal.html",
+ "public/js/frappe/form/formatters.js",
+ "public/js/frappe/form/layout.js",
+ "public/js/frappe/ui/field_group.js",
+ "public/js/frappe/form/control.js",
+ "public/js/frappe/form/link_selector.js",
+ "public/js/frappe/ui/dialog.js"
+ ],
"css/desk.min.css": [
"public/js/lib/jquery/bootstrap_theme/jquery-ui.selected.css",
"public/css/bootstrap.css",
@@ -38,7 +47,6 @@
"public/css/sidebar.css",
"public/css/page.css",
"public/css/tree.css",
- "public/css/nprogress.css",
"public/css/desktop.css",
"public/css/form.css",
"public/css/mobile.css"
@@ -49,7 +57,6 @@
"public/js/lib/tag-it.min.js",
"public/js/lib/notify.js",
"public/js/lib/bootstrap.min.js",
- "public/js/lib/nprogress.js",
"public/js/lib/moment/moment-with-locales.min.js",
"public/js/lib/moment/moment-timezone-with-data.min.js",
"public/js/lib/socket.io.min.js",
@@ -84,7 +91,6 @@
"public/js/frappe/form/control.js",
"public/js/frappe/form/link_selector.js",
"public/js/frappe/ui/dialog.js",
- "public/js/frappe/ui/button.js",
"public/js/frappe/ui/app_icon.js",
"public/js/frappe/model/model.js",
@@ -121,6 +127,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 +187,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/common.css b/frappe/public/css/common.css
index 769eb98990..20d00d7f3c 100644
--- a/frappe/public/css/common.css
+++ b/frappe/public/css/common.css
@@ -108,6 +108,7 @@ a.badge-hover:active .badge {
background-color: #D8DFE5;
}
.msgprint {
+ margin: 15px 0px;
text-align: center;
}
.msgprint pre {
diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index e19fbbb788..a7be95bad8 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -108,6 +108,7 @@ a.badge-hover:active .badge {
background-color: #D8DFE5;
}
.msgprint {
+ margin: 15px 0px;
text-align: center;
}
.msgprint pre {
@@ -546,3 +547,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/navbar.css b/frappe/public/css/navbar.css
index 1328c1743b..96704dd59d 100644
--- a/frappe/public/css/navbar.css
+++ b/frappe/public/css/navbar.css
@@ -32,11 +32,13 @@
min-width: 24px;
height: 24px;
border-radius: 4px;
- background-color: #ff5858;
color: #fff;
text-align: center;
padding: 2px 5px;
}
+.navbar-new-comments-true {
+ background-color: #ff5858;
+}
#navbar-search {
width: 300px;
background-color: rgba(255, 255, 255, 0.9);
diff --git a/frappe/public/css/nprogress.css b/frappe/public/css/nprogress.css
deleted file mode 100644
index 1eaeae9210..0000000000
--- a/frappe/public/css/nprogress.css
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Make clicks pass-through */
-#nprogress {
- pointer-events: none;
- -webkit-pointer-events: none;
-}
-
-/* Make the entire page show a busy cursor */
-.nprogress-busy body {
- cursor: wait;
-}
-
-#nprogress .bar {
- background: #36414C;
-
- position: fixed;
- z-index: 1050;
- top: 0;
- left: 0;
-
- width: 100%;
- height: 2px;
-}
-
-/* Fancy blur effect */
-#nprogress .peg {
- display: block;
- position: absolute;
- right: 0px;
- width: 100px;
- height: 100%;
- /*box-shadow: 0 0 10px #2ecc71, 0 0 5px #2ecc71;*/
- opacity: 1.0;
-
- -webkit-transform: rotate(3deg) translate(0px, -4px);
- -moz-transform: rotate(3deg) translate(0px, -4px);
- -ms-transform: rotate(3deg) translate(0px, -4px);
- -o-transform: rotate(3deg) translate(0px, -4px);
- transform: rotate(3deg) translate(0px, -4px);
-}
-
-/* Remove these to get rid of the spinner
-#nprogress .spinner {
- display: block;
- position: fixed;
- z-index: 1050;
- top: 7px;
- right: 15px;
-}
-
-#nprogress .spinner-icon {
- width: 14px;
- height: 14px;
-
- border: solid 2px transparent;
- border-top-color: #fff;
- border-left-color: #fff;
- border-radius: 10px;
-
- -webkit-animation: nprogress-spinner 400ms linear infinite;
- -moz-animation: nprogress-spinner 400ms linear infinite;
- -ms-animation: nprogress-spinner 400ms linear infinite;
- -o-animation: nprogress-spinner 400ms linear infinite;
- animation: nprogress-spinner 400ms linear infinite;
-}
-
-@-webkit-keyframes nprogress-spinner {
- 0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); }
- 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); }
-}
-@-moz-keyframes nprogress-spinner {
- 0% { -moz-transform: rotate(0deg); transform: rotate(0deg); }
- 100% { -moz-transform: rotate(360deg); transform: rotate(360deg); }
-}
-@-o-keyframes nprogress-spinner {
- 0% { -o-transform: rotate(0deg); transform: rotate(0deg); }
- 100% { -o-transform: rotate(360deg); transform: rotate(360deg); }
-}
-@-ms-keyframes nprogress-spinner {
- 0% { -ms-transform: rotate(0deg); transform: rotate(0deg); }
- 100% { -ms-transform: rotate(360deg); transform: rotate(360deg); }
-}
-@keyframes nprogress-spinner {
- 0% { transform: rotate(0deg); transform: rotate(0deg); }
- 100% { transform: rotate(360deg); transform: rotate(360deg); }
-}*/
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..33e269e7b2 100644
--- a/frappe/public/css/website.css
+++ b/frappe/public/css/website.css
@@ -108,6 +108,7 @@ a.badge-hover:active .badge {
background-color: #D8DFE5;
}
.msgprint {
+ margin: 15px 0px;
text-align: center;
}
.msgprint pre {
@@ -264,6 +265,15 @@ 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 center;
+ border-radius: 4px;
+}
.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/defaults.js b/frappe/public/js/frappe/defaults.js
index 1b8d4f1d15..2ca615767b 100644
--- a/frappe/public/js/frappe/defaults.js
+++ b/frappe/public/js/frappe/defaults.js
@@ -5,7 +5,7 @@ frappe.defaults = {
get_user_default: function(key) {
var defaults = frappe.boot.user.defaults;
var d = defaults[key];
- if(!d && (key !== frappe.model.scrub(key)))
+ if(!d && frappe.defaults.is_a_user_permission_key(key))
d = defaults[frappe.model.scrub(key)];
if($.isArray(d)) d = d[0];
return d;
@@ -13,8 +13,8 @@ frappe.defaults = {
get_user_defaults: function(key) {
var defaults = frappe.boot.user.defaults;
var d = defaults[key];
-
- if (key !== frappe.model.scrub(key)) {
+
+ if (frappe.defaults.is_a_user_permission_key(key)) {
if (d && $.isArray(d) && d.length===1) {
// Use User Permission value when only when it has a single value
d = d[0];
@@ -52,14 +52,14 @@ frappe.defaults = {
get_default: function(key) {
var defaults = frappe.boot.user.defaults;
var value = defaults[key];
- if (key !== frappe.model.scrub(key)) {
+ if (frappe.defaults.is_a_user_permission_key(key)) {
if (value && $.isArray(value) && value.length===1) {
value = value[0];
} else {
value = defaults[frappe.model.scrub(key)];
}
}
-
+
if(value) {
try {
return JSON.parse(value)
@@ -68,6 +68,11 @@ frappe.defaults = {
}
}
},
+
+ is_a_user_permission_key: function(key) {
+ return key.indexOf(":")===-1 && key !== frappe.model.scrub(key);
+ },
+
get_user_permissions: function() {
return frappe.defaults.user_permissions;
},
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index ff5015d1fe..53050382b6 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -70,6 +70,14 @@ frappe.Application = Class.extend({
frappe.csrf_token = data.csrf_token;
}
});
+
+ frappe.realtime.on("version-update", function() {
+ var dialog = frappe.msgprint(__("The application has been updated to a new version, please refresh this page"));
+ dialog.set_primary_action("Refresh", function() {
+ location.reload(true);
+ });
+ dialog.get_close_btn().toggle(false);
+ });
},
load_bootinfo: function() {
@@ -80,7 +88,7 @@ frappe.Application = Class.extend({
this.check_metadata_cache_status();
this.set_globals();
this.sync_pages();
- moment.locale(frappe.boot.lang);
+ moment.locale("en");
moment.user_utc_offset = moment().utcOffset();
if(frappe.boot.timezone_info) {
moment.tz.add(frappe.boot.timezone_info);
diff --git a/frappe/public/js/frappe/dom.js b/frappe/public/js/frappe/dom.js
index 386e40d884..ef0c2347c4 100644
--- a/frappe/public/js/frappe/dom.js
+++ b/frappe/public/js/frappe/dom.js
@@ -24,6 +24,18 @@ frappe.dom = {
// execute the script globally
document.getElementsByTagName('head')[0].appendChild(el);
},
+ remove_script_and_style: function(txt) {
+ var div = document.createElement('div');
+ div.innerHTML = txt;
+ ["script", "style", "noscript", "title", "meta", "base", "head"].forEach(function(e, i) {
+ var elements = div.getElementsByTagName(e);
+ var i = elements.length;
+ while (i--) {
+ elements[i].parentNode.removeChild(elements[i]);
+ }
+ });
+ return div.innerHTML;
+ },
set_style: function(txt, id) {
if(!txt) return;
diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js
index 42f2f93b21..2ff8cddd6a 100644
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
@@ -102,9 +102,11 @@ frappe.ui.form.Control = Class.extend({
undefined;
},
set_model_value: function(value) {
- if(frappe.model.set_value(this.doctype, this.docname, this.df.fieldname,
- value, this.df.fieldtype)) {
- this.last_value = value;
+ if(this.doctype) {
+ if(frappe.model.set_value(this.doctype, this.docname, this.df.fieldname,
+ value, this.df.fieldtype)) {
+ this.last_value = value;
+ }
}
},
});
@@ -1153,10 +1155,6 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
select: function(event, ui) {
me.autocomplete_open = false;
- if(ui.item.action) {
- ui.item.action.apply(me);
- }
-
// prevent selection on tab
var TABKEY = 9;
if(event.keyCode === TABKEY) {
@@ -1165,6 +1163,11 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
return false;
}
+ if(ui.item.action) {
+ ui.item.value = "";
+ ui.item.action.apply(me);
+ }
+
if(me.frm && me.frm.doc) {
me.selected = true;
me.parse_validate_and_set_in_model(ui.item.value);
@@ -1383,7 +1386,7 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
},
_set_input: function(value) {
if(value == null) value = "";
- value = frappe.utils.remove_script_and_style(value);
+ value = frappe.dom.remove_script_and_style(value);
this.editor.set_input(value);
this.md_editor.val(value);
this.last_value = value;
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 @@
+ + + frappe.core.notifications.get_unseen_likes + () +
+Returns count of unseen likes
++ + + \ No newline at end of file diff --git a/frappe/docs/current/api/desk/frappe.desk.like.html b/frappe/docs/current/api/desk/frappe.desk.like.html new file mode 100644 index 0000000000..d1b364d46a --- /dev/null +++ b/frappe/docs/current/api/desk/frappe.desk.like.html @@ -0,0 +1,96 @@ +
+
+
+ Version 6.x.x
+
+
+ Source
+
+
+
+
+
+
+
+
+
+
+
+ + + + frappe.desk.like._toggle_like + (doctype, name, add, user=None) +
+Same as toggle_like but hides param user from API
+ + + + + + + +
+ + + frappe.desk.like.add_comment + (doctype, name) +
+No docs
++ + + + + + + +
+ + + frappe.desk.like.remove_like + (doctype, name) +
+Remove previous Like
++ + + + + + +
Public API
+ /api/method/frappe.desk.like.toggle_like
+
+ + + frappe.desk.like.toggle_like + (doctype, name, add=False) +
+Adds / removes the current user in the __liked_by property of the given document.
+If column does not exist, will add it in the database.
The _liked_by property is always set from this function and is ignored if set via
+Document API
Parameters:
+ +-
+
doctype- DocType of the document to like
+name- Name of the document to like
+add-Yesif like is to be added. If notYesthe like will be removed.
+
+ + + + + + \ No newline at end of file diff --git a/frappe/docs/current/api/desk/frappe.desk.notifications.html b/frappe/docs/current/api/desk/frappe.desk.notifications.html index 799d78174c..81727789f3 100644 --- a/frappe/docs/current/api/desk/frappe.desk.notifications.html +++ b/frappe/docs/current/api/desk/frappe.desk.notifications.html @@ -131,6 +131,22 @@ +
+ + + frappe.desk.notifications.get_notifications_for + (notification_type, config, notification_count) +
+No docs
++ + + + + + +
@@ -159,6 +175,22 @@ + + + + +
+ + + frappe.desk.notifications.get_notifications_for_other + (config, notification_count) +
+Notifications for other items
++ + + \ No newline at end of file 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 @@ -
-
-
- 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/docs/current/api/desk/index.txt b/frappe/docs/current/api/desk/index.txt index 439207c279..dba8734feb 100644 --- a/frappe/docs/current/api/desk/index.txt +++ b/frappe/docs/current/api/desk/index.txt @@ -1,6 +1,7 @@ frappe.desk.calendar frappe.desk.desk_page frappe.desk +frappe.desk.like frappe.desk.moduleview frappe.desk.notifications frappe.desk.query_builder @@ -8,5 +9,4 @@ frappe.desk.query_report frappe.desk.report_dump frappe.desk.reportview frappe.desk.search -frappe.desk.star frappe.desk.tags \ No newline at end of file diff --git a/frappe/docs/current/api/frappe.sessions.html b/frappe/docs/current/api/frappe.sessions.html index 84690315b5..21f51c17c9 100644 --- a/frappe/docs/current/api/frappe.sessions.html +++ b/frappe/docs/current/api/frappe.sessions.html @@ -284,7 +284,7 @@ frappe.sessions.clear_sessions - (user=None, keep_current=False) + (user=None, keep_current=False, device=None)
No docs
+ + + add_comment_count + (self, result) +
+No docs
++ + + + +
@@ -156,7 +170,7 @@ 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) + (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, with_comment_count=False)
No docs
Add a comment to this document.
@@ -280,6 +280,20 @@ timestamps don't match. ++ + + get_liked_by + (self) +
+No docs
++ + + + +
@@ -308,20 +322,6 @@ timestamps don't match.
-- - - get_starred_by - (self) -
-No docs
-- - - - -
diff --git a/frappe/docs/current/api/utils/frappe.utils.bench_helper.html b/frappe/docs/current/api/utils/frappe.utils.bench_helper.html index c5a73083df..28066aa7ba 100644 --- a/frappe/docs/current/api/utils/frappe.utils.bench_helper.html +++ b/frappe/docs/current/api/utils/frappe.utils.bench_helper.html @@ -21,7 +21,7 @@ frappe.utils.bench_helper.app_group - (ctx, site=False, force=False, verbose=False, profile=False) + ()
No docs
+ + + frappe.utils.data.to_markdown + (html) +
+No docs
++ + + + + + +
diff --git a/frappe/docs/current/api/website/frappe.website.render.html b/frappe/docs/current/api/website/frappe.website.render.html index 0b45cee97b..acb3b6e9e3 100644 --- a/frappe/docs/current/api/website/frappe.website.render.html +++ b/frappe/docs/current/api/website/frappe.website.render.html @@ -64,22 +64,6 @@ -
- - - frappe.website.render.build_json - (path) -
-No docs
-- - - - - - -
- - - frappe.website.render.is_ajax - () -
-No docs
-- - - - - - -
diff --git a/frappe/docs/current/api/website/frappe.website.template.html b/frappe/docs/current/api/website/frappe.website.template.html deleted file mode 100644 index 6c55adf387..0000000000 --- a/frappe/docs/current/api/website/frappe.website.template.html +++ /dev/null @@ -1,147 +0,0 @@ -
-
-
- Version 6.x.x
-
-
- Source
-
-
-
-
-
-
-
-
-
-
-
- - - - frappe.website.template.add_hero - (out, context) -
-Add a hero element if specified in content or hooks. -Hero elements get full page width.
-- - - - - - - -
- - - frappe.website.template.add_index - (out, context) -
-Add index, next button if {index}, {next} is present.
- - - - - - - -
- - - frappe.website.template.build_template - (context) -
-Returns a dict of block name and its rendered content
-- - - - - - - -
- - - frappe.website.template.render_blocks - (template_path, out, context) -
-Build the template block by block from the main template.
-- - - - - - - -
- - - frappe.website.template.separate_style_and_script - (out, context) -
-Extract style and script tags into separate blocks
- - - - - - - -
- - - frappe.website.template.set_breadcrumbs - (out, context) -
-Build breadcrumbs template (deprecated)
-- - - - - - - -
- - - frappe.website.template.set_sidebar - (out, context) -
-Include sidebar (deprecated)
-- - - - - - - -
- - - frappe.website.template.set_title_and_header - (out, context) -
-Extract and set title and header from content or context.
-- - - - - - \ No newline at end of file diff --git a/frappe/docs/current/api/website/index.txt b/frappe/docs/current/api/website/index.txt index 45ac658638..991920d20a 100644 --- a/frappe/docs/current/api/website/index.txt +++ b/frappe/docs/current/api/website/index.txt @@ -3,6 +3,5 @@ frappe.website frappe.website.render frappe.website.router frappe.website.statics -frappe.website.template frappe.website.utils frappe.website.website_generator \ No newline at end of file diff --git a/frappe/docs/current/index.html b/frappe/docs/current/index.html index 0ac6840f4f..ab1f93dff9 100644 --- a/frappe/docs/current/index.html +++ b/frappe/docs/current/index.html @@ -35,7 +35,7 @@ Version
6.16.3
+ 6.17.3
- - - get_starrers - (self) -
-Return list of users who have starred this document.
-- - - - -
diff --git a/frappe/docs/current/models/core/user.html b/frappe/docs/current/models/core/user.html index f51f81074d..a74b436399 100644 --- a/frappe/docs/current/models/core/user.html +++ b/frappe/docs/current/models/core/user.html @@ -1068,9 +1068,9 @@ Website User
- + - send_password_notifcation + send_password_notification (self, new_password)
No docs
diff --git a/frappe/docs/current/models/desk/feed.html b/frappe/docs/current/models/desk/feed.html index 827a680734..1c834c4268 100644 --- a/frappe/docs/current/models/desk/feed.html +++ b/frappe/docs/current/models/desk/feed.html @@ -52,7 +52,8 @@ Comment Login Label -Info +Info +Like @@ -116,6 +117,55 @@ Infodoc_ownerseenreference_doctype+ Use this to provide alternative link to a feed record
+reference_namediff --git a/frappe/docs/current/models/website/web_page.html b/frappe/docs/current/models/website/web_page.html index d7acc0e721..215b7e2a14 100644 --- a/frappe/docs/current/models/website/web_page.html +++ b/frappe/docs/current/models/website/web_page.html @@ -423,6 +423,35 @@ Right +
+ + + add_hero + (self, context) +
+Add a hero element if specified in content or hooks. +Hero elements get full page width.
++ + + + + +
+ + + add_index + (self, context) +
+Add index, next button if {index}, {next} is present.
+ + + + +
+ + + set_breadcrumbs + (self, context) +
+Build breadcrumbs template (deprecated)
++ + + + +
+ + + set_title_and_header + (self, context) +
+Extract and set title and header from content or context.
++ + + + +
diff --git a/frappe/docs/user/guides/app-development/fetch-custom-field-value-from-master-to-all-related-transactions.md b/frappe/docs/user/guides/app-development/fetch-custom-field-value-from-master-to-all-related-transactions.md
index bbf1c863c7..d6e495ca1e 100644
--- a/frappe/docs/user/guides/app-development/fetch-custom-field-value-from-master-to-all-related-transactions.md
+++ b/frappe/docs/user/guides/app-development/fetch-custom-field-value-from-master-to-all-related-transactions.md
@@ -1,20 +1,15 @@
-Let's say, there is a custom field "VAT Number" in Supplier master, which should be fetched in Purchase Order document.
-
-
Steps:
-
1. Create a Custom Field "VAT Number" for Supplier document with Field Type as Data.
-
-
2. Create another Custom Field "VAT Number" for Purchase Order document. But in this case, enter Field Type as Read Only and Options as supplier.vat_number.
-
3. Refresh the system using Help -> Clear Cache.
-
4. Now on selection of Supplier in new Purchase Order form, "VAT Number" will be fetched automatically from Supplier master.
-
5. The above procedure should be replicated, for all other supplier related transactions.
-
-
Note:
-
-
If field type of "VAT Number" in Purchase Order is other than `Read Only`, then to fetch the value, a small piece of Custom Script need to be written. -\ No newline at end of file +# Fetch a Field Value from a Document into a Transaction + +Let's say, there is a custom field "VAT Number" in Supplier, which should be fetched in Purchase Order. + +#### Steps: + +1. Create a Custom Field **VAT Number** for *Supplier* document with *Field Type* as **Data**. +
i. Go to Setup -> Customize -> Custom Script. -
ii. Select DocType as `Purchase Order`. -
iii. Add Script `cur_frm.add_fetch('supplier', 'vat_number', 'vat_number')` -
iv. Save the Custom Script. -
v. Clear cache before testing. -
-
+
+1. Create another Custom Field **VAT Number** for *Purchase Order* document, but in this case with *Field Type* as **Read Only** or check **Read Only** checkbox. Set the **Options** as `supplier.vat_number`.
+
+
+1. Go to the user menu and click "Reload".
+1. Now, on selection of Supplier in a new Purchase Order, **VAT Number** will be fetched automatically from the selected Supplier.
+
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/hooks.py b/frappe/hooks.py
index 76d975d919..c86744f157 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
app_icon = "octicon octicon-circuit-board"
-app_version = "6.16.4"
+app_version = "6.17.6"
app_color = "orange"
source_link = "https://github.com/frappe/frappe"
app_license = "MIT"
@@ -45,12 +45,6 @@ website_route_rules = [
{"from_route": "/blog/
-
diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index 3482d445ac..8b72afba6d 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);
@@ -150,7 +148,7 @@ frappe.ui.form.Comments = Class.extend({
if(c.comment_type=="Email") {
c.comment = c.comment.split("")[0];
c.comment = frappe.utils.strip_original_content(c.comment);
- c.comment = frappe.utils.remove_script_and_style(c.comment);
+ c.comment = frappe.dom.remove_script_and_style(c.comment);
c.original_comment = c.comment;
c.comment = frappe.utils.toggle_blockquote(c.comment);
@@ -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) { %}
- 
+
-
-
-
+ {% } %}
+
+
+ {{ title }}
+ {% block title %} {{ title }} {% endblock %}
-
-
{% block favicon %}
- {%- if style is defined -%}{{ style }}{%- endif -%}
-
- {%- endblock -%}
+ {%- block style %}{%- endblock -%}
{%- endblock -%}
- {%- if js_globals is defined %}
- {% endif -%}
+
+
{%= 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..bf4484c468 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..d1aaa1d48a 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,26 +22,25 @@ 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");
}
}
},
set_title: function() {
if(this.frm.meta.title_field) {
- var title = (this.frm.doc[this.frm.meta.title_field] || "").trim() || __(this.frm.docname);
+ var title = (this.frm.doc[this.frm.meta.title_field] || "").trim() || this.frm.docname;
if(this.frm.doc.__islocal || title === this.frm.docname || this.frm.meta.autoname==="hash") {
this.page.set_title_sub("");
} else {
this.page.set_title_sub(this.frm.docname);
}
} else {
- var title = __(this.frm.docname);
+ var title = this.frm.docname;
}
var me = this;
+ title = __(title);
this.page.set_title(title);
if(this.frm.meta.title_field) {
frappe.utils.set_title(title + " - " + this.frm.docname);
@@ -97,13 +95,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 +108,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.html b/frappe/public/js/frappe/list/list_item_main.html
index 6ed25c515f..ab49855d99 100644
--- a/frappe/public/js/frappe/list/list_item_main.html
+++ b/frappe/public/js/frappe/list/list_item_main.html
@@ -31,7 +31,7 @@
{% } %}
{% } else if(col.fieldtype==="Select") { %}
{%= value %}
+ data-filter="{%= col.fieldname %},=,{%= value %}">{%= __(value) %}
{% } else if(col.fieldtype==="Link") { %}
{%= value %}
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..765551c4c1 100644
--- a/frappe/public/js/frappe/list/list_item_main_head.html
+++ b/frappe/public/js/frappe/list/list_item_main_head.html
@@ -23,12 +23,12 @@
title="{%= __("Select All") %}">
{% } %}
-
+
{% } %}
- {%= col.title || col.label || "" %}
+ {%= __(col.title) || __(col.label) || "" %}
{% } %}
{% } %}
diff --git a/frappe/public/js/frappe/list/list_item_row.html b/frappe/public/js/frappe/list/list_item_row.html
index d03ac45f64..c2afc7b2f9 100644
--- a/frappe/public/js/frappe/list/list_item_row.html
+++ b/frappe/public/js/frappe/list/list_item_row.html
@@ -23,9 +23,12 @@
- {%= list.get_indicator_dot(data) %}
-
+ text-right list-row-right" style="padding-left:0px">
+ {%= list.get_indicator_dot(data) %}
+
+
+ {%= comment_when(data.modified, true) %}
+
{% if (data._assign_list.length) { %}
@@ -33,14 +36,11 @@
{% } else { %}
{% } %}
-
+
- {%= data._comments_list.length || 0 %}
+ {%= (data._comment_count > 99 ? "99+" : data._comment_count) || 0 %}
-
-
- {%= comment_when(data.modified, true) %}
-
diff --git a/frappe/public/js/frappe/list/list_item_subject.html b/frappe/public/js/frappe/list/list_item_subject.html
index 5d5442dab6..1a00e96db7 100644
--- a/frappe/public/js/frappe/list/list_item_subject.html
+++ b/frappe/public/js/frappe/list/list_item_subject.html
@@ -2,13 +2,16 @@
{% } %}
-
-
+
+
+
+ {{ (_liked_by.length > 9 ? "9+" : _liked_by.length) || "" }}
+
'+indicator[0]+'';
+ +indicator[2]+'">'+__(indicator[0])+'';
} else {
return "";
}
@@ -277,15 +277,15 @@ frappe.views.ListView = Class.extend({
if (!indicator) {
return "";
}
- return '';
+ return '';
},
prepare_data: function(data) {
if(data.modified)
this.prepare_when(data, data.modified);
- data._starred_by = data._starred_by ?
- JSON.parse(data._starred_by) : [];
+ data._liked_by = data._liked_by ?
+ JSON.parse(data._liked_by) : [];
data._checkbox = (frappe.model.can_delete(this.doctype) || this.settings.selectable) && !this.no_delete
@@ -311,7 +311,6 @@ frappe.views.ListView = Class.extend({
}
data._user = user;
- data._comments_list = data._comments ? JSON.parse(data._comments) : [];
data._tags = $.map((data._user_tags || "").split(","),
function(v) { return v ? v : null; });
data._assign_list = data._assign ? JSON.parse(data._assign) : [];
diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index 17db281cf5..b1ef0cd774 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -50,18 +50,6 @@ frappe.utils = {
return txt.toLowerCase().substr(0,7)=='http://'
|| txt.toLowerCase().substr(0,8)=='https://'
},
- remove_script_and_style: function(txt) {
- var div = document.createElement('div');
- div.innerHTML = txt;
- ["script", "style", "noscript", "title", "meta", "base", "head"].forEach(function(e, i) {
- var elements = div.getElementsByTagName(e);
- var i = elements.length;
- while (i--) {
- elements[i].parentNode.removeChild(elements[i]);
- }
- });
- return div.innerHTML;
- },
toggle_blockquote: function(txt) {
if (!txt) return txt;
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index b691cf9ee0..cd942cc5cd 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -10,7 +10,7 @@ $.extend(frappe.model, {
layout_fields: ['Section Break', 'Column Break', 'Fold'],
std_fields_list: ['name', 'owner', 'creation', 'modified', 'modified_by',
- '_user_tags', '_comments', '_assign', '_starred_by', 'docstatus',
+ '_user_tags', '_comments', '_assign', '_liked_by', 'docstatus',
'parent', 'parenttype', 'parentfield', 'idx'],
std_fields: [
@@ -21,7 +21,7 @@ $.extend(frappe.model, {
{fieldname:'modified', fieldtype:'Date', label:__('Last Updated On')},
{fieldname:'modified_by', fieldtype:'Data', label:__('Last Updated By')},
{fieldname:'_user_tags', fieldtype:'Data', label:__('Tags')},
- {fieldname:'_starred_by', fieldtype:'Data', label:__('Starred By')},
+ {fieldname:'_liked_by', fieldtype:'Data', label:__('Liked By')},
{fieldname:'_comments', fieldtype:'Text', label:__('Comments')},
{fieldname:'_assign', fieldtype:'Text', label:__('Assigned To')},
{fieldname:'docstatus', fieldtype:'Int', label:__('Document Status')},
diff --git a/frappe/public/js/frappe/query_string.js b/frappe/public/js/frappe/query_string.js
new file mode 100644
index 0000000000..3d4026af2e
--- /dev/null
+++ b/frappe/public/js/frappe/query_string.js
@@ -0,0 +1,42 @@
+function get_url_arg(name) {
+ return get_query_params()[name] || "";
+}
+
+function get_query_params(query_string) {
+ var query_params = {};
+ if (!query_string) {
+ query_string = location.search.substring(1);
+ }
+
+ var query_list = query_string.split("&");
+ for (var i=0, l=query_list.length; i < l; i++ ){
+ var pair = query_list[i].split("=");
+ var key = pair[0];
+ if (!key) {
+ continue;
+ }
+
+ var value = pair[1];
+ if (typeof value === "string") {
+ value = decodeURIComponent(value);
+ }
+
+ if (key in query_params) {
+ if (typeof query_params[key] === undefined) {
+ query_params[key] = [];
+ } else if (typeof query_params[key] === "string") {
+ query_params[key] = [query_params[key]];
+ }
+ query_params[key].push(value);
+ } else {
+ query_params[key] = value;
+ }
+ }
+ return query_params;
+}
+
+function make_query_string(obj) {
+ var query_params = [];
+ $.each(obj, function(k, v) { query_params.push(encodeURIComponent(k) + "=" + encodeURIComponent(v)); });
+ return "?" + query_params.join("&");
+}
diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index 0e8174877a..d7db4c55de 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -53,7 +53,15 @@ frappe.route = function() {
frappe.get_route = function(route) {
// for app
- return frappe.get_route_str(route).split('/')
+ var route = frappe.get_route_str(route).split('/')
+ var parts = route[route.length - 1].split("?");
+ route[route.length - 1] = parts[0];
+ if (parts.length > 1) {
+ var query_params = get_query_params(parts[1]);
+ frappe.route_options = $.extend(frappe.route_options || {}, query_params);
+ }
+
+ return route;
}
frappe.get_prev_route = function() {
diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js
index 931d4bd0c3..4a112526c1 100644
--- a/frappe/public/js/frappe/socketio_client.js
+++ b/frappe/public/js/frappe/socketio_client.js
@@ -60,12 +60,12 @@ frappe.socket = {
});
window.onbeforeunload = function() {
- if (frm.is_new()) {
+ if (!cur_frm || cur_frm.is_new()) {
return;
}
// if tab/window is closed, notify other users
- if (cur_frm && cur_frm.doc) {
+ if (cur_frm.doc) {
frappe.socket.doc_close(cur_frm.doctype, cur_frm.docname);
}
}
diff --git a/frappe/public/js/frappe/ui/button.js b/frappe/public/js/frappe/ui/button.js
deleted file mode 100644
index 6d6798b74d..0000000000
--- a/frappe/public/js/frappe/ui/button.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
-frappe.ui.Button = function(args) {
- var me = this;
- $.extend(this, {
- make: function() {
- me.btn = frappe.dom.add(args.parent, 'button', 'btn ' + (args.css_class || 'btn-default'));
- me.btn.args = args;
-
- // ajax loading
- me.loading_img = frappe.dom.add(me.btn.args.parent,'img','',{margin:'0px 4px -2px 4px', display:'none'});
- me.loading_img.src= 'assets/frappe/images/ui/button-load.gif';
-
- // label
- me.btn.innerHTML = args.label;
-
- // onclick
- me.btn.user_onclick = args.onclick;
- $(me.btn).bind('click', function() {
- if(!this.disabled && this.user_onclick)
- this.user_onclick(this);
- })
-
- // bc
- me.btn.set_working = me.set_working;
- me.btn.done_working = me.done_working;
-
- // style
- if(me.btn.args.style)
- frappe.dom.css(me.btn, args.style);
- },
-
- set_working: function() {
- me.btn.disabled = 'disabled';
- $(me.loading_img).css('display','inline');
- },
-
- done_working: function() {
- me.btn.disabled = false;
- $(me.loading_img).toggle(false);
- }
- });
- this.make();
-}
diff --git a/frappe/public/js/frappe/ui/editor.js b/frappe/public/js/frappe/ui/editor.js
index cec109971a..b716edec55 100644
--- a/frappe/public/js/frappe/ui/editor.js
+++ b/frappe/public/js/frappe/ui/editor.js
@@ -91,7 +91,7 @@ bsEditor = Class.extend({
selection_marker: 'edit-focus-marker',
selection_color: 'darkgrey',
remove_typography: false,
- max_file_size: 1,
+ max_file_size: 5,
},
bind_hotkeys: function () {
diff --git a/frappe/public/js/frappe/ui/like.js b/frappe/public/js/frappe/ui/like.js
new file mode 100644
index 0000000000..0ebd429a2d
--- /dev/null
+++ b/frappe/public/js/frappe/ui/like.js
@@ -0,0 +1,128 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// MIT License. See license.txt
+
+frappe.ui.is_liked = function(doc) {
+ var liked = frappe.ui.get_liked_by(doc);
+ return liked.indexOf(user)===-1 ? false : true;
+}
+
+frappe.ui.get_liked_by = function(doc) {
+ var liked = doc._liked_by;
+ if(liked) {
+ liked = JSON.parse(liked);
+ }
+
+ return liked || [];
+}
+
+frappe.ui.toggle_like = function($btn, doctype, name, callback) {
+ var add = $btn.hasClass("not-liked") ? "Yes" : "No";
+ // disable click
+ $btn.css('pointer-events', 'none');
+
+ frappe.call({
+ method: "frappe.desk.like.toggle_like",
+ quiet: true,
+ args: {
+ doctype: doctype,
+ name: name,
+ add: add,
+ },
+ callback: function(r) {
+ // renable click
+ $btn.css('pointer-events', 'auto');
+
+ if(!r.exc) {
+ // update in all local-buttons
+ var action_buttons = $('.like-action[data-name="'+ name.replace(/"/g, '\"')
+ +'"][data-doctype="'+ doctype.replace(/"/g, '\"')+'"]');
+
+ if(add==="Yes") {
+ action_buttons.removeClass("not-liked text-extra-muted");
+ } else {
+ action_buttons.addClass("not-liked text-extra-muted");
+ }
+
+ // update in locals (form)
+ var doc = locals[doctype] && locals[doctype][name];
+ if(doc) {
+ var liked_by = JSON.parse(doc._liked_by || "[]"),
+ idx = liked_by.indexOf(user);
+ if(add==="Yes") {
+ if(idx===-1)
+ liked_by.push(user);
+ } else {
+ if(idx!==-1) {
+ liked_by = liked_by.slice(0,idx).concat(liked_by.slice(idx+1))
+ }
+ }
+ doc._liked_by = JSON.stringify(liked_by);
+ }
+
+ if(callback) {
+ callback();
+ }
+ }
+ }
+ });
+};
+
+frappe.ui.click_toggle_like = function() {
+ var $btn = $(this);
+ var $count = $btn.siblings(".likes-count");
+ var not_liked = $btn.hasClass("not-liked");
+ var doctype = $btn.attr("data-doctype");
+ var name = $btn.attr("data-name");
+
+ frappe.ui.toggle_like($btn, doctype, name, function() {
+ if (not_liked) {
+ $count.text(cint($count.text()) + 1);
+ } else {
+ $count.text(cint($count.text()) - 1);
+ }
+ });
+
+ return false;
+}
+
+frappe.ui.setup_like_popover = function($parent, selector) {
+ if (frappe.dom.is_touchscreen()) {
+ return;
+ }
+
+ $parent.on("mouseover", selector, function() {
+ var $wrapper = $(this);
+
+ $wrapper.popover({
+ animation: true,
+ placement: "right",
+ content: function() {
+ var liked_by = JSON.parse($wrapper.attr('data-liked-by') || "[]");
+
+ // hack
+ if ($wrapper.find(".not-liked").length) {
+ if (liked_by.indexOf(user)!==-1) {
+ liked_by.splice(liked_by.indexOf(user), 1);
+ }
+ } else {
+ if (liked_by.indexOf(user)===-1) {
+ liked_by.push(user);
+ }
+ }
+
+ if (!liked_by.length) {
+ return "";
+ }
+ return frappe.render_template("liked_by", {"liked_by": liked_by});
+ },
+ html: true,
+ container: 'body'
+ });
+
+ $wrapper.popover('show');
+ });
+
+ $parent.on("mouseout", selector, function() {
+ $(this).popover('destroy');
+ });
+}
diff --git a/frappe/public/js/frappe/ui/liked_by.html b/frappe/public/js/frappe/ui/liked_by.html
new file mode 100644
index 0000000000..0b836c5561
--- /dev/null
+++ b/frappe/public/js/frappe/ui/liked_by.html
@@ -0,0 +1,8 @@
+
+ {% for (var i in liked_by) { var liked_by_user = liked_by[i]; %}
+ -
+ {%= frappe.avatar(liked_by_user) %}
+ {%= frappe.user.full_name(liked_by_user) %}
+
+ {% } %}
+
diff --git a/frappe/public/js/frappe/ui/listing.js b/frappe/public/js/frappe/ui/listing.js
index 40a72c35c3..814c33230c 100644
--- a/frappe/public/js/frappe/ui/listing.js
+++ b/frappe/public/js/frappe/ui/listing.js
@@ -318,7 +318,7 @@ frappe.ui.Listing = Class.extend({
} else {
// no filter for this item,
// setup one
- if(['_user_tags', '_comments', '_assign', '_starred_by'].indexOf(fieldname)!==-1) {
+ if(['_user_tags', '_comments', '_assign', '_liked_by'].indexOf(fieldname)!==-1) {
this.filter_list.add_filter(doctype, fieldname,
'like', '%' + label + '%');
} else {
diff --git a/frappe/public/js/frappe/ui/star.js b/frappe/public/js/frappe/ui/star.js
deleted file mode 100644
index c07516bf70..0000000000
--- a/frappe/public/js/frappe/ui/star.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
-frappe.ui.is_starred = function(doc) {
- var starred = frappe.ui.get_starred_by(doc);
- return starred.indexOf(user)===-1 ? false : true;
-}
-
-frappe.ui.get_starred_by = function(doc) {
- var starred = doc._starred_by;
- if(starred) {
- starred = JSON.parse(starred);
- }
-
- return starred || [];
-}
-
-frappe.ui.toggle_star = function($btn, doctype, name) {
- var add = $btn.hasClass("not-starred") ? "Yes" : "No";
- frappe.call({
- method: "frappe.desk.star.toggle_star",
- quiet: true,
- args: {
- doctype: doctype,
- name: name,
- add: add,
- },
- callback: function(r) {
- if(!r.exc) {
- // update in all local-buttons
- var action_buttons = $('.star-action[data-name="'+ name.replace(/"/g, '\"')
- +'"][data-doctype="'+ doctype.replace(/"/g, '\"')+'"]');
-
- if(add==="Yes") {
- action_buttons.removeClass("not-starred").removeClass("text-extra-muted");
- } else {
- action_buttons.addClass("not-starred").addClass("text-extra-muted");
- }
-
- // update in locals (form)
- var doc = locals[doctype] && locals[doctype][name];
- if(doc) {
- var starred_by = JSON.parse(doc._starred_by || "[]"),
- idx = starred_by.indexOf(user);
- if(add==="Yes") {
- if(idx===-1)
- starred_by.push(user);
- } else {
- if(idx!==-1) {
- starred_by = starred_by.slice(0,idx).concat(starred_by.slice(idx+1))
- }
- }
- doc._starred_by = JSON.stringify(starred_by);
- }
- }
- }
- });
-};
diff --git a/frappe/public/js/frappe/ui/toolbar/notifications.js b/frappe/public/js/frappe/ui/toolbar/notifications.js
index 0cbb897a9e..60c98a3691 100644
--- a/frappe/public/js/frappe/ui/toolbar/notifications.js
+++ b/frappe/public/js/frappe/ui/toolbar/notifications.js
@@ -4,6 +4,7 @@ frappe.ui.notifications.update_notifications = function() {
frappe.ui.notifications.total = 0;
var doctypes = keys(frappe.boot.notification_info.open_count_doctype).sort();
var modules = keys(frappe.boot.notification_info.open_count_module).sort();
+ var other = keys(frappe.boot.notification_info.open_count_other).sort();
// clear toolbar / sidebar notifications
frappe.ui.notifications.navbar_notification = $("#navbar-notification").empty();
@@ -14,6 +15,12 @@ frappe.ui.notifications.update_notifications = function() {
frappe.ui.notifications.add_notification("ToDo");
frappe.ui.notifications.add_notification("Event");
+ // add other
+ $.each(other, function(i, name) {
+ frappe.ui.notifications.add_notification(name, frappe.boot.notification_info.open_count_other);
+ });
+
+
// add a divider
if(frappe.ui.notifications.total) {
var divider = '';
@@ -34,6 +41,8 @@ frappe.ui.notifications.update_notifications = function() {
var config = frappe.ui.notifications.config[doctype] || {};
if (config.route) {
frappe.set_route(config.route);
+ } else if (config.click) {
+ config.click();
} else {
frappe.views.show_open_count_list(this);
}
@@ -46,8 +55,12 @@ frappe.ui.notifications.update_notifications = function() {
}
-frappe.ui.notifications.add_notification = function(doctype) {
- var count = frappe.boot.notification_info.open_count_doctype[doctype];
+frappe.ui.notifications.add_notification = function(doctype, notifications_map) {
+ if(!notifications_map) {
+ notifications_map = frappe.boot.notification_info.open_count_doctype;
+ }
+
+ var count = notifications_map[doctype];
if(count) {
var config = frappe.ui.notifications.config[doctype] || {};
var label = config.label || doctype;
@@ -72,7 +85,21 @@ frappe.ui.notifications.add_notification = function(doctype) {
frappe.ui.notifications.config = {
"ToDo": { label: __("To Do") },
"Comment": { label: __("Messages"), route: "messages"},
- "Event": { label: __("Calendar"), route: "Calendar/Event" }
+ "Event": { label: __("Calendar"), route: "Calendar/Event" },
+ "Likes": {
+ label: __("Likes"),
+ click: function() {
+ frappe.route_options = {
+ show_likes: true
+ };
+
+ if (frappe.get_route()[0]=="activity") {
+ frappe.pages['activity'].on_page_show();
+ } else {
+ frappe.set_route("activity");
+ }
+ }
+ }
};
frappe.views.show_open_count_list = function(element) {
diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js
index 2a1187dfe8..df648ff93b 100644
--- a/frappe/public/js/frappe/views/breadcrumbs.js
+++ b/frappe/public/js/frappe/views/breadcrumbs.js
@@ -40,7 +40,7 @@ frappe.breadcrumbs = {
breadcrumbs.module = frappe.breadcrumbs.preferred[breadcrumbs.doctype];
}
- if(breadcrumbs.module && breadcrumbs.module != "Desk") {
+ if(breadcrumbs.module) {
if(in_list(["Core", "Email", "Custom", "Workflow", "Print"], breadcrumbs.module))
breadcrumbs.module = "Setup";
diff --git a/frappe/public/js/frappe/views/calendar.js b/frappe/public/js/frappe/views/calendar.js
index e0c0155227..fdf8e7003b 100644
--- a/frappe/public/js/frappe/views/calendar.js
+++ b/frappe/public/js/frappe/views/calendar.js
@@ -42,9 +42,7 @@ frappe.views.Calendar = frappe.views.CalendarBase.extend({
var module = locals.DocType[this.doctype].module;
this.page.set_title(__("Calendar") + " - " + __(this.doctype));
- if (module !== "Desk") {
- frappe.breadcrumbs.add(module, this.doctype)
- }
+ frappe.breadcrumbs.add(module, this.doctype)
this.add_filters();
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index c9692f6546..23df5cb3d3 100644
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -96,10 +96,10 @@ frappe.views.CommunicationComposer = Class.extend({
var cc = [ [this.frm.doc.owner, 1] ];
- var starred_by = frappe.ui.get_starred_by(this.frm.doc);
- if (starred_by) {
- for ( var i=0, l=starred_by.length; i\
- Edit %(doctype)s\
- ', {doctype: doctype}))
- .prependTo($("#website-post-login ul.dropdown-menu"));
-
- $edit_btn.find("a")
- .on("click", function() {
- me.toggle_edit_mode(true);
- $edit_btn.remove();
- return false;
- });
- }
- }
- });
-
- bseditor = new WebPageEditor({
- editor: editor,
- onsave: function(bseditor) {
- frappe.call({
- type: "POST",
- method: "frappe.client.set_value",
- args: {
- doctype: doctype,
- name: name,
- fieldname: fieldname,
- value: bseditor.get_value()
- },
- callback: function(r) {
- frappe.msgprint(r.exc ? __("Error") : __("Saved"));
- if(!r.exc)
- editor.html(r.message[0][fieldname]);
- }
- });
- }
- });
-};
diff --git a/frappe/public/js/legacy/dom.js b/frappe/public/js/legacy/dom.js
index ab8ef7476e..25fc294214 100644
--- a/frappe/public/js/legacy/dom.js
+++ b/frappe/public/js/legacy/dom.js
@@ -1,13 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// MIT License. See license.txt
-function $btn(parent, label, onclick, style, css_class, is_ajax) {
- if(css_class==='green') css_class='btn-primary';
- return new frappe.ui.Button(
- {parent:parent, label:label, onclick:onclick, style:style, is_ajax: is_ajax, css_class: css_class}
- ).btn;
-}
-
function empty_select(s) {
if(s.custom_select) { s.empty(); return; }
if(s.inp)s = s.inp;
@@ -27,20 +20,6 @@ function sel_val(s) {
} catch(err) { return ''; /* IE fix */ }
}
-function add_sel_options(s, list, sel_val, o_style) {
- if(s.custom_select) {
- s.set_options(list)
- if(sel_val) s.inp.value = sel_val;
- return;
- }
- if(s.inp)s = s.inp;
- for(var i=0, len=list.length; i').find('input:last');
- for(key in attributes)
- $input.attr(key, attributes[key]);
-
- var input = $input.get(0);
- if(cs)
- $y(input,cs);
- return input;
-}
function $dh(d) {
if(d && d.substr)d=$i(d);
diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js
index f965464bc1..0f39e64050 100644
--- a/frappe/public/js/legacy/form.js
+++ b/frappe/public/js/legacy/form.js
@@ -472,6 +472,8 @@ _f.Frm.prototype.render_form = function(is_a_different_doc) {
$(cur_frm.wrapper).trigger('render_complete');
this.layout.show_empty_form_message();
+
+ this.scroll_to_element();
}
_f.Frm.prototype.refresh_field = function(fname) {
@@ -873,3 +875,21 @@ _f.Frm.prototype.get_handlers = function(fieldname, doctype, docname) {
_f.Frm.prototype.has_perm = function(ptype) {
return frappe.perm.has_perm(this.doctype, 0, ptype, this.doc);
}
+
+_f.Frm.prototype.scroll_to_element = function() {
+ if (frappe.route_options && frappe.route_options.scroll_to) {
+ var scroll_to = frappe.route_options.scroll_to;
+ delete frappe.route_options.scroll_to;
+
+ var selector = [];
+ for (var key in scroll_to) {
+ var value = scroll_to[key];
+ selector.push(repl('[data-%(key)s="%(value)s"]', {key: key, value: value}));
+ }
+
+ selector = $(selector.join(" "));
+ if (selector.length) {
+ frappe.ui.scroll(selector, true, 30);
+ }
+ }
+}
diff --git a/frappe/public/js/legacy/layout.js b/frappe/public/js/legacy/layout.js
index b60117e51d..627d4a521f 100644
--- a/frappe/public/js/legacy/layout.js
+++ b/frappe/public/js/legacy/layout.js
@@ -1,5 +1,5 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
+// MIT License. See license.txt
/*
+ Layout
@@ -14,7 +14,7 @@
+ subrows
*/
-function Layout(parent, width) {
+function Layout(parent, width) {
if(parent&&parent.substr) { parent = $i(parent); }
this.wrapper = $a(parent, 'div', '', {display:'none'});
@@ -23,7 +23,7 @@ function Layout(parent, width) {
if(width) {
this.width = this.wrapper.style.width;
}
-
+
this.myrows = [];
}
@@ -45,8 +45,8 @@ Layout.prototype.addcell = function(width) {
Layout.prototype.setcolour = function(col) { $bg(cc,col); }
-Layout.prototype.show = function() { $ds(this.wrapper); }
-Layout.prototype.hide = function() { $dh(this.wrapper); }
+Layout.prototype.show = function() { $(this.wrapper).toggle(false); }
+Layout.prototype.hide = function() { $(this.wrapper).toggle(false); }
Layout.prototype.close_borders = function() {
if(this.with_border) {
this.myrows[this.myrows.length-1].wrapper.style.borderBottom = '1px solid #000';
@@ -56,7 +56,7 @@ Layout.prototype.close_borders = function() {
function LayoutRow(layout, parent) {
this.layout = layout;
this.wrapper = $a(parent,'div','form-layout-row');
-
+
// main head
this.main_head = $a(this.wrapper, 'div');
@@ -67,17 +67,17 @@ function LayoutRow(layout, parent) {
this.wrapper.style.border = '1px solid #000';
this.wrapper.style.borderBottom = '0px';
}
-
+
this.header = $a(this.main_body, 'div','',{padding:(layout.with_border ? '0px 8px' : '0px')});
this.body = $a(this.main_body,'div');
this.table = $a(this.body, 'table', '', {width:'100%', borderCollapse: 'collapse', tableLayout:'fixed'});
this.row = this.table.insertRow(0);
-
+
this.mycells = [];
}
-LayoutRow.prototype.hide = function() { $dh(this.wrapper); }
-LayoutRow.prototype.show = function() { $ds(this.wrapper); }
+LayoutRow.prototype.hide = function() { $(this.wrapper).toggle(false); }
+LayoutRow.prototype.show = function() { $(this.wrapper).toggle(true); }
LayoutRow.prototype.addCell = function(wid) {
var lc = new LayoutCell(this.layout, this, wid);
@@ -100,11 +100,11 @@ function LayoutCell(layout, layoutRow, width) {
this.cell.style.verticalAlign = 'top';
this.set_width(layoutRow.row, width);
-
- var h = $a(this.cell, 'div','',{padding:(layout.with_border ? '0px 8px' : '0px')});
- this.wrapper = $a(this.cell, 'div','',{padding:(layout.with_border ? '8px' : '0px')});
-
+ var h = $a(this.cell, 'div','',{padding:(layout.with_border ? '0px 8px' : '0px')});
+
+ this.wrapper = $a(this.cell, 'div','',{padding:(layout.with_border ? '8px' : '0px')});
+
layout.cur_cell = this.wrapper;
layout.cur_cell.header = h;
}
@@ -114,29 +114,29 @@ LayoutCell.prototype.set_width = function(row, width) {
var w = 100;
var n_cells = row.cells.length;
var cells_with_no_width = n_cells;
-
+
// current cell
if(width) {
$y(row.cells[n_cells-1], {width: cint(width) + '%'})
} else {
row.cells[n_cells-1].estimated_width = 1;
}
-
+
// get user specified width
for(var i=0; i
{%= 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..bf4484c468 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..d1aaa1d48a 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,26 +22,25 @@ 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");
}
}
},
set_title: function() {
if(this.frm.meta.title_field) {
- var title = (this.frm.doc[this.frm.meta.title_field] || "").trim() || __(this.frm.docname);
+ var title = (this.frm.doc[this.frm.meta.title_field] || "").trim() || this.frm.docname;
if(this.frm.doc.__islocal || title === this.frm.docname || this.frm.meta.autoname==="hash") {
this.page.set_title_sub("");
} else {
this.page.set_title_sub(this.frm.docname);
}
} else {
- var title = __(this.frm.docname);
+ var title = this.frm.docname;
}
var me = this;
+ title = __(title);
this.page.set_title(title);
if(this.frm.meta.title_field) {
frappe.utils.set_title(title + " - " + this.frm.docname);
@@ -97,13 +95,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 +108,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.html b/frappe/public/js/frappe/list/list_item_main.html
index 6ed25c515f..ab49855d99 100644
--- a/frappe/public/js/frappe/list/list_item_main.html
+++ b/frappe/public/js/frappe/list/list_item_main.html
@@ -31,7 +31,7 @@
{% } %}
{% } else if(col.fieldtype==="Select") { %}
{%= value %}
+ data-filter="{%= col.fieldname %},=,{%= value %}">{%= __(value) %}
{% } else if(col.fieldtype==="Link") { %}
{%= value %}
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..765551c4c1 100644
--- a/frappe/public/js/frappe/list/list_item_main_head.html
+++ b/frappe/public/js/frappe/list/list_item_main_head.html
@@ -23,12 +23,12 @@
title="{%= __("Select All") %}">
{% } %}
-
+
{% } %}
- {%= col.title || col.label || "" %}
+ {%= __(col.title) || __(col.label) || "" %}
{% } %}
{% } %}
diff --git a/frappe/public/js/frappe/list/list_item_row.html b/frappe/public/js/frappe/list/list_item_row.html
index d03ac45f64..c2afc7b2f9 100644
--- a/frappe/public/js/frappe/list/list_item_row.html
+++ b/frappe/public/js/frappe/list/list_item_row.html
@@ -23,9 +23,12 @@
- {%= list.get_indicator_dot(data) %}
-
+ text-right list-row-right" style="padding-left:0px">
+ {%= list.get_indicator_dot(data) %}
+
+
+ {%= comment_when(data.modified, true) %}
+
{% if (data._assign_list.length) { %}
@@ -33,14 +36,11 @@
{% } else { %}
{% } %}
-
+
- {%= data._comments_list.length || 0 %}
+ {%= (data._comment_count > 99 ? "99+" : data._comment_count) || 0 %}
-
-
- {%= comment_when(data.modified, true) %}
-
diff --git a/frappe/public/js/frappe/list/list_item_subject.html b/frappe/public/js/frappe/list/list_item_subject.html
index 5d5442dab6..1a00e96db7 100644
--- a/frappe/public/js/frappe/list/list_item_subject.html
+++ b/frappe/public/js/frappe/list/list_item_subject.html
@@ -2,13 +2,16 @@
{% } %}
-
-
+
+
+
+ {{ (_liked_by.length > 9 ? "9+" : _liked_by.length) || "" }}
+
'+indicator[0]+'';
+ +indicator[2]+'">'+__(indicator[0])+'';
} else {
return "";
}
@@ -277,15 +277,15 @@ frappe.views.ListView = Class.extend({
if (!indicator) {
return "";
}
- return '';
+ return '';
},
prepare_data: function(data) {
if(data.modified)
this.prepare_when(data, data.modified);
- data._starred_by = data._starred_by ?
- JSON.parse(data._starred_by) : [];
+ data._liked_by = data._liked_by ?
+ JSON.parse(data._liked_by) : [];
data._checkbox = (frappe.model.can_delete(this.doctype) || this.settings.selectable) && !this.no_delete
@@ -311,7 +311,6 @@ frappe.views.ListView = Class.extend({
}
data._user = user;
- data._comments_list = data._comments ? JSON.parse(data._comments) : [];
data._tags = $.map((data._user_tags || "").split(","),
function(v) { return v ? v : null; });
data._assign_list = data._assign ? JSON.parse(data._assign) : [];
diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index 17db281cf5..b1ef0cd774 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -50,18 +50,6 @@ frappe.utils = {
return txt.toLowerCase().substr(0,7)=='http://'
|| txt.toLowerCase().substr(0,8)=='https://'
},
- remove_script_and_style: function(txt) {
- var div = document.createElement('div');
- div.innerHTML = txt;
- ["script", "style", "noscript", "title", "meta", "base", "head"].forEach(function(e, i) {
- var elements = div.getElementsByTagName(e);
- var i = elements.length;
- while (i--) {
- elements[i].parentNode.removeChild(elements[i]);
- }
- });
- return div.innerHTML;
- },
toggle_blockquote: function(txt) {
if (!txt) return txt;
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index b691cf9ee0..cd942cc5cd 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -10,7 +10,7 @@ $.extend(frappe.model, {
layout_fields: ['Section Break', 'Column Break', 'Fold'],
std_fields_list: ['name', 'owner', 'creation', 'modified', 'modified_by',
- '_user_tags', '_comments', '_assign', '_starred_by', 'docstatus',
+ '_user_tags', '_comments', '_assign', '_liked_by', 'docstatus',
'parent', 'parenttype', 'parentfield', 'idx'],
std_fields: [
@@ -21,7 +21,7 @@ $.extend(frappe.model, {
{fieldname:'modified', fieldtype:'Date', label:__('Last Updated On')},
{fieldname:'modified_by', fieldtype:'Data', label:__('Last Updated By')},
{fieldname:'_user_tags', fieldtype:'Data', label:__('Tags')},
- {fieldname:'_starred_by', fieldtype:'Data', label:__('Starred By')},
+ {fieldname:'_liked_by', fieldtype:'Data', label:__('Liked By')},
{fieldname:'_comments', fieldtype:'Text', label:__('Comments')},
{fieldname:'_assign', fieldtype:'Text', label:__('Assigned To')},
{fieldname:'docstatus', fieldtype:'Int', label:__('Document Status')},
diff --git a/frappe/public/js/frappe/query_string.js b/frappe/public/js/frappe/query_string.js
new file mode 100644
index 0000000000..3d4026af2e
--- /dev/null
+++ b/frappe/public/js/frappe/query_string.js
@@ -0,0 +1,42 @@
+function get_url_arg(name) {
+ return get_query_params()[name] || "";
+}
+
+function get_query_params(query_string) {
+ var query_params = {};
+ if (!query_string) {
+ query_string = location.search.substring(1);
+ }
+
+ var query_list = query_string.split("&");
+ for (var i=0, l=query_list.length; i < l; i++ ){
+ var pair = query_list[i].split("=");
+ var key = pair[0];
+ if (!key) {
+ continue;
+ }
+
+ var value = pair[1];
+ if (typeof value === "string") {
+ value = decodeURIComponent(value);
+ }
+
+ if (key in query_params) {
+ if (typeof query_params[key] === undefined) {
+ query_params[key] = [];
+ } else if (typeof query_params[key] === "string") {
+ query_params[key] = [query_params[key]];
+ }
+ query_params[key].push(value);
+ } else {
+ query_params[key] = value;
+ }
+ }
+ return query_params;
+}
+
+function make_query_string(obj) {
+ var query_params = [];
+ $.each(obj, function(k, v) { query_params.push(encodeURIComponent(k) + "=" + encodeURIComponent(v)); });
+ return "?" + query_params.join("&");
+}
diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index 0e8174877a..d7db4c55de 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -53,7 +53,15 @@ frappe.route = function() {
frappe.get_route = function(route) {
// for app
- return frappe.get_route_str(route).split('/')
+ var route = frappe.get_route_str(route).split('/')
+ var parts = route[route.length - 1].split("?");
+ route[route.length - 1] = parts[0];
+ if (parts.length > 1) {
+ var query_params = get_query_params(parts[1]);
+ frappe.route_options = $.extend(frappe.route_options || {}, query_params);
+ }
+
+ return route;
}
frappe.get_prev_route = function() {
diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js
index 931d4bd0c3..4a112526c1 100644
--- a/frappe/public/js/frappe/socketio_client.js
+++ b/frappe/public/js/frappe/socketio_client.js
@@ -60,12 +60,12 @@ frappe.socket = {
});
window.onbeforeunload = function() {
- if (frm.is_new()) {
+ if (!cur_frm || cur_frm.is_new()) {
return;
}
// if tab/window is closed, notify other users
- if (cur_frm && cur_frm.doc) {
+ if (cur_frm.doc) {
frappe.socket.doc_close(cur_frm.doctype, cur_frm.docname);
}
}
diff --git a/frappe/public/js/frappe/ui/button.js b/frappe/public/js/frappe/ui/button.js
deleted file mode 100644
index 6d6798b74d..0000000000
--- a/frappe/public/js/frappe/ui/button.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
-frappe.ui.Button = function(args) {
- var me = this;
- $.extend(this, {
- make: function() {
- me.btn = frappe.dom.add(args.parent, 'button', 'btn ' + (args.css_class || 'btn-default'));
- me.btn.args = args;
-
- // ajax loading
- me.loading_img = frappe.dom.add(me.btn.args.parent,'img','',{margin:'0px 4px -2px 4px', display:'none'});
- me.loading_img.src= 'assets/frappe/images/ui/button-load.gif';
-
- // label
- me.btn.innerHTML = args.label;
-
- // onclick
- me.btn.user_onclick = args.onclick;
- $(me.btn).bind('click', function() {
- if(!this.disabled && this.user_onclick)
- this.user_onclick(this);
- })
-
- // bc
- me.btn.set_working = me.set_working;
- me.btn.done_working = me.done_working;
-
- // style
- if(me.btn.args.style)
- frappe.dom.css(me.btn, args.style);
- },
-
- set_working: function() {
- me.btn.disabled = 'disabled';
- $(me.loading_img).css('display','inline');
- },
-
- done_working: function() {
- me.btn.disabled = false;
- $(me.loading_img).toggle(false);
- }
- });
- this.make();
-}
diff --git a/frappe/public/js/frappe/ui/editor.js b/frappe/public/js/frappe/ui/editor.js
index cec109971a..b716edec55 100644
--- a/frappe/public/js/frappe/ui/editor.js
+++ b/frappe/public/js/frappe/ui/editor.js
@@ -91,7 +91,7 @@ bsEditor = Class.extend({
selection_marker: 'edit-focus-marker',
selection_color: 'darkgrey',
remove_typography: false,
- max_file_size: 1,
+ max_file_size: 5,
},
bind_hotkeys: function () {
diff --git a/frappe/public/js/frappe/ui/like.js b/frappe/public/js/frappe/ui/like.js
new file mode 100644
index 0000000000..0ebd429a2d
--- /dev/null
+++ b/frappe/public/js/frappe/ui/like.js
@@ -0,0 +1,128 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// MIT License. See license.txt
+
+frappe.ui.is_liked = function(doc) {
+ var liked = frappe.ui.get_liked_by(doc);
+ return liked.indexOf(user)===-1 ? false : true;
+}
+
+frappe.ui.get_liked_by = function(doc) {
+ var liked = doc._liked_by;
+ if(liked) {
+ liked = JSON.parse(liked);
+ }
+
+ return liked || [];
+}
+
+frappe.ui.toggle_like = function($btn, doctype, name, callback) {
+ var add = $btn.hasClass("not-liked") ? "Yes" : "No";
+ // disable click
+ $btn.css('pointer-events', 'none');
+
+ frappe.call({
+ method: "frappe.desk.like.toggle_like",
+ quiet: true,
+ args: {
+ doctype: doctype,
+ name: name,
+ add: add,
+ },
+ callback: function(r) {
+ // renable click
+ $btn.css('pointer-events', 'auto');
+
+ if(!r.exc) {
+ // update in all local-buttons
+ var action_buttons = $('.like-action[data-name="'+ name.replace(/"/g, '\"')
+ +'"][data-doctype="'+ doctype.replace(/"/g, '\"')+'"]');
+
+ if(add==="Yes") {
+ action_buttons.removeClass("not-liked text-extra-muted");
+ } else {
+ action_buttons.addClass("not-liked text-extra-muted");
+ }
+
+ // update in locals (form)
+ var doc = locals[doctype] && locals[doctype][name];
+ if(doc) {
+ var liked_by = JSON.parse(doc._liked_by || "[]"),
+ idx = liked_by.indexOf(user);
+ if(add==="Yes") {
+ if(idx===-1)
+ liked_by.push(user);
+ } else {
+ if(idx!==-1) {
+ liked_by = liked_by.slice(0,idx).concat(liked_by.slice(idx+1))
+ }
+ }
+ doc._liked_by = JSON.stringify(liked_by);
+ }
+
+ if(callback) {
+ callback();
+ }
+ }
+ }
+ });
+};
+
+frappe.ui.click_toggle_like = function() {
+ var $btn = $(this);
+ var $count = $btn.siblings(".likes-count");
+ var not_liked = $btn.hasClass("not-liked");
+ var doctype = $btn.attr("data-doctype");
+ var name = $btn.attr("data-name");
+
+ frappe.ui.toggle_like($btn, doctype, name, function() {
+ if (not_liked) {
+ $count.text(cint($count.text()) + 1);
+ } else {
+ $count.text(cint($count.text()) - 1);
+ }
+ });
+
+ return false;
+}
+
+frappe.ui.setup_like_popover = function($parent, selector) {
+ if (frappe.dom.is_touchscreen()) {
+ return;
+ }
+
+ $parent.on("mouseover", selector, function() {
+ var $wrapper = $(this);
+
+ $wrapper.popover({
+ animation: true,
+ placement: "right",
+ content: function() {
+ var liked_by = JSON.parse($wrapper.attr('data-liked-by') || "[]");
+
+ // hack
+ if ($wrapper.find(".not-liked").length) {
+ if (liked_by.indexOf(user)!==-1) {
+ liked_by.splice(liked_by.indexOf(user), 1);
+ }
+ } else {
+ if (liked_by.indexOf(user)===-1) {
+ liked_by.push(user);
+ }
+ }
+
+ if (!liked_by.length) {
+ return "";
+ }
+ return frappe.render_template("liked_by", {"liked_by": liked_by});
+ },
+ html: true,
+ container: 'body'
+ });
+
+ $wrapper.popover('show');
+ });
+
+ $parent.on("mouseout", selector, function() {
+ $(this).popover('destroy');
+ });
+}
diff --git a/frappe/public/js/frappe/ui/liked_by.html b/frappe/public/js/frappe/ui/liked_by.html
new file mode 100644
index 0000000000..0b836c5561
--- /dev/null
+++ b/frappe/public/js/frappe/ui/liked_by.html
@@ -0,0 +1,8 @@
+
+ {% for (var i in liked_by) { var liked_by_user = liked_by[i]; %}
+ -
+ {%= frappe.avatar(liked_by_user) %}
+ {%= frappe.user.full_name(liked_by_user) %}
+
+ {% } %}
+
diff --git a/frappe/public/js/frappe/ui/listing.js b/frappe/public/js/frappe/ui/listing.js
index 40a72c35c3..814c33230c 100644
--- a/frappe/public/js/frappe/ui/listing.js
+++ b/frappe/public/js/frappe/ui/listing.js
@@ -318,7 +318,7 @@ frappe.ui.Listing = Class.extend({
} else {
// no filter for this item,
// setup one
- if(['_user_tags', '_comments', '_assign', '_starred_by'].indexOf(fieldname)!==-1) {
+ if(['_user_tags', '_comments', '_assign', '_liked_by'].indexOf(fieldname)!==-1) {
this.filter_list.add_filter(doctype, fieldname,
'like', '%' + label + '%');
} else {
diff --git a/frappe/public/js/frappe/ui/star.js b/frappe/public/js/frappe/ui/star.js
deleted file mode 100644
index c07516bf70..0000000000
--- a/frappe/public/js/frappe/ui/star.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
-frappe.ui.is_starred = function(doc) {
- var starred = frappe.ui.get_starred_by(doc);
- return starred.indexOf(user)===-1 ? false : true;
-}
-
-frappe.ui.get_starred_by = function(doc) {
- var starred = doc._starred_by;
- if(starred) {
- starred = JSON.parse(starred);
- }
-
- return starred || [];
-}
-
-frappe.ui.toggle_star = function($btn, doctype, name) {
- var add = $btn.hasClass("not-starred") ? "Yes" : "No";
- frappe.call({
- method: "frappe.desk.star.toggle_star",
- quiet: true,
- args: {
- doctype: doctype,
- name: name,
- add: add,
- },
- callback: function(r) {
- if(!r.exc) {
- // update in all local-buttons
- var action_buttons = $('.star-action[data-name="'+ name.replace(/"/g, '\"')
- +'"][data-doctype="'+ doctype.replace(/"/g, '\"')+'"]');
-
- if(add==="Yes") {
- action_buttons.removeClass("not-starred").removeClass("text-extra-muted");
- } else {
- action_buttons.addClass("not-starred").addClass("text-extra-muted");
- }
-
- // update in locals (form)
- var doc = locals[doctype] && locals[doctype][name];
- if(doc) {
- var starred_by = JSON.parse(doc._starred_by || "[]"),
- idx = starred_by.indexOf(user);
- if(add==="Yes") {
- if(idx===-1)
- starred_by.push(user);
- } else {
- if(idx!==-1) {
- starred_by = starred_by.slice(0,idx).concat(starred_by.slice(idx+1))
- }
- }
- doc._starred_by = JSON.stringify(starred_by);
- }
- }
- }
- });
-};
diff --git a/frappe/public/js/frappe/ui/toolbar/notifications.js b/frappe/public/js/frappe/ui/toolbar/notifications.js
index 0cbb897a9e..60c98a3691 100644
--- a/frappe/public/js/frappe/ui/toolbar/notifications.js
+++ b/frappe/public/js/frappe/ui/toolbar/notifications.js
@@ -4,6 +4,7 @@ frappe.ui.notifications.update_notifications = function() {
frappe.ui.notifications.total = 0;
var doctypes = keys(frappe.boot.notification_info.open_count_doctype).sort();
var modules = keys(frappe.boot.notification_info.open_count_module).sort();
+ var other = keys(frappe.boot.notification_info.open_count_other).sort();
// clear toolbar / sidebar notifications
frappe.ui.notifications.navbar_notification = $("#navbar-notification").empty();
@@ -14,6 +15,12 @@ frappe.ui.notifications.update_notifications = function() {
frappe.ui.notifications.add_notification("ToDo");
frappe.ui.notifications.add_notification("Event");
+ // add other
+ $.each(other, function(i, name) {
+ frappe.ui.notifications.add_notification(name, frappe.boot.notification_info.open_count_other);
+ });
+
+
// add a divider
if(frappe.ui.notifications.total) {
var divider = '';
@@ -34,6 +41,8 @@ frappe.ui.notifications.update_notifications = function() {
var config = frappe.ui.notifications.config[doctype] || {};
if (config.route) {
frappe.set_route(config.route);
+ } else if (config.click) {
+ config.click();
} else {
frappe.views.show_open_count_list(this);
}
@@ -46,8 +55,12 @@ frappe.ui.notifications.update_notifications = function() {
}
-frappe.ui.notifications.add_notification = function(doctype) {
- var count = frappe.boot.notification_info.open_count_doctype[doctype];
+frappe.ui.notifications.add_notification = function(doctype, notifications_map) {
+ if(!notifications_map) {
+ notifications_map = frappe.boot.notification_info.open_count_doctype;
+ }
+
+ var count = notifications_map[doctype];
if(count) {
var config = frappe.ui.notifications.config[doctype] || {};
var label = config.label || doctype;
@@ -72,7 +85,21 @@ frappe.ui.notifications.add_notification = function(doctype) {
frappe.ui.notifications.config = {
"ToDo": { label: __("To Do") },
"Comment": { label: __("Messages"), route: "messages"},
- "Event": { label: __("Calendar"), route: "Calendar/Event" }
+ "Event": { label: __("Calendar"), route: "Calendar/Event" },
+ "Likes": {
+ label: __("Likes"),
+ click: function() {
+ frappe.route_options = {
+ show_likes: true
+ };
+
+ if (frappe.get_route()[0]=="activity") {
+ frappe.pages['activity'].on_page_show();
+ } else {
+ frappe.set_route("activity");
+ }
+ }
+ }
};
frappe.views.show_open_count_list = function(element) {
diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js
index 2a1187dfe8..df648ff93b 100644
--- a/frappe/public/js/frappe/views/breadcrumbs.js
+++ b/frappe/public/js/frappe/views/breadcrumbs.js
@@ -40,7 +40,7 @@ frappe.breadcrumbs = {
breadcrumbs.module = frappe.breadcrumbs.preferred[breadcrumbs.doctype];
}
- if(breadcrumbs.module && breadcrumbs.module != "Desk") {
+ if(breadcrumbs.module) {
if(in_list(["Core", "Email", "Custom", "Workflow", "Print"], breadcrumbs.module))
breadcrumbs.module = "Setup";
diff --git a/frappe/public/js/frappe/views/calendar.js b/frappe/public/js/frappe/views/calendar.js
index e0c0155227..fdf8e7003b 100644
--- a/frappe/public/js/frappe/views/calendar.js
+++ b/frappe/public/js/frappe/views/calendar.js
@@ -42,9 +42,7 @@ frappe.views.Calendar = frappe.views.CalendarBase.extend({
var module = locals.DocType[this.doctype].module;
this.page.set_title(__("Calendar") + " - " + __(this.doctype));
- if (module !== "Desk") {
- frappe.breadcrumbs.add(module, this.doctype)
- }
+ frappe.breadcrumbs.add(module, this.doctype)
this.add_filters();
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index c9692f6546..23df5cb3d3 100644
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -96,10 +96,10 @@ frappe.views.CommunicationComposer = Class.extend({
var cc = [ [this.frm.doc.owner, 1] ];
- var starred_by = frappe.ui.get_starred_by(this.frm.doc);
- if (starred_by) {
- for ( var i=0, l=starred_by.length; i\
- Edit %(doctype)s\
- ', {doctype: doctype}))
- .prependTo($("#website-post-login ul.dropdown-menu"));
-
- $edit_btn.find("a")
- .on("click", function() {
- me.toggle_edit_mode(true);
- $edit_btn.remove();
- return false;
- });
- }
- }
- });
-
- bseditor = new WebPageEditor({
- editor: editor,
- onsave: function(bseditor) {
- frappe.call({
- type: "POST",
- method: "frappe.client.set_value",
- args: {
- doctype: doctype,
- name: name,
- fieldname: fieldname,
- value: bseditor.get_value()
- },
- callback: function(r) {
- frappe.msgprint(r.exc ? __("Error") : __("Saved"));
- if(!r.exc)
- editor.html(r.message[0][fieldname]);
- }
- });
- }
- });
-};
diff --git a/frappe/public/js/legacy/dom.js b/frappe/public/js/legacy/dom.js
index ab8ef7476e..25fc294214 100644
--- a/frappe/public/js/legacy/dom.js
+++ b/frappe/public/js/legacy/dom.js
@@ -1,13 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// MIT License. See license.txt
-function $btn(parent, label, onclick, style, css_class, is_ajax) {
- if(css_class==='green') css_class='btn-primary';
- return new frappe.ui.Button(
- {parent:parent, label:label, onclick:onclick, style:style, is_ajax: is_ajax, css_class: css_class}
- ).btn;
-}
-
function empty_select(s) {
if(s.custom_select) { s.empty(); return; }
if(s.inp)s = s.inp;
@@ -27,20 +20,6 @@ function sel_val(s) {
} catch(err) { return ''; /* IE fix */ }
}
-function add_sel_options(s, list, sel_val, o_style) {
- if(s.custom_select) {
- s.set_options(list)
- if(sel_val) s.inp.value = sel_val;
- return;
- }
- if(s.inp)s = s.inp;
- for(var i=0, len=list.length; i').find('input:last');
- for(key in attributes)
- $input.attr(key, attributes[key]);
-
- var input = $input.get(0);
- if(cs)
- $y(input,cs);
- return input;
-}
function $dh(d) {
if(d && d.substr)d=$i(d);
diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js
index f965464bc1..0f39e64050 100644
--- a/frappe/public/js/legacy/form.js
+++ b/frappe/public/js/legacy/form.js
@@ -472,6 +472,8 @@ _f.Frm.prototype.render_form = function(is_a_different_doc) {
$(cur_frm.wrapper).trigger('render_complete');
this.layout.show_empty_form_message();
+
+ this.scroll_to_element();
}
_f.Frm.prototype.refresh_field = function(fname) {
@@ -873,3 +875,21 @@ _f.Frm.prototype.get_handlers = function(fieldname, doctype, docname) {
_f.Frm.prototype.has_perm = function(ptype) {
return frappe.perm.has_perm(this.doctype, 0, ptype, this.doc);
}
+
+_f.Frm.prototype.scroll_to_element = function() {
+ if (frappe.route_options && frappe.route_options.scroll_to) {
+ var scroll_to = frappe.route_options.scroll_to;
+ delete frappe.route_options.scroll_to;
+
+ var selector = [];
+ for (var key in scroll_to) {
+ var value = scroll_to[key];
+ selector.push(repl('[data-%(key)s="%(value)s"]', {key: key, value: value}));
+ }
+
+ selector = $(selector.join(" "));
+ if (selector.length) {
+ frappe.ui.scroll(selector, true, 30);
+ }
+ }
+}
diff --git a/frappe/public/js/legacy/layout.js b/frappe/public/js/legacy/layout.js
index b60117e51d..627d4a521f 100644
--- a/frappe/public/js/legacy/layout.js
+++ b/frappe/public/js/legacy/layout.js
@@ -1,5 +1,5 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
+// MIT License. See license.txt
/*
+ Layout
@@ -14,7 +14,7 @@
+ subrows
*/
-function Layout(parent, width) {
+function Layout(parent, width) {
if(parent&&parent.substr) { parent = $i(parent); }
this.wrapper = $a(parent, 'div', '', {display:'none'});
@@ -23,7 +23,7 @@ function Layout(parent, width) {
if(width) {
this.width = this.wrapper.style.width;
}
-
+
this.myrows = [];
}
@@ -45,8 +45,8 @@ Layout.prototype.addcell = function(width) {
Layout.prototype.setcolour = function(col) { $bg(cc,col); }
-Layout.prototype.show = function() { $ds(this.wrapper); }
-Layout.prototype.hide = function() { $dh(this.wrapper); }
+Layout.prototype.show = function() { $(this.wrapper).toggle(false); }
+Layout.prototype.hide = function() { $(this.wrapper).toggle(false); }
Layout.prototype.close_borders = function() {
if(this.with_border) {
this.myrows[this.myrows.length-1].wrapper.style.borderBottom = '1px solid #000';
@@ -56,7 +56,7 @@ Layout.prototype.close_borders = function() {
function LayoutRow(layout, parent) {
this.layout = layout;
this.wrapper = $a(parent,'div','form-layout-row');
-
+
// main head
this.main_head = $a(this.wrapper, 'div');
@@ -67,17 +67,17 @@ function LayoutRow(layout, parent) {
this.wrapper.style.border = '1px solid #000';
this.wrapper.style.borderBottom = '0px';
}
-
+
this.header = $a(this.main_body, 'div','',{padding:(layout.with_border ? '0px 8px' : '0px')});
this.body = $a(this.main_body,'div');
this.table = $a(this.body, 'table', '', {width:'100%', borderCollapse: 'collapse', tableLayout:'fixed'});
this.row = this.table.insertRow(0);
-
+
this.mycells = [];
}
-LayoutRow.prototype.hide = function() { $dh(this.wrapper); }
-LayoutRow.prototype.show = function() { $ds(this.wrapper); }
+LayoutRow.prototype.hide = function() { $(this.wrapper).toggle(false); }
+LayoutRow.prototype.show = function() { $(this.wrapper).toggle(true); }
LayoutRow.prototype.addCell = function(wid) {
var lc = new LayoutCell(this.layout, this, wid);
@@ -100,11 +100,11 @@ function LayoutCell(layout, layoutRow, width) {
this.cell.style.verticalAlign = 'top';
this.set_width(layoutRow.row, width);
-
- var h = $a(this.cell, 'div','',{padding:(layout.with_border ? '0px 8px' : '0px')});
- this.wrapper = $a(this.cell, 'div','',{padding:(layout.with_border ? '8px' : '0px')});
-
+ var h = $a(this.cell, 'div','',{padding:(layout.with_border ? '0px 8px' : '0px')});
+
+ this.wrapper = $a(this.cell, 'div','',{padding:(layout.with_border ? '8px' : '0px')});
+
layout.cur_cell = this.wrapper;
layout.cur_cell.header = h;
}
@@ -114,29 +114,29 @@ LayoutCell.prototype.set_width = function(row, width) {
var w = 100;
var n_cells = row.cells.length;
var cells_with_no_width = n_cells;
-
+
// current cell
if(width) {
$y(row.cells[n_cells-1], {width: cint(width) + '%'})
} else {
row.cells[n_cells-1].estimated_width = 1;
}
-
+
// get user specified width
for(var i=0; i
" + 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..d1aaa1d48a 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,26 +22,25 @@ 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"); } } }, set_title: function() { if(this.frm.meta.title_field) { - var title = (this.frm.doc[this.frm.meta.title_field] || "").trim() || __(this.frm.docname); + var title = (this.frm.doc[this.frm.meta.title_field] || "").trim() || this.frm.docname; if(this.frm.doc.__islocal || title === this.frm.docname || this.frm.meta.autoname==="hash") { this.page.set_title_sub(""); } else { this.page.set_title_sub(this.frm.docname); } } else { - var title = __(this.frm.docname); + var title = this.frm.docname; } var me = this; + title = __(title); this.page.set_title(title); if(this.frm.meta.title_field) { frappe.utils.set_title(title + " - " + this.frm.docname); @@ -97,13 +95,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 +108,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.html b/frappe/public/js/frappe/list/list_item_main.html index 6ed25c515f..ab49855d99 100644 --- a/frappe/public/js/frappe/list/list_item_main.html +++ b/frappe/public/js/frappe/list/list_item_main.html @@ -31,7 +31,7 @@ {% } %} {% } else if(col.fieldtype==="Select") { %} {%= value %} + data-filter="{%= col.fieldname %},=,{%= value %}">{%= __(value) %} {% } else if(col.fieldtype==="Link") { %} {%= value %} 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..765551c4c1 100644 --- a/frappe/public/js/frappe/list/list_item_main_head.html +++ b/frappe/public/js/frappe/list/list_item_main_head.html @@ -23,12 +23,12 @@ title="{%= __("Select All") %}"> {% } %} - + {% } %} - {%= col.title || col.label || "" %} + {%= __(col.title) || __(col.label) || "" %}
{%= list.get_indicator_dot(data) %}
-
+ text-right list-row-right" style="padding-left:0px">
+
{%= list.get_indicator_dot(data) %}
+
+
+ {%= comment_when(data.modified, true) %}
+
{% if (data._assign_list.length) { %}
@@ -33,14 +36,11 @@
{% } else { %}
{% } %}
-
+
- {%= data._comments_list.length || 0 %}
+ {%= (data._comment_count > 99 ? "99+" : data._comment_count) || 0 %}
-
-
- {%= comment_when(data.modified, true) %}
-
'
- };
-
- /**
- * Updates configuration.
- *
- * NProgress.configure({
- * minimum: 0.1
- * });
- */
- NProgress.configure = function(options) {
- $.extend(Settings, options);
- return this;
- };
-
- /**
- * Last number.
- */
-
- NProgress.status = null;
-
- /**
- * Sets the progress bar status, where `n` is a number from `0.0` to `1.0`.
- *
- * NProgress.set(0.4);
- * NProgress.set(1.0);
- */
-
- NProgress.set = function(n) {
- var started = NProgress.isStarted();
-
- n = clamp(n, Settings.minimum, 1);
- NProgress.status = (n === 1 ? null : n);
-
- var $progress = NProgress.render(!started),
- $bar = $progress.find('[role="bar"]'),
- speed = Settings.speed,
- ease = Settings.easing;
-
- $progress[0].offsetWidth; /* Repaint */
-
- $progress.queue(function(next) {
- $bar.css({
- transition: 'all '+speed+'ms '+ease,
- transform: 'translate3d('+toBarPerc(n)+'%,0,0)'
- });
-
- if (n === 1) {
- // Fade out
- $progress.css({ transition: 'none', opacity: 1 });
- $progress[0].offsetWidth; /* Repaint */
-
- setTimeout(function() {
- $progress.css({ transition: 'all '+speed+'ms linear', opacity: 0 });
- setTimeout(function() {
- NProgress.remove();
- next();
- }, speed);
- }, speed);
- } else {
- setTimeout(next, speed);
- }
- });
-
- return this;
- };
-
- NProgress.isStarted = function() {
- return typeof NProgress.status === 'number';
- };
-
- /**
- * Shows the progress bar.
- * This is the same as setting the status to 0%, except that it doesn't go backwards.
- *
- * NProgress.start();
- *
- */
- NProgress.start = function() {
- if (!NProgress.status) NProgress.set(0);
-
- var work = function() {
- setTimeout(function() {
- if (!NProgress.status) return;
- NProgress.trickle();
- work();
- }, Settings.trickleSpeed);
- };
-
- if (Settings.trickle) work();
-
- return this;
- };
-
- /**
- * Hides the progress bar.
- * This is the *sort of* the same as setting the status to 100%, with the
- * difference being `done()` makes some placebo effect of some realistic motion.
- *
- * NProgress.done();
- *
- * If `true` is passed, it will show the progress bar even if its hidden.
- *
- * NProgress.done(true);
- */
-
- NProgress.done = function(force) {
- if (!force && !NProgress.status) return this;
-
- return NProgress.inc(0.3 + 0.5 * Math.random()).set(1);
- };
-
- /**
- * Increments by a random amount.
- */
-
- NProgress.inc = function(amount) {
- var n = NProgress.status;
-
- if (!n) {
- return NProgress.start();
- } else {
- if (typeof amount !== 'number') {
- amount = (1 - n) * clamp(Math.random() * n, 0.1, 0.95);
- }
-
- n = clamp(n + amount, 0, 0.994);
- return NProgress.set(n);
- }
- };
-
- NProgress.trickle = function() {
- return NProgress.inc(Math.random() * Settings.trickleRate);
- };
-
- /**
- * (Internal) renders the progress bar markup based on the `template`
- * setting.
- */
-
- NProgress.render = function(fromStart) {
- if (NProgress.isRendered()) return $("#nprogress");
- $('html').addClass('nprogress-busy');
-
- var $el = $("
")
- .html(Settings.template);
-
- var perc = fromStart ? '-100' : toBarPerc(NProgress.status || 0);
-
- $el.find('[role="bar"]').css({
- transition: 'all 0 linear',
- transform: 'translate3d('+perc+'%,0,0)'
- });
-
- $el.appendTo(document.body);
-
- return $el;
- };
-
- /**
- * (Internal) Removes the element. Opposite of render().
- */
-
- NProgress.remove = function() {
- $('html').removeClass('nprogress-busy');
- $('#nprogress').remove();
- };
-
- /**
- * Checks if the progress bar is rendered.
- */
-
- NProgress.isRendered = function() {
- return ($("#nprogress").length > 0);
- };
-
- /**
- * Helpers
- */
-
- function clamp(n, min, max) {
- if (n < min) return min;
- if (n > max) return max;
- return n;
- }
-
- /**
- * (Internal) converts a percentage (`0..1`) to a bar translateX
- * percentage (`-100%..0%`).
- */
-
- function toBarPerc(n) {
- return (-1 + n) * 100;
- }
-
- return NProgress;
-});
diff --git a/frappe/public/less/avatar.less b/frappe/public/less/avatar.less
index 896ab6bc73..138a2558e7 100644
--- a/frappe/public/less/avatar.less
+++ b/frappe/public/less/avatar.less
@@ -50,3 +50,13 @@
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/less/common.less b/frappe/public/less/common.less
index cd9d4109a6..5ccbd93516 100644
--- a/frappe/public/less/common.less
+++ b/frappe/public/less/common.less
@@ -115,6 +115,7 @@ a.badge-hover& {
}
.msgprint {
+ margin: 15px 0px;
text-align: center;
pre {
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 8ba7abf010..d3c37b48e9 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -408,3 +408,14 @@ ul.linked-with-list li {
border-bottom: 1px solid @border-color;
border-radius: 0px;
}
+
+// like pop-over
+.liked-by-popover {
+ min-width: 200px;
+ margin-top: -10px;
+ margin-bottom: -10px;
+
+ li {
+ margin: 15px 0px;
+ }
+}
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index 0b14d168a7..9030dd4abb 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -78,7 +78,7 @@
display: none !important;
}
-.shaded-section, .timeline-item:nth-child(even) {
+.shaded-section {
background-color: @light-bg;
}
@@ -112,47 +112,200 @@
}
.timeline {
- border: 1px solid @border-color;
margin: 30px 0px;
+
+ .timeline-head {
+ .comment-input {
+ height: auto;
+ }
+ }
}
.timeline-item {
margin-top: 0px;
- padding: 15px 30px 7px;
-
- .icon-fixed-width {
- text-align: center;
- }
-
- border-bottom: 1px solid @border-color;
blockquote {
font-size: inherit;
}
}
-.timeline-item:last-child {
- border-bottom: 0px;
+.timeline-items {
+ position: relative;
}
-.timeline-item .reply {
- margin-top: 5px;
- // padding-left: 24px;
- // border-left: 8px solid #d8dfe6;
+.timeline {
+ position: relative;
+}
+
+.timeline::before {
+ content: " ";
+ border-left: 1px solid @border-color;
+ position: absolute;
+ top: 0px;
+ bottom: -124px;
+ left: 43px;
+ z-index: -1;
+}
+
+@media(max-width: @screen-sm) {
+ .timeline::before {
+ bottom: -64px;
+ }
+}
+
+.timeline-item.user-content {
+ margin: 30px 0px 30px 30px;
+
+ .media-body {
+ border: 1px solid @border-color;
+ border-radius: 2px;
+ margin-left: -7px;
+ position: relative;
+
+ // to display the triangle beside the box
+ overflow: visible;
+ }
+
+ .comment-header {
+ background-color: @light-bg;
+ padding: 7px 15px;
+ margin: 0px;
+ color: @text-muted;
+ border-bottom: 1px solid @light-border-color;
+
+ .octicon-heart {
+ color: @heart-color;
+ cursor: pointer;
+ }
+ }
+
+ .reply {
+ padding: 10px 15px;
+
+ & > div > p:first-child {
+ margin-top: 0px;
+ }
+
+ & > div > p:last-child {
+ margin-bottom: 0px;
+ }
+ }
+
+ .close-btn-container {
+ padding: 2px 15px;
+ }
+
+ .comment-likes {
+ margin-left: 5px;
+ }
+
+ .media-body:after, .media-body:before {
+ right: 100%;
+ top: 15px;
+ border: solid transparent;
+ content: " ";
+ height: 0;
+ width: 0;
+ position: absolute;
+ pointer-events: none;
+ }
+
+ .media-body:after {
+ border-color: rgba(136, 183, 213, 0);
+ border-right-color: #fafbfc;
+ border-width: 6px;
+ margin-top: -6px;
+ }
+ .media-body:before {
+ border-color: rgba(194, 225, 245, 0);
+ border-right-color: @border-color;
+ border-width: 7px;
+ margin-top: -7px;
+ }
+}
+
+.timeline-item.notification-content {
+ padding-left: 30px;
+ margin: 30px 0px;
+ position: relative;
+ color: @text-muted;
+
+ * {
+ color: @text-muted;
+ }
+
+ .icon-fixed-width {
+ margin-left: 36px;
+ }
+
+ .octicon-heart {
+ color: @heart-color !important;
+ }
+}
+
+.timeline-indicator() {
+ content: " ";
+ width: 7px;
+ height: 7px;
+ background-color: @border-color;
+ // background-color: white;
+ // border: 1px solid @border-color;
+ position: absolute;
+ left: 40px;
+ border-radius: 50%;
+ top: 5px;
+}
+
+.timeline-item.notification-content::before {
+ .timeline-indicator();
}
.timeline-item .reply-link {
- padding: 0px 7px;
-}
-
-.timeline-item h6, .timeline-head h6 {
- margin-top: 6px;
+ padding-left: 7px;
}
.timeline-head {
- background-color: @light-bg;
- padding: 15px 30px;
- border-bottom: 1px solid @border-color;
+ background-color: white;
+ // padding: 15px 30px;
+ border: 1px solid @border-color;
+ border-radius: 2px;
+
+ .comment-input-header {
+ background-color: @light-bg;
+ padding: 7px 15px;
+ border-bottom: 1px solid @light-border-color;
+ }
+
+ .comment-input-container {
+ padding: 15px;
+ }
+
+ .comment-input {
+ border-color: @light-border-color;
+ max-width: 100%;
+
+ &:focus {
+ box-shadow: none;
+ }
+ }
+}
+
+@media(max-width: @screen-xs) {
+ .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 {
+ .timeline-indicator();
}
.form-footer h5 {
diff --git a/frappe/public/less/indicator.less b/frappe/public/less/indicator.less
index d0cc2af0a3..900acf7408 100644
--- a/frappe/public/less/indicator.less
+++ b/frappe/public/less/indicator.less
@@ -54,3 +54,13 @@
.indicator-right.darkgrey::after {
background: @indicator-darkgrey;
}
+
+.indicator.yellow::before,
+.indicator-right.yellow::after {
+ background: @indicator-yellow;
+}
+
+.indicator.light-blue::before,
+.indicator-right.light-blue::after {
+ background: @indicator-light-blue;
+}
diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less
index c3454d10b1..880543a549 100644
--- a/frappe/public/less/list.less
+++ b/frappe/public/less/list.less
@@ -124,6 +124,14 @@
.doclist-row {
font-size: 12px;
+
+ .likes-count {
+ display: inline-block;
+ width: 15px;
+ margin-left: -5px;
+ color: @text-muted;
+ font-size: 12px;
+ }
}
.doclist-row .docstatus .octicon {
@@ -172,16 +180,17 @@
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: #ffdb4c;
+ color: @heart-color;
}
.list-id {
@@ -209,3 +218,9 @@
display: none;
}
}
+
+.list-comment-count {
+ display: inline-block;
+ width: 37px;
+ text-align: left;
+}
diff --git a/frappe/public/less/mobile.less b/frappe/public/less/mobile.less
index a7409e3111..19e4c2bc90 100644
--- a/frappe/public/less/mobile.less
+++ b/frappe/public/less/mobile.less
@@ -261,26 +261,6 @@
border-right-color: transparent !important;
}
- // timeline
-
- .timeline {
- border-left: none !important;
- border-right: none !important;
-
- .timeline-head {
- padding: 7px 15px;
- }
-
- .timeline-item {
- padding: 15px;
- border-bottom: 1px dashed @border-color;
- }
-
- .timeline-item:last-child {
- border-bottom: none;
- }
- }
-
// listviews
.list-row {
padding: 13px 15px !important;
diff --git a/frappe/public/less/navbar.less b/frappe/public/less/navbar.less
index c899d8c51a..b52c53068b 100644
--- a/frappe/public/less/navbar.less
+++ b/frappe/public/less/navbar.less
@@ -40,12 +40,15 @@
min-width: 24px;
height: 24px;
border-radius: 4px;
- background-color: @indicator-red;
color: #fff;
text-align: center;
padding: 2px 5px;
}
+.navbar-new-comments-true {
+ background-color: @indicator-red;
+}
+
#navbar-search {
width: 300px;
background-color: rgba(255, 255, 255, 0.9);
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index af703acab9..be68a6e6fb 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -146,6 +146,11 @@ body[data-route^="Module"] .main-menu {
}
}
}
+
+ .liked-by .octicon-heart {
+ font-size: 16px;
+ cursor: pointer;
+ }
}
.form-sidebar .form-shared .share-doc-btn& {
@@ -164,6 +169,7 @@ body[data-route^="Module"] .main-menu {
.form-tags,
.assignment-row,
.form-shared,
+ .liked-by,
.modified-by,
.created-by,
.tags-label,
diff --git a/frappe/public/less/variables.less b/frappe/public/less/variables.less
index c64e7c3a87..64f9857a09 100644
--- a/frappe/public/less/variables.less
+++ b/frappe/public/less/variables.less
@@ -24,6 +24,10 @@
@indicator-orange: #ffa00a;
@indicator-purple: #743ee2;
@indicator-darkgrey: #b8c2cc;
+@indicator-yellow: #FEEF72;
+@indicator-light-blue:#7CD6FD;
+
+@heart-color: @indicator-red;
@navbar-default-color: #6C7680;
@navbar-inverse-color: #9D9D9D;
diff --git a/frappe/sessions.py b/frappe/sessions.py
index 5d70f97073..138b8efc8d 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -148,7 +148,7 @@ def generate_csrf_token():
# and it leads to invalid request in the current tab
frappe.publish_realtime(event="csrf_generated",
message={"sid": frappe.local.session.sid, "csrf_token": frappe.local.session.data.csrf_token},
- user=frappe.session.user)
+ user=frappe.session.user, after_commit=True)
class Session:
def __init__(self, user, resume=False, full_name=None, user_type=None):
diff --git a/frappe/templates/autodoc/base_template.html b/frappe/templates/autodoc/base_template.html
index 362e4fe460..05c4a422be 100644
--- a/frappe/templates/autodoc/base_template.html
+++ b/frappe/templates/autodoc/base_template.html
@@ -4,7 +4,7 @@
- {{ title }}
+ {% block title %} {{ title }} {% endblock %}
@@ -12,11 +12,6 @@
-
-
-
-
-
{% block favicon %}
- {%- if style is defined -%}{{ style }}{%- endif -%}
-
- {%- endblock -%}
+ {%- block style %}{%- endblock -%}
{%- endblock -%}
@@ -60,17 +51,13 @@
{% include "templates/includes/navbar/navbar.html" %}
{%- endblock -%}
+
+
+
+
+
- {%- block script %}
-
- {%- endblock %}
+
+ {%- block script %}{%- endblock %}
{%- block body_include %}{{ body_include or "" }}{% endblock -%}
diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index 3b282bc136..f949c23bc7 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -4,12 +4,8 @@
-
- {%- block hero -%}
-
- {{ hero or "" }}
-
- {%- endblock -%}
- {% block content %}
-
- {{ content }}
-
-
- {% endblock %}
+
+ {%- block hero -%}{%- endblock -%}
+
+
+ {% block content %}{% endblock %}
+
+
@@ -64,22 +60,20 @@
{% include "templates/includes/navbar/navbar.html" %}
{%- endblock -%}
- {%- block hero -%}
-
+ {%- if footer is defined -%}
- {{ hero or "" }}
-
- {%- endblock -%}
- {% block content %}
-
- {{ content }}
-
- {% endblock %}
+
+ {%- block hero -%}{%- endblock -%}
+
+
+ {% block content %}{% endblock %}
+