Dockerfile

@@ -8,20 +8,8 @@ WORKDIR /blog
 
 RUN pip3 install -r requirements.txt
 
-RUN apt-get update && \
-    apt-get install -y locales && \
-    sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \
-    sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
-    dpkg-reconfigure --frontend=noninteractive locales
-
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
 VOLUME /blog/templates/entry
 
-VOLUME /blog/static/graphics
-
 EXPOSE 5000
 
 ENTRYPOINT [ "python3" ]

README.md

@@ -26,9 +26,6 @@ via plain text files.
 - [x] Switchable CSS
   - [x] CSS dark-theme
   - [x] CSS light-theme
-- [x] Language Support
-  - [x] English
-  - [x] German
 - [x] Config file
 - [x] Docker installation
 - [x] Logo
@@ -62,12 +59,11 @@ The `config.py` can be found in the `src` folder.
 Set the following volumes with the -v tag.
 
 | Volume-Name   | Container mount             | Description                                                  |
-| ------------- | ----------------------- | ------------------------------------------------------------ |
+| ------------- | --------------------------- | ------------------------------------------------------------ |
-| `config-file` | `/blog/config.py`       | Config file                                                  |
+| `config-file` | `/blog/src/config.py`       | Config file                                                  |
-| `entries`     | `/blog/templates/entry` | Directory for blog entries                                   |
+| `entries`     | `/blog/src/templates/entry` | Directory for blog entries                                   |
-| `graphics`    | `/blog/static/graphics` | Directory for images needed for entries                      |
+| `css`         | `/blog/src/static/css`      | (optional) Directory for css files                           |
-| `css`         | `/blog/static/css`      | (optional) Directory for css files                           |
+| `html`        | `/blog/src/templates`       | (optional) Directory for templates (entry-volume not needed) |
-| `html`        | `/blog/templates`       | (optional) Directory for templates (entry-volume not needed) |
 
 #### Ports
 

rebuild.sh

@@ -6,6 +6,4 @@ docker run --name beaker-blog \
     --restart unless-stopped \
     -p "5000:5000" \
     -e FLASK_ENV=development \
-    -v entries:/blog/templates/entry \
-    -v graphics:/blog/static/graphics \
     -d tiyn/beaker-blog

src/app.py

@@ -8,34 +8,33 @@ app = Flask(__name__)
 
 TITLE = config.TITLE
 STYLE = config.STYLE
-LANGUAGE = config.LANGUAGE
 DESCRIPTION = config.DESCRIPTION
 WEBSITE = config.WEBSITE
 
 @app.errorhandler(404)
 def page_not_found(e):
-    return render_template("error.html", title=TITLE, errorcode="404", style=STYLE, language=LANGUAGE), 404
+    return render_template("error.html", title=TITLE, errorcode="404", style=STYLE), 404
 
 
 @app.route("/")
 @app.route("/index.html")
 def index():
     content = con_gen.gen_index_string()
-    return render_template("index.html", title=TITLE, content_string=content, style=STYLE, language=LANGUAGE)
+    return render_template("index.html", title=TITLE, content_string=content, style=STYLE)
 
 
 @app.route("/archive")
 @app.route("/archive.html")
 def archive():
     content = con_gen.gen_arch_string()
-    return render_template("archive.html", title=TITLE, content_string=content, style=STYLE, language=LANGUAGE)
+    return render_template("archive.html", title=TITLE, content_string=content, style=STYLE)
 
 
 @app.route("/entry/<path>")
 def entry(path):
     content = con_gen.gen_stand_string(path)
     if content != "":
-        return render_template("standalone.html", title=TITLE, content_string=content, style=STYLE, language=LANGUAGE)
+        return render_template("standalone.html", title=TITLE, content_string=content, style=STYLE)
     abort(404)
 
 

src/config.py

@@ -9,6 +9,3 @@ WEBSITE = "localhost:5000"
 
 # Theme for the blog: dark, light
 STYLE = "dark"
-
-# Language for the titles: en-us or de-de
-LANGUAGE = "en-us"

src/content.py

@@ -1,20 +1,12 @@
-import locale
-import os
-import pathlib
 from datetime import datetime
+import markdown
+import os
 from os import path
+import pathlib
 
 import config
-import markdown
 
 ENTRY_DIR = "templates/entry"
-LANGUAGE = config.LANGUAGE
-LOCAL = "de_DE.UTF-8" if LANGUAGE == "de-de" else "en_US.UTF-8"
-
-locale.setlocale(locale.LC_TIME, LOCAL)
-
-standalone_str = "Artikel" if LANGUAGE == "de-de" else "standalone"
-
 
 def gen_arch_string():
     """
@@ -31,8 +23,10 @@ def gen_arch_string():
         content_string = ""
         last_month = ""
         for file in reversed(contents):
-      curr_date = datetime.fromtimestamp(os.path.getctime(file)).strftime("%Y-%m-%d")
+            curr_date = datetime.fromtimestamp(
-      curr_month = datetime.fromtimestamp(os.path.getctime(file)).strftime("%B %Y")
+                os.path.getctime(file)).strftime("%Y-%m-%d")
+            curr_month = datetime.fromtimestamp(
+                os.path.getctime(file)).strftime("%b %Y")
             if curr_month != last_month:
                 if last_month != "":
                     content_string += "</ul>\n"
@@ -45,11 +39,13 @@ def gen_arch_string():
             if filename[0] != ".":
                 filename = filename.split(".", 1)[0]
             content_string += "<li>"
+            content_string += curr_date + " - "
+            content_string += title + " ["
             content_string += "<a href=\"" + "/index.html#" + \
-          filename + "\">" + curr_date + "</a> - "
+                filename + "\">" + "link" + "</a> - "
             content_string += "<a href=\"" + "/entry/" + \
-          pathlib.PurePath(file).name + "\"><b>" + title + "</b></a>"
+                pathlib.PurePath(file).name + "\">" + "standalone" + "</a>"
-      content_string += "<br>"
+            content_string += "] <br>"
             content_string += "</li>\n"
         content_string += "</ul>\n"
         return content_string
@@ -77,19 +73,19 @@ def gen_index_string():
             if filename[0] != ".":
                 filename = filename.split(".", 1)[0]
             content_string += "<div class=\"entry\">\n"
-      content_string += "<h2 id=\"" + filename + "\">"
+            content_string += "<h2 id=\"" + filename + "\">" + title + "</h2>\n"
-      content_string += "<a href=\"" + "/entry/" + \
+            content_string += "[<a href=\"" + "/entry/" + \
                 pathlib.PurePath(file).name + "\">" + \
-          title + "</a>" +"</h2>\n"
+                "standalone" + "</a>]<br>\n"
-      content_string += "<small>" + \
-          datetime.fromtimestamp(os.path.getctime(
-              file)).strftime("%Y-%m-%d") + "</small><br><br>"
             if file.endswith(".html"):
                 for line in text:
                     content_string += line
                 content_string += "<br>"
             if file.endswith(".md"):
                 content_string += gen_md_content(file, 2)
+            content_string += "<small>" + \
+                datetime.fromtimestamp(os.path.getctime(
+                    file)).strftime("%Y-%m-%d") + "</small>"
             content_string += "</div>"
     return content_string
 
@@ -111,13 +107,12 @@ def gen_stand_string(path_ex):
     if path.exists(filename):
         title = open(filename).readline().rstrip("\n")
         text = open(filename).readlines()[1:]
-    curr_date = datetime.fromtimestamp(os.path.getctime(filename)).strftime("%Y-%m-%d")
         filename_no_end = filename.split(".", 1)[0]
-    filename_no_end = filename_no_end.split("/")[-1]
         content_string += "<h1>" + title + "</h1>\n"
+        content_string += "["
         content_string += "<a href=\"" + "/index.html#" + \
-        filename_no_end + "\">" + curr_date + "</a>"
+            filename_no_end + "\">" + "link" + "</a>"
-    content_string += "<br>\n"
+        content_string += "]<br>\n"
         if filename.endswith(".html"):
             for line in text:
                 content_string += line
@@ -150,7 +145,9 @@ def gen_md_content(path_ex, depth):
         markdown_text = ""
         for line in markdown_lines:
             markdown_text += line.replace("# ", header)
-    content_string = markdown.markdown(markdown_text, extensions=["fenced_code", "tables"])
+        content_string = markdown.markdown(
+            markdown_text, extensions=["fenced_code", "tables"]
+        )
     return content_string
 
 

src/requirements.txt

@@ -1,2 +1,2 @@
-Flask
+Flask==1.1.2
-Markdown
+Markdown==3.1.1

src/static/css/light.css

@@ -6,7 +6,7 @@
     --error: rgb(255,0,0);
     --footerbg0: rgb(192,192,192);
     --link0: rgb(0,0,120);
-    --link1: rgb(0,0,0);
+    --link1: rgb(255,255,255);
     --menulink0: rgb(0,0,120);
     --menulink1: rgb(255,255,255);
     --menubg0: rgb(192,192,192);

src/static/css/style.css

@@ -76,10 +76,6 @@ footer .center {
     padding-top: 10px;
 }
 
-
-.main-menu-dropdown img {
-    float: left;
-}
 .main-menu-dropdown span {
     float: left;
     font-family: monospace;
@@ -171,24 +167,3 @@ footer .center {
     padding-left: 20;
 }
 
-figure {
-    padding:20px;
-}
-
-ul {
-    padding-left:20px;
-}
-
-ol {
-    padding-left:20px;
-}
-
-code {
-    border-radius: 25px;
-    padding-left: 20px;
-    padding-right: 20px;
-    page-break-inside: avoid;
-    font-family: monospace;
-    white-space: pre;
-    display: inline-block
-}

src/templates/archive.html

@@ -2,7 +2,7 @@
 {% block content %}
 <div class="container">
     <div class="blogarchive">
-	<h1>{% if language=="de-de" %}Archiv{% else %}Archive{% endif %}</h1><br>
+	<h1>Archive</h1><br>
         {% autoescape off %}
         {{ content_string }}
         {% endautoescape %}

src/templates/error.html

@@ -2,7 +2,7 @@
 {% block content %}
 <div class="container">
     <div class="important">
-        {% if language=="de-de" %}Fehler{% else %}Error{% endif %}<br>
+        Error<br>
 	<span>{{ errorcode }}</span>
     </div>
 </div>

src/templates/index.html

@@ -2,7 +2,7 @@
 {% block content %}
 <div class="container">
     <div class="blog">
-        <h1>Feed</h1><br>
+        <h1>Index</h1><br>
         {% autoescape off %}
         {{ content_string }}
         {% endautoescape %}

src/templates/rss.xml

@@ -4,7 +4,7 @@
 <channel>
     <title>{{ title }}</title>
     <description>{{ description }}</description>
-    <language>{{ language }}</language>
+<language>en-us</language>
 <link>{{ website }}/feed.xml</link>
 <atom:link href="/feed.xml" rel="self" type="application/rss+xml" />
 

src/templates/template.html

@@ -2,22 +2,19 @@
 <head>
     <title>{{ title }}</title>
     <link href="{{ url_for('static', filename='css/' + style + '.css') }}" rel="stylesheet" type="text/css">
-    <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='graphics/logo.png') }}">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width" initial-scale=1.0>
 </head>
 <body>
     <!-- Menu -->
     <div class="main-menu-dropdown">
-        <a href="{{ url_for('index') }}">
+        <!-- <img class="logo" src="/static/images/logo.png"> -->
-          <img class="logo" src="{{ url_for('static', filename='graphics/logo.png') }}">
         <span>{{ title }}</span>
-        </a>
         <input type="checkbox" id="main-menu-check">
         <label for="main-menu-check" class="show-menu">&#9776;</label>
         <div class="main-menu">
             <a href="{{ url_for('index') }}">Blog</a>
-            <a href="{{ url_for('archive') }}">{% if language=="de-de" %}Archiv{% else %}Archive{% endif %}</a>
+            <a href="{{ url_for('archive') }}">Archive</a>
             <label for="main-menu-check" class="hide-menu">X</label>
         </div>
     </div>