mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-14 02:31:21 +00:00
Merge branch 'master' into edge
This commit is contained in:
Rushabh Mehta
@@ -1,17 +1,12 @@
|
||||
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);
|
||||
background-color: #fff;
|
||||
border-radius: 5px;
|
||||
padding: 20px;
|
||||
margin: 30px -20px 10px -20px;
|
||||
padding: 30px;
|
||||
margin: 30px -30px 10px -30px;
|
||||
min-height: 400px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.outer .navbar {
|
||||
margin: -20px -20px 10px -20px;
|
||||
margin: -30px -30px 10px -30px;
|
||||
}
|
||||
|
||||
footer {
|
||||
@@ -24,6 +19,8 @@ footer {
|
||||
border: 0px;
|
||||
border-bottom: 1px solid #ddd;
|
||||
border-radius: 0px;
|
||||
padding-right: 30px;
|
||||
padding-left: 30px;
|
||||
}
|
||||
|
||||
p, li {
|
||||
@@ -98,6 +95,18 @@ p, li {
|
||||
width: 30px;
|
||||
}
|
||||
|
||||
.avatar-medium {
|
||||
margin-right: 5px;
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
border-radius: 48px;
|
||||
-moz-border-radius: 48px;
|
||||
-webkit-border-radius: 48px;
|
||||
}
|
||||
.avatar-medium img {
|
||||
width: 48px;
|
||||
}
|
||||
|
||||
.avatar-large {
|
||||
margin-right: 10px;
|
||||
width: 72px;
|
||||
@@ -121,5 +130,3 @@ p, li {
|
||||
.avatar-x-large img {
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
/* */
|
||||
@@ -18,6 +18,7 @@ from __future__ import unicode_literals
|
||||
|
||||
import webnotes
|
||||
import website.utils
|
||||
from webnotes import _
|
||||
|
||||
class DocType:
|
||||
def __init__(self, d, dl):
|
||||
@@ -27,6 +28,9 @@ class DocType:
|
||||
from website.utils import page_name
|
||||
self.doc.name = page_name(self.doc.title)
|
||||
|
||||
def validate(self):
|
||||
self.doc.blog_intro = self.doc.blog_intro[:140]
|
||||
|
||||
def on_update(self):
|
||||
from website.utils import update_page_name
|
||||
update_page_name(self.doc, self.doc.title)
|
||||
@@ -66,6 +70,20 @@ class DocType:
|
||||
self.doc.full_name = get_fullname(self.doc.owner)
|
||||
self.doc.updated = global_date_format(self.doc.creation)
|
||||
self.doc.content_html = self.doc.content
|
||||
if self.doc.blogger:
|
||||
self.doc.blogger_info = webnotes.doc("blogger", self.doc.blogger).fields
|
||||
if self.doc.blogger_info.avatar and not "/" in self.doc.blogger_info.avatar:
|
||||
self.doc.blogger_info.avatar = "files/" + self.doc.blogger_info.avatar
|
||||
|
||||
self.doc.categories = webnotes.conn.sql_list("select name from `tabBlog Category` order by name")
|
||||
|
||||
self.doc.texts = {
|
||||
"comments": _("Comments"),
|
||||
"first_comment": _("Be the first one to comment"),
|
||||
"add_comment": _("Add Comment"),
|
||||
"submit": _("Submit"),
|
||||
"all_posts_by": _("All posts by"),
|
||||
}
|
||||
|
||||
comment_list = webnotes.conn.sql("""\
|
||||
select comment, comment_by_fullname, creation
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"creation": "2013-01-25 11:35:09",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-02-21 16:54:04",
|
||||
"modified": "2013-03-08 09:41:37",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -50,18 +50,44 @@
|
||||
"label": "Published"
|
||||
},
|
||||
{
|
||||
"description": "Description for listing page, in plain text, only a couple of lines.",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "column_break_3",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "blogger",
|
||||
"fieldtype": "Link",
|
||||
"label": "Blogger",
|
||||
"options": "Blogger",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "blog_category",
|
||||
"fieldtype": "Link",
|
||||
"label": "Blog Category",
|
||||
"options": "Blog Category"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "section_break_5",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"description": "Description for listing page, in plain text, only a couple of lines. (max 140 characters)",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "blog_intro",
|
||||
"fieldtype": "Small Text",
|
||||
"label": "Blog Intro"
|
||||
"label": "Blog Intro",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "content",
|
||||
"fieldtype": "Text Editor",
|
||||
"label": "Content",
|
||||
"reqd": 0
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
|
||||
0
website/doctype/blog_category/__init__.py
Normal file
0
website/doctype/blog_category/__init__.py
Normal file
14
website/doctype/blog_category/blog_category.py
Normal file
14
website/doctype/blog_category/blog_category.py
Normal file
@@ -0,0 +1,14 @@
|
||||
# For license information, please see license.txt
|
||||
|
||||
from __future__ import unicode_literals
|
||||
import webnotes
|
||||
|
||||
class DocType:
|
||||
def __init__(self, d, dl):
|
||||
self.doc, self.doclist = d, dl
|
||||
|
||||
def on_update(self):
|
||||
# for blog footer
|
||||
from website.utils import clear_cache
|
||||
clear_cache()
|
||||
|
||||
51
website/doctype/blog_category/blog_category.txt
Normal file
51
website/doctype/blog_category/blog_category.txt
Normal file
@@ -0,0 +1,51 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-03-08 09:41:11",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-03-08 09:41:11",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
{
|
||||
"autoname": "field:category_name",
|
||||
"doctype": "DocType",
|
||||
"document_type": "Master",
|
||||
"module": "Website",
|
||||
"name": "__common__"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "category_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Category Name",
|
||||
"name": "__common__",
|
||||
"parent": "Blog Category",
|
||||
"parentfield": "fields",
|
||||
"parenttype": "DocType",
|
||||
"permlevel": 0,
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"cancel": 1,
|
||||
"create": 1,
|
||||
"doctype": "DocPerm",
|
||||
"name": "__common__",
|
||||
"parent": "Blog Category",
|
||||
"parentfield": "permissions",
|
||||
"parenttype": "DocType",
|
||||
"permlevel": 0,
|
||||
"read": 1,
|
||||
"role": "Website Manager",
|
||||
"write": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocType",
|
||||
"name": "Blog Category"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField"
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm"
|
||||
}
|
||||
]
|
||||
0
website/doctype/blogger/__init__.py
Normal file
0
website/doctype/blogger/__init__.py
Normal file
18
website/doctype/blogger/blogger.py
Normal file
18
website/doctype/blogger/blogger.py
Normal file
@@ -0,0 +1,18 @@
|
||||
# For license information, please see license.txt
|
||||
|
||||
from __future__ import unicode_literals
|
||||
import webnotes
|
||||
|
||||
class DocType:
|
||||
def __init__(self, d, dl):
|
||||
self.doc, self.doclist = d, dl
|
||||
|
||||
def on_update(self):
|
||||
"if profile is set, then update all older blogs"
|
||||
if self.doc.profile:
|
||||
for blog in webnotes.conn.sql_list("""select name from tabBlog where owner=%s
|
||||
and ifnull(blogger,'')=''""", self.doc.profile):
|
||||
b = webnotes.bean("Blog", blog)
|
||||
b.blogger = self.doc.name
|
||||
b.save()
|
||||
|
||||
95
website/doctype/blogger/blogger.txt
Normal file
95
website/doctype/blogger/blogger.txt
Normal file
@@ -0,0 +1,95 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-03-07 16:28:19",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-03-07 16:33:37",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
{
|
||||
"allow_attach": 1,
|
||||
"autoname": "field:short_name",
|
||||
"description": "Profile of a Blogger",
|
||||
"doctype": "DocType",
|
||||
"document_type": "Master",
|
||||
"max_attachments": 1,
|
||||
"module": "Website",
|
||||
"name": "__common__"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"name": "__common__",
|
||||
"parent": "Blogger",
|
||||
"parentfield": "fields",
|
||||
"parenttype": "DocType",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm",
|
||||
"name": "__common__",
|
||||
"parent": "Blogger",
|
||||
"parentfield": "permissions",
|
||||
"parenttype": "DocType",
|
||||
"permlevel": 0,
|
||||
"read": 1,
|
||||
"write": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocType",
|
||||
"name": "Blogger"
|
||||
},
|
||||
{
|
||||
"description": "Will be used in url (usually first name).",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "short_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Short Name",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "full_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Full Name",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "profile",
|
||||
"fieldtype": "Link",
|
||||
"label": "Profile",
|
||||
"options": "Profile"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "bio",
|
||||
"fieldtype": "Small Text",
|
||||
"label": "Bio"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "avatar",
|
||||
"fieldtype": "Select",
|
||||
"label": "Avatar",
|
||||
"options": "attach_files:"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "file_list",
|
||||
"fieldtype": "Text",
|
||||
"hidden": 1,
|
||||
"label": "File List",
|
||||
"no_copy": 1,
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
"create": 1,
|
||||
"doctype": "DocPerm",
|
||||
"role": "Website Manager"
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm",
|
||||
"match": "owner:profile",
|
||||
"role": "Blogger"
|
||||
}
|
||||
]
|
||||
@@ -1,3 +1,7 @@
|
||||
{% if doc.at_import %}
|
||||
{{ doc.at_import }}
|
||||
{% endif %}
|
||||
|
||||
body {
|
||||
{% if doc.background_image %}
|
||||
background: url("../files/{{ doc.background_image }}") repeat;
|
||||
@@ -7,8 +11,8 @@ body {
|
||||
{% else %}
|
||||
background-color: #edede7;
|
||||
{% endif %}
|
||||
{% if doc.font %}
|
||||
font-family: '{{ doc.font }}', Verdana, Sans !important;
|
||||
{% if doc.font or doc.google_web_font_for_text %}
|
||||
font-family: '{{ doc.google_web_font_for_text or doc.font }}', Verdana, Sans !important;
|
||||
{% endif %}
|
||||
{% if doc.font_size %}
|
||||
font-size: {{ doc.font_size }} !important;
|
||||
@@ -21,8 +25,106 @@ body {
|
||||
}
|
||||
{% endif %}
|
||||
|
||||
{% if doc.heading_font %}
|
||||
div.outer {
|
||||
background-color: #{{ doc.page_background or "fff" }};
|
||||
}
|
||||
|
||||
{% if doc.google_web_font_for_heading or doc.heading_font %}
|
||||
h1, h2, h3, h4, h5 {
|
||||
font-family: '{{ doc.heading_font}}', Arial, 'Helvetica Neue' !important;
|
||||
font-family: '{{ doc.google_web_font_for_heading or doc.heading_font }}', Arial, 'Helvetica Neue' !important;
|
||||
}
|
||||
{% endif %}
|
||||
{% if doc.heading_text_as %}
|
||||
h1, h2, h3, h4, h5 {
|
||||
text-transform: {{ doc.heading_text_as }};
|
||||
}
|
||||
{% endif %}
|
||||
|
||||
{% 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;
|
||||
}
|
||||
{% else %}
|
||||
div.web-footer {
|
||||
border-top: 1px solid #eee;
|
||||
padding-top: 10px;
|
||||
}
|
||||
{% endif %}
|
||||
|
||||
/* Bootstrap Navbar */
|
||||
.navbar-inverse .navbar-inner {
|
||||
background-color: #{{ doc.top_bar_background or "444"}};
|
||||
background-repeat: repeat-x;
|
||||
border-color: transparent;
|
||||
background-image: none;
|
||||
}
|
||||
|
||||
.navbar-inverse .brand,
|
||||
.navbar-inverse .nav > li > a {
|
||||
color: #{{ doc.top_bar_foreground or "fff"}};
|
||||
text-shadow: none;
|
||||
}
|
||||
|
||||
.navbar-inverse .brand:hover,
|
||||
.navbar-inverse .nav > li > a:hover,
|
||||
.navbar-inverse .brand:focus,
|
||||
.navbar-inverse .nav > li > a:focus {
|
||||
color: #{{ doc.top_bar_foreground or "fff"}};
|
||||
}
|
||||
|
||||
.navbar-inverse .brand {
|
||||
color: #{{ doc.top_bar_foreground or "fff"}};
|
||||
}
|
||||
|
||||
.navbar-inverse .navbar-text {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.navbar-inverse .nav > li > a:focus,
|
||||
.navbar-inverse .nav > li > a:hover {
|
||||
color: #{{ doc.top_bar_foreground or "fff"}};
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.navbar-inverse .nav .active > a,
|
||||
.navbar-inverse .nav .active > a:hover,
|
||||
.navbar-inverse .nav .active > a:focus {
|
||||
color: #{{ doc.top_bar_foreground or "fff"}};
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.navbar-inverse .navbar-link {
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
.navbar-inverse .navbar-link:hover,
|
||||
.navbar-inverse .navbar-link:focus {
|
||||
color: #{{ doc.top_bar_foreground or "fff"}};
|
||||
}
|
||||
|
||||
.navbar-fixed-top .navbar-inner,
|
||||
.navbar-static-top .navbar-inner {
|
||||
-webkit-box-shadow: none;
|
||||
-moz-box-shadow: none;
|
||||
box-shadow: none;
|
||||
|
||||
}
|
||||
.navbar .nav > .active > a,
|
||||
.navbar .nav > .active > a:hover,
|
||||
.navbar .nav > .active > a:focus {
|
||||
color: #424242;
|
||||
text-decoration: none;
|
||||
background-color: transparent;
|
||||
-webkit-box-shadow: none;
|
||||
-moz-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
|
||||
border-top-color: #{{ doc.top_bar_foreground or "fff"}};
|
||||
border-bottom-color: #{{ doc.top_bar_foreground or "fff"}};
|
||||
}
|
||||
|
||||
@@ -18,5 +18,7 @@
|
||||
cur_frm.cscript.onload_post_render = function() {
|
||||
wn.require('lib/public/js/lib/jscolor/jscolor.js');
|
||||
cur_frm.fields_dict.background_color.input.className = 'color';
|
||||
cur_frm.fields_dict.page_background.input.className = 'color';
|
||||
cur_frm.fields_dict.top_bar_background.input.className = 'color';
|
||||
jscolor.bind();
|
||||
}
|
||||
@@ -15,6 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from __future__ import unicode_literals
|
||||
from webnotes.utils import cint, cstr
|
||||
|
||||
class DocType:
|
||||
def __init__(self, d, dl):
|
||||
self.doc, self.doclist = d, dl
|
||||
@@ -29,10 +31,7 @@ class DocType:
|
||||
'custom_template.css'), 'r') as f:
|
||||
temp = Template(f.read())
|
||||
|
||||
if not self.doc.font_size:
|
||||
self.doc.font_size = '13px'
|
||||
|
||||
self.doc.small_font_size = str(int(self.doc.font_size[:-2])-2) + 'px'
|
||||
self.prepare()
|
||||
|
||||
self.doc.custom_css = temp.render(doc = self.doc)
|
||||
if self.doc.add_css:
|
||||
@@ -41,7 +40,36 @@ class DocType:
|
||||
from webnotes.sessions import clear_cache
|
||||
clear_cache('Guest')
|
||||
|
||||
del self.doc.fields['small_font_size']
|
||||
for f in ["small_font_size", "at_import"]:
|
||||
if f in self.doc.fields:
|
||||
del self.doc.fields[f]
|
||||
|
||||
def prepare(self):
|
||||
if not self.doc.font_size:
|
||||
self.doc.font_size = '13px'
|
||||
|
||||
self.doc.small_font_size = cstr(cint(self.doc.font_size[:-2])-2) + 'px'
|
||||
self.doc.page_border = cint(self.doc.page_border)
|
||||
|
||||
fonts = []
|
||||
if self.doc.google_web_font_for_heading:
|
||||
fonts.append(self.doc.google_web_font_for_heading)
|
||||
if self.doc.google_web_font_for_text:
|
||||
fonts.append(self.doc.google_web_font_for_text)
|
||||
|
||||
fonts = list(set(fonts))
|
||||
|
||||
if self.doc.heading_text_as:
|
||||
self.doc.heading_text_as = {
|
||||
"UPPERCASE": "uppercase",
|
||||
"Title Case":"capitalize",
|
||||
"lowercase": "lowercase"
|
||||
}[self.doc.heading_text_as]
|
||||
|
||||
self.doc.at_import = ""
|
||||
for f in fonts:
|
||||
self.doc.at_import += "\n@import url(http://fonts.googleapis.com/css?family=%s);" % f.replace(" ", "+")
|
||||
|
||||
|
||||
def on_update(self):
|
||||
"""rebuild pages"""
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-01-10 16:34:32",
|
||||
"creation": "2013-01-25 11:35:10",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-01-22 14:57:25",
|
||||
"modified": "2013-03-08 09:58:49",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -24,23 +24,26 @@
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"create": 1,
|
||||
"doctype": "DocPerm",
|
||||
"name": "__common__",
|
||||
"parent": "Style Settings",
|
||||
"parentfield": "permissions",
|
||||
"parenttype": "DocType",
|
||||
"permlevel": 0,
|
||||
"read": 1,
|
||||
"report": 1,
|
||||
"report": 0,
|
||||
"role": "Website Manager",
|
||||
"submit": 0,
|
||||
"write": 1
|
||||
"submit": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocType",
|
||||
"name": "Style Settings"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "color",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Color"
|
||||
},
|
||||
{
|
||||
"description": "If image is selected, color will be ignored (attach first)",
|
||||
"doctype": "DocField",
|
||||
@@ -56,6 +59,18 @@
|
||||
"fieldtype": "Data",
|
||||
"label": "Background Color"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "page_background",
|
||||
"fieldtype": "Data",
|
||||
"label": "Page Background"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "page_border",
|
||||
"fieldtype": "Check",
|
||||
"label": "Page Border"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "cb0",
|
||||
@@ -63,26 +78,72 @@
|
||||
"print_width": "50%",
|
||||
"width": "50%"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "top_bar_background",
|
||||
"fieldtype": "Data",
|
||||
"label": "Top Bar Background"
|
||||
},
|
||||
{
|
||||
"description": "000 is black, fff is white",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "top_bar_foreground",
|
||||
"fieldtype": "Select",
|
||||
"label": "Top Bar Foreground",
|
||||
"options": "000\nFFF"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "fonts",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Fonts"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "heading_font",
|
||||
"fieldtype": "Select",
|
||||
"label": "Font (Heading)",
|
||||
"options": "\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "font",
|
||||
"fieldtype": "Select",
|
||||
"label": "Font",
|
||||
"label": "Font (Text)",
|
||||
"options": "\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "font_size",
|
||||
"fieldtype": "Select",
|
||||
"label": "Font Size",
|
||||
"label": "Font Size (Text)",
|
||||
"options": "\n12px\n13px\n14px\n15px\n16px"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "heading_font",
|
||||
"fieldname": "heading_text_as",
|
||||
"fieldtype": "Select",
|
||||
"label": "Heading Font",
|
||||
"options": "\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans"
|
||||
"label": "Heading Text As",
|
||||
"options": "\nUPPERCASE\nTitle Case\nlowercase"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "column_break_13",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"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\"",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "google_web_font_for_text",
|
||||
"fieldtype": "Data",
|
||||
"label": "Google Web Font (Text)"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
@@ -115,6 +176,16 @@
|
||||
"print_hide": 1
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm"
|
||||
"create": 1,
|
||||
"doctype": "DocPerm",
|
||||
"permlevel": 0,
|
||||
"write": 1
|
||||
},
|
||||
{
|
||||
"amend": 0,
|
||||
"cancel": 0,
|
||||
"create": 0,
|
||||
"doctype": "DocPerm",
|
||||
"permlevel": 1
|
||||
}
|
||||
]
|
||||
@@ -31,9 +31,6 @@ class DocType:
|
||||
from website.utils import clear_cache
|
||||
clear_cache()
|
||||
|
||||
from webnotes.sessions import clear_cache
|
||||
clear_cache('Guest')
|
||||
|
||||
def set_home_page(self):
|
||||
|
||||
import webnotes
|
||||
|
||||
@@ -4,41 +4,44 @@
|
||||
from __future__ import unicode_literals
|
||||
import webnotes
|
||||
import website.utils
|
||||
from webnotes import _
|
||||
|
||||
@webnotes.whitelist(allow_guest=True)
|
||||
def get_blog_list(args=None):
|
||||
"""
|
||||
args = {
|
||||
'start': 0,
|
||||
}
|
||||
"""
|
||||
def get_blog_list(start=0, by=None, category=None):
|
||||
import webnotes
|
||||
|
||||
if not args: args = webnotes.form_dict
|
||||
|
||||
condition = ""
|
||||
if by:
|
||||
condition = " and t1.blogger='%s'" % by.replace("'", "\'")
|
||||
if category:
|
||||
condition += " and t1.blog_category='%s'" % category.replace("'", "\'")
|
||||
query = """\
|
||||
select
|
||||
name, page_name, content, owner, creation as creation,
|
||||
title, (select count(name) from `tabComment` where
|
||||
comment_doctype='Blog' and comment_docname=`tabBlog`.name) as comments
|
||||
from `tabBlog`
|
||||
where ifnull(published,0)=1
|
||||
t1.title, t1.name, t1.page_name, t1.creation as creation,
|
||||
ifnull(t1.blog_intro, t1.content) as content,
|
||||
t2.full_name, t2.avatar, t1.blogger,
|
||||
(select count(name) from `tabComment` where
|
||||
comment_doctype='Blog' and comment_docname=t1.name) as comments
|
||||
from `tabBlog` t1, `tabBlogger` t2
|
||||
where ifnull(t1.published,0)=1
|
||||
and t1.blogger = t2.name
|
||||
%(condition)s
|
||||
order by creation desc, name asc
|
||||
limit %s, 5""" % args.start
|
||||
limit %(start)s, 5""" % {"start": start, "condition": condition}
|
||||
|
||||
result = webnotes.conn.sql(query, args, as_dict=1)
|
||||
result = webnotes.conn.sql(query, as_dict=1)
|
||||
|
||||
# strip html tags from content
|
||||
import webnotes.utils
|
||||
|
||||
for res in result:
|
||||
from webnotes.utils import global_date_format, get_fullname
|
||||
res['full_name'] = get_fullname(res['owner'])
|
||||
res['published'] = global_date_format(res['creation'])
|
||||
if not res['content']:
|
||||
res['content'] = website.utils.get_html(res['page_name'])
|
||||
res['content'] = split_blog_content(res['content'])
|
||||
|
||||
res['content'] = res['content'][:140]
|
||||
if res.avatar and not "/" in res.avatar:
|
||||
res.avatar = "files/" + res.avatar
|
||||
|
||||
return result
|
||||
|
||||
@webnotes.whitelist(allow_guest=True)
|
||||
@@ -115,10 +118,22 @@ def get_blog_content(blog_page_name):
|
||||
import webnotes.utils
|
||||
content = webnotes.utils.escape_html(content)
|
||||
return content
|
||||
|
||||
def get_blog_template_args():
|
||||
return {
|
||||
"categories": webnotes.conn.sql_list("select name from `tabBlog Category` order by name")
|
||||
}
|
||||
|
||||
def split_blog_content(content):
|
||||
content = content.split("<!-- begin blog content -->")
|
||||
content = len(content) > 1 and content[1] or content[0]
|
||||
content = content.split("<!-- end blog content -->")
|
||||
content = content[0]
|
||||
return content
|
||||
def get_writers_args():
|
||||
bloggers = webnotes.conn.sql("select * from `tabBlogger` order by full_name", as_dict=1)
|
||||
for blogger in bloggers:
|
||||
if blogger.avatar and not "/" in blogger.avatar:
|
||||
blogger.avatar = "files/" + blogger.avatar
|
||||
|
||||
return {
|
||||
"bloggers": bloggers,
|
||||
"texts": {
|
||||
"all_posts_by": _("All posts by")
|
||||
},
|
||||
"categories": webnotes.conn.sql_list("select name from `tabBlog Category` order by name")
|
||||
}
|
||||
@@ -11,11 +11,6 @@ wn.module_page["Website"] = [
|
||||
description: wn._("Content web page."),
|
||||
doctype:"Web Page"
|
||||
},
|
||||
{
|
||||
label: wn._("Blog"),
|
||||
description: wn._("Blog entry."),
|
||||
doctype:"Blog"
|
||||
},
|
||||
{
|
||||
label: wn._("Website Slideshow"),
|
||||
description: wn._("Embed image slideshows in website pages."),
|
||||
@@ -23,6 +18,28 @@ wn.module_page["Website"] = [
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
title: wn._("Blog"),
|
||||
icon: "icon-edit",
|
||||
items: [
|
||||
{
|
||||
label: wn._("Blog"),
|
||||
description: wn._("Blog post."),
|
||||
doctype:"Blog"
|
||||
},
|
||||
{
|
||||
label: wn._("Blogger"),
|
||||
description: wn._("Profile of a blog writer."),
|
||||
doctype:"Blogger"
|
||||
},
|
||||
{
|
||||
label: wn._("Blog Category"),
|
||||
description: wn._("Categorize blog posts."),
|
||||
doctype:"Blogger"
|
||||
},
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
title: wn._("Website Overall Settings"),
|
||||
icon: "icon-wrench",
|
||||
|
||||
13
website/templates/html/blog_footer.html
Normal file
13
website/templates/html/blog_footer.html
Normal file
@@ -0,0 +1,13 @@
|
||||
<div class="span12">
|
||||
<hr />
|
||||
{% if categories %}
|
||||
<h5>Explore posts by categories</h5>
|
||||
<ul class="breadcrumb" style="background-color: transparent; padding-left: 0px;">
|
||||
{% for category in categories %}
|
||||
<li><a href="blog?category={{ category }}">{{ category }}</a>
|
||||
{% if not loop.last %}<span class="divider">/</span>{% endif %}</li>
|
||||
{% endfor %}
|
||||
<br><br>
|
||||
{% endif %}
|
||||
<p>Show posts by <a href="blog">everyone</a>. Meet the <a href="writers">writers</a> of this blog</p>
|
||||
</div>
|
||||
@@ -13,41 +13,41 @@
|
||||
<h2>{{ title }}</h2>
|
||||
|
||||
<!-- begin blog content -->
|
||||
<div class="help">By {{ full_name }} on {{ updated }}</div>
|
||||
<div class="help" style="color: #aaa">
|
||||
{{ blogger_info and blogger_info.full_name or full_name }} / {{ updated }}</div>
|
||||
<br>
|
||||
{{ content_html }}
|
||||
<!-- end blog content -->
|
||||
|
||||
{% if blogger_info %}
|
||||
<hr />
|
||||
{% include "html/blogger.html" %}
|
||||
{% endif %}
|
||||
<hr>
|
||||
<h3>Comments</h3><br>
|
||||
<h3>{{ texts.comments }}</h3><br>
|
||||
<div class="blog-comments">
|
||||
|
||||
{% if not comment_list %}
|
||||
<div class="alert no-comment">
|
||||
<p>Be the first one to comment</p>
|
||||
<div class="no-comment">
|
||||
<p>{{ texts.first_comment }}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% include 'html/comment.html' %}
|
||||
</div>
|
||||
<div><button class="btn add-comment">Add Comment</button></div>
|
||||
<div><button class="btn add-comment">{{ texts.add_comment }}</button></div>
|
||||
<div style="display: none; margin-top: 10px;"
|
||||
id="comment-form" class="well">
|
||||
id="comment-form">
|
||||
<div class="alert" style="display:none;"></div>
|
||||
<form>
|
||||
<p>
|
||||
<input name="comment_by_fullname" placeholder="Your Name" />
|
||||
</p>
|
||||
<p>
|
||||
<input name="comment_by" placeholder="Your Email Id" />
|
||||
</p>
|
||||
<p>
|
||||
<fieldset>
|
||||
<input name="comment_by_fullname" placeholder="Your Name" type="text"/><br>
|
||||
<input name="comment_by" placeholder="Your Email Id" type="text"/><br>
|
||||
<textarea name="comment" placeholder="Comment" style="width: 300px; height: 120px;"/>
|
||||
</textarea>
|
||||
</p>
|
||||
<p>
|
||||
<button class="btn btn-info" id="submit-comment">Submit</button>
|
||||
</textarea><br>
|
||||
<button class="btn btn-info" id="submit-comment">{{ texts.submit }}</button>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% include 'html/blog_footer.html' %}
|
||||
{% endblock %}
|
||||
13
website/templates/html/blogger.html
Normal file
13
website/templates/html/blogger.html
Normal file
@@ -0,0 +1,13 @@
|
||||
<div class="row">
|
||||
<div class="span2">
|
||||
<div class="avatar avatar-large">
|
||||
<img src="{{ blogger_info.avatar }}" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="span10">
|
||||
<h4>{{ blogger_info.full_name }}</h4>
|
||||
<p style="color: #999">{{ blogger_info.bio }}</p>
|
||||
<p><a href="blog?by={{ blogger_info.name }}&by_name={{ blogger_info.full_name }}">
|
||||
{{ texts.all_posts_by }} {{ blogger_info.full_name }}</a></p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -6,7 +6,7 @@
|
||||
<div class="container">
|
||||
<div class="outer">
|
||||
<div class="navbar{% if top_bar_background=="Black" %} navbar-inverse{% endif %}"
|
||||
style="margin-bottom: 0px;">
|
||||
style="">
|
||||
<div class="navbar-inner">
|
||||
<a class="brand" href="index">{{ brand_html }}</a>
|
||||
<div class="container">
|
||||
|
||||
@@ -23,6 +23,15 @@ $(document).ready(function() {
|
||||
$("#next-page").click(function() {
|
||||
blog.get_list();
|
||||
})
|
||||
|
||||
if(get_url_arg("by_name")) {
|
||||
$("#blog-title").html("Posts by " + get_url_arg("by_name"));
|
||||
}
|
||||
|
||||
if(get_url_arg("category")) {
|
||||
$("#blog-title").html("Posts filed under " + get_url_arg("category"));
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
var blog = {
|
||||
@@ -33,10 +42,13 @@ var blog = {
|
||||
url: "server.py",
|
||||
data: {
|
||||
cmd: "website.helpers.blog.get_blog_list",
|
||||
start: blog.start
|
||||
start: blog.start,
|
||||
by: get_url_arg("by"),
|
||||
category: get_url_arg("category")
|
||||
},
|
||||
dataType: "json",
|
||||
success: function(data) {
|
||||
if(data.exc) console.log(data.exc);
|
||||
blog.render(data.message);
|
||||
}
|
||||
});
|
||||
@@ -53,11 +65,20 @@ var blog = {
|
||||
b.comment_text = b.comments + ' comments.'
|
||||
}
|
||||
|
||||
$(repl('<h2><a href="%(page_name)s">%(title)s</a></h2>\
|
||||
<div class="help">%(comment_text)s</div>\
|
||||
%(content)s<br />\
|
||||
<p><a href="%(page_name)s">Read with comments...</a></p>\
|
||||
<hr /><br />', b)).appendTo($wrap);
|
||||
$(repl('<div class="row">\
|
||||
<div class="span1">\
|
||||
<div class="avatar avatar-medium" style="margin-top: 6px;">\
|
||||
<img src="%(avatar)s" />\
|
||||
</div>\
|
||||
</div>\
|
||||
<div class="span11">\
|
||||
<h4><a href="%(page_name)s">%(title)s</a></h4>\
|
||||
<p>%(content)s</p>\
|
||||
<p style="color: #aaa; font-size: 90%">\
|
||||
<a href="blog?by=%(blogger)s&by_name=%(full_name)s">\
|
||||
%(full_name)s</a> wrote this on %(published)s / %(comment_text)s</p>\
|
||||
</div>\
|
||||
</div><hr>', b)).appendTo($wrap);
|
||||
});
|
||||
blog.start += (data.length || 0);
|
||||
if(!data.length) {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
{% block content %}
|
||||
<div class="span12">
|
||||
<h1>Blog</h1>
|
||||
<h2 id="blog-title">Blog</h2>
|
||||
<br>
|
||||
<div id="blog-list">
|
||||
<!-- blog list will be generated dynamically -->
|
||||
@@ -22,4 +22,5 @@
|
||||
style="display:none;">More...</button>
|
||||
</div>
|
||||
</div>
|
||||
{% include 'html/blog_footer.html' %}
|
||||
{% endblock %}
|
||||
14
website/templates/pages/writers.html
Normal file
14
website/templates/pages/writers.html
Normal file
@@ -0,0 +1,14 @@
|
||||
{% extends "html/page.html" %}
|
||||
|
||||
{% set title="Blog Writers" %}
|
||||
|
||||
{% block content %}
|
||||
<div class="span12">
|
||||
<h2 id="blog-title">Blog Writers</h2>
|
||||
<hr>
|
||||
{% for blogger_info in bloggers %}
|
||||
{% include "html/blogger.html" %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% include 'html/blog_footer.html' %}
|
||||
{% endblock %}
|
||||
@@ -41,7 +41,9 @@ page_map = {
|
||||
|
||||
page_settings_map = {
|
||||
"about": "About Us Settings",
|
||||
"contact": "Contact Us Settings"
|
||||
"contact": "Contact Us Settings",
|
||||
"blog": "website.helpers.blog.get_blog_template_args",
|
||||
"writers": "website.helpers.blog.get_writers_args"
|
||||
}
|
||||
|
||||
def render(page_name):
|
||||
@@ -155,7 +157,11 @@ def prepare_args(page_name):
|
||||
'name': page_name,
|
||||
})
|
||||
if page_name in page_settings_map:
|
||||
args.obj = webnotes.bean(page_settings_map[page_name]).obj
|
||||
target = page_settings_map[page_name]
|
||||
if "." in target:
|
||||
args.update(webnotes.get_method(target)())
|
||||
else:
|
||||
args.obj = webnotes.bean(page_settings_map[page_name]).obj
|
||||
else:
|
||||
args = get_doc_fields(page_name)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user