diff --git a/.gitignore b/.gitignore index b6bc583a..17801a58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .DS_Store +!themes/pure +themes/* content/databases content/pages content/posts diff --git a/admin/themes/default/index.php b/admin/themes/default/index.php index 54c24897..e2c4f1f0 100644 --- a/admin/themes/default/index.php +++ b/admin/themes/default/index.php @@ -1,20 +1,21 @@ - + + <?php echo $layout['title'] ?> - - - - + + + + - - - + + + @@ -96,7 +97,7 @@ $(document).ready(function() { - + \ No newline at end of file diff --git a/admin/views/add-user.php b/admin/views/add-user.php index c7bb96be..911a7192 100644 --- a/admin/views/add-user.php +++ b/admin/views/add-user.php @@ -31,7 +31,7 @@ diff --git a/kernel/boot/init.php b/kernel/boot/init.php index c932bf32..8529f69e 100644 --- a/kernel/boot/init.php +++ b/kernel/boot/init.php @@ -137,10 +137,13 @@ $Security = new Security(); $base = (dirname(getenv('SCRIPT_NAME'))==DS)?'/':dirname(getenv('SCRIPT_NAME')).'/'; define('HTML_PATH_ROOT', $base); +// Paths for themes define('HTML_PATH_THEMES', HTML_PATH_ROOT.'themes/'); define('HTML_PATH_THEME', HTML_PATH_ROOT.'themes/'.$Site->theme().'/'); define('HTML_PATH_THEME_CSS', HTML_PATH_THEME.'css/'); define('HTML_PATH_THEME_JS', HTML_PATH_THEME.'js/'); +define('HTML_PATH_THEME_IMG', HTML_PATH_THEME.'img/'); + define('HTML_PATH_ADMIN_THEME', HTML_PATH_ROOT.'admin/themes/'.$Site->adminTheme().'/'); define('HTML_PATH_ADMIN_ROOT', HTML_PATH_ROOT.'admin/'); define('HTML_PATH_UPLOADS', HTML_PATH_ROOT.'content/uploads/'); diff --git a/languages/de_DE.json b/languages/de_DE.json index 7e69d684..b110451e 100755 --- a/languages/de_DE.json +++ b/languages/de_DE.json @@ -144,6 +144,7 @@ "read-the-documentation-for-more-information": "Lies die [Dokumentation](http://docs.bludit.com) für weitere Informationen.", "share-with-your-friends-and-enjoy": "Teile Bludit mit Deinen Freunden und geniesse es.", "the-page-has-not-been-found": "Die Seite wurde nicht gefunden.", - "error": "Fehler" + "error": "Fehler", + "drafts":"aaa" } \ No newline at end of file diff --git a/themes/pure/index.php b/themes/pure/index.php index 027a6b57..d8b93753 100644 --- a/themes/pure/index.php +++ b/themes/pure/index.php @@ -40,7 +40,7 @@ diff --git a/themes/pure/php/head.php b/themes/pure/php/head.php index ed0bae6a..7502dff7 100644 --- a/themes/pure/php/head.php +++ b/themes/pure/php/head.php @@ -36,7 +36,6 @@ Theme::javascript(array( 'rainbow.min.js' )); - ?>