diff --git a/kernel/admin/themes/default/css/default.css b/kernel/admin/themes/default/css/default.css index 260e2800..fc687c9d 100644 --- a/kernel/admin/themes/default/css/default.css +++ b/kernel/admin/themes/default/css/default.css @@ -102,11 +102,15 @@ li.bludit-logo { } .uk-thumbnail { - margin: 2px 4px !important; + margin: 2px 3px !important; max-width: 30% !important; padding: 0 !important; } +.uk-progress-bar { + background: #2672ec !important; +} + /* ----------- BLUDIT ----------- */ #logo { @@ -185,6 +189,7 @@ button.delete-button:hover { #bludit-images-v8-progressbar { display: none; + margin: 20px; } #bludit-images-v8-thumbnails { @@ -211,6 +216,10 @@ button.delete-button:hover { font-size: 0.9em; } +#bludit-quick-images-thumbnails { + text-align: center; +} + /* ----------- BLUDIT COVER IMAGE ----------- */ #bludit-cover-image { @@ -246,6 +255,11 @@ button.delete-button:hover { #cover-image-progressbar { display: none; + left: 5%; + position: relative; + top: 33%; + width: 90%; + } /* ----------- LOGIN FORM ----------- */ diff --git a/kernel/admin/themes/default/init.php b/kernel/admin/themes/default/init.php index d86250b7..812f941d 100644 --- a/kernel/admin/themes/default/init.php +++ b/kernel/admin/themes/default/init.php @@ -157,21 +157,28 @@ $html .= ' echo $html; } - public static function bluditCoverImage() + public static function bluditCoverImage($coverImage="") { global $L; + $style = ''; + if(!empty($coverImage)) { + $style = 'background-image: url('.HTML_PATH_UPLOADS_THUMBNAILS.$coverImage.')'; + } + $html = ''; $html .= '
-
+
-
+ + +
'.$L->g('Cover image').'
-
'.$L->g('Drag and drop or click here').'
+
'.$L->g('Drag and drop or click here').'
-
+
@@ -189,6 +196,7 @@ $(document).ready(function() { $("#cover-image-delete").on("click", function() { $("#cover-image-thumbnail").attr("style",""); + $("#cover-image-upload-filename").attr("value",""); $("#cover-image-delete").hide(); $("#cover-image-upload").show(); }); @@ -202,7 +210,7 @@ $(document).ready(function() { loadstart: function() { $("#cover-image-progressbar").find(".uk-progress-bar").css("width", "0%").text("0%"); - $("#cover-image-progressbar").hide(); + $("#cover-image-progressbar").show(); $("#cover-image-delete").hide(); $("#cover-image-upload").hide(); }, @@ -222,6 +230,8 @@ $(document).ready(function() { $("img:last-child", "#bludit-quick-images-thumbnails").remove(); $("#bludit-quick-images-thumbnails").prepend("\"Thumbnail\""); + + $("#cover-image-upload-filename").attr("value",response.filename); }, notallowed: function(file, settings) { @@ -251,7 +261,7 @@ $html .= '
'.$L->g('Upload image').'
-
'.$L->g('Drag and drop or click here').'
+
'.$L->g('Drag and drop or click here').'
@@ -310,6 +320,8 @@ $(document).ready(function() { loadstart: function() { $("#bludit-images-v8-progressbar").find(".uk-progress-bar").css("width", "0%").text("0%"); + $("#bludit-images-v8-drag-drop").hide(); + $("#bludit-images-v8-progressbar").show(); }, progress: function(percent) { @@ -320,6 +332,7 @@ $(document).ready(function() { allcomplete: function(response) { $("#bludit-images-v8-progressbar").find(".uk-progress-bar").css("width", "100%").text("100%"); $("#bludit-images-v8-progressbar").hide(); + $("#bludit-images-v8-drag-drop").show(); // Images V8 Thumbnails var imageSrc = HTML_PATH_UPLOADS_THUMBNAILS+response.filename; diff --git a/kernel/admin/views/edit-page.php b/kernel/admin/views/edit-page.php index d41c43d8..6711b587 100644 --- a/kernel/admin/views/edit-page.php +++ b/kernel/admin/views/edit-page.php @@ -91,7 +91,7 @@ echo '
'; echo '
  • '; // --- BLUDIT COVER IMAGE --- - HTML::bluditCoverImage(); + HTML::bluditCoverImage($_Page->coverImage()); // --- BLUDIT QUICK IMAGES --- HTML::bluditQuickImages(); diff --git a/kernel/admin/views/edit-post.php b/kernel/admin/views/edit-post.php index 386538f0..6236209e 100644 --- a/kernel/admin/views/edit-post.php +++ b/kernel/admin/views/edit-post.php @@ -85,7 +85,7 @@ echo '
    '; echo '
  • '; // --- BLUDIT COVER IMAGE --- - HTML::bluditCoverImage(); + HTML::bluditCoverImage($_Post->coverImage()); // --- BLUDIT QUICK IMAGES --- HTML::bluditQuickImages(); diff --git a/kernel/dbpages.class.php b/kernel/dbpages.class.php index d325406f..134dfed5 100644 --- a/kernel/dbpages.class.php +++ b/kernel/dbpages.class.php @@ -12,7 +12,8 @@ class dbPages extends dbJSON 'tags'=> array('inFile'=>false, 'value'=>array()), 'status'=> array('inFile'=>false, 'value'=>'draft'), 'date'=> array('inFile'=>false, 'value'=>''), - 'position'=> array('inFile'=>false, 'value'=>0) + 'position'=> array('inFile'=>false, 'value'=>0), + 'coverImage'=> array('inFile'=>false, 'value'=>''), ); function __construct() diff --git a/kernel/dbposts.class.php b/kernel/dbposts.class.php index 6d260a4d..6f5d1f08 100644 --- a/kernel/dbposts.class.php +++ b/kernel/dbposts.class.php @@ -10,7 +10,8 @@ class dbPosts extends dbJSON 'status'=> array('inFile'=>false, 'value'=>'draft'), // published, draft, scheduled 'tags'=> array('inFile'=>false, 'value'=>array()), 'allowComments'=> array('inFile'=>false, 'value'=>false), - 'date'=> array('inFile'=>false, 'value'=>'') + 'date'=> array('inFile'=>false, 'value'=>''), + 'coverImage'=> array('inFile'=>false, 'value'=>''), ); private $numberPosts = array( diff --git a/kernel/page.class.php b/kernel/page.class.php index 94288fcb..3fb05f66 100644 --- a/kernel/page.class.php +++ b/kernel/page.class.php @@ -111,6 +111,11 @@ class Page extends fileContent return $this->getField('key'); } + public function coverImage() + { + return $this->getField('coverImage'); + } + // Returns TRUE if the page is published, FALSE otherwise. public function published() { diff --git a/kernel/post.class.php b/kernel/post.class.php index 83fe8143..fef9deb3 100644 --- a/kernel/post.class.php +++ b/kernel/post.class.php @@ -83,6 +83,11 @@ class Post extends fileContent return $this->getField('username'); } + public function coverImage() + { + return $this->getField('coverImage'); + } + public function profilePicture() { return HTML_PATH_UPLOADS_PROFILES.$this->username().'.jpg';