From b8d649781852f38d6d25171b53866b052b1f1d57 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 8 Feb 2012 12:33:13 +0530 Subject: [PATCH] many style fixes --- erpnext/home/__init__.py | 6 +- erpnext/home/doctype/feed/feed.txt | 76 ++++++++++--------- .../home/page/event_updates/event_updates.js | 5 +- erpnext/startup/event_handlers.py | 1 - erpnext/startup/modules.js | 34 --------- erpnext/website/css/website.css | 21 +++++ erpnext/website/doctype/blog/blog.py | 9 +++ erpnext/website/doctype/blog/blog_page.js | 6 +- erpnext/website/doctype/blog/template.html | 3 +- .../website/doctype/web_page/template.html | 10 ++- erpnext/website/doctype/web_page/web_page.py | 17 ++--- erpnext/website/page/blog/blog.js | 6 +- version.num | 2 +- 13 files changed, 102 insertions(+), 94 deletions(-) diff --git a/erpnext/home/__init__.py b/erpnext/home/__init__.py index bec99d48ff..75556e3937 100644 --- a/erpnext/home/__init__.py +++ b/erpnext/home/__init__.py @@ -42,11 +42,12 @@ def make_feed(feedtype, doctype, name, owner, subject, color): "makes a new Feed record" #msgprint(subject) from webnotes.model.doc import Document + from webnotes.utils import get_full_name - if feedtype in ('Login', 'Comment'): + if feedtype in ('Login', 'Comment', 'Assignment'): # delete old login, comment feed webnotes.conn.sql("""delete from tabFeed where - datediff(curdate(), creation) > 7 and doc_type in ('Comment', 'Login')""") + datediff(curdate(), creation) > 7 and doc_type in ('Comment', 'Login', 'Assignment')""") else: # one feed per item webnotes.conn.sql("""delete from tabFeed @@ -60,6 +61,7 @@ def make_feed(feedtype, doctype, name, owner, subject, color): f.doc_name = name f.subject = subject f.color = color + f.full_name = get_full_name(owner) f.save() def update_feed(doc, method=None): diff --git a/erpnext/home/doctype/feed/feed.txt b/erpnext/home/doctype/feed/feed.txt index f239f7c7c8..62d6633a0b 100644 --- a/erpnext/home/doctype/feed/feed.txt +++ b/erpnext/home/doctype/feed/feed.txt @@ -5,77 +5,85 @@ { 'creation': '2011-04-06 18:11:38', 'docstatus': 0, - 'modified': '2012-02-03 11:28:16', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-02-08 11:35:40', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all DocType { - 'autoname': '_FEED.#####', - 'colour': 'White:FFF', - 'default_print_format': 'Standard', + 'autoname': u'_FEED.#####', + 'colour': u'White:FFF', + 'default_print_format': u'Standard', 'doctype': 'DocType', - 'module': 'Home', + 'module': u'Home', 'name': '__common__', - 'section_style': 'Simple', + 'section_style': u'Simple', 'show_in_menu': 0, - 'version': 2 + 'version': 3 }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'Feed', - 'parentfield': 'fields', - 'parenttype': 'DocType', + 'parent': u'Feed', + 'parentfield': u'fields', + 'parenttype': u'DocType', 'permlevel': 0 }, # DocType, Feed { 'doctype': 'DocType', - 'name': 'Feed' + 'name': u'Feed' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'feed_type', - 'fieldtype': 'Select', - 'label': 'Feed Type' + 'doctype': u'DocField', + 'fieldname': u'feed_type', + 'fieldtype': u'Select', + 'label': u'Feed Type' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'doc_type', - 'fieldtype': 'Data', - 'label': 'Doc Type' + 'doctype': u'DocField', + 'fieldname': u'doc_type', + 'fieldtype': u'Data', + 'label': u'Doc Type' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'doc_name', - 'fieldtype': 'Data', - 'label': 'Doc Name' + 'doctype': u'DocField', + 'fieldname': u'doc_name', + 'fieldtype': u'Data', + 'label': u'Doc Name' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'subject', - 'fieldtype': 'Data', - 'label': 'Subject' + 'doctype': u'DocField', + 'fieldname': u'subject', + 'fieldtype': u'Data', + 'label': u'Subject' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'color', - 'fieldtype': 'Data', - 'label': 'Color' + 'doctype': u'DocField', + 'fieldname': u'color', + 'fieldtype': u'Data', + 'label': u'Color' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'full_name', + 'fieldtype': u'Data', + 'label': u'Full Name' } ] \ No newline at end of file diff --git a/erpnext/home/page/event_updates/event_updates.js b/erpnext/home/page/event_updates/event_updates.js index 90aef9e696..9a76d16892 100644 --- a/erpnext/home/page/event_updates/event_updates.js +++ b/erpnext/home/page/event_updates/event_updates.js @@ -457,11 +457,10 @@ FeedList.prototype.make_list = function() { parent: this.list_area, query: repl('select \ distinct t1.name, t1.feed_type, t1.doc_type, t1.doc_name, t1.subject, t1.modified_by, \ - concat(ifnull(t2.first_name,""), " ", ifnull(t2.last_name,"")) as full_name, \ + if(ifnull(t1.full_name,"")="", t1.owner, t1.full_name) as full_name, \ t1.modified, t1.color \ - from tabFeed t1, tabProfile t2, tabUserRole t3, tabDocPerm t4 \ + from tabFeed t1, tabUserRole t3, tabDocPerm t4 \ where t1.doc_type = t4.parent \ - and t2.name = t1.owner \ and t3.parent = "%(user)s" \ and t4.role = t3.role \ and ifnull(t4.`read`,0) = 1 \ diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py index 3c6281f1fd..d9fbbedfd3 100644 --- a/erpnext/startup/event_handlers.py +++ b/erpnext/startup/event_handlers.py @@ -38,7 +38,6 @@ def on_login_post_session(login_manager): def comment_added(doc): """add comment to feed""" - import json home.make_feed('Comment', doc.comment_doctype, doc.comment_docname, doc.comment_by, '"' + doc.comment + '"', '#6B24B3') diff --git a/erpnext/startup/modules.js b/erpnext/startup/modules.js index c22aee00b2..0280c74265 100644 --- a/erpnext/startup/modules.js +++ b/erpnext/startup/modules.js @@ -15,10 +15,6 @@ pscript.startup_make_sidebar = function() { new SidebarItem(ml[m]); } } - if(in_list(user_roles, 'System Manager')) { - var div = $a(page_body.left_sidebar, 'div', 'link_type', {padding:'8px', fontSize:'11px'}); - $(div).html('[edit]').click(pscript.startup_set_module_order) - } nav_obj.observers.push({notify:function(t,dt,dn) { pscript.select_sidebar_menu(t, dt, dn); }}); // select current @@ -352,33 +348,3 @@ SidebarModuleItem = function(si, det) { si.show_section(me.det.doc_type); } } - - -// ==================================================================== -// Drag & Drop order selection -// ==================================================================== - -pscript.startup_set_module_order = function() { - var update_order= function(ml) { - mdict = {}; - for(var i=0; iNote: These changes will apply to all users!', ml, update_order, 1); - } - $c_obj('Home Control', 'get_module_order', '', callback) - -} - - - diff --git a/erpnext/website/css/website.css b/erpnext/website/css/website.css index 8a90b1b003..7d60d84348 100644 --- a/erpnext/website/css/website.css +++ b/erpnext/website/css/website.css @@ -61,6 +61,27 @@ header .topbar .container { overflow-x: hidden; } +.web-page-status { + background-color: #DDD; + padding: 7px; + color: #777; + clear: both; + text-align: right; +} + +.web-page-status a, +.web-page-status a:hover, +.web-page-status a:visited { + padding: 2px; + background-color: #777; + color: #FFF; + text-decoration: none; +} + +.web-page-status a:hover { + background-color: #444; +} + footer { color: #777; } diff --git a/erpnext/website/doctype/blog/blog.py b/erpnext/website/doctype/blog/blog.py index c83b922d50..5e50327e04 100644 --- a/erpnext/website/doctype/blog/blog.py +++ b/erpnext/website/doctype/blog/blog.py @@ -23,8 +23,11 @@ class DocType(): from jinja2 import Template import markdown2 import os + from webnotes.utils import global_date_format, get_full_name self.doc.content_html = markdown2.markdown(self.doc.content or '') + self.doc.full_name = get_full_name(self.doc.owner) + self.doc.updated = global_date_format(self.doc.modified) with open(os.path.join(os.path.dirname(__file__), 'template.html'), 'r') as f: p.content = Template(f.read()).render(doc=self.doc) @@ -35,5 +38,11 @@ class DocType(): p.save() website.utils.add_guest_access_to_page(p.name) + + # cleanup + for f in ['content_html', 'full_name', 'updated']: + if f in self.doc.fields: + del self.doc.fields[f] + \ No newline at end of file diff --git a/erpnext/website/doctype/blog/blog_page.js b/erpnext/website/doctype/blog/blog_page.js index 1df9b5498c..3ad25356ff 100644 --- a/erpnext/website/doctype/blog/blog_page.js +++ b/erpnext/website/doctype/blog/blog_page.js @@ -25,14 +25,14 @@ pscript['onload_{{ doc.name }}'] = function(wrapper) { wrapper.comment_list = new wn.widgets.Listing({ parent: $(wrapper).find('.web-main-section').get(0), - query: 'select comment, comment_by_fullname, comment_date\ + query: 'select comment, comment_by_fullname, modified\ from `tabComment Widget Record` where comment_doctype="Page"\ and comment_docname="{{ doc.name }}"', no_result_message: 'Be the first one to comment', render_row: function(parent, data) { - data.comment_date = dateutil.str_to_user(data.comment_date); + data.comment_date = prettyDate(data.modified); $(parent).html(repl("
\ - On %(comment_date)s %(comment_by_fullname)s said:\ + %(comment_by_fullname)s | %(comment_date)s:\
\

%(comment)s


", data)) }, diff --git a/erpnext/website/doctype/blog/template.html b/erpnext/website/doctype/blog/template.html index f70bacb728..1b81fe2d90 100644 --- a/erpnext/website/doctype/blog/template.html +++ b/erpnext/website/doctype/blog/template.html @@ -2,7 +2,8 @@

Blog

-

{{ doc.title }}

+

{{ doc.title }}

+
By {{ doc.full_name }} on {{ doc.updated }}

{{ doc.content_html }}
diff --git a/erpnext/website/doctype/web_page/template.html b/erpnext/website/doctype/web_page/template.html index faacca1566..1fb613c70d 100644 --- a/erpnext/website/doctype/web_page/template.html +++ b/erpnext/website/doctype/web_page/template.html @@ -14,11 +14,15 @@
{{ doc.side_section_html }} {% if doc.see_also %} +

See Also

{{ doc.see_also }} +
{% endif %}
-
-
+
- \ No newline at end of file + +
+ Last Modified: {{ doc.updated }} Feedback +
diff --git a/erpnext/website/doctype/web_page/web_page.py b/erpnext/website/doctype/web_page/web_page.py index 8f7c38f18d..e262bfe757 100644 --- a/erpnext/website/doctype/web_page/web_page.py +++ b/erpnext/website/doctype/web_page/web_page.py @@ -14,8 +14,10 @@ class DocType: p = website.utils.add_page(self.doc.title) from jinja2 import Template + from webnotes.utils import global_date_format import os + self.doc.updated = global_date_format(self.doc.modified) website.utils.markdown(self.doc, ['head_section','main_section', 'side_section']) self.add_page_links() @@ -31,24 +33,21 @@ class DocType: def add_page_links(self): """add links for next_page and see_also""" if self.doc.next_page: - self.doc.next_page_html = """
-

Next: - %(title)s

""" % {"name":self.doc.next_page, \ + self.doc.next_page_html = """
+ Next: + %(title)s
""" % {"name":self.doc.next_page, \ "title": webnotes.conn.get_value("Page", self.doc.next_page, "title")} self.doc.see_also = '' for d in self.doclist: if d.doctype=='Related Page': tmp = {"page":d.page, "title":webnotes.conn.get_value('Page', d.page, 'title')} - self.doc.see_also += """
  • %(title)s
    • """ % tmp - - if self.doc.see_also: - self.doc.see_also = '' % self.doc.see_also - + self.doc.see_also += """
    %(title)s
    """ % tmp + def cleanup_temp(self): """cleanup temp fields""" fl = ['main_section_html', 'side_section_html', 'see_also', \ - 'next_page_html', 'head_section_html'] + 'next_page_html', 'head_section_html', 'updated'] for f in fl: if f in self.doc.fields: del self.doc.fields[f] diff --git a/erpnext/website/page/blog/blog.js b/erpnext/website/page/blog/blog.js index 6be1d0768f..9e89acdca8 100644 --- a/erpnext/website/page/blog/blog.js +++ b/erpnext/website/page/blog/blog.js @@ -10,9 +10,9 @@ pscript.onload_blog = function(wrapper) { render_row: function(parent, data) { if(data.content.length==300) data.content += '...'; data.date = prettyDate(data.modified); - parent.innerHTML = repl('

    %(title)s

    \ -
    By %(first_name)s %(last_name)s on %(date)s
    \ -

    %(content)s


    ', data); + parent.innerHTML = repl('

    %(title)s

    \ +

    By %(first_name)s %(last_name)s on %(date)s

    \ +
    %(content)s

    ', data); }, page_length: 10 }); diff --git a/version.num b/version.num index 24f98f2d5f..6d540e9f23 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -367 \ No newline at end of file +382 \ No newline at end of file