nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into edge

Browse Source
This commit is contained in:
Rushabh Mehta
2013-03-08 11:09:48 +05:30
parent 98ffb47f89 6008f96540
commit 981db7b561
30 changed files with 829 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
website/templates/html/blog_footer.html Normal file
View File

@@ -0,0 +1,13 @@
<div class="span12">
<hr />
{% if categories %}
<h5>Explore posts by categories</h5>
<ul class="breadcrumb" style="background-color: transparent; padding-left: 0px;">
{% for category in categories %}
<li><a href="blog?category={{ category }}">{{ category }}</a>
{% if not loop.last %}<span class="divider">/</span>{% endif %}</li>
{% endfor %}
<br><br>
{% endif %}
<p>Show posts by <a href="blog">everyone</a>. Meet the <a href="writers">writers</a> of this blog</p>
</div>

36
website/templates/html/blog_page.html
View File

@@ -13,41 +13,41 @@
<h2>{{ title }}</h2>
<!-- begin blog content -->
<div class="help">By {{ full_name }} on {{ updated }}</div>
<div class="help" style="color: #aaa">
{{ blogger_info and blogger_info.full_name or full_name }} / {{ updated }}</div>
<br>
{{ content_html }}
<!-- end blog content -->
{% if blogger_info %}
<hr />
{% include "html/blogger.html" %}
{% endif %}
<hr>
<h3>Comments</h3><br>
<h3>{{ texts.comments }}</h3><br>
<div class="blog-comments">
{% if not comment_list %}
<div class="alert no-comment">
<p>Be the first one to comment</p>
<div class="no-comment">
<p>{{ texts.first_comment }}</p>
</div>
{% endif %}
{% include 'html/comment.html' %}
</div>
<div><button class="btn add-comment">Add Comment</button></div>
<div><button class="btn add-comment">{{ texts.add_comment }}</button></div>
<div style="display: none; margin-top: 10px;"
id="comment-form" class="well">
id="comment-form">
<div class="alert" style="display:none;"></div>
<form>
<p>
<input name="comment_by_fullname" placeholder="Your Name" />
</p>
<p>
<input name="comment_by" placeholder="Your Email Id" />
</p>
<p>
<fieldset>
<input name="comment_by_fullname" placeholder="Your Name" type="text"/><br>
<input name="comment_by" placeholder="Your Email Id" type="text"/><br>
<textarea name="comment" placeholder="Comment" style="width: 300px; height: 120px;"/>
</textarea>
</p>
<p>
<button class="btn btn-info" id="submit-comment">Submit</button>
</textarea><br>
<button class="btn btn-info" id="submit-comment">{{ texts.submit }}</button>
</fieldset>
</form>
</div>
</div>
{% include 'html/blog_footer.html' %}
{% endblock %}

13
website/templates/html/blogger.html Normal file
View File

@@ -0,0 +1,13 @@
<div class="row">
<div class="span2">
<div class="avatar avatar-large">
<img src="{{ blogger_info.avatar }}" />
</div>
</div>
<div class="span10">
<h4>{{ blogger_info.full_name }}</h4>
<p style="color: #999">{{ blogger_info.bio }}</p>
<p><a href="blog?by={{ blogger_info.name }}&by_name={{ blogger_info.full_name }}">
{{ texts.all_posts_by }} {{ blogger_info.full_name }}</a></p>
</div>
</div>

2
website/templates/html/outer.html
View File

@@ -6,7 +6,7 @@
<div class="container">
<div class="outer">
<div class="navbar{% if top_bar_background=="Black" %} navbar-inverse{% endif %}"
style="margin-bottom: 0px;">
style="">
<div class="navbar-inner">
<a class="brand" href="index">{{ brand_html }}</a>
<div class="container">