diff --git a/bl-kernel/admin/views/edit-page.php b/bl-kernel/admin/views/edit-page.php index 35bcd2b0..1c98fe75 100644 --- a/bl-kernel/admin/views/edit-page.php +++ b/bl-kernel/admin/views/edit-page.php @@ -29,13 +29,16 @@ echo '
'; 'placeholder'=>$L->g('Title') )); + echo '
'; + // Content input - HTML::formTextarea(array( - 'name'=>'content', - 'value'=>$_Page->contentRaw(false), - 'class'=>'uk-width-1-1 uk-form-large', - 'placeholder'=>'' - )); + // HTML::formTextarea(array( + // 'name'=>'content', + // 'value'=>$_Post->contentRaw(false), + // 'class'=>'uk-width-1-1 uk-form-large', + // 'placeholder'=>'' + // )); + echo '
'; // Form buttons echo '
'; @@ -239,10 +242,10 @@ $(document).ready(function() } else { $(".sidebar-view").hide(); - $(view).show(); + $(view).show(); } }); }); - \ No newline at end of file + diff --git a/bl-kernel/admin/views/edit-post.php b/bl-kernel/admin/views/edit-post.php index c1d51b78..4a896ad5 100644 --- a/bl-kernel/admin/views/edit-post.php +++ b/bl-kernel/admin/views/edit-post.php @@ -29,13 +29,16 @@ echo '
'; 'placeholder'=>$L->g('Title') )); + echo '
'; + // Content input - HTML::formTextarea(array( - 'name'=>'content', - 'value'=>$_Post->contentRaw(false), - 'class'=>'uk-width-1-1 uk-form-large', - 'placeholder'=>'' - )); + // HTML::formTextarea(array( + // 'name'=>'content', + // 'value'=>$_Post->contentRaw(false), + // 'class'=>'uk-width-1-1 uk-form-large', + // 'placeholder'=>'' + // )); + echo '
'; // Form buttons echo '
@@ -197,7 +200,7 @@ $(document).ready(function() { } else { $(".sidebar-view").hide(); - $(view).show(); + $(view).show(); } }); diff --git a/bl-kernel/admin/views/new-page.php b/bl-kernel/admin/views/new-page.php index db5f1e05..6cf422af 100644 --- a/bl-kernel/admin/views/new-page.php +++ b/bl-kernel/admin/views/new-page.php @@ -23,13 +23,16 @@ echo '
'; 'placeholder'=>$L->g('Title') )); + echo '
'; + // Content input - HTML::formTextarea(array( - 'name'=>'content', - 'value'=>'', - 'class'=>'uk-width-1-1 uk-form-large', - 'placeholder'=>'' - )); + // HTML::formTextarea(array( + // 'name'=>'content', + // 'value'=>'', + // 'class'=>'uk-width-1-1 uk-form-large', + // 'placeholder'=>'' + // )); + echo '
'; // Form buttons echo '
@@ -212,10 +215,10 @@ $(document).ready(function() } else { $(".sidebar-view").hide(); - $(view).show(); + $(view).show(); } }); }); - \ No newline at end of file + diff --git a/bl-kernel/admin/views/new-post.php b/bl-kernel/admin/views/new-post.php index 95840c5d..c10694f8 100644 --- a/bl-kernel/admin/views/new-post.php +++ b/bl-kernel/admin/views/new-post.php @@ -23,13 +23,16 @@ echo '
'; 'placeholder'=>$L->g('Title') )); + echo '
'; + // Content input - HTML::formTextarea(array( - 'name'=>'content', - 'value'=>'', - 'class'=>'uk-width-1-1 uk-form-large', - 'placeholder'=>'' - )); + // HTML::formTextarea(array( + // 'name'=>'content', + // 'value'=>'', + // 'class'=>'uk-width-1-1 uk-form-large', + // 'placeholder'=>'' + // )); + echo '
'; // Form buttons echo '
@@ -73,7 +76,7 @@ echo '
'; )); echo ''; - + // IMAGES TAB // -------------------------------------------------------------------- echo '
  • '; @@ -182,10 +185,10 @@ $(document).ready(function() { } else { $(".sidebar-view").hide(); - $(view).show(); + $(view).show(); } }); }); - \ No newline at end of file + diff --git a/bl-kernel/helpers/image.class.php b/bl-kernel/helpers/image.class.php index db70ae74..610117eb 100644 --- a/bl-kernel/helpers/image.class.php +++ b/bl-kernel/helpers/image.class.php @@ -108,6 +108,8 @@ class Image { // *** Resample - create image canvas of x, y size $this->imageResized = imagecreatetruecolor($optimalWidth, $optimalHeight); + imagealphablending($this->imageResized, false); + imagesavealpha($this->imageResized, true); imagecopyresampled($this->imageResized, $this->image, 0, 0, 0, 0, $optimalWidth, $optimalHeight, $this->width, $this->height); @@ -230,6 +232,8 @@ class Image { // *** Now crop from center to exact requested size $this->imageResized = imagecreatetruecolor($newWidth , $newHeight); + imagealphablending($this->imageResized, false); + imagesavealpha($this->imageResized, true); imagecopyresampled($this->imageResized, $crop , 0, 0, $cropStartX, $cropStartY, $newWidth, $newHeight , $newWidth, $newHeight); } } diff --git a/bl-plugins/quill/languages/en_US.json b/bl-plugins/quill/languages/en_US.json index aded94fc..ac8dc647 100644 --- a/bl-plugins/quill/languages/en_US.json +++ b/bl-plugins/quill/languages/en_US.json @@ -2,6 +2,6 @@ "plugin-data": { "name": "Quill", - "description": "" + "description": "Quill is a free, open source WYSIWYG editor built for the modern web. With its modular architecture and expressive API, it is completely customizable to fit any need." } -} \ No newline at end of file +} diff --git a/bl-plugins/quill/plugin.php b/bl-plugins/quill/plugin.php index 7a7076de..583b093b 100644 --- a/bl-plugins/quill/plugin.php +++ b/bl-plugins/quill/plugin.php @@ -56,7 +56,7 @@ class pluginQuill extends Plugin { $html .= 'getDbField('autosave')?'checked':'').'>'; $html .= ''; $html .= '
    '; - + $html .= '
    '; $html .= ''; $html .= 'getDbField('spellChecker')?'checked':'').'>'; @@ -72,25 +72,43 @@ class pluginQuill extends Plugin { global $Language; $html = ''; - if( $this->enabled() ) { + // Load CSS and JS only on Controllers in array. + if(in_array($layout['controller'], $this->loadWhenController)) + { $html .= ' '; } return $html; } -} \ No newline at end of file +}