Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
diff --git a/erpnext/website/doctype/style_settings/custom_template.css b/erpnext/website/doctype/style_settings/custom_template.css
index 4866ac7..6fe8ce5 100644
--- a/erpnext/website/doctype/style_settings/custom_template.css
+++ b/erpnext/website/doctype/style_settings/custom_template.css
@@ -19,18 +19,6 @@
}
{% endif %}
-{% if doc.footer_font_color %}
-footer {
- color: {{ doc.footer_font_color }};
-}
-footer a, footer a:visited, footer a:hover {
- color: {{ doc.footer_font_color }};
-}
-.web-footer-menu ul li {
- border-right: 1px solid {{ doc.footer_font_color }};
-}
-{% endif %}
-
{% if doc.heading_font %}
h1, h2, h3, h4, h5 {
font-family: '{{ doc.heading_font}}', Arial, 'Helvetica Neue' !important;
diff --git a/erpnext/website/doctype/style_settings/style_settings.txt b/erpnext/website/doctype/style_settings/style_settings.txt
index dd962d5..d5a9e80 100644
--- a/erpnext/website/doctype/style_settings/style_settings.txt
+++ b/erpnext/website/doctype/style_settings/style_settings.txt
@@ -5,7 +5,7 @@
{
'creation': '2012-04-02 16:02:43',
'docstatus': 0,
- 'modified': '2012-04-25 10:00:35',
+ 'modified': '2012-05-01 15:58:16',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -23,7 +23,7 @@
'name': '__common__',
'section_style': u'Simple',
'show_in_menu': 0,
- 'version': 23
+ 'version': 1
},
# These values are common for all DocField
@@ -91,21 +91,8 @@
# DocField
{
- 'colour': u'White:FFF',
- 'description': u'Select a white footer foreground color if you have a dark background',
- 'doctype': u'DocField',
- 'fieldname': u'footer_font_color',
- 'fieldtype': u'Select',
- 'label': u'Footer Font Color',
- 'options': u'\nwhite',
- 'permlevel': 0
- },
-
- # DocField
- {
'doctype': u'DocField',
'fieldtype': u'Column Break',
- 'label': u'Fonts',
'permlevel': 0,
'width': u'50%'
},
@@ -143,6 +130,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'css',
'fieldtype': u'Section Break',
'label': u'CSS',
'permlevel': 0
diff --git a/erpnext/website/page/blog/blog.js b/erpnext/website/page/blog/blog.js
index 3836f90..184424b 100644
--- a/erpnext/website/page/blog/blog.js
+++ b/erpnext/website/page/blog/blog.js
@@ -21,7 +21,8 @@
query: 'select tabBlog.name, title, left(content, 1000) as content, tabBlog.modified, \
ifnull(first_name, "") as first_name, ifnull(last_name, "") as last_name \
from tabProfile, tabBlog\
- where ifnull(published,0)=1 and tabBlog.owner = tabProfile.name',
+ where ifnull(published,0)=1 and tabBlog.owner = tabProfile.name \
+ order by tabBlog.modified desc',
hide_refresh: true,
no_toolbar: true,
render_row: function(parent, data) {