From 9d12e07adf2bdb8fc07fd4bb258956d4595be84f Mon Sep 17 00:00:00 2001
From: dignajar <dignajar@gmail.com>
Date: Sat, 13 Feb 2016 21:15:19 -0300
Subject: [PATCH] Updates

---
 .../admin/themes/default/css/default.css      |  9 +++++
 .../default/css/jquery.auto-complete.css      |  9 -----
 bl-kernel/admin/themes/default/index.php      |  6 +--
 bl-kernel/admin/themes/default/init.php       |  2 +-
 .../default/js/jquery.auto-complete.min.js    |  3 --
 bl-kernel/admin/views/edit-user.php           | 26 ++++++------
 bl-kernel/admin/views/settings-general.php    | 40 ++++++++++++++++++-
 bl-kernel/dbsite.class.php                    | 26 +++++++++++-
 bl-kernel/dbusers.class.php                   |  8 ++--
 bl-kernel/js/bludit-tags.js                   | 11 ++++-
 bl-kernel/user.class.php                      | 16 ++++----
 bl-languages/en_US.json                       |  8 +---
 bl-themes/blogme/metadata.json                |  6 +--
 bl-themes/future-imperfect/metadata.json      |  8 ++--
 bl-themes/pure/metadata.json                  |  6 +--
 15 files changed, 123 insertions(+), 61 deletions(-)
 delete mode 100644 bl-kernel/admin/themes/default/css/jquery.auto-complete.css
 delete mode 100644 bl-kernel/admin/themes/default/js/jquery.auto-complete.min.js

diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css
index b9cfd13c..065414f8 100644
--- a/bl-kernel/admin/themes/default/css/default.css
+++ b/bl-kernel/admin/themes/default/css/default.css
@@ -118,6 +118,15 @@ li.bludit-logo {
 
 /* ----------- BLUDIT ----------- */
 
+body {
+	overflow-y: scroll;
+}
+
+.bludit-navbar {
+	border-radius: 0 !important;
+	box-shadow: 1px 1px 1px rgba(50, 50, 50, 0.37);
+}
+
 #logo {
 	background: #f4f4f4;
 	padding:20px 0;
diff --git a/bl-kernel/admin/themes/default/css/jquery.auto-complete.css b/bl-kernel/admin/themes/default/css/jquery.auto-complete.css
deleted file mode 100644
index 4261b1d0..00000000
--- a/bl-kernel/admin/themes/default/css/jquery.auto-complete.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.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/bl-kernel/admin/themes/default/index.php b/bl-kernel/admin/themes/default/index.php
index d90c144e..ff233a77 100644
--- a/bl-kernel/admin/themes/default/index.php
+++ b/bl-kernel/admin/themes/default/index.php
@@ -20,14 +20,12 @@
 
 	<link rel="stylesheet" type="text/css" href="./css/default.css?version=<?php echo BLUDIT_VERSION ?>">
 	<link rel="stylesheet" type="text/css" href="./css/jquery.datetimepicker.css?version=<?php echo BLUDIT_VERSION ?>">
-	<link rel="stylesheet" type="text/css" href="./css/jquery.auto-complete.css?version=<?php echo BLUDIT_VERSION ?>">
 
 	<!-- Javascript -->
 	<script charset="utf-8" src="./js/jquery.min.js?version=<?php echo BLUDIT_VERSION ?>"></script>
 	<script charset="utf-8" src="./js/uikit/uikit.min.js?version=<?php echo BLUDIT_VERSION ?>"></script>
 	<script charset="utf-8" src="./js/uikit/upload.min.js?version=<?php echo BLUDIT_VERSION ?>"></script>
 	<script charset="utf-8" src="./js/jquery.datetimepicker.js?version=<?php echo BLUDIT_VERSION ?>"></script>
-	<script charset="utf-8" src="./js/jquery.auto-complete.min.js?version=<?php echo BLUDIT_VERSION ?>"></script>
 
 	<!-- Plugins -->
 	<?php Theme::plugins('adminHead') ?>
@@ -56,7 +54,7 @@ $(document).ready(function() {
 </div>
 
 <!-- Navbar -->
-<nav class="uk-navbar">
+<nav class="uk-navbar bludit-navbar">
 
 	<!-- Navbar for Desktop -->
 	<div class="uk-container uk-container-center uk-hidden-small">
@@ -168,4 +166,4 @@ $(document).ready(function() {
 <?php Theme::plugins('adminBodyEnd') ?>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/bl-kernel/admin/themes/default/init.php b/bl-kernel/admin/themes/default/init.php
index 9cabb687..3e4aceb5 100755
--- a/bl-kernel/admin/themes/default/init.php
+++ b/bl-kernel/admin/themes/default/init.php
@@ -87,7 +87,7 @@ class HTML {
 		$html .= '<div id="jstagList">';
 
 		foreach($args['allTags'] as $tag) {
-			$html .= '<span class="'.( in_array($tag, $args['selectedTags'])?'select':'unselect' ).'">'.$tag.'</span>';
+			$html .= '<span data-tag="'.$tag.'" class="'.( in_array($tag, $args['selectedTags'])?'select':'unselect' ).'">'.$tag.'</span>';
 		}
 
 		$html .= '</div>';
diff --git a/bl-kernel/admin/themes/default/js/jquery.auto-complete.min.js b/bl-kernel/admin/themes/default/js/jquery.auto-complete.min.js
deleted file mode 100644
index 6fdb3bc6..00000000
--- a/bl-kernel/admin/themes/default/js/jquery.auto-complete.min.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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<e.length;c++)a+=o.renderItem(e[c],t);s.sc.html(a),s.updateSC(0)}else s.sc.hide()}var s=e(this);s.sc=e('<div class="autocomplete-suggestions '+o.menuClass+'"></div>'),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<c.length-o.minChars;l++){var i=c.slice(0,c.length-l);if(i in s.cache&&!s.cache[i].length)return void t([])}}s.timer=setTimeout(function(){o.source(c,t)},o.delay)}}else s.last_val=c,s.sc.hide()}})})},e.fn.autoComplete.defaults={source:0,minChars:3,delay:150,cache:1,menuClass:"",renderItem:function(e,t){t=t.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&");var o=new RegExp("("+t.split(" ").join("|")+")","gi");return'<div class="autocomplete-suggestion" data-val="'+e+'">'+e.replace(o,"<b>$1</b>")+"</div>"},onSelect:function(e,t,o){}}}(jQuery);
\ No newline at end of file
diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php
index a04b285b..739199af 100755
--- a/bl-kernel/admin/views/edit-user.php
+++ b/bl-kernel/admin/views/edit-user.php
@@ -72,36 +72,36 @@ if($Login->role()==='admin') {
 		'tip'=>$L->g('email-will-not-be-publicly-displayed')
 	));
 
-	HTML::legend(array('value'=>$L->g('Social networks')));
+	HTML::legend(array('value'=>$L->g('Social networks links')));
 
 	HTML::formInputText(array(
-		'name'=>'twitterUsername',
-		'label'=>$L->g('Twitter username'),
-		'value'=>$_User->twitterUsername(),
+		'name'=>'twitter',
+		'label'=>'Twitter',
+		'value'=>$_User->twitter(),
 		'class'=>'uk-width-1-2 uk-form-medium',
 		'tip'=>''
 	));
 
 	HTML::formInputText(array(
-		'name'=>'facebookUsername',
-		'label'=>$L->g('Facebook username'),
-		'value'=>$_User->facebookUsername(),
+		'name'=>'facebook',
+		'label'=>'Facebook',
+		'value'=>$_User->facebook(),
 		'class'=>'uk-width-1-2 uk-form-medium',
 		'tip'=>''
 	));
 
 	HTML::formInputText(array(
-		'name'=>'googleUsername',
-		'label'=>$L->g('Google username'),
-		'value'=>$_User->googleUsername(),
+		'name'=>'googlePlus',
+		'label'=>'Google+',
+		'value'=>$_User->googlePlus(),
 		'class'=>'uk-width-1-2 uk-form-medium',
 		'tip'=>''
 	));
 
 	HTML::formInputText(array(
-		'name'=>'instagramUsername',
-		'label'=>$L->g('Instagram username'),
-		'value'=>$_User->instagramUsername(),
+		'name'=>'instagram',
+		'label'=>'Instagram',
+		'value'=>$_User->instagram(),
 		'class'=>'uk-width-1-2 uk-form-medium',
 		'tip'=>''
 	));
diff --git a/bl-kernel/admin/views/settings-general.php b/bl-kernel/admin/views/settings-general.php
index 9291cc8d..6724abe5 100644
--- a/bl-kernel/admin/views/settings-general.php
+++ b/bl-kernel/admin/views/settings-general.php
@@ -44,10 +44,48 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
 		'tip'=>$L->g('you-can-add-a-small-text-on-the-bottom')
 	));
 
+	HTML::legend(array('value'=>$L->g('Social networks links')));
+
+	HTML::formInputText(array(
+		'name'=>'twitter',
+		'label'=>'Twitter',
+		'value'=>$Site->twitter(),
+		'class'=>'uk-width-1-2 uk-form-medium',
+		'placeholder'=>'https://twitter.com/USERNAME',
+		'tip'=>''
+	));
+
+	HTML::formInputText(array(
+		'name'=>'facebook',
+		'label'=>'Facebook',
+		'value'=>$Site->facebook(),
+		'class'=>'uk-width-1-2 uk-form-medium',
+		'placeholder'=>'https://www.facebook.com/USERNAME',
+		'tip'=>''
+	));
+
+	HTML::formInputText(array(
+		'name'=>'googlePlus',
+		'label'=>'Google+',
+		'value'=>$Site->googlePlus(),
+		'class'=>'uk-width-1-2 uk-form-medium',
+		'placeholder'=>'https://plus.google.com/+USERNAME',
+		'tip'=>''
+	));
+
+	HTML::formInputText(array(
+		'name'=>'github',
+		'label'=>'Github',
+		'value'=>$Site->github(),
+		'class'=>'uk-width-1-2 uk-form-medium',
+		'placeholder'=>'https://github.com/USERNAME',
+		'tip'=>''
+	));
+
 	echo '<div class="uk-form-row">
 		<div class="uk-form-controls">
 		<button type="submit" class="uk-button uk-button-primary">'.$L->g('Save').'</button>
 		</div>
 	</div>';
 
-HTML::formClose();
+HTML::formClose();
\ No newline at end of file
diff --git a/bl-kernel/dbsite.class.php b/bl-kernel/dbsite.class.php
index de313244..d4bdaec7 100644
--- a/bl-kernel/dbsite.class.php
+++ b/bl-kernel/dbsite.class.php
@@ -23,7 +23,11 @@ class dbSite extends dbJSON
 		'emailFrom'=>		array('inFile'=>false, 'value'=>''),
 		'dateFormat'=>		array('inFile'=>false, 'value'=>'F j, Y'),
 		'timeFormat'=>		array('inFile'=>false, 'value'=>'g:i a'),
-		'currentBuild'=>	array('inFile'=>false, 'value'=>0)
+		'currentBuild'=>	array('inFile'=>false, 'value'=>0),
+		'twitter'=>		array('inFile'=>false, 'value'=>''),
+		'facebook'=>		array('inFile'=>false, 'value'=>''),
+		'googlePlus'=>		array('inFile'=>false, 'value'=>''),
+		'github'=>		array('inFile'=>false, 'value'=>'')
 	);
 
 	function __construct()
@@ -101,6 +105,26 @@ class dbSite extends dbJSON
 		return $this->url().ltrim($filter, '/');
 	}
 
+	public function twitter()
+	{
+		return $this->getField('twitter');
+	}
+
+	public function facebook()
+	{
+		return $this->getField('facebook');
+	}
+
+	public function github()
+	{
+		return $this->getField('github');
+	}
+
+	public function googlePlus()
+	{
+		return $this->getField('googlePlus');
+	}
+
 	// Returns the site title.
 	public function title()
 	{
diff --git a/bl-kernel/dbusers.class.php b/bl-kernel/dbusers.class.php
index 8a1b4fb3..fbb0166d 100644
--- a/bl-kernel/dbusers.class.php
+++ b/bl-kernel/dbusers.class.php
@@ -13,10 +13,10 @@ class dbUsers extends dbJSON
 		'registered'=>		array('inFile'=>false, 'value'=>'1985-03-15 10:00'),
 		'tokenEmail'=>		array('inFile'=>false, 'value'=>''),
 		'tokenEmailTTL'=>	array('inFile'=>false, 'value'=>'2009-03-15 14:00'),
-		'twitterUsername'=>	array('inFile'=>false, 'value'=>''),
-		'facebookUsername'=>	array('inFile'=>false, 'value'=>''),
-		'googleUsername'=>	array('inFile'=>false, 'value'=>''),
-		'instagramUsername'=>	array('inFile'=>false, 'value'=>'')
+		'twitter'=>		array('inFile'=>false, 'value'=>''),
+		'facebook'=>		array('inFile'=>false, 'value'=>''),
+		'googlePlus'=>		array('inFile'=>false, 'value'=>''),
+		'instagram'=>		array('inFile'=>false, 'value'=>'')
 	);
 
 	function __construct()
diff --git a/bl-kernel/js/bludit-tags.js b/bl-kernel/js/bludit-tags.js
index 046059d8..ad21bcd7 100644
--- a/bl-kernel/js/bludit-tags.js
+++ b/bl-kernel/js/bludit-tags.js
@@ -8,7 +8,16 @@ function insertTag() {
 		return true;
 	}
 
-	$("#jstagList").append("<span class=\"select\">"+newTag+"</span>");
+	var findTag = $("span[data-tag]").filter(function() {
+		return $(this).attr('data-tag').toLowerCase() == newTag;
+	});
+
+	if( findTag.length > 0 ) {
+		findTag.removeClass("unselect").addClass("select");
+	}
+	else {
+		$("#jstagList").append("<span data-tag=\""+newTag+"\" class=\"select\">"+newTag+"</span>");
+	}
 
 	// Clean the input.
 	$("#jstagInput").val("");
diff --git a/bl-kernel/user.class.php b/bl-kernel/user.class.php
index f75456ca..99fe1e68 100644
--- a/bl-kernel/user.class.php
+++ b/bl-kernel/user.class.php
@@ -61,24 +61,24 @@ class User
 		return $this->getField('registered');
 	}
 
-	public function twitterUsername()
+	public function twitter()
 	{
-		return $this->getField('twitterUsername');
+		return $this->getField('twitter');
 	}
 
-	public function facebookUsername()
+	public function facebook()
 	{
-		return $this->getField('facebookUsername');
+		return $this->getField('facebook');
 	}
 
-	public function googleUsername()
+	public function googlePlus()
 	{
-		return $this->getField('googleUsername');
+		return $this->getField('googlePlus');
 	}
 
-	public function instagramUsername()
+	public function instagram()
 	{
-		return $this->getField('instagramUsername');
+		return $this->getField('instagram');
 	}
 
 	public function profilePicture($absolute=true)
diff --git a/bl-languages/en_US.json b/bl-languages/en_US.json
index 618e038d..8e740ada 100755
--- a/bl-languages/en_US.json
+++ b/bl-languages/en_US.json
@@ -234,10 +234,6 @@
 	"set-as-cover-image": "Set as cover image",
 	"delete-image": "Delete image",
 	"image-description": "Image description",
-	
-	"social-networks": "Social networks",
-	"twitter-username": "Twitter username",
-	"facebook-username": "Facebook username",
-	"google-username": "Google username",
-	"instagram-username": "Instagram username"
+
+	"social-networks-links": "Social networks links"
 }
\ No newline at end of file
diff --git a/bl-themes/blogme/metadata.json b/bl-themes/blogme/metadata.json
index 26108020..0a972672 100644
--- a/bl-themes/blogme/metadata.json
+++ b/bl-themes/blogme/metadata.json
@@ -2,9 +2,9 @@
 	"author": "n33co & diego",
 	"email": "",
 	"website": "https://github.com/dignajar/bludit-themes",
-	"version": "1.0",
+	"version": "1.1",
 	"releaseDate": "2016-01-21",
 	"license": "CCA 3.0",
-	"requires": "Bludit v1.0",
+	"requires": "Bludit v1.1",
 	"notes": "This theme is based on Future Imperfect, all credits to the author n33co."
-}
\ No newline at end of file
+}
diff --git a/bl-themes/future-imperfect/metadata.json b/bl-themes/future-imperfect/metadata.json
index a5fadaba..23c23b98 100644
--- a/bl-themes/future-imperfect/metadata.json
+++ b/bl-themes/future-imperfect/metadata.json
@@ -2,9 +2,9 @@
 	"author": "n33co",
 	"email": "",
 	"website": "http://html5up.net",
-	"version": "1.0",
-	"releaseDate": "2015-11-01",
+	"version": "1.1",
+	"releaseDate": "2015-11.11",
 	"license": "CCA 3.0",
-	"requires": "Bludit v1.0",
+	"requires": "Bludit v1.1",
 	"notes": ""
-}
\ No newline at end of file
+}
diff --git a/bl-themes/pure/metadata.json b/bl-themes/pure/metadata.json
index 5d3fad82..6b6e7385 100644
--- a/bl-themes/pure/metadata.json
+++ b/bl-themes/pure/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://github.com/dignajar/bludit-themes",
-	"version": "1.0",
+	"version": "1.1",
 	"releaseDate": "2016-01-15",
 	"license": "MIT",
-	"requires": "Bludit v1.0",
+	"requires": "Bludit v1.1",
 	"notes": ""
-}
\ No newline at end of file
+}