Merge pull request #10 from dignajar/master

New pull request

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',
+				'tabSize'=>4,
-				'toolbar'=>'bold italic underline strikethrough | alignleft aligncenter alignright | bullist numlist | styleselect | link forecolor backcolor removeformat | pagebreak code fullscreen'
+				'toolbar'=>'"bold", "italic", "heading", "|", "quote", "unordered-list", "|", "link", "image", "code", "horizontal-rule", "|", "preview", "side-by-side", "fullscreen", "guide"'
 			),
 		JSON_PRETTY_PRINT),
 		LOCK_EX

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 ----------- */

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 .= '<img class="bludit-thumbnail uk-thumbnail" data-filename="'.$filename.'" src="'.HTML_PATH_UPLOADS_THUMBNAILS.$filename.'" alt="Thumbnail">';
+	$html .= '<img class="bludit-thumbnail" data-filename="'.$filename.'" src="'.HTML_PATH_UPLOADS_THUMBNAILS.$filename.'" alt="Thumbnail">';
 }
 
 $html .= '
 </div>
+';
 
+if(empty($thumbnailList)) {
+	$html .= '<div class="empty-images uk-block uk-text-center uk-block-muted">There are no images, upload someone to make your site more cheerful.</div>';
+}
+
+$html .= '
 <a data-uk-modal href="#bludit-images-v8" class="moreImages uk-button">More images</a>
 
 </div>
 ';
 
-		echo $html;
+$script = '
+<script>
+
+// Add thumbnail to Quick Images
+function addQuickImages(filename)
+{
+	var imageSrc = HTML_PATH_UPLOADS_THUMBNAILS + filename;
+
+	// Remove element if there are more than 6 thumbnails
+	if ($("#bludit-quick-images-thumbnails > img").length > 5) {
+		$("img:last-child", "#bludit-quick-images-thumbnails").remove();
+	}
+
+	// Add the new thumbnail to Quick images
+	$("#bludit-quick-images-thumbnails").prepend("<img class=\"bludit-thumbnail\" data-filename=\""+filename+"\" src=\""+imageSrc+"\" alt=\"Thumbnail\">");
+}
+
+</script>
+';
+
+		echo $html.$script;
 	}
 
 	public static function bluditCoverImage($coverImage="")
@@ -190,6 +216,18 @@ $html .= '
 
 $script = '
 <script>
+
+function addCoverImage(filename)
+{
+	var imageSrc = HTML_PATH_UPLOADS_THUMBNAILS + filename;
+
+	// Cover image background
+	$("#cover-image-thumbnail").attr("style","background-image: url("+imageSrc+")");
+
+	// Form attribute
+	$("#cover-image-upload-filename").attr("value", filename);
+}
+
 $(document).ready(function() {
 
 	$("#cover-image-delete").on("click", function() {
@@ -221,15 +259,17 @@ $(document).ready(function() {
 		allcomplete: function(response) {
 			$("#cover-image-progressbar").find(".uk-progress-bar").css("width", "100%").text("100%");
 			$("#cover-image-progressbar").hide();
-
-			var imageSrc = HTML_PATH_UPLOADS_THUMBNAILS+response.filename;
-			$("#cover-image-thumbnail").attr("style","background-image: url("+imageSrc+")");
 			$("#cover-image-delete").show();
+			$(".empty-images").hide();
 
-			$("img:last-child", "#bludit-quick-images-thumbnails").remove();
+			// Add Cover Image
-			$("#bludit-quick-images-thumbnails").prepend("<img class=\"bludit-thumbnail uk-thumbnail\" data-filename=\""+response.filename+"\" src=\""+imageSrc+"\" alt=\"Thumbnail\">");
+			addCoverImage(response.filename);
 
-			$("#cover-image-upload-filename").attr("value",response.filename);
+			// Add thumbnail to Quick Images
+			addQuickImages(response.filename);
+
+			// Add thumbnail to Bludit Images V8
+			addBluditImagev8(response.filename);
 		},
 
 		notallowed: function(file, settings) {
@@ -271,15 +311,21 @@ $html .= '
 	<div id="bludit-images-v8-thumbnails">
 ';
 
-	$thumbnailList = Filesystem::listFiles(PATH_UPLOADS_THUMBNAILS,'*','*',true);
+$thumbnailList = Filesystem::listFiles(PATH_UPLOADS_THUMBNAILS,'*','*',true);
-	foreach($thumbnailList as $file) {
+foreach($thumbnailList as $file) {
-		$filename = basename($file);
+	$filename = basename($file);
-		$html .= '<img class="bludit-thumbnail uk-thumbnail" src="'.HTML_PATH_UPLOADS_THUMBNAILS.$filename.'" data-filename="'.$filename.'" alt="Thumbnail">';
+	$html .= '<img class="bludit-thumbnail" src="'.HTML_PATH_UPLOADS_THUMBNAILS.$filename.'" data-filename="'.$filename.'" alt="Thumbnail">';
-	}
+}
 
 $html .= '
 	</div>
+';
 
+if(empty($thumbnailList)) {
+	$html .= '<div class="empty-images uk-block uk-text-center uk-block-muted">There are no images, upload someone to make your site more cheerful.</div>';
+}
+
+$html .= '
 	<div class="uk-modal-footer">
 		Double click on the image to add it or <a href="" class="uk-modal-close">click here to cancel</a>
 	</div>
@@ -290,6 +336,16 @@ $html .= '
 
 $script = '
 <script>
+
+// Add thumbnail to Bludit Images v8
+function addBluditImagev8(filename)
+{
+	var imageSrc = HTML_PATH_UPLOADS_THUMBNAILS + filename;
+
+	// Add the new thumbnail to Bludit Images v8
+	$("#bludit-images-v8-thumbnails").prepend("<img class=\"bludit-thumbnail\" data-filename=\""+filename+"\" src=\""+imageSrc+"\" alt=\"Thumbnail\">");
+}
+
 $(document).ready(function() {
 
 	// Add border when select an thumbnail
@@ -331,14 +387,13 @@ $(document).ready(function() {
 			$("#bludit-images-v8-progressbar").find(".uk-progress-bar").css("width", "100%").text("100%");
 			$("#bludit-images-v8-progressbar").hide();
 			$("#bludit-images-v8-drag-drop").show();
+			$(".empty-images").hide();
 
-			// Images V8 Thumbnails
+			// Add thumbnail to Bludit Images V8
-			var imageSrc = HTML_PATH_UPLOADS_THUMBNAILS+response.filename;
+			addBluditImagev8(response.filename);
-			$("#bludit-images-v8-thumbnails").prepend("<img class=\"bludit-thumbnail uk-thumbnail\" data-filename=\""+response.filename+"\" src=\""+imageSrc+"\" alt=\"Thumbnail\">");
 
-			// Quick images Thumbnails
+			// Add thumbnail to Quick Images
-			$("img:last-child", "#bludit-quick-images-thumbnails").remove();
+			addQuickImages(response.filename);
-			$("#bludit-quick-images-thumbnails").prepend("<img class=\"bludit-thumbnail uk-thumbnail\" data-filename=\""+response.filename+"\" src=\""+imageSrc+"\" alt=\"Thumbnail\">");
 		},
 
 		notallowed: function(file, settings) {

languages/de_DE.json

@@ -142,7 +142,7 @@
 	"follow-bludit-on": "Folge Bludit bei",
 	"visit-the-support-forum": "Besuche das [Forum](http://forum.bludit.com), um Hilfe zu erhalten.",
 	"read-the-documentation-for-more-information": "Lies die [Dokumentation](http://docs.bludit.com) und das [Bludit-Tutorial](https://bludit-tutorial.ch) für weitere Informationen.",
-        "share-with-your-friends-and-enjoy": "Erzähle deinen Freunden von Bludit und habe Spass daran.",
+        "share-with-your-friends-and-enjoy": "Erzähle deinen Freunden von Bludit und habe Spaß daran.",
 	"the-page-has-not-been-found": "Die Seite wurde nicht gefunden.",
 	"error": "Fehler",
 	"bludit-installer": "Bludit-Installer",
@@ -184,7 +184,7 @@
 	"emails-will-be-sent-from-this-address":"E-Mails werden mit dieser E-Mail-Adresse als Absender verschickt.",
 	"bludit-login-access-code": "BLUDIT - Zugangscode",
 	"check-your-inbox-for-your-login-access-code":"Der Zugangscode wurde dir geschickt.",
-	"there-was-a-problem-sending-the-email":"Es besteht ein Pronlem mit dem Verschicken dieser E-Mail.",
+	"there-was-a-problem-sending-the-email":"Es besteht ein Problem mit dem Verschicken dieser E-Mail.",
 	"back-to-login-form": "Zurück zum Login",
 	"send-me-a-login-access-code": "Zugangscode zuschicken",
 	"get-login-access-code": "Zugangscode schicken",

languages/ru_RU.json

@@ -218,5 +218,7 @@
 	"site-information": "Информация о сайте",
 	"date-and-time-formats": "Форматы даты и времени",
 	"activate": "Активировать",
-	"deactivate": "Деактивировать"
+	"deactivate": "Деактивировать",
+	
+	"cover-image": "Обложка"
 }

languages/tr_TR.json

@@ -218,5 +218,7 @@
 	"site-information": "Site bilgisi",
 	"date-and-time-formats": "Tarih ve saat formatları",
 	"activate": "Aktifleştir",
-	"deactivate": "Deaktive et"
+	"deactivate": "Deaktive et",
+	
+	"cover-image": "Kapak resmi"
 }