website updates changes

This commit is contained in:
Rushabh Mehta
2012-12-10 18:25:30 +05:30
parent 275c04c1f7
commit c50f088a22
7 changed files with 89 additions and 96 deletions

View File

@@ -15,20 +15,13 @@
<div class="layout-wrapper layout-wrapper-background">
<div class="web-content" id="content-blog">
<div class="layout-main-section">
<div class="layout-main">
<h1>Blog</h1>
<br>
<div id="blog-list">
<!-- blog list will be generated dynamically -->
</div>
</div>
<div class="layout-side-section">
{% block blog_subscribe %}
{% include "html/blog_subscribe.html" %}
{% endblock %}
</div>
<div style="clear: both"></div>
</div>
</div>
{% endblock %}

View File

@@ -1,10 +1,9 @@
{% extends "html/page.html" %}
{% extends "html/base.html" %}
{% block javascript %}
{% include "js/login.js" %}
{% endblock %}
{% block css %}
{% block header %}
<script>
{% include "js/login.js" %}
</script>
{% include "css/login.css" %}
{% endblock %}
@@ -12,41 +11,45 @@
Login Page
{% endblock %}
{% block content %}
<div class="layout-wrapper layout-wrapper-appframe" id='login_wrapper'>
<div style="width: 40px; margin: auto;">
<h3>Login</h3>
<form autocomplete="on">
<table border="0" class="login-box">
<tbody>
<tr>
<td>Login Id</td>
<td><input id="login_id" type="text" style="width: 180px"/></td>
</tr>
<tr>
<td>Password</td>
<td><input id="password" type="password" style="width: 180px" /></td>
</tr>
<!--<tr>
<td style="text-align:right"><input id="remember_me" type="checkbox" /></td>
<td>Remember Me</td>
</tr>-->
<tr>
<td>&nbsp;</td>
<td>
<button type="submit" id="login_btn" class="btn btn-small btn-primary">Login</button>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td id="login_message">&nbsp;</td>
</tr>
</tbody>
</table>
</form>
<p style="margin-left: 80px;"><span class="link_type"
onclick="erpnext.login.show_forgot_password()">Forgot Password</span></p>
</div>
{% block body %}
<div id='login_wrapper'>
<div class='layout-wrapper layout-main'>
<h3><i class="icon-lock" style="margin-top: 7px"></i> Login</h3>
<form autocomplete="on">
<table border="0" class="login-box">
<tbody>
<tr>
<td style="text-align: right;">Login Id</td>
<td><input id="login_id" type="text" style="width: 180px"/></td>
</tr>
<tr>
<td style="text-align: right;">Password</td>
<td><input id="password" type="password" style="width: 180px" /></td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<button type="submit" id="login_btn"
class="btn btn-small btn-primary">Login</button>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td id="login_message">&nbsp;</td>
</tr>
</tbody>
</table>
</form>
<p style="text-align: center"><span class="link_type"
onclick="erpnext.login.show_forgot_password()">Forgot Password</span></p>
</div>
<div class="login-footer">
<a href="index.html">Home</a> |
<a href="https://erpnext.com">ERPNext</a><br><br>
{% if copyright %}
<div class="web-footer-copyright">&copy; {{ copyright }}
{% endif %}
</div>
</div>
{% endblock %}