From ebee1c70337e34bee964465f09766032e2143bf3 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Mar 2013 14:33:31 +0530 Subject: [PATCH 1/7] website module: minor updates --- stock/doctype/item/item.py | 3 +-- .../style_settings/custom_template.css | 11 ++++++---- .../doctype/style_settings/style_settings.txt | 6 ++--- .../website_settings/website_settings.js | 2 +- website/templates/html/product_page.html | 22 +++++++++---------- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py index 74bf3f308c8..931b7762d39 100644 --- a/stock/doctype/item/item.py +++ b/stock/doctype/item/item.py @@ -238,8 +238,7 @@ class DocType(DocListController): from website.helpers.product import get_parent_item_groups, url_for_website self.parent_groups = get_parent_item_groups(self.doc.item_group) + [{"name":self.doc.name}] self.doc.website_image = url_for_website(self.doc.website_image) - self.doc.title = self.doc.item_name == self.doc.name and self.doc.item_name or \ - (self.doc.item_name + " [" + self.doc.name + "]") + self.doc.title = self.doc.item_name if self.doc.slideshow: from website.helpers.slideshow import get_slideshow diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css index f4038fbdcd2..3e4aac76d2d 100644 --- a/website/doctype/style_settings/custom_template.css +++ b/website/doctype/style_settings/custom_template.css @@ -47,10 +47,9 @@ div.outer { {% if doc.page_border %} /* Page Border*/ div.outer { - -moz-box-shadow: 0px 0px 3px rgba(0,0,0,0.9); - -webkit-box-shadow: 0px 0px 3px rgba(0,0,0,0.9); - box-shadow: 0px 0px 3px rgba(0,0,0,0.9); - border-radius: 5px; + box-shadow: 0 0 8px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 0 8px rgba(0, 0, 0, 0.2); + -webkibox-shadow: 0 0 8px rgba(0, 0, 0, 0.2); } {% else %} {% if doc.background_color == doc.page_background %} @@ -61,6 +60,10 @@ div.web-footer { {% endif %} {% endif %} +div.web-footer, div.web-footer a { + color: #{{ get_hex_shade(doc.page_background or "ffffff", 70) }}; +} + /* Bootstrap Navbar */ .navbar-inverse .navbar-inner { background-color: #{{ doc.top_bar_background or "444444"}}; diff --git a/website/doctype/style_settings/style_settings.txt b/website/doctype/style_settings/style_settings.txt index 3f898e72f21..df266a5992c 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 13:35:14", + "modified": "2013-03-14 11:57:20", "modified_by": "Administrator", "owner": "Administrator" }, @@ -150,14 +150,14 @@ "fieldtype": "Column Break" }, { - "description": "Add the name of Google Web Font e.g. \"Open Sans\"", + "description": "Add the name of Google Web Font e.g. \"Open Sans\"", "doctype": "DocField", "fieldname": "google_web_font_for_heading", "fieldtype": "Data", "label": "Google Web Font (Heading)" }, { - "description": "Add the name of Google Web Font e.g. \"Open Sans\"", + "description": "Add the name of Google Web Font e.g. \"Open Sans\"", "doctype": "DocField", "fieldname": "google_web_font_for_text", "fieldtype": "Data", diff --git a/website/doctype/website_settings/website_settings.js b/website/doctype/website_settings/website_settings.js index a02c3b2fcc7..67e494154f7 100644 --- a/website/doctype/website_settings/website_settings.js +++ b/website/doctype/website_settings/website_settings.js @@ -50,5 +50,5 @@ cur_frm.cscript.set_banner_from_image = function(doc) { var src = doc.banner_image; if(src.indexOf("/")==-1) src = "files/" + src; cur_frm.set_value("banner_html", ""); + +"' style='max-width: 200px;'>"); } \ No newline at end of file diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html index 5bffe9133df..1680c7dec52 100644 --- a/website/templates/html/product_page.html +++ b/website/templates/html/product_page.html @@ -36,18 +36,18 @@ {{ web_long_description or web_short_description or "[No description given]" }} -
{% if obj.doclist.get({"doctype":"Item Website Specification"}) %} -

Specifications

- - {% for d in obj.doclist.get( - {"doctype":"Item Website Specification"}) %} - - - - - {% endfor %} -
{{ d.label }}{{ d.description }}
+
+

Specifications

+ + {% for d in obj.doclist.get( + {"doctype":"Item Website Specification"}) %} + + + + + {% endfor %} +
{{ d.label }}{{ d.description }}
{% endif %}
From 1aab4eaf8d8c1a4c641acfbe1b4a00d2fa6938d2 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Mar 2013 15:06:44 +0530 Subject: [PATCH 2/7] website module: minor updates --- website/utils.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/website/utils.py b/website/utils.py index c7fe2f697fc..39e30bad07d 100644 --- a/website/utils.py +++ b/website/utils.py @@ -309,10 +309,6 @@ def url_for_website(url): return url def get_hex_shade(color, percent): - # switch dark and light shades - if int(color, 16) > int("808080", 16): - percent = -percent - # stronger diff for darker shades if int(color, 16) < int("333333", 16): percent = percent * 2 @@ -329,4 +325,11 @@ def get_hex_shade(color, percent): return h r, g, b = color[0:2], color[2:4], color[4:6] - return p(r) + p(g) + p(b) \ No newline at end of file + + # switch dark and light shades + if float(int(r, 16) + int(g, 16) + int(b, 16)) / 3 < 8: + percent = -percent + + return p(r) + p(g) + p(b) + + \ No newline at end of file From 93da8a1b0e3fa71c1de443e84a1f5248b2e93faa Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Mar 2013 15:32:49 +0530 Subject: [PATCH 3/7] website module: minor updates --- website/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/utils.py b/website/utils.py index 39e30bad07d..94d648bf5f9 100644 --- a/website/utils.py +++ b/website/utils.py @@ -327,7 +327,7 @@ def get_hex_shade(color, percent): r, g, b = color[0:2], color[2:4], color[4:6] # switch dark and light shades - if float(int(r, 16) + int(g, 16) + int(b, 16)) / 3 < 8: + if (float(int(r, 16) + int(g, 16) + int(b, 16)) / 3) > 128: percent = -percent return p(r) + p(g) + p(b) From 1ffaaf411018eb6dbd20ef9f690cadf5ede45803 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Mar 2013 15:36:43 +0530 Subject: [PATCH 4/7] website module: minor updates --- website/utils.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/website/utils.py b/website/utils.py index 94d648bf5f9..443bde0b661 100644 --- a/website/utils.py +++ b/website/utils.py @@ -309,9 +309,6 @@ def url_for_website(url): return url def get_hex_shade(color, percent): - # stronger diff for darker shades - if int(color, 16) < int("333333", 16): - percent = percent * 2 def p(c): v = int(c, 16) + int(int('ff', 16) * (float(percent)/100)) @@ -326,9 +323,14 @@ def get_hex_shade(color, percent): r, g, b = color[0:2], color[2:4], color[4:6] - # switch dark and light shades - if (float(int(r, 16) + int(g, 16) + int(b, 16)) / 3) > 128: + avg = (float(int(r, 16) + int(g, 16) + int(b, 16)) / 3) + # switch dark and light shades + if avg > 128: percent = -percent + + # stronger diff for darker shades + if percent < 25 and avg < 64: + percent = percent * 2 return p(r) + p(g) + p(b) From e9bef3cbf0ff8aec6492a400fe2f6a20402dfa2d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Mar 2013 15:39:43 +0530 Subject: [PATCH 5/7] website module: minor updates --- website/doctype/style_settings/custom_template.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css index 3e4aac76d2d..b7e381bb801 100644 --- a/website/doctype/style_settings/custom_template.css +++ b/website/doctype/style_settings/custom_template.css @@ -61,7 +61,7 @@ div.web-footer { {% endif %} div.web-footer, div.web-footer a { - color: #{{ get_hex_shade(doc.page_background or "ffffff", 70) }}; + color: #{{ get_hex_shade(doc.background_color or "ffffff", 70) }}; } /* Bootstrap Navbar */ From cb6cf710bb38c47447f22792867a1c06593ac402 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Mar 2013 16:45:28 +0530 Subject: [PATCH 6/7] website module: product page update --- website/templates/html/product_page.html | 41 +++++++++++------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html index 1680c7dec52..0a19efe5065 100644 --- a/website/templates/html/product_page.html +++ b/website/templates/html/product_page.html @@ -11,34 +11,31 @@ {% block content %} {% include 'html/product_search_box.html' %} {% include 'html/product_breadcrumbs.html' %} -
-

{{ item_name }}

-

Item Code: {{ name }}

-
- {% if slideshow %} - {% include "html/slideshow.html" %} - {% else %} - {% if website_image %} - - {% else %} -
- {% include 'html/product_missing_image.html' %} -
- {% endif %} - {% endif %} -

-
-

Product Description

+
+ {% if slideshow %} + {% include "html/slideshow.html" %} + {% else %} + {% if website_image %} + + {% else %} +
+ {% include 'html/product_missing_image.html' %} +
+ {% endif %} + {% endif %} +
+
+

{{ item_name }}

+

Item Code: {{ name }}

+

Product Description

{{ web_long_description or web_short_description or "[No description given]" }}
{% if obj.doclist.get({"doctype":"Item Website Specification"}) %} -
-

Specifications

+

Specifications

{% for d in obj.doclist.get( {"doctype":"Item Website Specification"}) %} @@ -49,8 +46,6 @@ {% endfor %}
{% endif %} -
-

Price:

From 37db2233298bded11a0f95e45d56f0518cb00dfe Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 15 Mar 2013 11:29:25 +0530 Subject: [PATCH 7/7] make blog as raw content --- website/doctype/style_settings/custom_template.css | 1 + website/helpers/blog_feed.py | 3 +-- website/templates/css/login.css | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css index b7e381bb801..712c748cb83 100644 --- a/website/doctype/style_settings/custom_template.css +++ b/website/doctype/style_settings/custom_template.css @@ -61,6 +61,7 @@ div.web-footer { {% endif %} div.web-footer, div.web-footer a { + font-size: 90%; color: #{{ get_hex_shade(doc.background_color or "ffffff", 70) }}; } diff --git a/website/helpers/blog_feed.py b/website/helpers/blog_feed.py index c59a419fc6d..ce1555649b7 100644 --- a/website/helpers/blog_feed.py +++ b/website/helpers/blog_feed.py @@ -57,13 +57,12 @@ def generate(): items = '' blog_list = webnotes.conn.sql("""\ - select page_name as name, modified, creation, title from `tabBlog Post` + select page_name as name, modified, creation, title, content from `tabBlog Post` where ifnull(published,0)=1 order by creation desc, modified desc, name asc limit 20""", as_dict=1) for blog in blog_list: blog.link = host + '/' + blog.name + '.html' - blog.content = get_blog_content(blog.name) items += rss_item % blog diff --git a/website/templates/css/login.css b/website/templates/css/login.css index 710f88944b1..c2a7af2521f 100644 --- a/website/templates/css/login.css +++ b/website/templates/css/login.css @@ -6,6 +6,7 @@ .layout-wrapper { background-color: #fff; + color: #333; padding: 10px; box-shadow: 1px 1px 3px 3px #ccc; font-size: 12px;