+
+
+
{% block content %}
{% endblock %}
@@ -68,8 +71,9 @@
{% endfor %}
{% if copyright %}
-
diff --git a/website/templates/js/blog_page.js b/website/templates/js/blog_page.js
index 524de8e7708..12dcac139f2 100644
--- a/website/templates/js/blog_page.js
+++ b/website/templates/js/blog_page.js
@@ -21,7 +21,7 @@ wn.pages['{{ name }}'].onload = function(wrapper) {
erpnext.blog.wrapper = wrapper;
// sidebar
- erpnext.blog.render_recent_list(wrapper);
+ //erpnext.blog.render_recent_list(wrapper);
// unhide no-result if no comments found
erpnext.blog.toggle_no_result(wrapper);
diff --git a/website/templates/js/login.js b/website/templates/js/login.js
index 6e6fcc7f73f..eb3a65c9b39 100644
--- a/website/templates/js/login.js
+++ b/website/templates/js/login.js
@@ -1,25 +1,7 @@
-// ERPNext - web based ERP (http://erpnext.com)
-// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see
.
wn.provide('erpnext.login');
-wn.pages["{{ name }}"].onload = function(wrapper) {
- var lw = $i('login_wrapper');
- $bs(lw, '1px 1px 3px #888');
-
+$(document).ready(function(wrapper) {
$('#login_btn').click(erpnext.login.doLogin)
$('#password').keypress(function(ev){
@@ -31,33 +13,32 @@ wn.pages["{{ name }}"].onload = function(wrapper) {
}
});
$(document).trigger('login_rendered');
-}
-
-// Login Callback
-erpnext.login.onLoginReply = function(r, rtext) {
- $('#login_btn').done_working();
- if(r.message=="Logged In"){
- window.location.href='app.html' + (get_url_arg('page') ? ('?page='+get_url_arg('page')) : '');
- } else {
- $i('login_message').innerHTML = '
'+(r.message)+'';
- //if(r.exc)alert(r.exc);
- }
-}
-
+})
// Login
erpnext.login.doLogin = function(){
var args = {};
- args['usr']=$i("login_id").value;
- args['pwd']=$i("password").value;
- //if($i('remember_me').checked)
- //args['remember_me'] = 1;
+ args['usr']=$("#login_id").val();
+ args['pwd']=$("#password").val();
+
+ if(!args.usr || !args.pwd) {
+ msgprint("Sorry, you can't login if you don't enter both the email id and password.")
+ }
$('#login_btn').set_working();
$('#login_message').empty();
- $c("login", args, erpnext.login.onLoginReply);
+ $c("login", args, function(r, rtext) {
+ $('#login_btn').done_working();
+ if(r.message=="Logged In"){
+ window.location.href='app.html' + (get_url_arg('page')
+ ? ('?page='+get_url_arg('page')) : '');
+ } else {
+ $i('login_message').innerHTML = '
'
+ +(r.message)+'';
+ }
+ });
return false;
}
diff --git a/website/templates/pages/blog.html b/website/templates/pages/blog.html
index 17fd6e7ba64..c4a5dad3d93 100644
--- a/website/templates/pages/blog.html
+++ b/website/templates/pages/blog.html
@@ -15,20 +15,13 @@
-
+
-
-
- {% block blog_subscribe %}
- {% include "html/blog_subscribe.html" %}
- {% endblock %}
-
-
{% endblock %}
\ No newline at end of file
diff --git a/website/templates/pages/login.html b/website/templates/pages/login.html
index b2da4749810..a81b2f5ceac 100644
--- a/website/templates/pages/login.html
+++ b/website/templates/pages/login.html
@@ -1,10 +1,9 @@
-{% extends "html/page.html" %}
+{% extends "html/base.html" %}
-{% block javascript %}
- {% include "js/login.js" %}
-{% endblock %}
-
-{% block css %}
+{% block header %}
+
{% include "css/login.css" %}
{% endblock %}
@@ -12,45 +11,45 @@
Login Page
{% endblock %}
-{% block content %}
-
-
-
-
Login
+{% block body %}
+
+
+
Login
+
+
Forgot Password
+
+
-
{% endblock %}
\ No newline at end of file