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

Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename

Browse Source
This commit is contained in:
Nabin Hait 2012-04-27 11:04:44 +05:30
commit 727431b7b1
18 changed files with 516 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,7 +1,7 @@
*.pyc *.pyc
*.comp.js *.comp.js
.DS_Store .DS_Store
user_files files
patch.log patch.log
lib lib
conf.py conf.py

17
css/all-app.css
View File

@ -1728,7 +1728,6 @@ body {
padding: 0px; padding: 0px;
font-size: 14px; font-size: 14px;
color: #000; color: #000;
background-color: #e2e2e2;
} }
/* font settings */ /* font settings */
@ -1848,12 +1847,12 @@ div.comment { color: #444; }
div#body_div { div#body_div {
display: none; display: none;
padding-right: 7px; padding-right: 7px;
width: 900px; padding-top: 70px;
margin: auto; padding-bottom: 50px;
margin-top: 56px;
} }
.content { .content {
margin: auto;
width: 900px; width: 900px;
} }
@ -1864,23 +1863,19 @@ div#body_div {
transition: background 1s ease-in; transition: background 1s ease-in;
} }
footer {
width: 900px;
margin: auto;
}
header .container { header .container {
width: 900px; width: 900px;
margin: auto; margin: auto;
} }
@media (max-width: 1200px) { @media (max-width: 1200px) {
div#body_div, header .container, .content, #opened-page-selector, footer { header .container, .content {
width: 900px; width: 900px;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
div#body_div, header .container, .content, #opened-page-selector, footer { header .container, .content {
width: 1100px; width: 1100px;
} }
} }
@ -1931,7 +1926,6 @@ div.std-footer-item {
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
margin-bottom: 30px;
overflow: hidden; overflow: hidden;
} }
@ -3581,7 +3575,6 @@ span, div, td, input, textarea, button, select {
} }
body { body {
background: url(../images/redbeech.jpg) repeat;
color: #616161; color: #616161;
} }

425
css/all-web.css
View File

@ -1195,6 +1195,387 @@ button.btn.small, input[type="submit"].btn.small {
margin-bottom: 0; margin-bottom: 0;
} }
/*
* lib/css/bootstrap/icons.css
*/
[class^="icon-"], [class*=" icon-"] {
display: inline-block;
width: 14px;
height: 14px;
line-height: 14px;
vertical-align: text-top;
background-image: url("../lib/images/icons/glyphicons-halflings.png");
background-position: 14px 14px;
background-repeat: no-repeat;
*margin-right: .3em;
}
[class^="icon-"]:last-child, [class*=" icon-"]:last-child {
*margin-left: 0;
}
.icon-white {
background-image: url("../lib/images/icons/glyphicons-halflings-white.png");
}
.icon-glass {
background-position: 0 0;
}
.icon-music {
background-position: -24px 0;
}
.icon-search {
background-position: -48px 0;
}
.icon-envelope {
background-position: -72px 0;
}
.icon-heart {
background-position: -96px 0;
}
.icon-star {
background-position: -120px 0;
}
.icon-star-empty {
background-position: -144px 0;
}
.icon-user {
background-position: -168px 0;
}
.icon-film {
background-position: -192px 0;
}
.icon-th-large {
background-position: -216px 0;
}
.icon-th {
background-position: -240px 0;
}
.icon-th-list {
background-position: -264px 0;
}
.icon-ok {
background-position: -288px 0;
}
.icon-remove {
background-position: -312px 0;
}
.icon-zoom-in {
background-position: -336px 0;
}
.icon-zoom-out {
background-position: -360px 0;
}
.icon-off {
background-position: -384px 0;
}
.icon-signal {
background-position: -408px 0;
}
.icon-cog {
background-position: -432px 0;
}
.icon-trash {
background-position: -456px 0;
}
.icon-home {
background-position: 0 -24px;
}
.icon-file {
background-position: -24px -24px;
}
.icon-time {
background-position: -48px -24px;
}
.icon-road {
background-position: -72px -24px;
}
.icon-download-alt {
background-position: -96px -24px;
}
.icon-download {
background-position: -120px -24px;
}
.icon-upload {
background-position: -144px -24px;
}
.icon-inbox {
background-position: -168px -24px;
}
.icon-play-circle {
background-position: -192px -24px;
}
.icon-repeat {
background-position: -216px -24px;
}
.icon-refresh {
background-position: -240px -24px;
}
.icon-list-alt {
background-position: -264px -24px;
}
.icon-lock {
background-position: -287px -24px;
}
.icon-flag {
background-position: -312px -24px;
}
.icon-headphones {
background-position: -336px -24px;
}
.icon-volume-off {
background-position: -360px -24px;
}
.icon-volume-down {
background-position: -384px -24px;
}
.icon-volume-up {
background-position: -408px -24px;
}
.icon-qrcode {
background-position: -432px -24px;
}
.icon-barcode {
background-position: -456px -24px;
}
.icon-tag {
background-position: 0 -48px;
}
.icon-tags {
background-position: -25px -48px;
}
.icon-book {
background-position: -48px -48px;
}
.icon-bookmark {
background-position: -72px -48px;
}
.icon-print {
background-position: -96px -48px;
}
.icon-camera {
background-position: -120px -48px;
}
.icon-font {
background-position: -144px -48px;
}
.icon-bold {
background-position: -167px -48px;
}
.icon-italic {
background-position: -192px -48px;
}
.icon-text-height {
background-position: -216px -48px;
}
.icon-text-width {
background-position: -240px -48px;
}
.icon-align-left {
background-position: -264px -48px;
}
.icon-align-center {
background-position: -288px -48px;
}
.icon-align-right {
background-position: -312px -48px;
}
.icon-align-justify {
background-position: -336px -48px;
}
.icon-list {
background-position: -360px -48px;
}
.icon-indent-left {
background-position: -384px -48px;
}
.icon-indent-right {
background-position: -408px -48px;
}
.icon-facetime-video {
background-position: -432px -48px;
}
.icon-picture {
background-position: -456px -48px;
}
.icon-pencil {
background-position: 0 -72px;
}
.icon-map-marker {
background-position: -24px -72px;
}
.icon-adjust {
background-position: -48px -72px;
}
.icon-tint {
background-position: -72px -72px;
}
.icon-edit {
background-position: -96px -72px;
}
.icon-share {
background-position: -120px -72px;
}
.icon-check {
background-position: -144px -72px;
}
.icon-move {
background-position: -168px -72px;
}
.icon-step-backward {
background-position: -192px -72px;
}
.icon-fast-backward {
background-position: -216px -72px;
}
.icon-backward {
background-position: -240px -72px;
}
.icon-play {
background-position: -264px -72px;
}
.icon-pause {
background-position: -288px -72px;
}
.icon-stop {
background-position: -312px -72px;
}
.icon-forward {
background-position: -336px -72px;
}
.icon-fast-forward {
background-position: -360px -72px;
}
.icon-step-forward {
background-position: -384px -72px;
}
.icon-eject {
background-position: -408px -72px;
}
.icon-chevron-left {
background-position: -432px -72px;
}
.icon-chevron-right {
background-position: -456px -72px;
}
.icon-plus-sign {
background-position: 0 -96px;
}
.icon-minus-sign {
background-position: -24px -96px;
}
.icon-remove-sign {
background-position: -48px -96px;
}
.icon-ok-sign {
background-position: -72px -96px;
}
.icon-question-sign {
background-position: -96px -96px;
}
.icon-info-sign {
background-position: -120px -96px;
}
.icon-screenshot {
background-position: -144px -96px;
}
.icon-remove-circle {
background-position: -168px -96px;
}
.icon-ok-circle {
background-position: -192px -96px;
}
.icon-ban-circle {
background-position: -216px -96px;
}
.icon-arrow-left {
background-position: -240px -96px;
}
.icon-arrow-right {
background-position: -264px -96px;
}
.icon-arrow-up {
background-position: -289px -96px;
}
.icon-arrow-down {
background-position: -312px -96px;
}
.icon-share-alt {
background-position: -336px -96px;
}
.icon-resize-full {
background-position: -360px -96px;
}
.icon-resize-small {
background-position: -384px -96px;
}
.icon-plus {
background-position: -408px -96px;
}
.icon-minus {
background-position: -433px -96px;
}
.icon-asterisk {
background-position: -456px -96px;
}
.icon-exclamation-sign {
background-position: 0 -120px;
}
.icon-gift {
background-position: -24px -120px;
}
.icon-leaf {
background-position: -48px -120px;
}
.icon-fire {
background-position: -72px -120px;
}
.icon-eye-open {
background-position: -96px -120px;
}
.icon-eye-close {
background-position: -120px -120px;
}
.icon-warning-sign {
background-position: -144px -120px;
}
.icon-plane {
background-position: -168px -120px;
}
.icon-calendar {
background-position: -192px -120px;
}
.icon-random {
background-position: -216px -120px;
}
.icon-comment {
background-position: -240px -120px;
}
.icon-magnet {
background-position: -264px -120px;
}
.icon-chevron-up {
background-position: -288px -120px;
}
.icon-chevron-down {
background-position: -313px -119px;
}
.icon-retweet {
background-position: -336px -120px;
}
.icon-shopping-cart {
background-position: -360px -120px;
}
.icon-folder-close {
background-position: -384px -120px;
}
.icon-folder-open {
background-position: -408px -120px;
}
.icon-resize-vertical {
background-position: -432px -119px;
}
.icon-resize-horizontal {
background-position: -456px -118px;
}
/* /*
* lib/css/legacy/body.css * lib/css/legacy/body.css
*/ */
@ -1208,7 +1589,6 @@ body {
padding: 0px; padding: 0px;
font-size: 14px; font-size: 14px;
color: #000; color: #000;
background-color: #e2e2e2;
} }
/* font settings */ /* font settings */
@ -1328,12 +1708,12 @@ div.comment { color: #444; }
div#body_div { div#body_div {
display: none; display: none;
padding-right: 7px; padding-right: 7px;
width: 900px; padding-top: 70px;
margin: auto; padding-bottom: 50px;
margin-top: 56px;
} }
.content { .content {
margin: auto;
width: 900px; width: 900px;
} }
@ -1344,23 +1724,19 @@ div#body_div {
transition: background 1s ease-in; transition: background 1s ease-in;
} }
footer {
width: 900px;
margin: auto;
}
header .container { header .container {
width: 900px; width: 900px;
margin: auto; margin: auto;
} }
@media (max-width: 1200px) { @media (max-width: 1200px) {
div#body_div, header .container, .content, #opened-page-selector, footer { header .container, .content {
width: 900px; width: 900px;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
div#body_div, header .container, .content, #opened-page-selector, footer { header .container, .content {
width: 1100px; width: 1100px;
} }
} }
@ -1411,7 +1787,6 @@ div.std-footer-item {
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
margin-bottom: 30px;
overflow: hidden; overflow: hidden;
} }
@ -1898,7 +2273,6 @@ span, div, td, input, textarea, button, select {
} }
body { body {
background: url(../images/redbeech.jpg) repeat;
color: #616161; color: #616161;
} }
@ -1943,12 +2317,13 @@ body {
/* /*
* erpnext/website/css/website.css * erpnext/website/css/website.css
*/ */
div#body_div, header .container, .content, #opened-page-selector, footer { header .container, .content {
width: 900px; width: 900px;
} }
div#body_div { div#body_div {
margin-top: 90px; padding-top: 90px;
min-height: 400px;
} }
p, li { p, li {
@ -2007,19 +2382,23 @@ pre {
background-color: #444; background-color: #444;
} }
footer { footer {
color: #777; background-color: #eee;
box-shadow: inset 0 10px 10px rgba(0,0,0,0.3), inset 0 3px 3px rgba(0,0,0,0.3);
border-top: 1px solid #555;
padding-top: 10px;
text-align: center;
} }
.web-footer { .web-footer {
color: inherit; color: inherit;
text-align: center; padding: 10px;
margin: 10px;
line-height: 1.7; line-height: 1.7;
} }
.web-footer div, .web-footer a { .web-footer div, .web-footer a {
font-size: 14px; font-size: 12px;
} }
.web-footer-menu { .web-footer-menu {
@ -2038,10 +2417,20 @@ footer {
border-right: 1px solid #999; border-right: 1px solid #999;
} }
.web-footer-menu ul li:first-child {
padding-left: 0px;
}
.web-footer-menu ul li:last-child { .web-footer-menu ul li:last-child {
border-right: 0px solid #777 !important; border-right: 0px solid #777 !important;
} }
.web-footer-powered {
color: #888;
float: right;
margin-top: -12px;
}
/* slide view */ /* slide view */
.next-slide { .next-slide {

1
erpnext/startup/startup.css
View File

@ -13,7 +13,6 @@ span, div, td, input, textarea, button, select {
} }
body { body {
background: url(../images/redbeech.jpg) repeat;
color: #616161; color: #616161;
} }

2
erpnext/startup/startup.js
View File

@ -170,7 +170,7 @@ erpnext.startup.set_periodic_updates = function() {
} }
erpnext.set_user_background = function(src) { erpnext.set_user_background = function(src) {
set_style(repl('body { background: url("files/%(src)s") repeat;}', {src:src})) set_style(repl('#body_div { background: url("files/%(src)s") repeat;}', {src:src}))
} }
// start // start

27
erpnext/website/css/website.css
View File

@ -1,9 +1,10 @@
div#body_div, header .container, .content, #opened-page-selector, footer { header .container, .content {
width: 900px; width: 900px;
} }
div#body_div { div#body_div {
margin-top: 90px; padding-top: 90px;
min-height: 400px;
} }
p, li { p, li {
@ -62,19 +63,23 @@ pre {
background-color: #444; background-color: #444;
} }
footer { footer {
color: #777; background-color: #eee;
box-shadow: inset 0 10px 10px rgba(0,0,0,0.3), inset 0 3px 3px rgba(0,0,0,0.3);
border-top: 1px solid #555;
padding-top: 10px;
text-align: center;
} }
.web-footer { .web-footer {
color: inherit; color: inherit;
text-align: center; padding: 10px;
margin: 10px;
line-height: 1.7; line-height: 1.7;
} }
.web-footer div, .web-footer a { .web-footer div, .web-footer a {
font-size: 14px; font-size: 12px;
} }
.web-footer-menu { .web-footer-menu {
@ -93,10 +98,20 @@ footer {
border-right: 1px solid #999; border-right: 1px solid #999;
} }
.web-footer-menu ul li:first-child {
padding-left: 0px;
}
.web-footer-menu ul li:last-child { .web-footer-menu ul li:last-child {
border-right: 0px solid #777 !important; border-right: 0px solid #777 !important;
} }
.web-footer-powered {
color: #888;
float: right;
margin-top: -12px;
}
/* slide view */ /* slide view */
.next-slide { .next-slide {

10
erpnext/website/doctype/blog/blog.py
View File

@ -32,9 +32,11 @@ class DocType():
self.doc.name = website.utils.page_name(self.doc.title) self.doc.name = website.utils.page_name(self.doc.title)
def validate(self): def validate(self):
"""write/update 'Page' with the blog""" """write/update 'Page' with the blog"""
if self.doc.page_name:
webnotes.conn.sql("""delete from tabPage where name=%s""", self.doc.page_name)
p = website.utils.add_page(self.doc.title) p = website.utils.add_page(self.doc.title)
self.doc.name = p.name
from jinja2 import Template from jinja2 import Template
import markdown2 import markdown2
@ -54,11 +56,11 @@ class DocType():
p.save() p.save()
website.utils.add_guest_access_to_page(p.name) website.utils.add_guest_access_to_page(p.name)
self.doc.page_name = p.name
# cleanup # cleanup
for f in ['content_html', 'full_name', 'updated']: for f in ['content_html', 'full_name', 'updated']:
if f in self.doc.fields: if f in self.doc.fields:
del self.doc.fields[f] del self.doc.fields[f]

45
erpnext/website/doctype/blog/blog.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-03-27 14:36:47', 'creation': '2012-04-02 16:02:43',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-27 14:36:47', 'modified': '2012-04-26 16:58:27',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -21,7 +21,7 @@
'name': '__common__', 'name': '__common__',
'section_style': u'Simple', 'section_style': u'Simple',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 3 'version': 5
}, },
# These values are common for all DocField # These values are common for all DocField
@ -35,15 +35,12 @@
# These values are common for all DocPerm # These values are common for all DocPerm
{ {
'create': 1,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'name': '__common__', 'name': '__common__',
'parent': u'Blog', 'parent': u'Blog',
'parentfield': u'permissions', 'parentfield': u'permissions',
'parenttype': u'DocType', 'parenttype': u'DocType',
'permlevel': 0, 'read': 1
'read': 1,
'write': 1
}, },
# DocType, Blog # DocType, Blog
@ -54,14 +51,27 @@
# DocPerm # DocPerm
{ {
'create': 1,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'role': u'Website Manager' 'permlevel': 0,
'role': u'Website Manager',
'write': 1
},
# DocPerm
{
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Blogger',
'write': 1
}, },
# DocPerm # DocPerm
{ {
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'role': u'Blogger' 'permlevel': 1,
'role': u'All'
}, },
# DocField # DocField
@ -70,7 +80,8 @@
'fieldname': u'title', 'fieldname': u'title',
'fieldtype': u'Data', 'fieldtype': u'Data',
'label': u'Title', 'label': u'Title',
'permlevel': 0 'permlevel': 0,
'reqd': 1
}, },
# DocField # DocField
@ -88,7 +99,8 @@
'fieldname': u'content', 'fieldname': u'content',
'fieldtype': u'Code', 'fieldtype': u'Code',
'label': u'Content', 'label': u'Content',
'permlevel': 0 'permlevel': 0,
'reqd': 0
}, },
# DocField # DocField
@ -96,10 +108,19 @@
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'content_html', 'fieldname': u'content_html',
'fieldtype': u'Text', 'fieldtype': u'Text',
'label': u'Preview', 'label': u'Content HTML',
'permlevel': 1 'permlevel': 1
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'page_name',
'fieldtype': u'Data',
'label': u'Page Name',
'permlevel': 0
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',

26
erpnext/website/doctype/blog/blog_page.js
View File

@ -18,32 +18,28 @@
pscript['onload_{{ doc.name }}'] = function(wrapper) { pscript['onload_{{ doc.name }}'] = function(wrapper) {
// sidebar // sidebar
var side = $(wrapper).find('.web-side-section')
.append('<h4>Recent Posts</h4>').get(0);
wrapper.recent_list = new wn.ui.Listing({ wrapper.recent_list = new wn.ui.Listing({
parent: side, parent: $(wrapper).find('.recent-posts'),
no_toolbar: true,
query: 'select name, title, left(content, 100) as content from tabBlog\ query: 'select name, title, left(content, 100) as content from tabBlog\
where ifnull(published,1)=1', where ifnull(published,0)=1 and name!="{{ doc.name }}" order by modified desc',
hide_refresh: true, hide_refresh: true,
render_row: function(parent, data) { render_row: function(parent, data) {
if(data.content.length==100) data.content += '...'; console.log(data);
if(data.content && data.content.length==100) data.content += '...';
parent.innerHTML = repl('<a href="#!%(name)s">%(title)s</a>\ parent.innerHTML = repl('<a href="#!%(name)s">%(title)s</a>\
<div class="comment">%(content)s</div><br>', data); <div class="comment">%(content)s</div><br>', data);
}, },
page_length: 5 page_length: 5,
}); });
wrapper.recent_list.run(); wrapper.recent_list.run();
// comments
$(wrapper).find('.web-main-section').append('<hr><h3>Comments</h3>');
wrapper.comment_list = new wn.ui.Listing({ wrapper.comment_list = new wn.ui.Listing({
parent: $(wrapper).find('.web-main-section').get(0), parent: $(wrapper).find('.blog-comments').get(0),
no_toolbar: true,
query: 'select comment, comment_by_fullname, modified\ query: 'select comment, comment_by_fullname, modified\
from `tabComment` where comment_doctype="Page"\ from `tabComment` where comment_doctype="Page"\
and comment_docname="{{ doc.name }}"', and comment_docname="{{ doc.name }}" order by modified desc',
no_result_message: 'Be the first one to comment', no_result_message: 'Be the first one to comment',
render_row: function(parent, data) { render_row: function(parent, data) {
data.comment_date = prettyDate(data.modified); data.comment_date = prettyDate(data.modified);
@ -57,7 +53,7 @@ pscript['onload_{{ doc.name }}'] = function(wrapper) {
wrapper.comment_list.run(); wrapper.comment_list.run();
// add comment // add comment
$(wrapper).find('.web-main-section').append('<br><button class="btn add-comment">\ $(wrapper).find('.layout-main-section').append('<br><button class="btn add-comment">\
Add Comment</button>'); Add Comment</button>');
$(wrapper).find('button.add-comment').click(function(){ $(wrapper).find('button.add-comment').click(function(){
d = new wn.widgets.Dialog({ d = new wn.widgets.Dialog({

8
erpnext/website/doctype/blog/template.html
View File

@ -1,14 +1,18 @@
<div class="layout-wrapper layout-wrapper-background"> <div class="layout-wrapper layout-wrapper-background">
<div class="web-content" id="blog-{{ doc.name }}"> <div class="web-content" id="blog-{{ doc.name }}">
<div class="layout-main-section"> <div class="layout-main-section">
<h1>Blog</h1> <h2>{{ doc.title }}</h2>
<h3>{{ doc.title }}</h3>
<div class="help">By {{ doc.full_name }} on {{ doc.updated }}</div> <div class="help">By {{ doc.full_name }} on {{ doc.updated }}</div>
<br> <br>
{{ doc.content_html }} {{ doc.content_html }}
<hr><h3>Comments</h3>
<br>
<div class="blog-comments"></div>
</div> </div>
<div class="layout-side-section"> <div class="layout-side-section">
<p><a href="#!blog">All Blogs</a></p> <p><a href="#!blog">All Blogs</a></p>
<h4>Recent Posts</h4>
<div class="recent-posts" style="min-height: 100px;"></div>
<h4>Subscribe</h4> <h4>Subscribe</h4>
<p> <p>
<img src="images/feed.png" style="margin-right: 4px; margin-bottom: -4px"> <img src="images/feed.png" style="margin-right: 4px; margin-bottom: -4px">

2
erpnext/website/doctype/style_settings/custom_template.css
View File

@ -1,4 +1,4 @@
body { #body_div {
{% if doc.background_image %} {% if doc.background_image %}
background: url("files/{{ doc.background_image }}") repeat; background: url("files/{{ doc.background_image }}") repeat;
{% elif doc.background_color %} {% elif doc.background_color %}

3
erpnext/website/doctype/web_page/template.html
View File

@ -28,6 +28,3 @@
<div style="clear: both"></div> <div style="clear: both"></div>
</div> </div>
</div> </div>
<div class="web-page-status small">
Last Modified: {{ doc.updated }} <a href="#contact">Feedback</a>
</div>

4
erpnext/website/doctype/web_page/web_page.js
View File

@ -24,10 +24,10 @@ $.extend(cur_frm.cscript, {
refresh: function(doc) { refresh: function(doc) {
cur_frm.cscript.layout(doc); cur_frm.cscript.layout(doc);
}, },
insert_style: function() { insert_style: function(doc) {
cur_frm.cscript.layout(doc); cur_frm.cscript.layout(doc);
}, },
insert_code: function() { insert_code: function(doc) {
cur_frm.cscript.layout(doc); cur_frm.cscript.layout(doc);
} }
}) })

3
erpnext/website/js/topbar.js
View File

@ -91,8 +91,7 @@ erpnext.Footer = Class.extend({
init: function() { init: function() {
$('footer').html(repl('<div class="web-footer">\ $('footer').html(repl('<div class="web-footer">\
<div class="web-footer-menu"><ul></ul></div>\ <div class="web-footer-menu"><ul></ul></div>\
<div class="web-footer-address">%(address)s</div>\ <div class="web-footer-copyright">&copy; %(copyright)s | %(address)s</div>\
<div class="web-footer-copyright">&copy; %(copyright)s</div>\
<div class="web-footer-powered">Powered by \ <div class="web-footer-powered">Powered by \
<a href="https://erpnext.com">erpnext.com</a></div>\ <a href="https://erpnext.com">erpnext.com</a></div>\
</div>', wn.boot.website_settings)); </div>', wn.boot.website_settings));

1
erpnext/website/page/blog/blog.html
View File

@ -3,6 +3,7 @@
<div class="layout-main-section"> <div class="layout-main-section">
<h1>Blog</h1> <h1>Blog</h1>
<br> <br>
<div id="blog-list"></div>
</div> </div>
<div class="layout-side-section"> <div class="layout-side-section">
<!-- for later <!-- for later

18
erpnext/website/page/blog/blog.js
View File

@ -17,18 +17,22 @@
pscript.onload_blog = function(wrapper) { pscript.onload_blog = function(wrapper) {
wrapper.blog_list = new wn.ui.Listing({ wrapper.blog_list = new wn.ui.Listing({
parent: $(wrapper).find('.layout-main-section').get(0), parent: $(wrapper).find('#blog-list').get(0),
query: 'select tabBlog.name, title, left(content, 300) as content, tabBlog.modified, \ query: 'select tabBlog.name, title, left(content, 1000) as content, tabBlog.modified, \
ifnull(first_name, "") as first_name, ifnull(last_name, "") as last_name \ ifnull(first_name, "") as first_name, ifnull(last_name, "") as last_name \
from tabProfile, tabBlog\ from tabProfile, tabBlog\
where ifnull(published,1)=1 and tabBlog.owner = tabProfile.name', where ifnull(published,0)=1 and tabBlog.owner = tabProfile.name',
hide_refresh: true, hide_refresh: true,
no_toolbar: true,
render_row: function(parent, data) { render_row: function(parent, data) {
if(data.content.length==300) data.content += '...'; if(data.content && data.content.length==1000) data.content += '... (read on)';
data.content = wn.markdown(data.content);
if(data.last_name) data.last_name = ' ' + data.last_name;
data.date = prettyDate(data.modified); data.date = prettyDate(data.modified);
parent.innerHTML = repl('<h3><a href="#!%(name)s">%(title)s</a></h3>\ parent.innerHTML = repl('<h2>%(title)s</h2>\
<p><div class="help">By %(first_name)s %(last_name)s on %(date)s</div></p>\ <p><div class="help">By %(first_name)s%(last_name)s, %(date)s</div></p>\
<div class="comment">%(content)s</div><br>', data); <p>%(content)s</p>\
<a href="#!%(name)s">Read Full Text</a><br>', data);
}, },
page_length: 10 page_length: 10
}); });

11
js/all-app.js
View File

@ -1288,7 +1288,7 @@ LocalDB.delete_doc=function(dt,dn){var doc=get_local(dt,dn);for(var ndt in local
delete locals[dt][dn];} delete locals[dt][dn];}
function get_local(dt,dn){return locals[dt]?locals[dt][dn]:null;} function get_local(dt,dn){return locals[dt]?locals[dt][dn]:null;}
LocalDB.sync=function(list){if(list._kl)list=expand_doclist(list);for(var i=0;i<list.length;i++){var d=list[i];if(!d.name) LocalDB.sync=function(list){if(list._kl)list=expand_doclist(list);for(var i=0;i<list.length;i++){var d=list[i];if(!d.name)
d.name=LocalDB.get_localname(d.doctype);LocalDB.add(d.doctype,d.name);locals[d.doctype][d.name]=d;if(d.doctype=='DocField')wn.meta.add_field(d);if(d.localname){wn.model.new_names[d.localname]=d.name;$(document).trigger('rename',[d.doctype,d.localname,d.name]);delete locals[d.doctype][d.localname];}}} d.name=LocalDB.get_localname(d.doctype);LocalDB.add(d.doctype,d.name);locals[d.doctype][d.name]=d;if(d.doctype=='DocField')wn.meta.add_field(d);if(d.localname){wn.model.new_names[d.localname]=d.name;console.log(d.localname);$(document).trigger('rename',[d.doctype,d.localname,d.name]);delete locals[d.doctype][d.localname];}}}
local_name_idx={};LocalDB.get_localname=function(doctype){if(!local_name_idx[doctype])local_name_idx[doctype]=1;var n='New '+get_doctype_label(doctype)+' '+local_name_idx[doctype];local_name_idx[doctype]++;return n;} local_name_idx={};LocalDB.get_localname=function(doctype){if(!local_name_idx[doctype])local_name_idx[doctype]=1;var n='New '+get_doctype_label(doctype)+' '+local_name_idx[doctype];local_name_idx[doctype]++;return n;}
LocalDB.set_default_values=function(doc){var doctype=doc.doctype;var docfields=wn.meta.docfield_list[doctype];if(!docfields){return;} LocalDB.set_default_values=function(doc){var doctype=doc.doctype;var docfields=wn.meta.docfield_list[doctype];if(!docfields){return;}
var fields_to_refresh=[];for(var fid=0;fid<docfields.length;fid++){var f=docfields[fid];if(!in_list(no_value_fields,f.fieldtype)&&doc[f.fieldname]==null){var v=LocalDB.get_default_value(f.fieldname,f.fieldtype,f['default']);if(v){doc[f.fieldname]=v;fields_to_refresh.push(f.fieldname);}}} var fields_to_refresh=[];for(var fid=0;fid<docfields.length;fid++){var f=docfields[fid];if(!in_list(no_value_fields,f.fieldtype)&&doc[f.fieldname]==null){var v=LocalDB.get_default_value(f.fieldname,f.fieldtype,f['default']);if(v){doc[f.fieldname]=v;fields_to_refresh.push(f.fieldname);}}}
@ -1687,7 +1687,8 @@ this.appframe.add_button('Amend',function(){cur_frm.amend_doc()},'icon-pencil');
/* /*
* lib/js/legacy/widgets/form/form.js * lib/js/legacy/widgets/form/form.js
*/ */
wn.provide('_f');_f.frms={};_f.Frm=function(doctype,parent){this.docname='';this.doctype=doctype;this.display=0;var me=this;this.is_editable={};this.opendocs={};this.sections=[];this.grids=[];this.cscript={};this.pformat={};this.fetch_dict={};this.parent=parent;this.tinymce_id_list=[];this.setup_meta(doctype);var me=this;$(document).bind('rename',function(event,dt,old_name,new_name){if(dt==me.doctype) wn.provide('_f');_f.frms={};_f.Frm=function(doctype,parent){this.docname='';this.doctype=doctype;this.display=0;var me=this;this.is_editable={};this.opendocs={};this.sections=[];this.grids=[];this.cscript={};this.pformat={};this.fetch_dict={};this.parent=parent;this.tinymce_id_list=[];this.setup_meta(doctype);var me=this;$(document).bind('rename',function(event,dt,old_name,new_name){console.log(arguments)
if(dt==me.doctype)
me.rename_notify(dt,old_name,new_name)});} me.rename_notify(dt,old_name,new_name)});}
_f.Frm.prototype.check_doctype_conflict=function(docname){var me=this;if(this.doctype=='DocType'&&docname=='DocType'){msgprint('Allowing DocType, DocType. Be careful!')}else if(this.doctype=='DocType'){if(wn.views.formview[docname]){msgprint("Cannot open DocType when its instance is open") _f.Frm.prototype.check_doctype_conflict=function(docname){var me=this;if(this.doctype=='DocType'&&docname=='DocType'){msgprint('Allowing DocType, DocType. Be careful!')}else if(this.doctype=='DocType'){if(wn.views.formview[docname]){msgprint("Cannot open DocType when its instance is open")
throw'doctype open conflict'}}else{if(wn.views.formview.DocType&&wn.views.formview.DocType.frm.opendocs[this.doctype]){msgprint("Cannot open instance when its DocType is open") throw'doctype open conflict'}}else{if(wn.views.formview.DocType&&wn.views.formview.DocType.frm.opendocs[this.doctype]){msgprint("Cannot open instance when its DocType is open")
@ -1709,9 +1710,9 @@ _p.show_dialog();}
_f.Frm.prototype.email_doc=function(){if(!_e.dialog)_e.make();sel=this.print_sel;var c=$td(_e.dialog.rows['Format'].tab,0,1);if(c.cur_sel){c.removeChild(c.cur_sel);c.cur_sel=null;} _f.Frm.prototype.email_doc=function(){if(!_e.dialog)_e.make();sel=this.print_sel;var c=$td(_e.dialog.rows['Format'].tab,0,1);if(c.cur_sel){c.removeChild(c.cur_sel);c.cur_sel=null;}
c.appendChild(this.print_sel);c.cur_sel=this.print_sel;_e.dialog.widgets['Send With Attachments'].checked=0;if(cur_frm.doc.file_list){$ds(_e.dialog.rows['Send With Attachments']);}else{$dh(_e.dialog.rows['Send With Attachments']);} c.appendChild(this.print_sel);c.cur_sel=this.print_sel;_e.dialog.widgets['Send With Attachments'].checked=0;if(cur_frm.doc.file_list){$ds(_e.dialog.rows['Send With Attachments']);}else{$dh(_e.dialog.rows['Send With Attachments']);}
_e.dialog.widgets['Subject'].value=get_doctype_label(this.meta.name)+': '+this.docname;_e.dialog.show();} _e.dialog.widgets['Subject'].value=get_doctype_label(this.meta.name)+': '+this.docname;_e.dialog.show();}
_f.Frm.prototype.rename_notify=function(dt,old,name){this.is_editable[name]=this.is_editable[old];delete this.is_editable[old];if(this.docname==old) _f.Frm.prototype.rename_notify=function(dt,old,name){if(this.docname==old)
this.docname=name;else this.docname=name;else
return;if(this&&this.opendocs[old]){local_dt[dt][name]=local_dt[dt][old];local_dt[dt][old]=null;} return;this.is_editable[name]=this.is_editable[old];delete this.is_editable[old];if(this&&this.opendocs[old]){local_dt[dt][name]=local_dt[dt][old];local_dt[dt][old]=null;}
delete this.opendocs[old];this.opendocs[name]=true;wn.re_route[window.location.hash]='Form/'+encodeURIComponent(this.doctype)+'/'+encodeURIComponent(name);wn.set_route('Form',this.doctype,name);} delete this.opendocs[old];this.opendocs[name]=true;wn.re_route[window.location.hash]='Form/'+encodeURIComponent(this.doctype)+'/'+encodeURIComponent(name);wn.set_route('Form',this.doctype,name);}
_f.Frm.prototype.setup_meta=function(){this.meta=get_local('DocType',this.doctype);this.perm=get_perm(this.doctype);if(this.meta.istable){this.meta.in_dialog=1} _f.Frm.prototype.setup_meta=function(){this.meta=get_local('DocType',this.doctype);this.perm=get_perm(this.doctype);if(this.meta.istable){this.meta.in_dialog=1}
this.setup_print();} this.setup_print();}
@ -2232,7 +2233,7 @@ show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circl
wn.call({method:'startup.startup.get_global_status_messages',callback:set_messages});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}} wn.call({method:'startup.startup.get_global_status_messages',callback:set_messages});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}}
erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
wn.updates.id=setInterval(update_messages,60000);} wn.updates.id=setInterval(update_messages,60000);}
erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))} erpnext.set_user_background=function(src){set_style(repl('#body_div { background: url("files/%(src)s") repeat;}',{src:src}))}
$(document).bind('startup',function(){erpnext.startup.start();}); $(document).bind('startup',function(){erpnext.startup.start();});
/* /*
* erpnext/startup/js/modules.js * erpnext/startup/js/modules.js

7
js/all-web.js
View File

@ -739,7 +739,7 @@ LocalDB.delete_doc=function(dt,dn){var doc=get_local(dt,dn);for(var ndt in local
delete locals[dt][dn];} delete locals[dt][dn];}
function get_local(dt,dn){return locals[dt]?locals[dt][dn]:null;} function get_local(dt,dn){return locals[dt]?locals[dt][dn]:null;}
LocalDB.sync=function(list){if(list._kl)list=expand_doclist(list);for(var i=0;i<list.length;i++){var d=list[i];if(!d.name) LocalDB.sync=function(list){if(list._kl)list=expand_doclist(list);for(var i=0;i<list.length;i++){var d=list[i];if(!d.name)
d.name=LocalDB.get_localname(d.doctype);LocalDB.add(d.doctype,d.name);locals[d.doctype][d.name]=d;if(d.doctype=='DocField')wn.meta.add_field(d);if(d.localname){wn.model.new_names[d.localname]=d.name;$(document).trigger('rename',[d.doctype,d.localname,d.name]);delete locals[d.doctype][d.localname];}}} d.name=LocalDB.get_localname(d.doctype);LocalDB.add(d.doctype,d.name);locals[d.doctype][d.name]=d;if(d.doctype=='DocField')wn.meta.add_field(d);if(d.localname){wn.model.new_names[d.localname]=d.name;console.log(d.localname);$(document).trigger('rename',[d.doctype,d.localname,d.name]);delete locals[d.doctype][d.localname];}}}
local_name_idx={};LocalDB.get_localname=function(doctype){if(!local_name_idx[doctype])local_name_idx[doctype]=1;var n='New '+get_doctype_label(doctype)+' '+local_name_idx[doctype];local_name_idx[doctype]++;return n;} local_name_idx={};LocalDB.get_localname=function(doctype){if(!local_name_idx[doctype])local_name_idx[doctype]=1;var n='New '+get_doctype_label(doctype)+' '+local_name_idx[doctype];local_name_idx[doctype]++;return n;}
LocalDB.set_default_values=function(doc){var doctype=doc.doctype;var docfields=wn.meta.docfield_list[doctype];if(!docfields){return;} LocalDB.set_default_values=function(doc){var doctype=doc.doctype;var docfields=wn.meta.docfield_list[doctype];if(!docfields){return;}
var fields_to_refresh=[];for(var fid=0;fid<docfields.length;fid++){var f=docfields[fid];if(!in_list(no_value_fields,f.fieldtype)&&doc[f.fieldname]==null){var v=LocalDB.get_default_value(f.fieldname,f.fieldtype,f['default']);if(v){doc[f.fieldname]=v;fields_to_refresh.push(f.fieldname);}}} var fields_to_refresh=[];for(var fid=0;fid<docfields.length;fid++){var f=docfields[fid];if(!in_list(no_value_fields,f.fieldtype)&&doc[f.fieldname]==null){var v=LocalDB.get_default_value(f.fieldname,f.fieldtype,f['default']);if(v){doc[f.fieldname]=v;fields_to_refresh.push(f.fieldname);}}}
@ -840,7 +840,7 @@ show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circl
wn.call({method:'startup.startup.get_global_status_messages',callback:set_messages});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}} wn.call({method:'startup.startup.get_global_status_messages',callback:set_messages});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}}
erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
wn.updates.id=setInterval(update_messages,60000);} wn.updates.id=setInterval(update_messages,60000);}
erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))} erpnext.set_user_background=function(src){set_style(repl('#body_div { background: url("files/%(src)s") repeat;}',{src:src}))}
$(document).bind('startup',function(){erpnext.startup.start();}); $(document).bind('startup',function(){erpnext.startup.start();});
/* /*
* erpnext/website/js/topbar.js * erpnext/website/js/topbar.js
@ -863,8 +863,7 @@ for(var i=0;i<items.length;i++){var item=items[i];if(item.parent_label&&item.par
item.route=item.url||item.custom_page;$parent_li.find('.dropdown-menu').append(repl('<li data-label="%(label)s">\ item.route=item.url||item.custom_page;$parent_li.find('.dropdown-menu').append(repl('<li data-label="%(label)s">\
<a href="#!%(route)s">%(label)s</a></li>',item))}}}});erpnext.Footer=Class.extend({init:function(){$('footer').html(repl('<div class="web-footer">\ <a href="#!%(route)s">%(label)s</a></li>',item))}}}});erpnext.Footer=Class.extend({init:function(){$('footer').html(repl('<div class="web-footer">\
<div class="web-footer-menu"><ul></ul></div>\ <div class="web-footer-menu"><ul></ul></div>\
<div class="web-footer-address">%(address)s</div>\ <div class="web-footer-copyright">&copy; %(copyright)s | %(address)s</div>\
<div class="web-footer-copyright">&copy; %(copyright)s</div>\
<div class="web-footer-powered">Powered by \ <div class="web-footer-powered">Powered by \
<a href="https://erpnext.com">erpnext.com</a></div>\ <a href="https://erpnext.com">erpnext.com</a></div>\
</div>',wn.boot.website_settings));this.make_items();},make_items:function(){var items=wn.boot.website_menus </div>',wn.boot.website_settings));this.make_items();},make_items:function(){var items=wn.boot.website_menus