From 11b1fb811f432ce80e72a23a0ab8936134783f85 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 12 Mar 2013 14:28:29 +0530 Subject: [PATCH] fixes to about us --- home/page/latest_updates/latest_updates.js | 3 +- setup/page/setup/setup.js | 6 --- .../about_us_settings/about_us_settings.py | 22 ++++----- .../about_us_settings/about_us_settings.txt | 16 +++++-- .../about_us_team_member.txt | 35 ++++++++++----- .../doctype/style_settings/style_settings.txt | 15 ++++--- website/templates/html/product_in_list.html | 1 - website/templates/pages/about.html | 45 ++++++++----------- website/utils.py | 2 +- 9 files changed, 79 insertions(+), 66 deletions(-) diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index b66fe4c9a17..84db37287ff 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -1,5 +1,6 @@ erpnext.updates = [ - ["5th March", ["Refactored Upload Attendace Tool"]], + ["12th March", ["Updates to website module. Added more options in Style Settings and Website Settings."]], + ["5th March", ["Refactored Upload Attendance Tool"]], ["4th March", ["Lead organization added in Quotation classic/spartan/modern print format"]], ["1st March", [ "Time Log, Time Log Batch: Created feature to batch Time Logs so that they can be tracked for billing.", diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js index e970a60c247..394a5f6b56f 100644 --- a/setup/page/setup/setup.js +++ b/setup/page/setup/setup.js @@ -98,12 +98,6 @@ wn.module_page["Setup"] = [ label:wn._("Print Heading"), "description":wn._("Add headers for standard print formats") }, - { - "route":"Form/Style Settings/Style Settings", - doctype:wn._("Style Settings"), - label:wn._("Style Settings"), - "description":wn._("Change background fonts etc") - } ] }, { diff --git a/website/doctype/about_us_settings/about_us_settings.py b/website/doctype/about_us_settings/about_us_settings.py index 6c404f16f82..e291aa85d00 100644 --- a/website/doctype/about_us_settings/about_us_settings.py +++ b/website/doctype/about_us_settings/about_us_settings.py @@ -7,16 +7,16 @@ from website.utils import url_for_website class DocType: def __init__(self, d, dl): self.doc, self.doclist = d, dl - - def onload(self): - """load employee""" - emp_list = [] - for d in self.doclist.get({"doctype":"About Us Team Member"}): - emp = webnotes.doc("Employee", d.employee) - emp.image = url_for_website(emp.image) - emp_list.append(emp) - self.doclist += emp_list - + def on_update(self): from website.utils import clear_cache - clear_cache("about") \ No newline at end of file + clear_cache("about") + +def get_args(): + obj = webnotes.get_obj("About Us Settings") + for d in obj.doclist.get({"doctype":"About Us Team Member"}): + if not "/" in d.image_link: + d.image_link = "files/" + d.image_link + return { + "obj": obj + } \ No newline at end of file diff --git a/website/doctype/about_us_settings/about_us_settings.txt b/website/doctype/about_us_settings/about_us_settings.txt index a42d2f35119..6a27f732b9c 100644 --- a/website/doctype/about_us_settings/about_us_settings.txt +++ b/website/doctype/about_us_settings/about_us_settings.txt @@ -1,12 +1,13 @@ [ { - "creation": "2013-01-10 16:34:32", + "creation": "2013-03-07 15:53:15", "docstatus": 0, - "modified": "2013-01-22 14:12:16", + "modified": "2013-03-12 13:51:29", "modified_by": "Administrator", "owner": "Administrator" }, { + "allow_attach": 1, "description": "Settings for the About Us Page", "doctype": "DocType", "document_type": "Master", @@ -31,7 +32,7 @@ "parenttype": "DocType", "permlevel": 0, "read": 1, - "report": 1, + "report": 0, "role": "Website Manager", "submit": 0, "write": 1 @@ -101,6 +102,15 @@ "fieldtype": "Text Editor", "label": "Footer" }, + { + "doctype": "DocField", + "fieldname": "file_list", + "fieldtype": "Text", + "hidden": 1, + "label": "File List", + "no_copy": 1, + "print_hide": 1 + }, { "doctype": "DocPerm" } diff --git a/website/doctype/about_us_team_member/about_us_team_member.txt b/website/doctype/about_us_team_member/about_us_team_member.txt index ec77dd78b3a..b1bf6b306a3 100644 --- a/website/doctype/about_us_team_member/about_us_team_member.txt +++ b/website/doctype/about_us_team_member/about_us_team_member.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-02-22 01:28:07", + "creation": "2013-03-07 11:55:11", "docstatus": 0, - "modified": "2013-03-07 07:03:18", + "modified": "2013-03-12 13:51:02", "modified_by": "Administrator", "owner": "Administrator" }, @@ -14,23 +14,38 @@ }, { "doctype": "DocField", - "fieldname": "employee", - "fieldtype": "Link", - "label": "Employee", "name": "__common__", - "options": "Employee", "parent": "About Us Team Member", "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "print_width": "300px", - "width": "300px" + "permlevel": 0 }, { "doctype": "DocType", "name": "About Us Team Member" }, { - "doctype": "DocField" + "doctype": "DocField", + "fieldname": "full_name", + "fieldtype": "Data", + "label": "Full Name", + "reqd": 1, + "width": "150px" + }, + { + "doctype": "DocField", + "fieldname": "image_link", + "fieldtype": "Select", + "label": "Image Link", + "options": "attach_files:", + "width": "150px" + }, + { + "doctype": "DocField", + "fieldname": "bio", + "fieldtype": "Small Text", + "label": "Bio", + "reqd": 1, + "width": "200px" } ] \ No newline at end of file diff --git a/website/doctype/style_settings/style_settings.txt b/website/doctype/style_settings/style_settings.txt index fbb4c422f66..3f898e72f21 100644 --- a/website/doctype/style_settings/style_settings.txt +++ b/website/doctype/style_settings/style_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-08 11:36:53", "docstatus": 0, - "modified": "2013-03-12 11:34:32", + "modified": "2013-03-12 13:35:14", "modified_by": "Administrator", "owner": "Administrator" }, @@ -65,6 +65,12 @@ "fieldtype": "Data", "label": "Page Background" }, + { + "doctype": "DocField", + "fieldname": "page_border", + "fieldtype": "Check", + "label": "Page Border" + }, { "doctype": "DocField", "fieldname": "page_headings", @@ -83,16 +89,11 @@ "fieldtype": "Data", "label": "Page Links" }, - { - "doctype": "DocField", - "fieldname": "page_border", - "fieldtype": "Check", - "label": "Page Border" - }, { "doctype": "DocField", "fieldname": "cb0", "fieldtype": "Column Break", + "label": "Top Bar", "print_width": "50%", "width": "50%" }, diff --git a/website/templates/html/product_in_list.html b/website/templates/html/product_in_list.html index 43b0134c1d1..97de5963660 100644 --- a/website/templates/html/product_in_list.html +++ b/website/templates/html/product_in_list.html @@ -8,6 +8,5 @@

{{ item_name }}

-

Item Code: {{ name }}

\ No newline at end of file diff --git a/website/templates/pages/about.html b/website/templates/pages/about.html index 30d9a5d287d..28fb1f6a254 100644 --- a/website/templates/pages/about.html +++ b/website/templates/pages/about.html @@ -7,34 +7,27 @@ {{ obj.doc.company_introduction or "

About Us

Some Introduction about your company that you would like your website visitor to know. More people than you think will read your About page. People always like to know who the are doing business with. Be authentic and avoid using jargon like 'value added services' etc. Be sure to update your company history and list of key team members in Website > About Us Settings

" }} {% if obj.doclist.get({"doctype":"Company History"}) %}

{{ obj.doc.company_history_heading or "Company History" }}

- - - {% for d in obj.doclist.get({"doctype":"Company History"}) %} - - - - - {% endfor %} - -

{{ d.year }}

{{ d.highlight }}
+ {% for d in obj.doclist.get({"doctype":"Company History"}) %} +
+

{{ d.year }}

 +

{{ d.highlight }}

 +
+ {% endfor %} {% endif %} - {% if obj.doclist.get({"doctype":"Employee"}) %} + {% if obj.doclist.get({"doctype":"About Us Team Member"}) %}

{{ obj.doc.team_members_heading or "Team Members" }}

- - - {% for d in obj.doclist.get({"doctype":"Employee"}) %} - - - - - {% endfor %} - -
-
- -
-

{{ d.employee_name }}

-
{{ d.bio }}
+ {% for d in obj.doclist.get({"doctype":"About Us Team Member"}) %} +
+ +
+ +
+ +

{{ d.full_name }}

+
{{ d.bio }}
+ +
+ {% endfor %} {% endif %} {{ obj.doc.footer or "" }} diff --git a/website/utils.py b/website/utils.py index 921d2fc5f1f..0f62d26b630 100644 --- a/website/utils.py +++ b/website/utils.py @@ -40,7 +40,7 @@ page_map = { } page_settings_map = { - "about": "About Us Settings", + "about": "website.doctype.about_us_settings.about_us_settings.get_args", "contact": "Contact Us Settings", "blog": "website.helpers.blog.get_blog_template_args", "writers": "website.helpers.blog.get_writers_args"