diff --git a/kernel/admin/themes/default/css/jquery.auto-complete.css b/kernel/admin/themes/default/css/jquery.auto-complete.css new file mode 100755 index 00000000..4261b1d0 --- /dev/null +++ b/kernel/admin/themes/default/css/jquery.auto-complete.css @@ -0,0 +1,9 @@ +.autocomplete-suggestions { + text-align: left; cursor: default; border: 1px solid #ccc; border-top: 0; background: #fff; box-shadow: -1px 1px 3px rgba(0,0,0,.1); + + /* core styles should not be changed */ + position: absolute; display: none; z-index: 9999; max-height: 254px; overflow: hidden; overflow-y: auto; box-sizing: border-box; +} +.autocomplete-suggestion { position: relative; padding: 0 .6em; line-height: 23px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; font-size: 1.02em; color: #333; } +.autocomplete-suggestion b { font-weight: normal; color: #1f8dd6; } +.autocomplete-suggestion.selected { background: #f0f0f0; } diff --git a/kernel/admin/themes/default/index.php b/kernel/admin/themes/default/index.php index 94432b29..d90c144e 100644 --- a/kernel/admin/themes/default/index.php +++ b/kernel/admin/themes/default/index.php @@ -20,12 +20,14 @@ + + diff --git a/kernel/admin/themes/default/init.php b/kernel/admin/themes/default/init.php index f131cc83..00e44f33 100644 --- a/kernel/admin/themes/default/init.php +++ b/kernel/admin/themes/default/init.php @@ -52,6 +52,28 @@ class HTML { echo $html; } + public static function formInputAutocomplete($args) + { + self::formInputText($args); + +$script = ''; + + echo $script; + + } + public static function formInputPassword($args) { $args['type'] = 'password'; diff --git a/kernel/admin/themes/default/js/jquery.auto-complete.min.js b/kernel/admin/themes/default/js/jquery.auto-complete.min.js new file mode 100755 index 00000000..6fdb3bc6 --- /dev/null +++ b/kernel/admin/themes/default/js/jquery.auto-complete.min.js @@ -0,0 +1,3 @@ +// jQuery autoComplete v1.0.7 +// https://github.com/Pixabay/jQuery-autoComplete +!function(e){e.fn.autoComplete=function(t){var o=e.extend({},e.fn.autoComplete.defaults,t);return"string"==typeof t?(this.each(function(){var o=e(this);"destroy"==t&&(e(window).off("resize.autocomplete",o.updateSC),o.off("blur.autocomplete focus.autocomplete keydown.autocomplete keyup.autocomplete"),o.data("autocomplete")?o.attr("autocomplete",o.data("autocomplete")):o.removeAttr("autocomplete"),e(o.data("sc")).remove(),o.removeData("sc").removeData("autocomplete"))}),this):this.each(function(){function t(e){var t=s.val();if(s.cache[t]=e,e.length&&t.length>=o.minChars){for(var a="",c=0;c'),s.data("sc",s.sc).data("autocomplete",s.attr("autocomplete")),s.attr("autocomplete","off"),s.cache={},s.last_val="",s.updateSC=function(t,o){if(s.sc.css({top:s.offset().top+s.outerHeight(),left:s.offset().left,width:s.outerWidth()}),!t&&(s.sc.show(),s.sc.maxHeight||(s.sc.maxHeight=parseInt(s.sc.css("max-height"))),s.sc.suggestionHeight||(s.sc.suggestionHeight=e(".autocomplete-suggestion",s.sc).first().outerHeight()),s.sc.suggestionHeight))if(o){var a=s.sc.scrollTop(),c=o.offset().top-s.sc.offset().top;c+s.sc.suggestionHeight-s.sc.maxHeight>0?s.sc.scrollTop(c+s.sc.suggestionHeight+a-s.sc.maxHeight):0>c&&s.sc.scrollTop(c+a)}else s.sc.scrollTop(0)},e(window).on("resize.autocomplete",s.updateSC),s.sc.appendTo("body"),s.sc.on("mouseleave",".autocomplete-suggestion",function(){e(".autocomplete-suggestion.selected").removeClass("selected")}),s.sc.on("mouseenter",".autocomplete-suggestion",function(){e(".autocomplete-suggestion.selected").removeClass("selected"),e(this).addClass("selected")}),s.sc.on("mousedown",".autocomplete-suggestion",function(t){var a=e(this),c=a.data("val");return(c||a.hasClass("autocomplete-suggestion"))&&(s.val(c),o.onSelect(t,c,a),s.sc.hide()),!1}),s.on("blur.autocomplete",function(){try{over_sb=e(".autocomplete-suggestions:hover").length}catch(t){over_sb=0}over_sb?s.is(":focus")||setTimeout(function(){s.focus()},20):(s.last_val=s.val(),s.sc.hide(),setTimeout(function(){s.sc.hide()},350))}),o.minChars||s.on("focus.autocomplete",function(){s.last_val="\n",s.trigger("keyup.autocomplete")}),s.on("keydown.autocomplete",function(t){if((40==t.which||38==t.which)&&s.sc.html()){var a,c=e(".autocomplete-suggestion.selected",s.sc);return c.length?(a=40==t.which?c.next(".autocomplete-suggestion"):c.prev(".autocomplete-suggestion"),a.length?(c.removeClass("selected"),s.val(a.addClass("selected").data("val"))):(c.removeClass("selected"),s.val(s.last_val),a=0)):(a=40==t.which?e(".autocomplete-suggestion",s.sc).first():e(".autocomplete-suggestion",s.sc).last(),s.val(a.addClass("selected").data("val"))),s.updateSC(0,a),!1}if(27==t.which)s.val(s.last_val).sc.hide();else if(13==t.which||9==t.which){var c=e(".autocomplete-suggestion.selected",s.sc);c.length&&s.sc.is(":visible")&&(o.onSelect(t,c.data("val"),c),setTimeout(function(){s.sc.hide()},20))}}),s.on("keyup.autocomplete",function(a){if(!~e.inArray(a.which,[13,27,35,36,37,38,39,40])){var c=s.val();if(c.length>=o.minChars){if(c!=s.last_val){if(s.last_val=c,clearTimeout(s.timer),o.cache){if(c in s.cache)return void t(s.cache[c]);for(var l=1;l'+e.replace(o,"$1")+""},onSelect:function(e,t,o){}}}(jQuery); \ No newline at end of file diff --git a/kernel/admin/views/edit-page.php b/kernel/admin/views/edit-page.php index 62393751..abac66b7 100644 --- a/kernel/admin/views/edit-page.php +++ b/kernel/admin/views/edit-page.php @@ -77,12 +77,13 @@ echo '
'; )); // Tags input - HTML::formInputText(array( + HTML::formInputAutocomplete(array( 'name'=>'tags', 'value'=>$_Page->tags(), 'class'=>'uk-width-1-1 uk-form-large', 'tip'=>$L->g('Write the tags separated by commas'), - 'label'=>$L->g('Tags') + 'label'=>$L->g('Tags'), + 'words'=>'"'.implode('", "', $dbTags->getAll()).'"' )); echo ''; diff --git a/kernel/admin/views/edit-post.php b/kernel/admin/views/edit-post.php index 0edc653f..492e7747 100644 --- a/kernel/admin/views/edit-post.php +++ b/kernel/admin/views/edit-post.php @@ -71,12 +71,13 @@ echo '
'; )); // Tags input - HTML::formInputText(array( + HTML::formInputAutocomplete(array( 'name'=>'tags', 'value'=>$_Post->tags(), 'class'=>'uk-width-1-1 uk-form-large', 'tip'=>$L->g('Write the tags separated by commas'), - 'label'=>$L->g('Tags') + 'label'=>$L->g('Tags'), + 'words'=>'"'.implode('", "', $dbTags->getAll()).'"' )); echo ''; diff --git a/kernel/admin/views/new-page.php b/kernel/admin/views/new-page.php index 2f190354..38a2441b 100644 --- a/kernel/admin/views/new-page.php +++ b/kernel/admin/views/new-page.php @@ -64,12 +64,13 @@ echo '
'; )); // Tags input - HTML::formInputText(array( + HTML::formInputAutocomplete(array( 'name'=>'tags', 'value'=>'', 'class'=>'uk-width-1-1 uk-form-large', 'tip'=>$L->g('Write the tags separated by commas'), - 'label'=>$L->g('Tags') + 'label'=>$L->g('Tags'), + 'words'=>'"'.implode('", "', $dbTags->getAll()).'"' )); echo ''; diff --git a/kernel/admin/views/new-post.php b/kernel/admin/views/new-post.php index 4ca1dcc2..154c47eb 100644 --- a/kernel/admin/views/new-post.php +++ b/kernel/admin/views/new-post.php @@ -64,12 +64,13 @@ echo '
'; )); // Tags input - HTML::formInputText(array( + HTML::formInputAutocomplete(array( 'name'=>'tags', 'value'=>'', 'class'=>'uk-width-1-1 uk-form-large', 'tip'=>$L->g('Write the tags separated by commas'), - 'label'=>$L->g('Tags') + 'label'=>$L->g('Tags'), + 'words'=>'"'.implode('", "', $dbTags->getAll()).'"' )); echo ''; diff --git a/kernel/dbpages.class.php b/kernel/dbpages.class.php index c8e4792b..d6cab612 100644 --- a/kernel/dbpages.class.php +++ b/kernel/dbpages.class.php @@ -14,6 +14,7 @@ class dbPages extends dbJSON 'date'=> array('inFile'=>false, 'value'=>''), 'position'=> array('inFile'=>false, 'value'=>0), 'coverImage'=> array('inFile'=>false, 'value'=>''), + 'hash'=> array('inFile'=>false, 'value'=>'') ); function __construct() @@ -75,6 +76,10 @@ class dbPages extends dbJSON } } + // Create Hash + $serialize = serialize($dataForDb+$dataForFile); + $dataForDb['hash'] = sha1($serialize); + // Make the directory. Recursive. if( Filesystem::mkdir(PATH_PAGES.$key, true) === false ) { Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to create the directory '.PATH_PAGES.$key); @@ -157,6 +162,10 @@ class dbPages extends dbJSON } } + // Create Hash + $serialize = serialize($dataForDb+$dataForFile); + $dataForDb['hash'] = sha1($serialize); + // Move the directory from old key to new key. if($newKey!==$args['key']) { diff --git a/kernel/dbposts.class.php b/kernel/dbposts.class.php index a9fdbec8..180a58eb 100644 --- a/kernel/dbposts.class.php +++ b/kernel/dbposts.class.php @@ -12,6 +12,7 @@ class dbPosts extends dbJSON 'allowComments'=> array('inFile'=>false, 'value'=>false), 'date'=> array('inFile'=>false, 'value'=>''), 'coverImage'=> array('inFile'=>false, 'value'=>''), + 'hash'=> array('inFile'=>false, 'value'=>'') ); private $numberPosts = array( @@ -158,6 +159,10 @@ class dbPosts extends dbJSON } } + // Create Hash + $serialize = serialize($dataForDb+$dataForFile); + $dataForDb['hash'] = sha1($serialize); + // Make the directory. if( Filesystem::mkdir(PATH_POSTS.$key) === false ) { Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to create the directory '.PATH_POSTS.$key);