From 1c8ab8ad7a5812d41eafd22546308f7aa5a7c850 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 10 Dec 2012 14:56:45 +0530 Subject: [PATCH 1/2] c --- website/css/website.css | 99 +++++---------------------- website/templates/css/login.css | 9 ++- website/templates/html/blog_page.html | 15 +--- website/templates/html/outer.html | 15 ++-- website/templates/js/blog_page.js | 2 +- website/templates/pages/login.html | 68 +++++++++--------- 6 files changed, 69 insertions(+), 139 deletions(-) diff --git a/website/css/website.css b/website/css/website.css index eb9e6cc8346..4d08434ed06 100644 --- a/website/css/website.css +++ b/website/css/website.css @@ -1,69 +1,35 @@ -header .container, .content { - width: 900px; -} +.content { + width: 800px; +} div#body_div { - padding-top: 80px; + padding: 0px; min-height: 400px; + width: 800px; + margin: 40px auto; + box-shadow: 1px 1px 3px 3px #ccc; +} + +.navbar-inner { + border: 0px; + border-bottom: 1px solid #ddd; + border-radius: 0px; } p, li { line-height: 1.6em; } -pre { - background-color: #F8F8F8; - border: 1px solid #CCCCCC; - border-radius: 3px 3px 3px 3px; - font-size: 13px; - line-height: 19px; - overflow: auto; - padding: 6px 10px; - margin-bottom: 9px; +.layout-wrapper { + box-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; } -.web-head-section { - margin-bottom: 20px +.layout-side-section { + padding: 8px; } -.web-main-section { - width: 65%; - float: left; - margin-bottom: 20px; -} - -.web-side-section { - width: 30%; - float: right; - margin-bottom: 20px; - margin-right: 15px; - color: #606060; - overflow-x: hidden; - font-size: 90%; -} - -.web-page-status { - padding: 7px; - margin-top: -20px; - color: #777; - clear: both; - text-align: right; -} - -.web-page-status a, -.web-page-status a:hover, -.web-page-status a:visited { - padding: 2px; - background-color: #777; - color: #FFF; - text-decoration: none; -} - -.web-page-status a:hover { - background-color: #444; -} - - footer { } @@ -98,33 +64,6 @@ footer { margin-top: -12px; } -/* slide view */ - -.next-slide { - margin: 0px -27px 100px -27px; - background: #ffffff; /* Old browsers */ - background: -moz-linear-gradient(top, #eeeeee 0%, #fff 100%); /* FF3.6+ */ - background: -webkit-linear-gradient(top, #eeeeee 0%, #fff 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #eeeeee 0%, #fff 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #eeeeee 0%, #fff 100%); /* IE10+ */ - background: linear-gradient(top, #eeeeee 0%, #fff 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#fff',GradientType=0 ); /* IE6-9 */ - height: 36px; -} - -.slide-shadow { - background: #eeeeee; /* Old browsers */ - background: -moz-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* FF3.6+ */ - background: -webkit-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* IE10+ */ - background: linear-gradient(top, #bababa 0%,#eeeeee 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#bababa', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ - height: 3px; - margin: 100px -27px 0px -27px; - border-top: 1px solid #bababa; -} - .two-column { width: 50%; float: left; diff --git a/website/templates/css/login.css b/website/templates/css/login.css index 4c044d8d8ca..a3cab85f5b6 100644 --- a/website/templates/css/login.css +++ b/website/templates/css/login.css @@ -1,7 +1,12 @@ \ 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