website module: minor updates
This commit is contained in:
parent
7bec21cfe7
commit
ebee1c7033
@ -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
|
||||
|
@ -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"}};
|
||||
|
@ -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",
|
||||
|
@ -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", "<a href='/'><img src='"+ src
|
||||
+"'></a>");
|
||||
+"' style='max-width: 200px;'></a>");
|
||||
}
|
@ -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">
|
||||
|
Loading…
x
Reference in New Issue
Block a user