diff --git a/.htaccess b/.htaccess
index 5a85c80c..912ffa81 100644
--- a/.htaccess
+++ b/.htaccess
@@ -6,7 +6,7 @@ AddDefaultCharset UTF-8
RewriteEngine on
# Deny direct access to .txt files
-RewriteRule ^content/(.*)\.txt$ - [R=404,L]
+RewriteRule ^bl-content/(.*)\.txt$ - [R=404,L]
# All URL process by index.php
RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/bl-kernel/admin/controllers/dashboard.php b/bl-kernel/admin/controllers/dashboard.php
index d00ff280..e60a92d4 100644
--- a/bl-kernel/admin/controllers/dashboard.php
+++ b/bl-kernel/admin/controllers/dashboard.php
@@ -7,11 +7,12 @@ function updateBludit()
{
global $Site;
global $dbPosts;
+ global $dbPages;
// Check if Bludit need to be update.
if( ($Site->currentBuild() < BLUDIT_BUILD) || isset($_GET['update']) )
{
- // --- Update dates ---
+ // --- Update dates on posts ---
foreach($dbPosts->db as $key=>$post)
{
$date = Date::format($post['date'], 'Y-m-d H:i', DB_DATE_FORMAT);
@@ -22,6 +23,17 @@ function updateBludit()
$dbPosts->save();
+ // --- Update dates on pages ---
+ foreach($dbPages->db as $key=>$page)
+ {
+ $date = Date::format($page['date'], 'Y-m-d H:i', DB_DATE_FORMAT);
+ if($date !== false) {
+ $dbPages->setPageDb($key,'date',$date);
+ }
+ }
+
+ $dbPages->save();
+
// --- Update directories ---
$directories = array(
PATH_POSTS,
diff --git a/bl-kernel/dbpages.class.php b/bl-kernel/dbpages.class.php
index ef09e828..8235ed36 100644
--- a/bl-kernel/dbpages.class.php
+++ b/bl-kernel/dbpages.class.php
@@ -233,6 +233,15 @@ class dbPages extends dbJSON
return false;
}
+ public function setPageDb($key, $field, $value)
+ {
+ if($this->pageExists($key)) {
+ $this->db[$key][$field] = $value;
+ }
+
+ return false;
+ }
+
// Return TRUE if the page exists, FALSE otherwise.
public function pageExists($key)
{
diff --git a/bl-kernel/dbsite.class.php b/bl-kernel/dbsite.class.php
index dcd90625..de313244 100644
--- a/bl-kernel/dbsite.class.php
+++ b/bl-kernel/dbsite.class.php
@@ -107,6 +107,18 @@ class dbSite extends dbJSON
return $this->getField('title');
}
+ // Returns the site slogan.
+ public function slogan()
+ {
+ return $this->getField('slogan');
+ }
+
+ // Returns the site description.
+ public function description()
+ {
+ return $this->getField('description');
+ }
+
public function emailFrom()
{
return $this->getField('emailFrom');
@@ -122,18 +134,6 @@ class dbSite extends dbJSON
return $this->getField('timeFormat');
}
- // Returns the site slogan.
- public function slogan()
- {
- return $this->getField('slogan');
- }
-
- // Returns the site description.
- public function description()
- {
- return $this->getField('description');
- }
-
// Returns the site theme name.
public function theme()
{
diff --git a/bl-languages/bg_BG.json b/bl-languages/bg_BG.json
index 7ac3e4ca..e5723525 100644
--- a/bl-languages/bg_BG.json
+++ b/bl-languages/bg_BG.json
@@ -224,9 +224,9 @@
"blog": "Блог",
"more-images": "Още снимки",
"double-click-on-the-image-to-add-it": "Кликнете два пъти върху изображението, за да го добавите.",
- "click-here-to-cancel": "Кликнете тук, за да го отмените.",
- "type-the-tag-and-press-enter": "Напишете етикет и натиснете въведи.",
+ "click-here-to-cancel": "Кликнете тук, за да отмените.",
+ "type-the-tag-and-press-enter": "Напишете етикет и натиснете клавиша Enter.",
"manage-your-bludit-from-the-admin-panel": "Управлявайте вашият Bludit от [admin area]({{ADMIN_AREA_LINK}})",
- "there-are-no-images":"Още няма изображения"
+ "there-are-no-images":"Няма изображения"
}
diff --git a/bl-languages/ms_MY.json b/bl-languages/ms_MY.json
index f029a554..31547cc8 100644
--- a/bl-languages/ms_MY.json
+++ b/bl-languages/ms_MY.json
@@ -5,7 +5,7 @@
"english-name": "Malay",
"last-update": "2016-01-24",
"author": "Hakim Zulkufli",
- "email": "nozomi@iamnobuna.ga",
+ "email": "nobuna@iamnobuna.ga",
"website": "http://www.iamnobuna.ga/"
},
@@ -202,7 +202,7 @@
"view-and-edit-your-profile": "Lihat dan sunting profil anda.",
"password-must-be-at-least-6-characters-long": "Kata laluan perlu mempunyai sekurang-kurangnya 6 aksara",
- "images": "Gambar-gambar",
+ "images": "Gambar",
"upload-image": "Muat naik gambar",
"drag-and-drop-or-click-here": "Seret dan lepaskan atau klik di sini",
"insert-image": "Masukkan gambar",
diff --git a/bl-plugins/sitemap/metadata.json b/bl-plugins/sitemap/metadata.json
index 83f2154e..7fa41df1 100644
--- a/bl-plugins/sitemap/metadata.json
+++ b/bl-plugins/sitemap/metadata.json
@@ -2,8 +2,8 @@
"author": "Bludit",
"email": "",
"website": "https://github.com/dignajar/bludit-plugins",
- "version": "1.0",
- "releaseDate": "2016-01-15",
+ "version": "1.0.2",
+ "releaseDate": "2016-01-30",
"license": "MIT",
"requires": "Bludit v1.0",
"notes": ""
diff --git a/bl-plugins/sitemap/plugin.php b/bl-plugins/sitemap/plugin.php
index 48af4b94..3669f67f 100644
--- a/bl-plugins/sitemap/plugin.php
+++ b/bl-plugins/sitemap/plugin.php
@@ -44,9 +44,12 @@ class pluginSitemap extends Plugin {
unset($pages['error']);
foreach($pages as $key=>$db)
{
- $permalink = empty($filter) ? $url.'/'.$key : $url.'/'.$filter.'/'.$key;
- $date = Date::format($db['date'], DB_DATE_FORMAT, SITEMAP_DATE_FORMAT);
- array_push($all, array('permalink'=>$permalink, 'date'=>$date));
+ if($db['status']=='published')
+ {
+ $permalink = empty($filter) ? $url.'/'.$key : $url.'/'.$filter.'/'.$key;
+ $date = Date::format($db['date'], DB_DATE_FORMAT, SITEMAP_DATE_FORMAT);
+ array_push($all, array('permalink'=>$permalink, 'date'=>$date));
+ }
}
// --- Posts ---
@@ -54,9 +57,12 @@ class pluginSitemap extends Plugin {
$posts = $dbPosts->getDB();
foreach($posts as $key=>$db)
{
- $permalink = empty($filter) ? $url.'/'.$key : $url.'/'.$filter.'/'.$key;
- $date = Date::format($db['date'], DB_DATE_FORMAT, SITEMAP_DATE_FORMAT);
- array_push($all, array('permalink'=>$permalink, 'date'=>$date));
+ if($db['status']=='published')
+ {
+ $permalink = empty($filter) ? $url.'/'.$key : $url.'/'.$filter.'/'.$key;
+ $date = Date::format($db['date'], DB_DATE_FORMAT, SITEMAP_DATE_FORMAT);
+ array_push($all, array('permalink'=>$permalink, 'date'=>$date));
+ }
}
// Generate the XML for posts and pages
diff --git a/bl-themes/blogme/assets/css/bludit.css b/bl-themes/blogme/assets/css/bludit.css
index 90c93aa4..c182dffc 100644
--- a/bl-themes/blogme/assets/css/bludit.css
+++ b/bl-themes/blogme/assets/css/bludit.css
@@ -8,6 +8,10 @@
min-width: 12em !important;
}
+article.post {
+ overflow: hidden;
+}
+
article.post div.title h1 {
font-weight: normal;
margin: 0 !important;
@@ -32,8 +36,8 @@ div.cover-image {
width: calc(100% + 6em);
}
-h1.blog-title {
- font-size: 2.4em;
+h2.blog-title {
+ font-size: 2em;
font-weight: normal;
text-align: center;
}
diff --git a/bl-themes/blogme/assets/css/main.css b/bl-themes/blogme/assets/css/main.css
index 3b189eb3..c0d89b2b 100644
--- a/bl-themes/blogme/assets/css/main.css
+++ b/bl-themes/blogme/assets/css/main.css
@@ -528,7 +528,7 @@
}
- @media screen and (max-width: 1280px) {
+ @media screen and (max-width: 1010px) {
.row > * {
padding: 0 0 0 1em;
@@ -1439,7 +1439,7 @@
}
- @media screen and (max-width: 1280px) {
+ @media screen and (max-width: 1010px) {
body, input, select, textarea {
font-size: 12pt;
@@ -2271,7 +2271,7 @@
content: '\f053';
}
- @media screen and (max-width: 1280px) {
+ @media screen and (max-width: 1010px) {
ul.actions.pagination {
text-align: center;
@@ -2528,7 +2528,7 @@
margin: 0 0 2em 0;
}
- @media screen and (max-width: 1280px) {
+ @media screen and (max-width: 1010px) {
.mini-posts {
display: -moz-flex;
@@ -3178,7 +3178,7 @@
}
- @media screen and (max-width: 1280px) {
+ @media screen and (max-width: 1010px) {
#wrapper {
display: block;
@@ -3225,7 +3225,7 @@
padding-top: 0;
}
- @media screen and (max-width: 1280px) {
+ @media screen and (max-width: 1010px) {
#sidebar {
border-top: solid 1px rgba(160, 160, 160, 0.3);
@@ -3277,7 +3277,7 @@
font-size: 0.8em;
}
- @media screen and (max-width: 1280px) {
+ @media screen and (max-width: 1010px) {
#intro {
margin: 0 0 3em 0;
diff --git a/bl-themes/blogme/assets/js/main.js b/bl-themes/blogme/assets/js/main.js
index 8c6f6bc6..0eec14a0 100644
--- a/bl-themes/blogme/assets/js/main.js
+++ b/bl-themes/blogme/assets/js/main.js
@@ -7,10 +7,10 @@
(function($) {
skel.breakpoints({
- xlarge: '(max-width: 1100px)',
- large: '(max-width: 1000px)',
- medium: '(max-width: 980px)',
- small: '(max-width: 736px)',
+ xlarge: '(max-width: 1200px)',
+ large: '(max-width: 1010px)',
+ medium: '(max-width: 1200px)',
+ small: '(max-width: 1100px)',
xsmall: '(max-width: 480px)'
});
diff --git a/bl-themes/blogme/languages/de_CH.json b/bl-themes/blogme/languages/de_CH.json
new file mode 100644
index 00000000..568e415c
--- /dev/null
+++ b/bl-themes/blogme/languages/de_CH.json
@@ -0,0 +1,7 @@
+{
+ "theme-data":
+ {
+ "name": "Blogme",
+ "description": "Minimalistisches und übersichtliches Theme, das die Verwendung von Hauptbildern unterstützt. Das Theme basiert auf dem Theme Future Imperfect."
+ }
+}
diff --git a/bl-themes/blogme/languages/de_DE.json b/bl-themes/blogme/languages/de_DE.json
new file mode 100644
index 00000000..568e415c
--- /dev/null
+++ b/bl-themes/blogme/languages/de_DE.json
@@ -0,0 +1,7 @@
+{
+ "theme-data":
+ {
+ "name": "Blogme",
+ "description": "Minimalistisches und übersichtliches Theme, das die Verwendung von Hauptbildern unterstützt. Das Theme basiert auf dem Theme Future Imperfect."
+ }
+}
diff --git a/bl-themes/blogme/php/head.php b/bl-themes/blogme/php/head.php
index d6960457..0855c81a 100644
--- a/bl-themes/blogme/php/head.php
+++ b/bl-themes/blogme/php/head.php
@@ -10,7 +10,7 @@
-
+
url() ?>">title() ?>
+title() ?>
diff --git a/bl-themes/blogme/php/post.php b/bl-themes/blogme/php/post.php
index e0726665..9f30da71 100644
--- a/bl-themes/blogme/php/post.php
+++ b/bl-themes/blogme/php/post.php
@@ -1,4 +1,4 @@
-title() ?>
+title() ?>
diff --git a/bl-themes/future-imperfect/languages/de_CH.json b/bl-themes/future-imperfect/languages/de_CH.json
new file mode 100644
index 00000000..d239fd87
--- /dev/null
+++ b/bl-themes/future-imperfect/languages/de_CH.json
@@ -0,0 +1,7 @@
+{
+ "theme-data":
+ {
+ "name": "Future Imperfect",
+ "description": "Übersichtliches responsives Theme von @n33co, von Diego Najar für Bludit angepasst."
+ }
+}
diff --git a/bl-themes/future-imperfect/languages/de_DE.json b/bl-themes/future-imperfect/languages/de_DE.json
new file mode 100644
index 00000000..d239fd87
--- /dev/null
+++ b/bl-themes/future-imperfect/languages/de_DE.json
@@ -0,0 +1,7 @@
+{
+ "theme-data":
+ {
+ "name": "Future Imperfect",
+ "description": "Übersichtliches responsives Theme von @n33co, von Diego Najar für Bludit angepasst."
+ }
+}
diff --git a/bl-themes/pure/languages/de_CH.json b/bl-themes/pure/languages/de_CH.json
new file mode 100644
index 00000000..3d73c554
--- /dev/null
+++ b/bl-themes/pure/languages/de_CH.json
@@ -0,0 +1,7 @@
+{
+ "theme-data":
+ {
+ "name": "Pure",
+ "description": "Einfaches und übersichtliches Theme. Verwendet wir dafür das Framework Pure.css."
+ }
+}
diff --git a/bl-themes/pure/languages/de_DE.json b/bl-themes/pure/languages/de_DE.json
index 00255464..3d73c554 100644
--- a/bl-themes/pure/languages/de_DE.json
+++ b/bl-themes/pure/languages/de_DE.json
@@ -2,6 +2,6 @@
"theme-data":
{
"name": "Pure",
- "description": "Einfaches und übersichtliches Theme unter Verwendung des Frameworks Pure.css."
+ "description": "Einfaches und übersichtliches Theme. Verwendet wir dafür das Framework Pure.css."
}
-}
\ No newline at end of file
+}