Merge remote-tracking branch 'dignajar/master'
This commit is contained in:
Frédéric K
commit
fc44ec16db
@ -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
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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)
|
||||
{
|
||||
|
||||
@ -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()
|
||||
{
|
||||
|
||||
@ -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":"Няма изображения"
|
||||
}
|
||||
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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": ""
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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)'
|
||||
});
|
||||
|
||||
|
||||
7
bl-themes/blogme/languages/de_CH.json
Normal file
7
bl-themes/blogme/languages/de_CH.json
Normal file
@ -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."
|
||||
}
|
||||
}
|
||||
7
bl-themes/blogme/languages/de_DE.json
Normal file
7
bl-themes/blogme/languages/de_DE.json
Normal file
@ -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."
|
||||
}
|
||||
}
|
||||
@ -10,7 +10,7 @@
|
||||
<!--[if lte IE 8]><link rel="stylesheet" href="<?php echo HTML_PATH_THEME ?>assets/css/ie8.css" /><![endif]-->
|
||||
<link rel="stylesheet" href="<?php echo HTML_PATH_THEME ?>assets/css/bludit.css">
|
||||
|
||||
<link rel="shortcut icon" href="<?php echo HTML_PATH_THEME ?>img/favicon.png" type="image/x-icon">
|
||||
<link rel="shortcut icon" href="<?php echo HTML_PATH_THEME ?>img/favicon.png" type="image/png">
|
||||
|
||||
<?php
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<a href="<?php echo $Site->url() ?>"><h1 class="blog-title"><?php echo $Site->title() ?></h1></a>
|
||||
<a href="<?php echo $Site->url() ?>"><h2 class="blog-title"><?php echo $Site->title() ?></h2></a>
|
||||
|
||||
<article class="post">
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<a href="<?php echo $Site->url() ?>"><h1 class="blog-title"><?php echo $Site->title() ?></h1></a>
|
||||
<a href="<?php echo $Site->url() ?>"><h2 class="blog-title"><?php echo $Site->title() ?></h2></a>
|
||||
|
||||
<article class="post">
|
||||
|
||||
|
||||
7
bl-themes/future-imperfect/languages/de_CH.json
Normal file
7
bl-themes/future-imperfect/languages/de_CH.json
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"theme-data":
|
||||
{
|
||||
"name": "Future Imperfect",
|
||||
"description": "Übersichtliches responsives Theme von @n33co, von Diego Najar für Bludit angepasst."
|
||||
}
|
||||
}
|
||||
7
bl-themes/future-imperfect/languages/de_DE.json
Normal file
7
bl-themes/future-imperfect/languages/de_DE.json
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"theme-data":
|
||||
{
|
||||
"name": "Future Imperfect",
|
||||
"description": "Übersichtliches responsives Theme von @n33co, von Diego Najar für Bludit angepasst."
|
||||
}
|
||||
}
|
||||
7
bl-themes/pure/languages/de_CH.json
Normal file
7
bl-themes/pure/languages/de_CH.json
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"theme-data":
|
||||
{
|
||||
"name": "Pure",
|
||||
"description": "Einfaches und übersichtliches Theme. Verwendet wir dafür das Framework Pure.css."
|
||||
}
|
||||
}
|
||||
@ -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."
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user