diff --git a/install.php b/install.php index 3ec6ea5c..8bd84b0a 100644 --- a/install.php +++ b/install.php @@ -24,6 +24,7 @@ define('PATH_CONTENT', PATH_ROOT.'content'.DS); define('PATH_POSTS', PATH_CONTENT.'posts'.DS); define('PATH_UPLOADS', PATH_CONTENT.'uploads'.DS); define('PATH_UPLOADS_PROFILES', PATH_UPLOADS.'profiles'.DS); +define('PATH_UPLOADS_THUMBNAILS',PATH_UPLOADS.'thumbnails'.DS); define('PATH_PAGES', PATH_CONTENT.'pages'.DS); define('PATH_DATABASES', PATH_CONTENT.'databases'.DS); define('PATH_PLUGINS_DATABASES',PATH_CONTENT.'databases'.DS.'plugins'.DS); @@ -244,9 +245,9 @@ function install($adminPassword, $email, $timezoneOffset) error_log($errorText, 0); } - if(!mkdir(PATH_PLUGINS_DATABASES.'tinymce', $dirpermissions, true)) + if(!mkdir(PATH_PLUGINS_DATABASES.'simplemde', $dirpermissions, true)) { - $errorText = 'Error when trying to created the directory=>'.PATH_PLUGINS_DATABASES.'tinymce'; + $errorText = 'Error when trying to created the directory=>'.PATH_PLUGINS_DATABASES.'simplemde'; error_log($errorText, 0); } @@ -268,6 +269,12 @@ function install($adminPassword, $email, $timezoneOffset) error_log($errorText, 0); } + if(!mkdir(PATH_UPLOADS_THUMBNAILS, $dirpermissions, true)) + { + $errorText = 'Error when trying to created the directory=>'.PATH_UPLOADS_THUMBNAILS; + error_log($errorText, 0); + } + // ============================================================================ // Create files // ============================================================================ @@ -409,14 +416,14 @@ function install($adminPassword, $email, $timezoneOffset) LOCK_EX ); - // File plugins/tinymce/db.php + // File plugins/simplemde/db.php file_put_contents( - PATH_PLUGINS_DATABASES.'tinymce'.DS.'db.php', + PATH_PLUGINS_DATABASES.'simplemde'.DS.'db.php', $dataHead.json_encode( array( 'position'=>0, - 'plugins'=>'autoresize, fullscreen, pagebreak, link, textcolor, code', - 'toolbar'=>'bold italic underline strikethrough | alignleft aligncenter alignright | bullist numlist | styleselect | link forecolor backcolor removeformat | pagebreak code fullscreen' + 'tabSize'=>4, + 'toolbar'=>'"bold", "italic", "heading", "|", "quote", "unordered-list", "|", "link", "image", "code", "horizontal-rule", "|", "preview", "side-by-side", "fullscreen", "guide"' ), JSON_PRETTY_PRINT), LOCK_EX diff --git a/kernel/admin/themes/default/css/default.css b/kernel/admin/themes/default/css/default.css index 3ee4bdc4..9d992f00 100644 --- a/kernel/admin/themes/default/css/default.css +++ b/kernel/admin/themes/default/css/default.css @@ -184,13 +184,21 @@ button.delete-button:hover { } -#bludit-images-v8 img.uk-thumbnail { +#bludit-images-v8 .bludit-thumbnail { + border: 1px solid #ddd; + border-radius: 4px; + box-sizing: border-box; + display: inline-block; + height: auto; + margin: 2px; + padding: 0; width: 15% !important; } #bludit-images-v8-upload { width: 100%; padding: 0; + margin-bottom: 15px !important; } #bludit-images-v8-drag-drop { @@ -203,8 +211,9 @@ button.delete-button:hover { } #bludit-images-v8-thumbnails { - height: 350px; + max-height: 350px; overflow: auto; + font-size: 0; } /* ----------- BLUDIT QUICK IMAGES ----------- */ @@ -227,7 +236,18 @@ button.delete-button:hover { } #bludit-quick-images-thumbnails { - text-align: center; + font-size: 0; +} + +#bludit-quick-images .bludit-thumbnail { + border: 1px solid #ddd; + border-radius: 4px; + box-sizing: border-box; + display: inline-block; + height: auto; + margin: 2px; + padding: 0; + width: 31% !important; } /* ----------- BLUDIT COVER IMAGE ----------- */ diff --git a/kernel/admin/themes/default/img/default.jpg b/kernel/admin/themes/default/img/default.jpg deleted file mode 100644 index 2854b892..00000000 Binary files a/kernel/admin/themes/default/img/default.jpg and /dev/null differ diff --git a/kernel/admin/themes/default/img/default.png b/kernel/admin/themes/default/img/default.png new file mode 100644 index 00000000..f641423e Binary files /dev/null and b/kernel/admin/themes/default/img/default.png differ diff --git a/kernel/admin/themes/default/init.php b/kernel/admin/themes/default/init.php index 50dbb86f..637e45b4 100644 --- a/kernel/admin/themes/default/init.php +++ b/kernel/admin/themes/default/init.php @@ -141,18 +141,44 @@ $thumbnailList = Filesystem::listFiles(PATH_UPLOADS_THUMBNAILS,'*','*',true); array_splice($thumbnailList, THUMBNAILS_AMOUNT); foreach($thumbnailList as $file) { $filename = basename($file); - $html .= 'Thumbnail'; + $html .= 'Thumbnail'; } $html .= ' +'; +if(empty($thumbnailList)) { + $html .= '
There are no images, upload someone to make Bludit more cheerful.
'; +} + +$html .= ' More images '; - echo $html; +$script = ' + +'; + + echo $html.$script; } public static function bluditCoverImage($coverImage="") @@ -190,6 +216,18 @@ $html .= ' $script = '