From 344bb82fb430265b369e6e045165e08f23720b44 Mon Sep 17 00:00:00 2001 From: maste9 Date: Sun, 22 Mar 2015 00:08:55 +0100 Subject: [PATCH] Now ... There had been some restructuring on code: * update_blog has been split up into functions which build index, archive and current articles separately * Main's h1-title now shows the same terms like in nav-bar. * Articles now have perma-links - at least for current articles at this moment. Same function will be added soon for archieved articles. picoblogger is now close to beta testing I would claim ... --- picoblogger/blog/{ => css}/style.css | 0 picoblogger/blog/html/1426006082.html | 86 ++++++++++++++++++++ picoblogger/blog/html/1426966835.html | 86 ++++++++++++++++++++ picoblogger/blog/html/archive.html | 71 +++++++++++++++++ picoblogger/blog/html/index.html | 101 ++++++++++++++++++++++++ picoblogger/blog/l10n/de/static.conf | 6 +- picoblogger/blog/templates/article.htm | 2 +- picoblogger/blog/templates/index.htm | 3 +- picoblogger/blog/templates/main.htm | 1 + picoblogger/blog/templates/nav.htm | 4 +- picoblogger/main.py | 105 +++++++++++++++++++------ 11 files changed, 431 insertions(+), 34 deletions(-) rename picoblogger/blog/{ => css}/style.css (100%) create mode 100644 picoblogger/blog/html/1426006082.html create mode 100644 picoblogger/blog/html/1426966835.html create mode 100644 picoblogger/blog/html/archive.html create mode 100644 picoblogger/blog/html/index.html diff --git a/picoblogger/blog/style.css b/picoblogger/blog/css/style.css similarity index 100% rename from picoblogger/blog/style.css rename to picoblogger/blog/css/style.css diff --git a/picoblogger/blog/html/1426006082.html b/picoblogger/blog/html/1426006082.html new file mode 100644 index 0000000..3d707ed --- /dev/null +++ b/picoblogger/blog/html/1426006082.html @@ -0,0 +1,86 @@ + + + + Mein Blog + + + + + + + + + + + + + + +
+

Mein Blog

Meine Worte, Meine Meinung ...

+
+ +
+
+

Artikel

+
+
+

This article should stay on index!

+
+
Autor
homer77
+
Erstellt am
10.03.2015 um 17:48 Uhr
+
Zuletzt geändert
10.03.2015 um 16:49 Uhr
+
+
+

As this should be the only article on this machine written in march 2015 all the others should be moved to the correct folders in archive folder.

+

Let's have a look!

+ +
+ +
+ +
+ + + + diff --git a/picoblogger/blog/html/1426966835.html b/picoblogger/blog/html/1426966835.html new file mode 100644 index 0000000..dd2e345 --- /dev/null +++ b/picoblogger/blog/html/1426966835.html @@ -0,0 +1,86 @@ + + + + Mein Blog + + + + + + + + + + + + + + +
+

Mein Blog

Meine Worte, Meine Meinung ...

+
+ +
+
+

Artikel

+ + +
+ +
+ + + + diff --git a/picoblogger/blog/html/archive.html b/picoblogger/blog/html/archive.html new file mode 100644 index 0000000..f7bd9f1 --- /dev/null +++ b/picoblogger/blog/html/archive.html @@ -0,0 +1,71 @@ + + + + Mein Blog + + + + + + + + + + + + + + +
+

Mein Blog

Meine Worte, Meine Meinung ...

+
+ +
+
+

Archiv

+

2015

2

  • Das ist der zweite Artikel
  • Ein zweiter Test!
  • Dies ist ein Test

    • 1

  • May the Fourth Be With You!!
    • +
    + +
    + + + + diff --git a/picoblogger/blog/html/index.html b/picoblogger/blog/html/index.html new file mode 100644 index 0000000..9bf45d7 --- /dev/null +++ b/picoblogger/blog/html/index.html @@ -0,0 +1,101 @@ + + + + Mein Blog + + + + + + + + + + + + + + +
    +

    Mein Blog

    Meine Worte, Meine Meinung ...

    +
    + +
    +
    +

    Aktuell

    + +
    +
    +

    This article should stay on index!

    +
    +
    Autor
    homer77
    +
    Erstellt am
    10.03.2015 um 17:48 Uhr
    +
    Zuletzt geändert
    10.03.2015 um 16:49 Uhr
    +
    +
    +

    As this should be the only article on this machine written in march 2015 all the others should be moved to the correct folders in archive folder.

    +

    Let's have a look!

    + +
    + +
    + +
    + + + + diff --git a/picoblogger/blog/l10n/de/static.conf b/picoblogger/blog/l10n/de/static.conf index f46b548..6393b15 100644 --- a/picoblogger/blog/l10n/de/static.conf +++ b/picoblogger/blog/l10n/de/static.conf @@ -4,7 +4,6 @@ APP_NAME = picoblogger APP_VERSION = 0.1 -MAIN_TITLE = Artikel TEMPLATE_ARTICLE_AUTHOR = Autor TEMPLATE_ARTICLE_CREATED = Erstellt am TEMPLATE_ARTICLE_MODIFIED = Zuletzt geändert @@ -16,8 +15,9 @@ CONTACT_MAIL_TITLE = E-Mail CONTACT_SOCIAL_TITLE = Diaspora NAV_TITLE = Navigation -HOME_BUTTON = Aktuell -ARCHIVE_BUTTON = Archiv +CURRENT = Aktuell +ARCHIVE = Archiv +ARTICLE = Artikel BLOG_CHARSET = utf-8 FOOTER_TITLE = Appendix diff --git a/picoblogger/blog/templates/article.htm b/picoblogger/blog/templates/article.htm index fd0b4e6..d86fa8c 100644 --- a/picoblogger/blog/templates/article.htm +++ b/picoblogger/blog/templates/article.htm @@ -1,6 +1,6 @@
    -

    ${ARTICLE_TITLE}

    +

    ${ARTICLE_TITLE}

    ${TEMPLATE_ARTICLE_AUTHOR}
    ${ARTICLE_AUTHOR}
    ${TEMPLATE_ARTICLE_CREATED}
    ${ARTICLE_CREATED_DATE} ${ARTICLE_CREATED_TIME}
    diff --git a/picoblogger/blog/templates/index.htm b/picoblogger/blog/templates/index.htm index 01f0e88..7c8607a 100644 --- a/picoblogger/blog/templates/index.htm +++ b/picoblogger/blog/templates/index.htm @@ -10,7 +10,7 @@ - + @@ -28,7 +28,6 @@
    -

    ${MAIN_TITLE}

    ${TEMPLATE_MAIN}