This commit is contained in:
Rushabh Mehta
2012-12-10 14:56:45 +05:30
parent af63b16be8
commit 1c8ab8ad7a
6 changed files with 69 additions and 139 deletions

View File

@@ -1,7 +1,12 @@
<style>
#login_wrapper {
width: 300px !important;
margin: 20px auto;
height: 300px;
padding-top: 50px;
}
#login_wrapper h3 {
text-align: center;
}
.login-banner {

View File

@@ -13,7 +13,7 @@
<div class="layout-wrapper layout-wrapper-background">
<div class="web-content" id="blog-{{ name }}">
<div class="layout-main-section">
<div class="layout-main">
<h2>{{ title }}</h2>
@@ -38,19 +38,6 @@
</div>
<button class="btn add-comment">Add Comment</button>
</div>
<div class="layout-side-section">
<p><a href="blog.html">All Blogs</a></p>
<br />
{% block blog_subscribe %}
{% include "html/blog_subscribe.html" %}
{% endblock %}
<br />
<h4>Recent Posts</h4>
<div class="recent-posts" style="min-height: 100px;"></div>
</div>
<div style="clear: both"></div>
</div>
</div>
{% endblock %}

View File

@@ -5,9 +5,12 @@
{% extends "html/base.html" %}
{% block body %}
<header>
<div class="navbar navbar-fixed-top navbar-inverse">
</header>
<div id="body_div">
<div class="navbar-wrapper">
<div class="navbar navbar-inverse"
style="margin-bottom: 0px;">
<div class="navbar-inner">
<div class="container">
<a class="brand" href="index.html">{{ brand }}</a>
@@ -51,10 +54,10 @@
</ul>
</div>
</div>
</div>
<script>$('.dropdown-toggle').dropdown()</script>
</header>
<div id="body_div">
</div>
</div>
<script>$('.dropdown-toggle').dropdown()</script>
<div class="content" id="page-{{ name }}" style="display: block;">
{% block content %}
{% endblock %}

View File

@@ -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);

View File

@@ -14,42 +14,38 @@
{% block content %}
<div class="layout-wrapper layout-wrapper-appframe" id='login_wrapper'>
<div class="appframe-area">
<div class="appframe-titlebar">
<div class="appframe-title">Login</div>
</div>
</div>
<div class="layout-main" style="padding: 15px;">
<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: 72px;"><span class="link_type"
onclick="erpnext.login.show_forgot_password()">Forgot Password</span></p>
<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>
</div>