From 3b33beda3fc165e95b2ce56fe336ba5308835109 Mon Sep 17 00:00:00 2001
From: dignajar <dignajar@gmail.com>
Date: Sat, 24 Oct 2015 12:32:26 -0300
Subject: [PATCH] Dashboard clean-up

---
 admin/themes/default/css/installer.css | 10 +++++--
 admin/themes/default/index.php         | 38 +++++++++++---------------
 admin/views/dashboard.php              | 16 +++++------
 admin/views/settings-advanced.php      |  1 -
 admin/views/settings-general.php       |  1 -
 admin/views/settings-regional.php      |  3 +-
 install.php                            | 16 +++++------
 languages/en_US.json                   |  8 +++++-
 8 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/admin/themes/default/css/installer.css b/admin/themes/default/css/installer.css
index fe465151..da50e252 100644
--- a/admin/themes/default/css/installer.css
+++ b/admin/themes/default/css/installer.css
@@ -47,11 +47,17 @@ h3 {
 }
 
 .content {
-	text-align: left;
+
 }
 
 #jsshowPassword {
 	color: #999;
 	cursor: pointer;
-	font-size: 1.3em;
+	font-size: 1em;
+	margin-top: 10px;
+}
+
+#jscompleteEmail {
+	cursor: pointer;
+	text-decoration: underline;
 }
\ No newline at end of file
diff --git a/admin/themes/default/index.php b/admin/themes/default/index.php
index f800b244..1acab5a0 100644
--- a/admin/themes/default/index.php
+++ b/admin/themes/default/index.php
@@ -108,28 +108,22 @@ $(document).ready(function() {
 
 <!-- Offcanvas -->
 <div id="offcanvas" class="uk-offcanvas">
-    <div class="uk-offcanvas-bar">
-        <ul class="uk-nav uk-nav-offcanvas">
-            <li class="uk-active">
-                <a href="layouts_frontpage.html">Frontpage</a>
-            </li>
-            <li>
-                <a href="layouts_portfolio.html">Portfolio</a>
-            </li>
-            <li>
-                <a href="layouts_blog.html">Blog</a>
-            </li>
-            <li>
-                <a href="layouts_documentation.html">Documentation</a>
-            </li>
-            <li>
-                <a href="layouts_contact.html">Contact</a>
-            </li>
-            <li>
-                <a href="layouts_login.html">Login</a>
-            </li>
-        </ul>
-    </div>
+<div class="uk-offcanvas-bar">
+	<ul class="uk-nav uk-nav-offcanvas">
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'dashboard' ?>"><?php $L->p('Dashboard') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-post' ?>"><?php $L->p('New post') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><?php $L->p('New page') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-posts' ?>"><?php $L->p('Manage posts') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-pages' ?>"><?php $L->p('Manage pages') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>"><?php $L->p('Manage users') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-general' ?>"><?php $L->p('General settings') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-advanced' ?>"><?php $L->p('Advanced settings') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-regional' ?>"><?php $L->p('Language and timezone') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'plugins' ?>"><?php $L->p('Plugins') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'themes' ?>"><?php $L->p('Themes') ?></a></li>
+	<li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'about' ?>"><?php $L->p('About') ?></a></li>
+	</ul>
+</div>
 </div>
 
 <!-- View -->
diff --git a/admin/views/dashboard.php b/admin/views/dashboard.php
index c497b0a0..781520fb 100644
--- a/admin/views/dashboard.php
+++ b/admin/views/dashboard.php
@@ -5,13 +5,13 @@
 	<div class="uk-width-medium-1-3">
 
 		<div class="uk-panel">
-		<h4><a href=""><i class="uk-icon-pencil"></i> <?php $L->p('New post') ?></a></h4>
+		<h4><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-post' ?>"><i class="uk-icon-pencil"></i> <?php $L->p('New post') ?></a></h4>
 		<p><?php $L->p('Create a new article for your blog') ?></p>
 		</div>
 
 		<div class="uk-panel">
-		<h4><a href=""><i class="uk-icon-folder-o"></i> <?php $L->p('Manage posts') ?></a></h4>
-		<p><?php $L->p('') ?></p>
+		<h4><a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-posts' ?>"><i class="uk-icon-folder-o"></i> <?php $L->p('Manage posts') ?></a></h4>
+		<p><?php $L->p('edit-or-remove-your-blogs-posts') ?></p>
 		</div>
 
 	</div>
@@ -19,13 +19,13 @@
 	<div class="uk-width-medium-1-3" style="border-right: 1px solid #E6E6E6; border-left: 1px solid #E6E6E6">
 
 		<div class="uk-panel">
-		<h4><a href=""><i class="uk-icon-file-text-o"></i> <?php $L->p('New page') ?></a></h4>
+		<h4><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><i class="uk-icon-file-text-o"></i> <?php $L->p('New page') ?></a></h4>
 		<p><?php $L->p('Create a new page for your website') ?></p>
 		</div>
 
 		<div class="uk-panel">
-		<h4><a href=""><i class="uk-icon-folder-o"></i> <?php $L->p('Manage pages') ?></a></h4>
-		<p><?php $L->p('') ?></p>
+		<h4><a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-pages' ?>"><i class="uk-icon-folder-o"></i> <?php $L->p('Manage pages') ?></a></h4>
+		<p><?php $L->p('edit-or-remove-your=pages') ?></p>
 		</div>
 
 	</div>
@@ -33,12 +33,12 @@
 	<div class="uk-width-medium-1-3">
 
 		<div class="uk-panel">
-		<h4><a href=""><i class="uk-icon-user-plus"></i> <?php $L->p('Add a new user') ?></a></h4>
+		<h4><a href="<?php echo HTML_PATH_ADMIN_ROOT.'add-user' ?>"><i class="uk-icon-user-plus"></i> <?php $L->p('Add a new user') ?></a></h4>
 		<p><?php $L->p('Invite a friend to collaborate on your website') ?></p>
 		</div>
 
 		<div class="uk-panel">
-		<h4><a href=""><i class="uk-icon-globe"></i> <?php $L->p('Language and timezone') ?></a></h4>
+		<h4><a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-regional' ?>"><i class="uk-icon-globe"></i> <?php $L->p('Language and timezone') ?></a></h4>
 		<p><?php $L->p('Change your language and region settings') ?></p>
 		</div>
 
diff --git a/admin/views/settings-advanced.php b/admin/views/settings-advanced.php
index 0e31061f..40903786 100644
--- a/admin/views/settings-advanced.php
+++ b/admin/views/settings-advanced.php
@@ -85,7 +85,6 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
     echo '<div class="uk-form-row">
         <div class="uk-form-controls">
         <button type="submit" class="uk-button uk-button-primary">'.$L->g('Save').'</button>
-        <a href="#" class="uk-button">'.$L->g('Cancel').'</a>
         </div>
     </div>';
 
diff --git a/admin/views/settings-general.php b/admin/views/settings-general.php
index 5172228e..ac4bfbb4 100644
--- a/admin/views/settings-general.php
+++ b/admin/views/settings-general.php
@@ -45,7 +45,6 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
 	echo '<div class="uk-form-row">
 		<div class="uk-form-controls">
 		<button type="submit" class="uk-button uk-button-primary">'.$L->g('Save').'</button>
-		<a href="#" class="uk-button">'.$L->g('Cancel').'</a>
 		</div>
 	</div>';
 
diff --git a/admin/views/settings-regional.php b/admin/views/settings-regional.php
index cb0cc354..d06bb019 100644
--- a/admin/views/settings-regional.php
+++ b/admin/views/settings-regional.php
@@ -1,6 +1,6 @@
 <?php
 
-HTML::title(array('title'=>$L->g('Settings'), 'icon'=>'cogs'));
+HTML::title(array('title'=>$L->g('Language and timezone'), 'icon'=>'cogs'));
 
 HTML::formOpen(array('class'=>'uk-form-horizontal'));
 
@@ -38,7 +38,6 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
 	echo '<div class="uk-form-row">
 		<div class="uk-form-controls">
 		<button type="submit" class="uk-button uk-button-primary">'.$L->g('Save').'</button>
-		<a href="#" class="uk-button">'.$L->g('Cancel').'</a>
 		</div>
 	</div>';
 
diff --git a/install.php b/install.php
index b552088f..d356a8dd 100644
--- a/install.php
+++ b/install.php
@@ -519,17 +519,15 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
 		<input type="hidden" name="timezone" id="jstimezone" value="0">
 
 		<div class="uk-form-row">
-		<input type="text" value="admin" class="uk-width-9-10 uk-form-large" disabled>
+		<input type="text" value="admin" class="uk-width-1-1 uk-form-large" disabled>
 		</div>
 
 		<div class="uk-form-row">
-
-		<input name="password" id="jspassword" type="password" class="uk-width-9-10 uk-form-large" value="<?php echo isset($_POST['password'])?$_POST['password']:'' ?>" placeholder="<?php echo $Language->get('Password') ?>">
-		<i id="jsshowPassword" class="uk-icon-eye"></i>
+		<input name="password" id="jspassword" type="password" class="uk-width-1-1 uk-form-large" value="<?php echo isset($_POST['password'])?$_POST['password']:'' ?>" placeholder="<?php echo $Language->get('Password') ?>">
 		</div>
 
 		<div class="uk-form-row">
-		<input name="email" id="jsemail" type="text" class="uk-width-9-10 uk-form-large" placeholder="<?php echo $Language->get('Email') ?>" autocomplete="off" maxlength="100">
+		<input name="email" id="jsemail" type="text" class="uk-width-1-1 uk-form-large" placeholder="<?php echo $Language->get('Email') ?>" autocomplete="off" maxlength="100">
 		</div>
 
 		<div class="uk-form-row">
@@ -537,6 +535,8 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
 		</div>
 
 		</form>
+
+		<div id="jsshowPassword"><i class="uk-icon-eye"></i> <?php $Language->p('Show password') ?></div>
 	<?php
 		}
 		else
@@ -579,11 +579,11 @@ $(document).ready(function()
 	// Proceed without email field.
 	$("#jscompleteEmail").on("click", function() {
 
+		console.log("Click proceed anyway");
+
 		$("#jsnoCheckEmail").val("1");
 
-		if(!$("#jspassword").val()) {
-			$("#jsformInstaller").submit();
-		}
+		$("#jsformInstaller").submit();
 	});
 
 	// Show password
diff --git a/languages/en_US.json b/languages/en_US.json
index cb45a200..b00c9408 100644
--- a/languages/en_US.json
+++ b/languages/en_US.json
@@ -190,5 +190,11 @@
 	"send-me-a-login-access-code": "Send me a login access code",
 	"get-login-access-code": "Get login access code",
 	"email-notification-login-access-code": "<p>This is a notification from your website {{WEBSITE_NAME}}</p><p>You request a login access code, follow the next link:</p><p>{{LINK}}</p>",
-	"there-are-no-scheduled-posts": "There are no scheduled posts."
+	"there-are-no-scheduled-posts": "There are no scheduled posts.",
+	"show-password": "Show password",
+	"edit-or-remove-your=pages": "Edit or remove your pages.",
+	"edit-or-remove-your-blogs-posts": "Edit or remove your blog's posts.",
+	"general-settings": "General settings",
+	"advanced-settings": "Advanced settings",
+	"manage-users": "Manage users"
 }
\ No newline at end of file