Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

website module: minor updates

Browse Source
This commit is contained in:
Rushabh Mehta 2013-03-14 14:33:31 +05:30
parent 7bec21cfe7
commit ebee1c7033
5 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stock/doctype/item/item.py
View File

@ -238,8 +238,7 @@ class DocType(DocListController):
from website.helpers.product import get_parent_item_groups, url_for_website 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.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.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.title = self.doc.item_name
(self.doc.item_name + " [" + self.doc.name + "]")
if self.doc.slideshow: if self.doc.slideshow:
from website.helpers.slideshow import get_slideshow from website.helpers.slideshow import get_slideshow

11
website/doctype/style_settings/custom_template.css
View File

@ -47,10 +47,9 @@ div.outer {
{% if doc.page_border %} {% if doc.page_border %}
/* Page Border*/ /* Page Border*/
div.outer { div.outer {
-moz-box-shadow: 0px 0px 3px rgba(0,0,0,0.9); box-shadow: 0 0 8px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0px 0px 3px rgba(0,0,0,0.9); -moz-box-shadow: 0 0 8px rgba(0, 0, 0, 0.2);
box-shadow: 0px 0px 3px rgba(0,0,0,0.9); -webkibox-shadow: 0 0 8px rgba(0, 0, 0, 0.2);
border-radius: 5px;
} }
{% else %} {% else %}
{% if doc.background_color == doc.page_background %} {% if doc.background_color == doc.page_background %}
@ -61,6 +60,10 @@ div.web-footer {
{% endif %} {% endif %}
{% endif %} {% endif %}
div.web-footer, div.web-footer a {
color: #{{ get_hex_shade(doc.page_background or "ffffff", 70) }};
}
/* Bootstrap Navbar */ /* Bootstrap Navbar */
.navbar-inverse .navbar-inner { .navbar-inverse .navbar-inner {
background-color: #{{ doc.top_bar_background or "444444"}}; background-color: #{{ doc.top_bar_background or "444444"}};

6
website/doctype/style_settings/style_settings.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-03-08 11:36:53", "creation": "2013-03-08 11:36:53",
"docstatus": 0, "docstatus": 0,
"modified": "2013-03-12 13:35:14", "modified": "2013-03-14 11:57:20",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -150,14 +150,14 @@
"fieldtype": "Column Break" "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", "doctype": "DocField",
"fieldname": "google_web_font_for_heading", "fieldname": "google_web_font_for_heading",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Google Web Font (Heading)" "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", "doctype": "DocField",
"fieldname": "google_web_font_for_text", "fieldname": "google_web_font_for_text",
"fieldtype": "Data", "fieldtype": "Data",

2
website/doctype/website_settings/website_settings.js
View File

@ -50,5 +50,5 @@ cur_frm.cscript.set_banner_from_image = function(doc) {
var src = doc.banner_image; var src = doc.banner_image;
if(src.indexOf("/")==-1) src = "files/" + src; if(src.indexOf("/")==-1) src = "files/" + src;
cur_frm.set_value("banner_html", "<a href='/'><img src='"+ src cur_frm.set_value("banner_html", "<a href='/'><img src='"+ src
+"'></a>"); +"' style='max-width: 200px;'></a>");
} }

22
website/templates/html/product_page.html
View File

@ -36,18 +36,18 @@
{{ web_long_description or web_short_description or {{ web_long_description or web_short_description or
"[No description given]" }} "[No description given]" }}
</div> </div>
<hr>
{% if obj.doclist.get({"doctype":"Item Website Specification"}) %} {% if obj.doclist.get({"doctype":"Item Website Specification"}) %}
<h3>Specifications</h3> <hr>
<table class="table table-bordered" style="width: 100%"> <h3>Specifications</h3>
{% for d in obj.doclist.get( <table class="table table-bordered" style="width: 100%">
{"doctype":"Item Website Specification"}) %} {% for d in obj.doclist.get(
<tr> {"doctype":"Item Website Specification"}) %}
<td style="width: 30%;">{{ d.label }}</td> <tr>
<td>{{ d.description }}</td> <td style="width: 30%;">{{ d.label }}</td>
</tr> <td>{{ d.description }}</td>
{% endfor %} </tr>
</table> {% endfor %}
</table>
{% endif %} {% endif %}
</div> </div>
<div class="span3"> <div class="span3">