diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css index af0da748..958f0b5c 100644 --- a/bl-kernel/admin/themes/default/css/default.css +++ b/bl-kernel/admin/themes/default/css/default.css @@ -229,6 +229,36 @@ button.delete-button:hover { font-size: 0; } +/* Bludit Menu v8 */ + +#bludit-menuV8 { + display: none; + z-index: 1020; + position: absolute; + overflow: hidden; + border: 1px solid #CCC; + background: #FFF; + color: #333; + border-radius: 2px; + list-style-type: none; + padding: 5px; + margin: 0; +} + +#bludit-menuV8 li { + padding: 8px 12px; + cursor: pointer; +} + +#bludit-menuV8 li:hover { + background-color: #2672ec; + color: #fff; +} + +#bludit-menuV8 li i { + margin-right: 10px; +} + /* ----------- BLUDIT QUICK IMAGES ----------- */ #bludit-quick-images { diff --git a/bl-kernel/admin/themes/default/init.php b/bl-kernel/admin/themes/default/init.php index 5b271e07..a42dbdb2 100644 --- a/bl-kernel/admin/themes/default/init.php +++ b/bl-kernel/admin/themes/default/init.php @@ -249,60 +249,44 @@ $(document).ready(function() { public static function bluditQuickImages() { + // Javascript code + include(PATH_JS.'bludit-quick-images.js'); + global $L; -$html = ''; -$html .= ' -
-
-'; + $html = ''; + $html .= ' +
+
+ '; -$thumbnailList = Filesystem::listFiles(PATH_UPLOADS_THUMBNAILS,'*','*',true); -array_splice($thumbnailList, THUMBNAILS_AMOUNT); -foreach($thumbnailList as $file) { - $filename = basename($file); - $html .= 'Thumbnail'; -} + $thumbnailList = Filesystem::listFiles(PATH_UPLOADS_THUMBNAILS,'*','*',true); + array_splice($thumbnailList, THUMBNAILS_AMOUNT); + foreach($thumbnailList as $file) { + $filename = basename($file); + $html .= 'Thumbnail'; + } -$html .= ' -
-'; + $html .= ' +
+ '; -if(empty($thumbnailList)) { - $html .= '
'.$L->g('There are no images').'
'; -} + $html .= '
'.$L->g('There are no images').'
'; -$html .= ' -'.$L->g('More images').' + $html .= ' + '.$L->g('More images').' -
-'; +
+ '; -$script = ' - -'; - - echo $html.$script; + echo $html; } public static function bluditCoverImage($coverImage="") { + // Javascript code + include(PATH_JS.'bludit-cover-image.js'); + global $L; $style = ''; @@ -310,225 +294,106 @@ function addQuickImages(filename) $style = 'background-image: url('.HTML_PATH_UPLOADS_THUMBNAILS.$coverImage.')'; } -$html = ''; -$html .= ' -
-
+ $html = ''; + $html .= ' +
+
- + -
-
'.$L->g('Cover image').'
-
'.$L->g('Drag and drop or click here').'
-
+
+
'.$L->g('Cover image').'
+
'.$L->g('Drag and drop or click here').'
+
-
-
-
+
+
+
-
-
0%
-
+
+
0%
+
-
-
-'; +
+
+ '; -$script = ' - -'; - echo $html.$script; + echo $html; } public static function bluditImagesV8() { + // Javascript code + include(PATH_JS.'bludit-images-v8.js'); + global $L; -$html = ''; -$html .= ' -
-
+ $html = ''; + $html .= ' +
+
-
+
-
-
'.$L->g('Upload image').'
-
'.$L->g('Drag and drop or click here').'
-
+
+
'.$L->g('Upload image').'
+
'.$L->g('Drag and drop or click here').'
+
-
-
0%
-
+
+
0%
+
-
+
-
-'; +
+ '; -$thumbnailList = Filesystem::listFiles(PATH_UPLOADS_THUMBNAILS,'*','*',true); -foreach($thumbnailList as $file) { - $filename = basename($file); - $html .= 'Thumbnail'; -} - -$html .= ' -
-'; - -if(empty($thumbnailList)) { - $html .= '
'.$L->g('There are no images').'
'; -} - -$html .= ' -
- '.$L->g('Double click on the image to add it').' '.$L->g('Click here to cancel').' -
- -
-
-'; - -$script = ' - -'; - echo $html.$script; + echo $html; } + + public static function profileUploader($username) { global $L; diff --git a/bl-kernel/admin/views/edit-page.php b/bl-kernel/admin/views/edit-page.php index a58d8413..95012756 100644 --- a/bl-kernel/admin/views/edit-page.php +++ b/bl-kernel/admin/views/edit-page.php @@ -102,6 +102,9 @@ echo '
'; // --- BLUDIT IMAGES V8 --- HTML::bluditImagesV8(); + // --- BLUDIT MENU V8 --- + HTML::bluditMenuV8(); + echo ''; // ---- ADVANCED TAB ---- diff --git a/bl-kernel/admin/views/edit-post.php b/bl-kernel/admin/views/edit-post.php index 3395d5a8..1174b346 100644 --- a/bl-kernel/admin/views/edit-post.php +++ b/bl-kernel/admin/views/edit-post.php @@ -96,6 +96,9 @@ echo '
'; // --- BLUDIT IMAGES V8 --- HTML::bluditImagesV8(); + // --- BLUDIT MENU V8 --- + HTML::bluditMenuV8(); + echo ''; // ---- ADVANCED TAB ---- diff --git a/bl-kernel/admin/views/new-page.php b/bl-kernel/admin/views/new-page.php index 8b875dae..704e628d 100644 --- a/bl-kernel/admin/views/new-page.php +++ b/bl-kernel/admin/views/new-page.php @@ -89,6 +89,9 @@ echo '
'; // --- BLUDIT IMAGES V8 --- HTML::bluditImagesV8(); + // --- BLUDIT MENU V8 --- + HTML::bluditMenuV8(); + echo ''; // ---- ADVANCED TAB ---- diff --git a/bl-kernel/admin/views/new-post.php b/bl-kernel/admin/views/new-post.php index 894ad0d6..1d6cd022 100644 --- a/bl-kernel/admin/views/new-post.php +++ b/bl-kernel/admin/views/new-post.php @@ -89,6 +89,9 @@ echo '
'; // --- BLUDIT IMAGES V8 --- HTML::bluditImagesV8(); + // --- BLUDIT MENU V8 --- + HTML::bluditMenuV8(); + echo ''; // ---- ADVANCED TAB ---- diff --git a/bl-kernel/ajax/delete-file.php b/bl-kernel/ajax/delete-file.php new file mode 100644 index 00000000..8a5ab299 --- /dev/null +++ b/bl-kernel/ajax/delete-file.php @@ -0,0 +1,31 @@ +0, 'msg'=>'The filename is empty.') ); + exit; +} + +// Check if the filename exist and Sanitize::pathFile it's necesary for security reasons. +if( Sanitize::pathFile(PATH_UPLOADS.$filename) ) { + + // Delete the file. + Filesystem::rmfile(PATH_UPLOADS.$filename); + + // Delete the thumnails. + Filesystem::rmfile(PATH_UPLOADS_THUMBNAILS.$filename); + + echo json_encode( array('status'=>1, 'msg'=>'The file was deleted.') ); + + exit; +} + +echo json_encode( array('status'=>0, 'msg'=>'The file does not exist.') ); + +?> \ No newline at end of file diff --git a/bl-kernel/ajax/slug.php b/bl-kernel/ajax/slug.php index f6ecb583..cf94e123 100644 --- a/bl-kernel/ajax/slug.php +++ b/bl-kernel/ajax/slug.php @@ -8,7 +8,7 @@ header('Content-Type: application/json'); // parent: Page parent, if you are checking a slug for a page. // Response JSON -// text: valid slug text +// slug: valid slug text $text = isset($_POST['text']) ? $_POST['text'] : ''; $parent = isset($_POST['parent']) ? $_POST['parent'] : NO_PARENT_CHAR; @@ -21,6 +21,6 @@ elseif( $_POST['type']==='post' ) { $slug = $dbPosts->generateKey($text, $key); } -echo json_encode( array('slug'=>$slug) ); +echo json_encode( array('status'=>1, 'slug'=>$slug) ); ?> \ No newline at end of file diff --git a/bl-kernel/helpers/theme.class.php b/bl-kernel/helpers/theme.class.php index 277257f1..fcaf2fe9 100644 --- a/bl-kernel/helpers/theme.class.php +++ b/bl-kernel/helpers/theme.class.php @@ -142,6 +142,7 @@ class Theme { return $tmp; } + } ?> \ No newline at end of file diff --git a/bl-kernel/js/bludit-cover-image.js b/bl-kernel/js/bludit-cover-image.js new file mode 100644 index 00000000..4738cfb8 --- /dev/null +++ b/bl-kernel/js/bludit-cover-image.js @@ -0,0 +1,96 @@ + \ No newline at end of file diff --git a/bl-kernel/js/bludit-images-v8.js b/bl-kernel/js/bludit-images-v8.js new file mode 100644 index 00000000..4810becb --- /dev/null +++ b/bl-kernel/js/bludit-images-v8.js @@ -0,0 +1,68 @@ + \ No newline at end of file diff --git a/bl-kernel/js/bludit-menu-v8.js b/bl-kernel/js/bludit-menu-v8.js new file mode 100644 index 00000000..bf2b4a8f --- /dev/null +++ b/bl-kernel/js/bludit-menu-v8.js @@ -0,0 +1,144 @@ + \ No newline at end of file diff --git a/bl-kernel/js/bludit-quick-images.js b/bl-kernel/js/bludit-quick-images.js new file mode 100644 index 00000000..5cf79061 --- /dev/null +++ b/bl-kernel/js/bludit-quick-images.js @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/bl-languages/en_US.json b/bl-languages/en_US.json index 76c8a477..3c01ccfa 100644 --- a/bl-languages/en_US.json +++ b/bl-languages/en_US.json @@ -223,9 +223,13 @@ "cover-image": "Cover image", "blog": "Blog", "more-images": "More images", - "double-click-on-the-image-to-add-it": "Double click on the image to add it.", + "click-here-to-cancel": "Click here to cancel.", "type-the-tag-and-press-enter": "Type the tag and press enter.", "manage-your-bludit-from-the-admin-panel": "Manage your Bludit from the [admin area]({{ADMIN_AREA_LINK}})", - "there-are-no-images":"There are no images" + "there-are-no-images":"There are no images", + + "click-on-the-image-for-options": "Click on the image for options.", + "set-as-cover-image": "Set as cover image", + "delete-image": "Delete image" } \ No newline at end of file diff --git a/bl-plugins/simplemde/plugin.php b/bl-plugins/simplemde/plugin.php index 8c397704..1e4f2b28 100644 --- a/bl-plugins/simplemde/plugin.php +++ b/bl-plugins/simplemde/plugin.php @@ -105,6 +105,10 @@ class pluginsimpleMDE extends Plugin { simplemde.value(text + content + "\n"); }'.PHP_EOL; + $html .= 'function editorAddImage(filename) { + addContentSimpleMDE("![alt text]("+filename+")"); + }'.PHP_EOL; + $html .= '$(document).ready(function() { '.PHP_EOL; $html .= 'simplemde = new SimpleMDE({ element: document.getElementById("jscontent"), @@ -125,12 +129,6 @@ class pluginsimpleMDE extends Plugin { toolbar: ['.Sanitize::htmlDecode($this->getDbField('toolbar')).'] });'; - // This is the event for Bludit images - $html .= '$("body").on("dblclick", "img.bludit-thumbnail", function() { - var filename = $(this).data("filename"); - addContentSimpleMDE("![alt text]("+filename+")"); - });'; - $html .= '}); '; } diff --git a/install.php b/install.php index 09b79420..542e4ea9 100644 --- a/install.php +++ b/install.php @@ -361,7 +361,7 @@ function install($adminPassword, $email, $timezoneOffset) 'uriPage'=>'/', 'uriTag'=>'/tag/', 'url'=>PROTOCOL.DOMAIN.HTML_PATH_ROOT, - 'cliMode'=>'true', + 'cliMode'=>false, 'emailFrom'=>'no-reply@'.DOMAIN );