Simplemde updated, Uikit updated, Changes on CSS

bl-kernel/admin/themes/default/css/default.css

@@ -1,7 +1,88 @@
 /* ----------- UIKIT HACKs FOR BLUDIT ----------- */
+* {
+	border-radius: 2px !important;
+}
+
 .uk-navbar {
-	background: #EEEEEE !important;
+	background: #323232 !important;
+	border: 0 !important;
+	border-radius: 0 !important;
+}
+
+.uk-navbar-nav a {
 	border: none !important;
+	border-radius: none !important;
+	text-shadow: none !important;
+	color: #fff !important;
+	font-weight: 300 !important;
+	padding: 0 25px !important;
+}
+
+.uk-navbar-nav > li.uk-open > a,
+.uk-navbar-nav > li:hover > a,
+.uk-navbar-nav > li:focus > a,
+.uk-navbar-nav > li > a:focus,
+.uk-navbar-nav > li > a:hover {
+	background: none !important;
+	border-radius: 0 !important;
+	color: #BBBBBB !important;
+	box-shadow: none !important;
+	text-shadow: none !important;
+}
+
+.uk-nav-navbar > li > a:focus,
+.uk-nav-navbar > li > a:hover {
+	background: none !important;
+	border-radius: 0 !important;
+	color: #888 !important;
+	box-shadow: none !important;
+	text-shadow: none !important;
+}
+
+.uk-navbar-nav > li.uk-active > a {
+	background: none !important;
+	color: #BBBBBB !important;
+}
+
+.uk-navbar-nav .uk-border-circle {
+	border-radius: 20px !important;
+}
+
+.uk-dropdown-navbar {
+	margin: 0 !important;
+	padding: 10px 0 !important;
+	position: fixed;
+	text-align: center;
+	width: 100%;
+	border-radius: 0 !important;
+	border-left: 0 !important;
+	border-right: 0 !important;
+	border-top: 0 !important;
+}
+
+.uk-dropdown-navbar li {
+	display: inline-block !important;
+}
+
+.uk-dropdown-navbar a {
+	color: #323232 !important;
+}
+
+li.bludit-logo {
+	color: #fff !important;
+	display: block;
+	font-size: 14px;
+	font-weight: 400;
+	height: 41px;
+	line-height: 40px;
+	margin-left: -1px;
+	margin-top: -1px;
+	margin-right: 12px;
+}
+
+.bludit-user-navbar {
+	text-align: right !important;
+	padding-right: 60px !important;
 }
 
 .uk-button {
@@ -35,16 +116,7 @@ legend.first-child {
 	margin-top: 0px !important;
 }
 
-.uk-navbar-nav > li > a {
-	border: none;
-	height: 70px;
-	padding: 15px;
-}
 
-.uk-nav-navbar > li > a:hover,
-.uk-nav-navbar > li > a:focus {
-	background: #2672ec;
-}
 
 .uk-form-label {
 	color: #666666;
@@ -72,18 +144,6 @@ a {
 	color: #2672ec;
 }
 
-li.bludit-logo {
-	color: #848484 !important;
-	height: 70px;
-	padding: 15px;
-	display: block;
-	font-size: 14px;
-	font-weight: 400;
-	height: 35px;
-	line-height: 40px;
-	text-shadow: 0 1px 0 #fff;
-}
-
 .uk-panel-box {
 	background: #F9F9F9 !important;
 }
@@ -116,6 +176,7 @@ li.bludit-logo {
 	margin-bottom: 0 !important;
 }
 
+
 /* ----------- BLUDIT ----------- */
 
 body {

bl-kernel/admin/themes/default/css/login.css

@@ -1,6 +1,10 @@
 /* ----------- UIKIT HACKs FOR BLUDIT ----------- */
 html {
-	background: #f1f1f1;
+	background: #f3f3f3;
+}
+
+* {
+	border-radius: 2px !important;
 }
 
 .uk-button-primary {
@@ -14,6 +18,11 @@ html {
 input[type="text"],
 input[type="password"] {
 	border-color: #FFF !important;
+	border-radius: 2px !important;
+}
+
+.uk-alert {
+	padding: 22px 0 !important;
 }
 
 /* ----------- BLUDIT ----------- */
@@ -40,10 +49,10 @@ div.login-form > h2 {
 }
 
 a.login-email {
-	background: #f9f9f9 none repeat scroll 0 0;
 	border: 1px solid #eeeeee;
 	color: #777;
 	display: block;
-	padding: 20px;
 	margin: 20px 0;
+	padding: 0;
+	text-align: left;
 }

bl-kernel/admin/themes/default/css/uikit/form-file.almost-flat.min.css

@@ -1,2 +1,2 @@
-/*! UIkit 2.24.3 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-form-file{display:inline-block;vertical-align:middle;position:relative;overflow:hidden}.uk-form-file input[type=file]{position:absolute;top:0;z-index:1;width:100%;opacity:0;cursor:pointer;left:0;font-size:500px}

bl-kernel/admin/themes/default/css/uikit/placeholder.almost-flat.min.css

@@ -1,2 +1,2 @@
-/*! UIkit 2.24.3 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-placeholder{margin-bottom:15px;padding:15px;border:1px dashed #ddd;background:#fafafa;color:#444}*+.uk-placeholder{margin-top:15px}.uk-placeholder>:last-child{margin-bottom:0}.uk-placeholder-large{padding-top:80px;padding-bottom:80px}

bl-kernel/admin/themes/default/css/uikit/progress.almost-flat.min.css

@@ -1,2 +1,2 @@
-/*! UIkit 2.24.3 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-progress{box-sizing:border-box;height:20px;margin-bottom:15px;background:#f5f5f5;overflow:hidden;line-height:20px;box-shadow:inset 0 0 0 1px rgba(0,0,0,.06);border-radius:4px}*+.uk-progress{margin-top:15px}.uk-progress-bar{width:0;height:100%;background:#00a8e6;float:left;-webkit-transition:width .6s ease;transition:width .6s ease;font-size:12px;color:#fff;text-align:center;box-shadow:inset 0 0 5px rgba(0,0,0,.05);text-shadow:0 -1px 0 rgba(0,0,0,.1)}.uk-progress-mini{height:6px}.uk-progress-small{height:12px}.uk-progress-success .uk-progress-bar{background-color:#8cc14c}.uk-progress-warning .uk-progress-bar{background-color:#faa732}.uk-progress-danger .uk-progress-bar{background-color:#da314b}.uk-progress-striped .uk-progress-bar{background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:30px 30px}.uk-progress-striped.uk-active .uk-progress-bar{-webkit-animation:uk-progress-bar-stripes 2s linear infinite;animation:uk-progress-bar-stripes 2s linear infinite}@-webkit-keyframes uk-progress-bar-stripes{0%{background-position:0 0}100%{background-position:30px 0}}@keyframes uk-progress-bar-stripes{0%{background-position:0 0}100%{background-position:30px 0}}.uk-progress-mini,.uk-progress-small{border-radius:500px}

bl-kernel/admin/themes/default/css/uikit/upload.almost-flat.min.css

@@ -1,2 +1,2 @@
-/*! UIkit 2.24.3 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-dragover{box-shadow:0 0 20px rgba(100,100,100,.3)}

bl-kernel/admin/themes/default/index.php

@@ -61,12 +61,12 @@ $(document).ready(function() {
 
 		<ul class="uk-navbar-nav">
 		<li class="bludit-logo">BLUDIT</li>
-		<li <?php echo ($layout['view']=='dashboard')?'class="uk-active"':'' ?> ><a href="<?php echo HTML_PATH_ADMIN_ROOT.'dashboard' ?>"><i class="uk-icon-object-ungroup"></i> <?php $L->p('Dashboard') ?></a></li>
-		<li <?php echo ($layout['view']=='new-post')?'class="uk-active"':'' ?>><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-post' ?>"><i class="uk-icon-pencil"></i> <?php $L->p('New post') ?></a></li>
-		<li <?php echo ($layout['view']=='new-page')?'class="uk-active"':'' ?>><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><i class="uk-icon-file-text-o"></i> <?php $L->p('New page') ?></a></li>
+		<li <?php echo ($layout['view']=='dashboard')?'class="uk-active"':'' ?> ><a href="<?php echo HTML_PATH_ADMIN_ROOT.'dashboard' ?>"><?php $L->p('Dashboard') ?></a></li>
+		<li <?php echo ($layout['view']=='new-post')?'class="uk-active"':'' ?>><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-post' ?>"><?php $L->p('New post') ?></a></li>
+		<li <?php echo ($layout['view']=='new-page')?'class="uk-active"':'' ?>><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><?php $L->p('New page') ?></a></li>
 
 		<li class="uk-parent" data-uk-dropdown>
-			<a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-posts' ?>"><i class="uk-icon-clone"></i> <?php $L->p('Manage') ?> ▾</a>
+			<a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-posts' ?>"><?php $L->p('Manage') ?> ▾</a>
 			<div class="uk-dropdown uk-dropdown-navbar">
 				<ul class="uk-nav uk-nav-navbar">
 				<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-posts' ?>"><i class="uk-icon-folder-o"></i> <?php $L->p('Posts') ?></a></li>
@@ -80,27 +80,29 @@ $(document).ready(function() {
 
 		<?php if($Login->role() == 'admin') { ?>
 		<li class="uk-parent" data-uk-dropdown>
-			<a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-general' ?>"><i class="uk-icon-cog"></i> <?php $L->p('Settings') ?> ▾</a>
+			<a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-general' ?>"><?php $L->p('Settings') ?> ▾</a>
 			<div class="uk-dropdown uk-dropdown-navbar">
 				<ul class="uk-nav uk-nav-navbar">
 				<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-general' ?>"><i class="uk-icon-th-large"></i> <?php $L->p('General') ?></a></li>
 				<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-advanced' ?>"><i class="uk-icon-th"></i> <?php $L->p('Advanced') ?></a></li>
 				<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-regional' ?>"><i class="uk-icon-globe"></i> <?php $L->p('Language and timezone') ?></a></li>
-				<li class="uk-nav-divider"></li>
+
 				<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'plugins' ?>"><i class="uk-icon-puzzle-piece"></i> <?php $L->p('Plugins') ?></a></li>
 				<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'themes' ?>"><i class="uk-icon-paint-brush"></i> <?php $L->p('Themes') ?></a></li>
-				<li class="uk-nav-divider"></li>
-				<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'about' ?>"><?php $L->p('About') ?></a></li>
+
+				<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'about' ?>"><i class="uk-icon-info"></i> <?php $L->p('About') ?></a></li>
 				</ul>
 			</div>
 		</li>
 		<?php } ?>
 
+		<li><a target="_blank" href="<?php echo HTML_PATH_ROOT ?>"><?php $L->p('Website') ?></a></li>
+
 		</ul>
 
 		<div class="uk-navbar-flip">
 		<ul class="uk-navbar-nav">
-		<li class="uk-parent" data-uk-dropdown>
+		<li>
 			<?php
 				$profilePictureSrc = HTML_PATH_ADMIN_THEME_IMG.'default.png';
 				if(file_exists(PATH_UPLOADS_PROFILES.$Login->username().'.png')) {
@@ -108,16 +110,8 @@ $(document).ready(function() {
 				}
 			?>
 			<a href="<?php echo HTML_PATH_ADMIN_ROOT.'edit-user/'.$Login->username() ?>">
-				<img class="uk-border-circle" width="28px" src="<?php echo $profilePictureSrc ?>" alt=""> <?php echo $Login->username() ?> ▾
+				<img class="uk-border-circle" width="28px" src="<?php echo $profilePictureSrc ?>" alt=""> Welcome <?php echo $Login->username() ?>
 			</a>
-			<div class="uk-dropdown uk-dropdown-navbar">
-				<ul class="uk-nav uk-nav-navbar">
-				<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'edit-user/'.$Login->username() ?>"><?php $L->p('Profile') ?></a></li>
-				<li class="uk-nav-divider"></li>
-				<li><a target="_blank" href="<?php echo HTML_PATH_ROOT ?>"><?php $L->p('Website') ?></a></li>
-				<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'logout' ?>"><?php $L->p('Logout') ?></a></li>
-				</ul>
-			</div>
 		</li>
 		</ul>
 		</div>

bl-kernel/admin/themes/default/js/uikit/upload.min.js

@@ -1,2 +1,2 @@
-/*! UIkit 2.24.3 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 !function(e){var t;window.UIkit&&(t=e(UIkit)),"function"==typeof define&&define.amd&&define("uikit-upload",["uikit"],function(){return t||e(UIkit)})}(function(e){"use strict";function t(o,a){function r(t,n){var o=new FormData,a=new XMLHttpRequest;if(n.before(n,t)!==!1){for(var r,i=0;r=t[i];i++)o.append(n.param,r);for(var l in n.params)o.append(l,n.params[l]);a.upload.addEventListener("progress",function(e){var t=e.loaded/e.total*100;n.progress(t,e)},!1),a.addEventListener("loadstart",function(e){n.loadstart(e)},!1),a.addEventListener("load",function(e){n.load(e)},!1),a.addEventListener("loadend",function(e){n.loadend(e)},!1),a.addEventListener("error",function(e){n.error(e)},!1),a.addEventListener("abort",function(e){n.abort(e)},!1),a.open(n.method,n.action,!0),"json"==n.type&&a.setRequestHeader("Accept","application/json"),a.onreadystatechange=function(){if(n.readystatechange(a),4==a.readyState){var t=a.responseText;if("json"==n.type)try{t=e.$.parseJSON(t)}catch(o){t=!1}n.complete(t,a)}},n.beforeSend(a),a.send(o)}}if(!e.support.ajaxupload)return this;if(a=e.$.extend({},t.defaults,a),o.length){if("*.*"!==a.allow)for(var i,l=0;i=o[l];l++)if(!n(a.allow,i.name))return"string"==typeof a.notallowed?alert(a.notallowed):a.notallowed(i,a),void 0;var s=a.complete;if(a.single){var d=o.length,f=0,p=!0;a.beforeAll(o),a.complete=function(e,t){f+=1,s(e,t),a.filelimit&&f>=a.filelimit&&(p=!1),p&&d>f?r([o[f]],a):a.allcomplete(e,t)},r([o[0]],a)}else a.complete=function(e,t){s(e,t),a.allcomplete(e,t)},r(o,a)}}function n(e,t){var n="^"+e.replace(/\//g,"\\/").replace(/\*\*/g,"(\\/[^\\/]+)*").replace(/\*/g,"[^\\/]+").replace(/((?!\\))\?/g,"$1.")+"$";return n="^"+n+"$",null!==t.match(new RegExp(n,"i"))}return e.component("uploadSelect",{init:function(){var e=this;this.on("change",function(){t(e.element[0].files,e.options);var n=e.element.clone(!0).data("uploadSelect",e);e.element.replaceWith(n),e.element=n})}}),e.component("uploadDrop",{defaults:{dragoverClass:"uk-dragover"},init:function(){var e=this,n=!1;this.on("drop",function(n){n.dataTransfer&&n.dataTransfer.files&&(n.stopPropagation(),n.preventDefault(),e.element.removeClass(e.options.dragoverClass),e.element.trigger("dropped.uk.upload",[n.dataTransfer.files]),t(n.dataTransfer.files,e.options))}).on("dragenter",function(e){e.stopPropagation(),e.preventDefault()}).on("dragover",function(t){t.stopPropagation(),t.preventDefault(),n||(e.element.addClass(e.options.dragoverClass),n=!0)}).on("dragleave",function(t){t.stopPropagation(),t.preventDefault(),e.element.removeClass(e.options.dragoverClass),n=!1})}}),e.support.ajaxupload=function(){function e(){var e=document.createElement("INPUT");return e.type="file","files"in e}function t(){var e=new XMLHttpRequest;return!!(e&&"upload"in e&&"onprogress"in e.upload)}function n(){return!!window.FormData}return e()&&t()&&n()}(),e.support.ajaxupload&&e.$.event.props.push("dataTransfer"),t.defaults={action:"",single:!0,method:"POST",param:"files[]",params:{},allow:"*.*",type:"text",filelimit:!1,before:function(){},beforeSend:function(){},beforeAll:function(){},loadstart:function(){},load:function(){},loadend:function(){},error:function(){},abort:function(){},progress:function(){},complete:function(){},allcomplete:function(){},readystatechange:function(){},notallowed:function(e,t){alert("Only the following file types are allowed: "+t.allow)}},e.Utils.xhrupload=t,t});

bl-kernel/admin/themes/default/login.php

@@ -31,7 +31,7 @@
 <h1>BLUDIT</h1>
 <?php
 	if(Alert::defined()) {
-		echo '<div class="uk-alert uk-alert-danger">'.Alert::get().'</div>';
+		echo '<div class="uk-alert">'.Alert::get().'</div>';
 	}
 
 	if( Sanitize::pathFile(PATH_ADMIN_VIEWS, $layout['view'].'.php') ) {
@@ -45,4 +45,4 @@
 <?php Theme::plugins('loginBodyEnd') ?>
 
 </body>
-</html>
+</html>

bl-kernel/admin/views/login-email.php

@@ -1,3 +1,5 @@
+<?php if(empty($_POST)) { ?>
+
 <div class="login-form">
 
 <form method="post" action="" class="uk-form" autocomplete="off">
@@ -16,4 +18,6 @@
 
 </div>
 
+<?php } ?>
+
 <a class="login-email" href="<?php echo HTML_PATH_ADMIN_ROOT.'login' ?>"><i class="uk-icon-chevron-left"></i> <?php $L->p('Back to login form') ?></a>

bl-kernel/admin/views/login.php

@@ -20,4 +20,4 @@
 
 </div>
 
-<a class="login-email" href="<?php echo HTML_PATH_ADMIN_ROOT.'login-email' ?>"><i class="uk-icon-envelope-o"></i> <?php $L->p('Send me a login access code') ?></a>
+<a class="login-email" href="<?php echo HTML_PATH_ADMIN_ROOT.'login-email' ?>"><i class="uk-icon-envelope-o"></i> <?php $L->p('Email access code') ?></a>

bl-kernel/dbposts.class.php

@@ -485,7 +485,7 @@ class dbPosts extends dbJSON
 		// Remove orphan posts from db, the orphan posts are posts deleted by hand (directory deleted).
 		foreach( array_diff_key($db, $allPosts) as $key=>$data ) {
 			unset($this->db[$key]);
-			Log::set('CliMode - Delete post: '.$key);
+			Log::set('CliMode - Deleted post: '.$key);
 		}
 
 		// Sort posts before save.

bl-languages/en_US.json

@@ -235,5 +235,7 @@
 	"delete-image": "Delete image",
 	"image-description": "Image description",
 
-	"social-networks-links": "Social networks links"
+	"social-networks-links": "Social networks links",
+
+	"email-access-code": "Email access code"
 }