From d4e47e48d34326810c2e666b0ee774723291ce2a Mon Sep 17 00:00:00 2001 From: Jiachen Yang Date: Sun, 11 Mar 2012 04:40:57 +0900 Subject: adjust bootstrap2 --- bootstrap2/templates/analytics.html | 18 +++--- bootstrap2/templates/archives.html | 20 +++---- bootstrap2/templates/article.html | 71 +++++++++++----------- bootstrap2/templates/article_infos.html | 25 +++++--- bootstrap2/templates/base.html | 74 ++++++++++++++++++----- bootstrap2/templates/categories.html | 12 ++-- bootstrap2/templates/index.html | 103 +++++++++++++------------------- bootstrap2/templates/page.html | 22 ++++--- bootstrap2/templates/piwik.html | 28 ++++----- bootstrap2/templates/taglist.html | 14 ++--- bootstrap2/templates/tags.html | 13 ++++ bootstrap2/templates/translations.html | 8 +-- 12 files changed, 218 insertions(+), 190 deletions(-) (limited to 'bootstrap2/templates') diff --git a/bootstrap2/templates/analytics.html b/bootstrap2/templates/analytics.html index ba174fc..b96f455 100644 --- a/bootstrap2/templates/analytics.html +++ b/bootstrap2/templates/analytics.html @@ -1,11 +1,11 @@ {% if GOOGLE_ANALYTICS %} - - + + {% endif %} \ No newline at end of file diff --git a/bootstrap2/templates/archives.html b/bootstrap2/templates/archives.html index 42870c2..83976a1 100644 --- a/bootstrap2/templates/archives.html +++ b/bootstrap2/templates/archives.html @@ -1,15 +1,13 @@ {% extends "base.html" %} {% block content %} -
-
-

Archives for {{ SITENAME }}

+
+

Archives for {{ SITENAME }}

-
- {% for article in dates %} -
{{ article.locale_date }}
-
{{ article.title }}
- {% endfor %} -
-
-
+
+{% for article in dates %} +
{{ article.locale_date }}
+
{{ article.title }}
+{% endfor %} +
+ {% endblock %} diff --git a/bootstrap2/templates/article.html b/bootstrap2/templates/article.html index f8c4672..3e210a2 100644 --- a/bootstrap2/templates/article.html +++ b/bootstrap2/templates/article.html @@ -1,40 +1,39 @@ {% extends "base.html" %} {% block title %}{{ article.title }}{% endblock %} {% block content %} -
-
-
-
-

- - {{ article.title}} - -

{% include 'twitter.html' %} -
-
- {% include 'article_infos.html' %} - {{ article.content }} -
- {% if DISQUS_SITENAME %} -
-

Comments !

-
- -
- {% endif %} - -
-
-
+
+
+
+

+ + {{ article.title}} + +

{% include 'twitter.html' %} +
+
+
+ {% include 'article_infos.html' %} +
+ {{ article.content }} +
+ {% if DISQUS_SITENAME %} +
+

Comments !

+
+ +
+ {% endif %} +
+
{% endblock %} diff --git a/bootstrap2/templates/article_infos.html b/bootstrap2/templates/article_infos.html index a1993a0..7596f40 100644 --- a/bootstrap2/templates/article_infos.html +++ b/bootstrap2/templates/article_infos.html @@ -1,14 +1,21 @@ diff --git a/bootstrap2/templates/base.html b/bootstrap2/templates/base.html index 6687460..9a270d4 100644 --- a/bootstrap2/templates/base.html +++ b/bootstrap2/templates/base.html @@ -17,8 +17,28 @@ .sidebar-nav { padding: 9px 0; } + + .tag-1 { + font-size: 13pt; + } + + .tag-2 { + font-size: 10pt; + } + + .tag-2 { + font-size: 8pt; + } + + .tag-4 { + font-size: 6pt; + } + + + + @@ -74,37 +108,46 @@
-
- -
- {% block content %} - {% endblock %} -
- -
-
+
+ +
+ +
+ {% block content %} + {% endblock %}
+ + +
@@ -114,7 +157,7 @@ Proudly powered by Pelican, which takes great advantage of Python. -

The theme is by Bootstrap from Twitter, thanks!

+

The theme is from Bootstrap from Twitter, thanks!

@@ -141,7 +184,8 @@ - + + diff --git a/bootstrap2/templates/categories.html b/bootstrap2/templates/categories.html index 911d6ec..4a9088f 100644 --- a/bootstrap2/templates/categories.html +++ b/bootstrap2/templates/categories.html @@ -1,10 +1,8 @@ {% extends "base.html" %} {% block content %} -
-
    - {% for category, articles in categories %} -
  • {{ category }}
    • - {% endfor %} -
-
+
    +{% for category, articles in categories %} +
  • {{ category }}
    • +{% endfor %} +
{% endblock %} diff --git a/bootstrap2/templates/index.html b/bootstrap2/templates/index.html index 2a5b726..4dd4279 100644 --- a/bootstrap2/templates/index.html +++ b/bootstrap2/templates/index.html @@ -2,70 +2,47 @@ {% block content_title %}{% endblock %} {% block content %} {% if articles %} - {% for article in articles_page.object_list %} +

Articles

+ {% for article in (articles_page.object_list if articles_page else articles) %} +
+

{{ article.title }}

+
{% include "article_infos.html" %}
+
{{ article.summary }} + more ... +
+
+
+ {% endfor %} + {%endif%} + + {% if articles_page and articles_paginator.num_pages > 1 %} + - {# First item #} - {% if loop.first and not articles_page.has_previous() %} -
- -
- {% if loop.length > 1 %} -
-
-

Other articles

-
-
    - {% endif %} - {# other items #} - {% else %} - {% if loop.first and articles_page.has_previous %} -
    -
    -
      - {% endif %} -
    1. -
      -
      -
      -

      {{ article.title }}

      -
      - -
      - {% include 'article_infos.html' %} - {{ article.summary }} - read more - {% include 'comments.html' %} -
      -
      -
      -
      2. - {% endif %} - {% if loop.last and (articles_page.has_previous() - or not articles_page.has_previous() and loop.length > 1) %} - {% include 'pagination.html' %} - {% endif %} - {% endfor %} - {% if loop.length > 1 or articles_page.has_previous() %} -
    -
    -
    - {% endif %} {% else %} -
    -
    -

    Pages

    - {% for page in PAGES %} -
  1. {{ page.title }}
    2. - {% endfor %} -
    -
    + {% if PAGES %} +
    +

    Pages

    + {% for page in PAGES %} +
  2. {{ page.title }}
    3. + {% endfor %} +
    + {% endif %} {% endif %} {% endblock content %} diff --git a/bootstrap2/templates/page.html b/bootstrap2/templates/page.html index b4a289e..8d51188 100644 --- a/bootstrap2/templates/page.html +++ b/bootstrap2/templates/page.html @@ -1,15 +1,13 @@ {% extends "base.html" %} {% block title %}{{ page.title }}{% endblock %} -{% block content %} -
    -
    -

    {{ page.title }}

    - {% if PDF_PROCESSOR %} - - get the pdf - - {% endif %} - {{ page.content }} -
    -
    +{% block content %} +
    +

    {{ page.title }}

    + {% if PDF_PROCESSOR %} + + get the pdf + + {% endif %} + {{ page.content }} +
    {% endblock %} diff --git a/bootstrap2/templates/piwik.html b/bootstrap2/templates/piwik.html index ff459af..2202089 100644 --- a/bootstrap2/templates/piwik.html +++ b/bootstrap2/templates/piwik.html @@ -1,16 +1,16 @@ {% if PIWIK_URL and PIWIK_SITE_ID %} - + {% endif %} \ No newline at end of file diff --git a/bootstrap2/templates/taglist.html b/bootstrap2/templates/taglist.html index a4b3446..c7d5371 100644 --- a/bootstrap2/templates/taglist.html +++ b/bootstrap2/templates/taglist.html @@ -1,12 +1,6 @@ {% if article.tags %} -

    tags: - {% for tag in article.tags %} - {{ tag }} - {% endfor %} -

    -{% endif %} -{% if PDF_PROCESSOR %} -

    - get the pdf -

    +Tags +{% for tag in article.tags %} + {{ tag }} +{% endfor %} {% endif %} diff --git a/bootstrap2/templates/tags.html b/bootstrap2/templates/tags.html index e69de29..6e8a22f 100644 --- a/bootstrap2/templates/tags.html +++ b/bootstrap2/templates/tags.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} +{% block content %} + +{% endblock %} \ No newline at end of file diff --git a/bootstrap2/templates/translations.html b/bootstrap2/templates/translations.html index 0079883..b869dfd 100644 --- a/bootstrap2/templates/translations.html +++ b/bootstrap2/templates/translations.html @@ -1,6 +1,6 @@ {% if article.translations %} -Translations: - {% for translation in article.translations %} - {{ translation.lang }} - {% endfor %} +Lang +{% for translation in article.translations %} + {{ translation.lang }} +{% endfor %} {% endif %} -- cgit