diff --git a/qsgen2 b/qsgen2
index fb15e52..b3ff6ba 100755
--- a/qsgen2
+++ b/qsgen2
@@ -410,6 +410,10 @@ function _pages() {
if (${debug}) _msg debug "_pages: Replacing tagline"
local pages_tpl=$( echo ${pages_tpl} | perl -pe "s|#tagline|${site_tagline}|gs" )
+ # Replace every #sitename in pages_tpl
+ if (${debug}) _msg debug "_pages: Replacing sitename"
+ local pages_tpl=$( echo ${pages_tpl} | perl -pe "s|#sitename|${site_name}|gs" )
+
# Replace #updated with today's date and #version with Name and Version to footer
if (${debug}) _msg debug "_pages: _last_updated in pages_tpl"
local pages_tpl=$( _last_updated ${pages_tpl} )
@@ -528,6 +532,15 @@ function _blogs() {
elif [[ ${file_ext} == "md" ]]; then
local blog_content=$(echo "$blog_content" | ${engine})
fi
+
+ # Replace every #tagline in blog_content
+ if (${debug}) _msg debug "_blogs: Replacing tagline"
+ local blog_content=$( echo ${blog_content} | perl -pe "s|#tagline|${site_tagline}|gs" )
+
+ # Replace every #sitename in blog_content
+ if (${debug}) _msg debug "_blogs: Replacing sitename"
+ local blog_content=$( echo ${blog_content} | perl -pe "s|#sitename|${site_name}|gs" )
+
blog_content=$(_last_updated "${blog_content}")
blog_content=$(_cleanup "${blog_content}")
diff --git a/themes/black-orange/blog_index.tpl b/themes/black-orange/blog_index.tpl
index b3dc9ac..ffa16e4 100644
--- a/themes/black-orange/blog_index.tpl
+++ b/themes/black-orange/blog_index.tpl
@@ -2,7 +2,7 @@
- kekePower - Blog
+ #sitename - Blog
@@ -20,8 +20,8 @@
-
- Having fun scripting and hacking Linux and Mageia
+
+ #tagline
|
diff --git a/themes/black-orange/blogs.tpl b/themes/black-orange/blogs.tpl
index 4020362..e9e51e8 100644
--- a/themes/black-orange/blogs.tpl
+++ b/themes/black-orange/blogs.tpl
@@ -2,7 +2,7 @@
- kekePower - BLOGTITLE
+ #sitename - BLOGTITLE
@@ -20,8 +20,8 @@
-
- Having fun scripting and hacking Linux and Mageia
+
+ #tagline
|
diff --git a/themes/black-orange/pages.tpl b/themes/black-orange/pages.tpl
index 0412a2d..ea4bf24 100644
--- a/themes/black-orange/pages.tpl
+++ b/themes/black-orange/pages.tpl
@@ -2,7 +2,7 @@
- kekePower - #pagetitle
+ #sitename - #pagetitle
@@ -20,7 +20,7 @@
-
+
#tagline
|
@@ -40,8 +40,12 @@
+
+
BODY
+
+
diff --git a/themes/minimal/blog_index.tpl b/themes/minimal/blog_index.tpl
index c8531e1..aeac9d0 100644
--- a/themes/minimal/blog_index.tpl
+++ b/themes/minimal/blog_index.tpl
@@ -2,7 +2,7 @@
-El Vikingo TI - Blog
+#sitename - Blog
@@ -25,7 +25,7 @@
-El Vikingo TI
+#sitename