aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bootstrap2/LICENSE.txt13
-rw-r--r--bootstrap2/static/js/autosidebar.js8
-rw-r--r--bootstrap2/templates/article.html5
-rw-r--r--bootstrap2/templates/article_infos.html10
-rw-r--r--bootstrap2/templates/base.html50
-rw-r--r--bootstrap2/templates/github.html2
-rw-r--r--bootstrap2/templates/index.html5
-rw-r--r--bootstrap2/templates/taglist.html4
-rw-r--r--bootstrap2/templates/translations.html4
-rw-r--r--bootstrap2/templates/twitter_profile.html1
10 files changed, 59 insertions, 43 deletions
diff --git a/bootstrap2/LICENSE.txt b/bootstrap2/LICENSE.txt
new file mode 100644
index 0000000..ab27ee7
--- /dev/null
+++ b/bootstrap2/LICENSE.txt
@@ -0,0 +1,13 @@
+Copyright 2012 Jiachen Yang <farseerfc@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. \ No newline at end of file
diff --git a/bootstrap2/static/js/autosidebar.js b/bootstrap2/static/js/autosidebar.js
index 2f4a6d2..b9cef7e 100644
--- a/bootstrap2/static/js/autosidebar.js
+++ b/bootstrap2/static/js/autosidebar.js
@@ -7,20 +7,20 @@ jQuery.fn.justtext = function() {
};
-$(document).ready(function(){
+$(document).ready(function(){
$("h1").each(function(){
$("#sidebar").append(
- "<h4><a href='#'>"+$(this).justtext()+"</a></h4>"
+ "<li class=\"nav-header\"><h4>"+$(this).children()[0].justtext()+"</h4></li>"
);
ul = $("<ul>");
$("h2",$(this).parent().parent()).each(function(){
ul.append(
- "<li><a href='#'>"+$(this).justtext()+"</a></li>"
+ "<li class=\"nav-header\"><h5>"+$(this).justtext()+"</h5></li>"
);
subul = $("<ul>");
$("h3",$(this).parent()).each(function(){
subul.append(
- "<li><a href='#'>"+$(this).justtext()+"</a></li>"
+ "<li class=\"nav-header\"><h6>"+$(this).justtext()+"</h6></li>"
);
});
ul.append(subul);
diff --git a/bootstrap2/templates/article.html b/bootstrap2/templates/article.html
index 3e210a2..8b9e0ab 100644
--- a/bootstrap2/templates/article.html
+++ b/bootstrap2/templates/article.html
@@ -8,9 +8,10 @@
<a href="{{ pagename }}"
rel="bookmark"
title="Permalink to {{ article.title }}">
- {{ article.title}}
+ {{ article.title}}
</a>
- </h1> {% include 'twitter.html' %}
+ {% include 'twitter.html' %}
+ </h1>
</header>
<div class="entry-content">
<div class="well">
diff --git a/bootstrap2/templates/article_infos.html b/bootstrap2/templates/article_infos.html
index 7596f40..0a6ce7a 100644
--- a/bootstrap2/templates/article_infos.html
+++ b/bootstrap2/templates/article_infos.html
@@ -1,14 +1,14 @@
<footer class="post-info">
<span class="label">Date</span>
<abbr class="published" title="{{ article.date.isoformat() }}">
- {{ article.locale_date }}
+ <i class="icon-calendar"></i>{{ article.locale_date }}
</abbr>
{% if article.author %}
-<span class="label label-info">By</span>
-<a class="btn btn-primary xsmall" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
+<span class="label">By</span>
+<a href="{{ SITEURL }}/{{ article.author.url }}"><i class="icon-user"></i>{{ article.author }}</a>
{% endif %}
-<span class="label label-success">Category</span>
-<a class="btn btn-success xsmall" href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>.
+<span class="label">Category</span>
+<a href="{{ SITEURL }}/{{ article.category.url }}"><i class="icon-folder-open"></i>{{ article.category }}</a>.
{% if PDF_PROCESSOR %}
<span class="label">
diff --git a/bootstrap2/templates/base.html b/bootstrap2/templates/base.html
index 9a270d4..6aba1f7 100644
--- a/bootstrap2/templates/base.html
+++ b/bootstrap2/templates/base.html
@@ -60,8 +60,6 @@
<body>
- {% include 'github.html' %}
-
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
@@ -70,7 +68,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
- <a class="brand" href="{{ SITEURL }}">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a>
+ <a class="brand" href="{{ SITEURL }}/index.html">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a>
<div class="nav-collapse">
<ul class="nav">
{% for title, link in MENUITEMS %}
@@ -80,24 +78,19 @@
{% for page in PAGES %}
<li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
{% endfor %}
+ <li class="divider-vertical"></li>
{% endif %}
{% for cat, null in categories %}
<li {% if cat == category %}class="active"{% endif %}>
- <a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a>
+ <a href="{{ SITEURL }}/category/{{ cat }}.html">
+ <i class="icon-folder-open icon-large"></i>{{ cat }}
+ </a>
</li>
{% endfor %}
<li class="divider-vertical"></li>
- <li class="dropdown" id="othermenu">
- <a class="dropdown-toggle" data-toggle="dropdown">
- Others
- <b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
- <li><a href="{{ SITEURL }}/tags.html">Tags</a></li>
- </ul>
+ <li><a href="{{ SITEURL }}/archives.html"><i class="icon-th-list"></i>Archives</a></li>
</li>
</ul>
@@ -109,25 +102,34 @@
<div class="container-fluid">
<div class="row">
- <div class="span2 well sidebar-nav" id="sidebar">
+ <div class="span3 well sidebar-nav" id="sidebar">
<ul class="nav nav-list">
{% if LINKS %}
<li class="nav-header"><h4><i class="icon-external-link"></i>blogroll</h4></li>
{% for name, link in LINKS %}
- <li><a href="{{ link }}">{{ name }}</a></li>
+ <li><i class="icon-external-link"></i><a href="{{ link }}">{{ name }}</a></li>
{% endfor %}
{% endif %}
{% if SOCIAL %}
<li class="nav-header"><h4><i class="icon-home icon-large"></i> social</h4></li>
- <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">atom feed</a></li>
+ <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate"><i class="icon-bookmark icon-large"></i>atom feed</a></li>
{% if FEED_RSS %}
- <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">rss feed</a></li>
+ <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate"><i class="icon-bookmark icon-large"></i>rss feed</a></li>
{% endif %}
{% for name, link in SOCIAL %}
<li><a href="{{ link }}"><i class="icon-{{ name }}-sign icon-large"></i>{{ name }}</a></li>
{% endfor %}
{% endif %}
+ <li class="nav-header"><h4><i class="icon-folder-close icon-large"></i>Catagories</h4></li>
+ {% for cat, null in categories %}
+ <li>
+ <a href="{{ SITEURL }}/category/{{ cat }}.html">
+ <i class="icon-folder-open icon-large"></i>{{ cat }}
+ </a>
+ </li>
+ {% endfor %}
+
<li class="nav-header"><h4><i class="icon-tags icon-large"></i>Tags</h4></li>
{% for tag in tag_cloud %}
<li class="tag-{{ tag.1 }}">
@@ -136,28 +138,28 @@
</a>
</li>
{% endfor %}
+
+ {% include 'twitter_profile.html' %}
</ul>
</div><!--/.well -->
- <div class="span10" id="content">
+ <div class="span9" id="content">
{% block content %}
{% endblock %}
</div><!--/span-->
-
-
-
-
</div><!--/row-->
<hr>
<footer>
<address id="about">
- Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+ Proudly powered by <a href="http://pelican.notmyidea.org/">Pelican <i class="icon-external-link"></i></a>,
+ which takes great advantage of <a href="http://python.org">Python <i class="icon-external-link"></i></a>.
</address><!-- /#about -->
- <p>The theme is from <a href="http://twitter.github.com/bootstrap/">Bootstrap from Twitter</a>, thanks!</p>
+ <p>The theme is from <a href="http://twitter.github.com/bootstrap/">Bootstrap from Twitter <i class="icon-external-link"></i></a>,
+ and <a href="http://fortawesome.github.com/Font-Awesome/">Font-Awesome <i class="icon-external-link"></i></a>, thanks!</p>
</footer>
</div><!--/.fluid-container-->
diff --git a/bootstrap2/templates/github.html b/bootstrap2/templates/github.html
index 75592ac..31e6c47 100644
--- a/bootstrap2/templates/github.html
+++ b/bootstrap2/templates/github.html
@@ -1,7 +1,7 @@
{% if GITHUB_URL %}
<a href="{{ GITHUB_URL }}">
{% if GITHUB_POSITION != "left" %}
-<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+<img style="position: absolute; top: 0; left: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_left_red_aa0000.png" alt="Fork me on GitHub" />
{% else %}
<img style="position: absolute; top: 0; left: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_left_white_ffffff.png" alt="Fork me on GitHub" />
{% endif %}
diff --git a/bootstrap2/templates/index.html b/bootstrap2/templates/index.html
index 4dd4279..f1a75d9 100644
--- a/bootstrap2/templates/index.html
+++ b/bootstrap2/templates/index.html
@@ -2,10 +2,9 @@
{% block content_title %}{% endblock %}
{% block content %}
{% if articles %}
- <h1>Articles</h1>
{% for article in (articles_page.object_list if articles_page else articles) %}
<div class='article'>
- <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
+ <h1><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
<div class="well small">{% include "article_infos.html" %}</div>
<div class="summary">{{ article.summary }}
<a class="btn primary xsmall" href="{{ SITEURL }}/{{ article.url }}">more ...</a>
@@ -13,7 +12,7 @@
</div>
<hr />
{% endfor %}
- {%endif%}
+{%endif%}
{% if articles_page and articles_paginator.num_pages > 1 %}
<div class="pagination">
diff --git a/bootstrap2/templates/taglist.html b/bootstrap2/templates/taglist.html
index c7d5371..c87ec0e 100644
--- a/bootstrap2/templates/taglist.html
+++ b/bootstrap2/templates/taglist.html
@@ -1,6 +1,6 @@
{% if article.tags %}
-<span class="label label-warning">Tags</span>
+<span class="label">Tags</span>
{% for tag in article.tags %}
- <a href="{{ SITEURL }}/{{ tag.url }}" class="btn btn-warning xsmall">{{ tag }}</a>
+ <a href="{{ SITEURL }}/{{ tag.url }}"><i class="icon-tag"></i>{{ tag }}</a>
{% endfor %}
{% endif %}
diff --git a/bootstrap2/templates/translations.html b/bootstrap2/templates/translations.html
index b869dfd..d705533 100644
--- a/bootstrap2/templates/translations.html
+++ b/bootstrap2/templates/translations.html
@@ -1,6 +1,6 @@
{% if article.translations %}
-<span class="label label-important">Lang</span>
+<span class="label">Lang</span>
{% for translation in article.translations %}
- <a href="{{ SITEURL }}/{{ translation.url }}" class="btn btn-danger xsmall">{{ translation.lang }}</a>
+ <a href="{{ SITEURL }}/{{ translation.url }}"><i class="icon-edit"></i>{{ translation.lang }}</a>
{% endfor %}
{% endif %}
diff --git a/bootstrap2/templates/twitter_profile.html b/bootstrap2/templates/twitter_profile.html
new file mode 100644
index 0000000..5d913e9
--- /dev/null
+++ b/bootstrap2/templates/twitter_profile.html
@@ -0,0 +1 @@
+{% if TWITTER_USERNAME %} <li class="nav-header"><h4><i class="icon-twitter-sign"></i>Twitter</h4></li> <script charset="utf-8" src="http://widgets.twimg.com/j/2/widget.js"></script> <script> new TWTR.Widget({ version: 2, type: 'profile', rpp: 4, interval: 30000, width: 'auto', height: 300, theme: { shell: { background: '#f5f5f5', color: '#000000' }, tweets: { background: '#ffffff', color: '#000000', links: '#1a50a1' } }, features: { scrollbar: false, loop: false, live: false, behavior: 'all' } }).render().setUser('{{ TWITTER_USERNAME }}').start(); </script> {% endif %} \ No newline at end of file
generated by cgit (git 2.34.1) at 2024-11-16 04:45:33 +0000