website module: minor updates
diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py
index 74bf3f3..931b776 100644
--- a/stock/doctype/item/item.py
+++ b/stock/doctype/item/item.py
@@ -238,8 +238,7 @@
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 f4038fb..3e4aac7 100644
--- a/website/doctype/style_settings/custom_template.css
+++ b/website/doctype/style_settings/custom_template.css
@@ -47,10 +47,9 @@
{% 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 @@
{% 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 3f898e7..df266a5 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 <a href=\"http://google.com/webfonts\" target=\"_blank\">Google Web Font</a> 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 <a href=\"http://google.com/webfonts\" target=\"_blank\">Google Web Font</a> 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 a02c3b2..67e4941 100644
--- a/website/doctype/website_settings/website_settings.js
+++ b/website/doctype/website_settings/website_settings.js
@@ -50,5 +50,5 @@
var src = doc.banner_image;
if(src.indexOf("/")==-1) src = "files/" + src;
cur_frm.set_value("banner_html", "<a href='/'><img src='"+ src
- +"'></a>");
+ +"' style='max-width: 200px;'></a>");
}
\ No newline at end of file
diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html
index 5bffe91..1680c7d 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]" }}
</div>
- <hr>
{% if obj.doclist.get({"doctype":"Item Website Specification"}) %}
- <h3>Specifications</h3>
- <table class="table table-bordered" style="width: 100%">
- {% for d in obj.doclist.get(
- {"doctype":"Item Website Specification"}) %}
- <tr>
- <td style="width: 30%;">{{ d.label }}</td>
- <td>{{ d.description }}</td>
- </tr>
- {% endfor %}
- </table>
+ <hr>
+ <h3>Specifications</h3>
+ <table class="table table-bordered" style="width: 100%">
+ {% for d in obj.doclist.get(
+ {"doctype":"Item Website Specification"}) %}
+ <tr>
+ <td style="width: 30%;">{{ d.label }}</td>
+ <td>{{ d.description }}</td>
+ </tr>
+ {% endfor %}
+ </table>
{% endif %}
</div>
<div class="span3">