diff --git a/website/css/website.css b/website/css/website.css index 4d08434ed06..86f0414bbf1 100644 --- a/website/css/website.css +++ b/website/css/website.css @@ -1,11 +1,10 @@ -.content { - width: 800px; +.content, div#body_div { + width: 780px; } div#body_div { padding: 0px; min-height: 400px; - width: 800px; margin: 40px auto; box-shadow: 1px 1px 3px 3px #ccc; } @@ -26,6 +25,10 @@ p, li { -moz-box-shadow: none; } +.layout-main { + min-height: 400px; +} + .layout-side-section { padding: 8px; } @@ -58,10 +61,9 @@ footer { border-right: 0px solid #777 !important; } -.web-footer-powered { +.web-footer-powered, .web-footer-powered a { color: #888; - float: right; - margin-top: -12px; + margin-top: 20px; } .two-column { diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css index 03983258189..7e89ca03fbe 100644 --- a/website/doctype/style_settings/custom_template.css +++ b/website/doctype/style_settings/custom_template.css @@ -1,4 +1,4 @@ -#body_div { +body { {% if doc.background_image %} background: url("../files/{{ doc.background_image }}") repeat; {% elif doc.background_color %} diff --git a/website/templates/css/login.css b/website/templates/css/login.css index a3cab85f5b6..1f36e53f0c1 100644 --- a/website/templates/css/login.css +++ b/website/templates/css/login.css @@ -1,9 +1,15 @@ \ No newline at end of file diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html index 3b2dabe018c..9741451a43f 100644 --- a/website/templates/html/outer.html +++ b/website/templates/html/outer.html @@ -71,8 +71,9 @@ {% endfor %} {% if copyright %} -
© {{ copyright }} +
© {{ copyright }}
{% endif %} +
Powered by ERPNext.com
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 @@
-
+

Blog


- -
- {% 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 33a5943b5ba..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,41 +11,45 @@ Login Page {% endblock %} -{% block content %} -
-
-

Login

-
- - - - - - - - - - - - - - - - - - - - - -
-

Forgot Password

-
+{% block body %} +
+
+

Login

+
+ + + + + + + + + + + + + + + + + + + + +
+

Forgot Password

+
+ {% endblock %} \ No newline at end of file