r31k
/
bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Dashboard clean-up

This commit is contained in:
dignajar 2015-10-24 12:32:26 -03:00
parent e684e07e78
commit 3b33beda3f
8 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/themes/default/css/installer.css
View File

@ -47,11 +47,17 @@ h3 {
} }
.content { .content {
text-align: left;
} }
#jsshowPassword { #jsshowPassword {
color: #999; color: #999;
cursor: pointer; cursor: pointer;
font-size: 1.3em; font-size: 1em;
margin-top: 10px;
}
#jscompleteEmail {
cursor: pointer;
text-decoration: underline;
} }

38
admin/themes/default/index.php
View File

@ -108,28 +108,22 @@ $(document).ready(function() {
<!-- Offcanvas --> <!-- Offcanvas -->
<div id="offcanvas" class="uk-offcanvas"> <div id="offcanvas" class="uk-offcanvas">
<div class="uk-offcanvas-bar"> <div class="uk-offcanvas-bar">
<ul class="uk-nav uk-nav-offcanvas"> <ul class="uk-nav uk-nav-offcanvas">
<li class="uk-active"> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'dashboard' ?>"><?php $L->p('Dashboard') ?></a></li>
<a href="layouts_frontpage.html">Frontpage</a> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-post' ?>"><?php $L->p('New post') ?></a></li>
</li> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'new-page' ?>"><?php $L->p('New page') ?></a></li>
<li> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-posts' ?>"><?php $L->p('Manage posts') ?></a></li>
<a href="layouts_portfolio.html">Portfolio</a> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'manage-pages' ?>"><?php $L->p('Manage pages') ?></a></li>
</li> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>"><?php $L->p('Manage users') ?></a></li>
<li> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-general' ?>"><?php $L->p('General settings') ?></a></li>
<a href="layouts_blog.html">Blog</a> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-advanced' ?>"><?php $L->p('Advanced settings') ?></a></li>
</li> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'settings-regional' ?>"><?php $L->p('Language and timezone') ?></a></li>
<li> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'plugins' ?>"><?php $L->p('Plugins') ?></a></li>
<a href="layouts_documentation.html">Documentation</a> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'themes' ?>"><?php $L->p('Themes') ?></a></li>
</li> <li><a href="<?php echo HTML_PATH_ADMIN_ROOT.'about' ?>"><?php $L->p('About') ?></a></li>
<li> </ul>
<a href="layouts_contact.html">Contact</a> </div>
</li>
<li>
<a href="layouts_login.html">Login</a>
</li>
</ul>
</div>
</div> </div>
<!-- View --> <!-- View -->

16
admin/views/dashboard.php
View File

@ -5,13 +5,13 @@
<div class="uk-width-medium-1-3"> <div class="uk-width-medium-1-3">
<div class="uk-panel"> <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> <p><?php $L->p('Create a new article for your blog') ?></p>
</div> </div>
<div class="uk-panel"> <div class="uk-panel">
<h4><a href=""><i class="uk-icon-folder-o"></i> <?php $L->p('Manage posts') ?></a></h4> <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('') ?></p> <p><?php $L->p('edit-or-remove-your-blogs-posts') ?></p>
</div> </div>
</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-width-medium-1-3" style="border-right: 1px solid #E6E6E6; border-left: 1px solid #E6E6E6">
<div class="uk-panel"> <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> <p><?php $L->p('Create a new page for your website') ?></p>
</div> </div>
<div class="uk-panel"> <div class="uk-panel">
<h4><a href=""><i class="uk-icon-folder-o"></i> <?php $L->p('Manage pages') ?></a></h4> <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('') ?></p> <p><?php $L->p('edit-or-remove-your=pages') ?></p>
</div> </div>
</div> </div>
@ -33,12 +33,12 @@
<div class="uk-width-medium-1-3"> <div class="uk-width-medium-1-3">
<div class="uk-panel"> <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> <p><?php $L->p('Invite a friend to collaborate on your website') ?></p>
</div> </div>
<div class="uk-panel"> <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> <p><?php $L->p('Change your language and region settings') ?></p>
</div> </div>

1
admin/views/settings-advanced.php
View File

@ -85,7 +85,6 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
echo '<div class="uk-form-row"> echo '<div class="uk-form-row">
<div class="uk-form-controls"> <div class="uk-form-controls">
<button type="submit" class="uk-button uk-button-primary">'.$L->g('Save').'</button> <button type="submit" class="uk-button uk-button-primary">'.$L->g('Save').'</button>
<a href="#" class="uk-button">'.$L->g('Cancel').'</a>
</div> </div>
</div>'; </div>';

1
admin/views/settings-general.php
View File

@ -45,7 +45,6 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
echo '<div class="uk-form-row"> echo '<div class="uk-form-row">
<div class="uk-form-controls"> <div class="uk-form-controls">
<button type="submit" class="uk-button uk-button-primary">'.$L->g('Save').'</button> <button type="submit" class="uk-button uk-button-primary">'.$L->g('Save').'</button>
<a href="#" class="uk-button">'.$L->g('Cancel').'</a>
</div> </div>
</div>'; </div>';

3
admin/views/settings-regional.php
View File

@ -1,6 +1,6 @@
<?php <?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')); HTML::formOpen(array('class'=>'uk-form-horizontal'));
@ -38,7 +38,6 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
echo '<div class="uk-form-row"> echo '<div class="uk-form-row">
<div class="uk-form-controls"> <div class="uk-form-controls">
<button type="submit" class="uk-button uk-button-primary">'.$L->g('Save').'</button> <button type="submit" class="uk-button uk-button-primary">'.$L->g('Save').'</button>
<a href="#" class="uk-button">'.$L->g('Cancel').'</a>
</div> </div>
</div>'; </div>';

16
install.php
View File

@ -519,17 +519,15 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
<input type="hidden" name="timezone" id="jstimezone" value="0"> <input type="hidden" name="timezone" id="jstimezone" value="0">
<div class="uk-form-row"> <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>
<div class="uk-form-row"> <div class="uk-form-row">
<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') ?>">
<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>
</div> </div>
<div class="uk-form-row"> <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>
<div class="uk-form-row"> <div class="uk-form-row">
@ -537,6 +535,8 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
</div> </div>
</form> </form>
<div id="jsshowPassword"><i class="uk-icon-eye"></i> <?php $Language->p('Show password') ?></div>
<?php <?php
} }
else else
@ -579,11 +579,11 @@ $(document).ready(function()
// Proceed without email field. // Proceed without email field.
$("#jscompleteEmail").on("click", function() { $("#jscompleteEmail").on("click", function() {
console.log("Click proceed anyway");
$("#jsnoCheckEmail").val("1"); $("#jsnoCheckEmail").val("1");
if(!$("#jspassword").val()) { $("#jsformInstaller").submit();
$("#jsformInstaller").submit();
}
}); });
// Show password // Show password

8
languages/en_US.json
View File

@ -190,5 +190,11 @@
"send-me-a-login-access-code": "Send me a login access code", "send-me-a-login-access-code": "Send me a login access code",
"get-login-access-code": "Get 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>", "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"
} }