added blog category and other updates to website module
diff --git a/website/templates/html/blog_footer.html b/website/templates/html/blog_footer.html
new file mode 100644
index 0000000..81b92ab
--- /dev/null
+++ b/website/templates/html/blog_footer.html
@@ -0,0 +1,12 @@
+<div class="span12">
+ <hr />
+ <p><a href="blog">Show posts by everyone</a></p>
+ {% 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 %}
+ {% endif %}
+</div>
diff --git a/website/templates/html/blog_page.html b/website/templates/html/blog_page.html
index 6f7796b..e669642 100644
--- a/website/templates/html/blog_page.html
+++ b/website/templates/html/blog_page.html
@@ -14,7 +14,7 @@
<!-- begin blog content -->
<div class="help" style="color: #aaa">
- {{ blogger_info and blogger_info.full_name or full_name }} wrote this on {{ updated }}</div>
+ {{ blogger_info and blogger_info.full_name or full_name }} / {{ updated }}</div>
<br>
{{ content_html }}
<!-- end blog content -->
@@ -30,23 +30,23 @@
<h4>{{ blogger_info.full_name }}</h4>
<p>{{ blogger_info.bio }}</p>
<p><a href="blog?by={{ blogger_info.name }}&by_name={{ blogger_info.full_name }}">
- All posts by {{ blogger_info.full_name }}</a></p>
+ {{ texts.all_posts_by }} {{ blogger_info.full_name }}</a></p>
</div>
</div>
{% endif %}
<hr>
- <h3>Comments</h3><br>
+ <h3>{{ texts.comments }}</h3><br>
<div class="blog-comments">
{% if not comment_list %}
<div class="no-comment">
- <p>Be the first one to comment</p>
+ <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">
<div class="alert" style="display:none;"></div>
@@ -56,11 +56,10 @@
<input name="comment_by" placeholder="Your Email Id" type="text"/><br>
<textarea name="comment" placeholder="Comment" style="width: 300px; height: 120px;"/>
</textarea><br>
- <button class="btn btn-info" id="submit-comment">Submit</button>
+ <button class="btn btn-info" id="submit-comment">{{ texts.submit }}</button>
</fieldset>
</form>
</div>
- <hr>
- <a href="blog">Show posts by everyone</p>
</div>
+{% include 'html/blog_footer.html' %}
{% endblock %}
\ No newline at end of file
diff --git a/website/templates/js/blog.js b/website/templates/js/blog.js
index 70df99c..3cfb234 100644
--- a/website/templates/js/blog.js
+++ b/website/templates/js/blog.js
@@ -26,8 +26,12 @@
if(get_url_arg("by_name")) {
$("#blog-title").html("Posts by " + get_url_arg("by_name"));
- $("#blog-link").toggle(true);
}
+
+ if(get_url_arg("category")) {
+ $("#blog-title").html("Posts filed under " + get_url_arg("category"));
+ }
+
});
var blog = {
@@ -39,7 +43,8 @@
data: {
cmd: "website.helpers.blog.get_blog_list",
start: blog.start,
- by: get_url_arg("by")
+ by: get_url_arg("by"),
+ category: get_url_arg("category")
},
dataType: "json",
success: function(data) {
diff --git a/website/templates/pages/blog.html b/website/templates/pages/blog.html
index def83fe..05302c6 100644
--- a/website/templates/pages/blog.html
+++ b/website/templates/pages/blog.html
@@ -13,7 +13,6 @@
{% block content %}
<div class="span12">
<h2 id="blog-title">Blog</h2>
- <p id="blog-link" style="display:none"><a href="blog">Show posts by everyone.</a></p>
<br>
<div id="blog-list">
<!-- blog list will be generated dynamically -->
@@ -23,4 +22,5 @@
style="display:none;">More...</button>
</div>
</div>
+{% include 'html/blog_footer.html' %}
{% endblock %}
\ No newline at end of file