diff --git a/modules/system.py b/modules/system.py index 363bbd0..d52d63a 100644 --- a/modules/system.py +++ b/modules/system.py @@ -8,7 +8,7 @@ from livereload import Server from pygemstones.io import file -from modules import assets, config +from modules import assets, config, time flask_app = None freezer_app = None @@ -66,6 +66,7 @@ def setup(): flask_app.config["FREEZER_DESTINATION"] = config.build_dir flask_app.jinja_env.globals.update(file=file) + flask_app.jinja_env.globals.update(time=time) flask_app.jinja_env.globals.update(path=os.path) flask_app.jinja_env.globals.update(is_debug=is_debug()) flask_app.jinja_env.auto_reload = is_debug() diff --git a/modules/time.py b/modules/time.py index eae2855..def9844 100644 --- a/modules/time.py +++ b/modules/time.py @@ -9,3 +9,8 @@ def current_time(): # ----------------------------------------------------------------------------- def current_time_ms(): return round(time.time() * 1000) + + +# ----------------------------------------------------------------------------- +def current_time_str(): + return time.strftime("%Y-%m-%d %H:%M:%S") diff --git a/templates/pages/about.html b/templates/pages/about.html index 20266d4..7d45eeb 100644 --- a/templates/pages/about.html +++ b/templates/pages/about.html @@ -10,9 +10,9 @@ {{ page_container_start() }}
-
- Logo -
+
+ Logo +

@@ -24,22 +24,25 @@

About Kaktos


- Kaktos is a python static site generator. + Kaktos is a python static site generator.

- The idea is create a simple static site generator for people that don't need server-side languages and server. + The idea is create a simple static site generator for people that don't need server-side languages and server.

- Designers can use it too, since it don't need people that know a programming language. + Designers can use it too, since it don't need people that know a programming language. +

+

+ Version: {{ time.current_time_str() }}



- - Learn more - + + Learn more +
{{ page_container_end() }} diff --git a/templates/pages/gallery.html b/templates/pages/gallery.html index 36a3c61..a86e045 100644 --- a/templates/pages/gallery.html +++ b/templates/pages/gallery.html @@ -8,14 +8,14 @@ {% endblock %} @@ -26,9 +26,9 @@ {{ page_container_start() }}
-
- Logo -
+
+ Logo +

@@ -40,23 +40,24 @@

Gallery


- {% for gallery in file.find_dirs(path.join("files", "images", "gallery"), "*") %} + {% for gallery in file.find_dirs(path.join("files", "images", "gallery"), "*") %} - {% for image in file.find_files(gallery, ["*.jpg", "*.png"]) %} + {% for image in file.find_files(gallery, ["*.jpg", "*.png"]) %} -
- - - -
+
+ + + +
- {% endfor %} + {% endfor %} - {% else %} + {% else %} - No gallery + No gallery - {% endfor %} + {% endfor %}

diff --git a/templates/pages/index.html b/templates/pages/index.html index 47cc817..d161a9d 100644 --- a/templates/pages/index.html +++ b/templates/pages/index.html @@ -6,31 +6,31 @@ {{ page_container_start() }}
-

Generated with success!

- -
-
-
- -
- Logo -
- -
-
-
- -
-

- It was generated by Kaktos static site generator -

- -
- - Learn more - +

Generated with success!

+ +
+
+
+ +
+ Logo +
+ +
+
+
+ +
+

+ It was generated by Kaktos static site generator +

+ +
+ + Learn more + +
-
diff --git a/templates/shared/footer.html b/templates/shared/footer.html index 38d946c..9b5d1fe 100644 --- a/templates/shared/footer.html +++ b/templates/shared/footer.html @@ -1,10 +1,10 @@ diff --git a/templates/shared/google-analytics.html b/templates/shared/google-analytics.html index 5380f91..c162453 100644 --- a/templates/shared/google-analytics.html +++ b/templates/shared/google-analytics.html @@ -1,9 +1,9 @@ diff --git a/templates/shared/head.html b/templates/shared/head.html index 7509583..f9233ef 100644 --- a/templates/shared/head.html +++ b/templates/shared/head.html @@ -1,7 +1,7 @@ + content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> {%- if page_title %} {%- set page_title = page_title + " - " + kaktos.config.title -%} @@ -184,8 +184,8 @@ {% endif -%} + href="/assets/css/main.css{% if not kaktos.is_debug %}?v={{ kaktos.config.version_css_file }}{% endif %}" + type="text/css" /> diff --git a/templates/shared/header.html b/templates/shared/header.html index 5ec1aac..20d823c 100644 --- a/templates/shared/header.html +++ b/templates/shared/header.html @@ -1,37 +1,38 @@
- -
+ diff --git a/templates/shared/macros.html b/templates/shared/macros.html index 5196066..6587f92 100644 --- a/templates/shared/macros.html +++ b/templates/shared/macros.html @@ -1,11 +1,11 @@ {% macro page_container_start() -%}
-
+
{%- endmacro %} {% macro page_container_end() -%} -
+
{%- endmacro %}