Business/AccountHub
2
0
Fork 2
Code Issues 3 Pull Requests Releases 3 Wiki Activity

Move sync settings to separate page

Browse Source
This commit is contained in:
Skylar Ittner 2018-01-03 21:12:04 -07:00
parent ec2fac4ee4
commit 87c01fe2ce
4 changed files with 60 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
database_upgrade/1.0.1_1.1.sql
View File

@ -14,9 +14,9 @@ ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8; DEFAULT CHARACTER SET = utf8;
SET FOREIGN_KEY_CHECKS = 0; SET FOREIGN_KEY_CHECKS = 0;
ALTER TABLE `groups` ALTER TABLE `groups`
CHANGE COLUMN `groupid` `groupid` INT(11) NOT NULL AUTO_INCREMENT; CHANGE COLUMN `groupid` `groupid` INT(11) NOT NULL AUTO_INCREMENT;
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;
ALTER TABLE `accounthub`.`accounts` ALTER TABLE `accounts`
ADD COLUMN `pin` VARCHAR(10) NULL DEFAULT NULL AFTER `authsecret`; ADD COLUMN `pin` VARCHAR(10) NULL DEFAULT NULL AFTER `authsecret`;

71
home.php
View File

@ -1,5 +1,4 @@
<?php <?php
/* This Source Code Form is subject to the terms of the Mozilla Public /* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@ -88,33 +87,55 @@ if (!is_empty($_GET['page'])) {
<div class="collapse navbar-collapse" id="navbar-collapse"> <div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<?php <?php
$counter = 0;
$more = "";
$curpagefound = false;
foreach (PAGES as $id => $pg) { foreach (PAGES as $id => $pg) {
if ($pg['navbar'] === TRUE) { if ($pg['navbar'] === TRUE) {
if ($pageid == $id) { $counter++;
?> if ($counter > ($curpagefound ? 4 : 3) && $pageid != $id) {
<li class="active"> $item = '<a href="home.php?page=' . $id . '">';
<?php if (isset($pg['icon'])) {
} else { $item .= '<i class="fa fa-' . $pg['icon'] . ' fa-fw"></i>';
}
$item .= lang($pg['title'], false) . '</a>';
echo '<li class="hidden-sm hidden-md">' . $item . "</li>";
$more .= '<li>' . $item . "</li>";
} else {
if ($pageid == $id) {
$curpagefound = true;
?> ?>
<li> <li class="active">
<?php } ?> <?php
<a href="home.php?page=<?php echo $id; ?>"> } else {
<?php
if (isset($pg['icon'])) {
?> ?>
<i class="fa fa-<?php echo $pg['icon']; ?> fa-fw"></i> <li>
<?php } ?> <?php } ?>
<?php lang($pg['title']) ?> <a href="home.php?page=<?php echo $id; ?>">
</a> <?php
</li> if (isset($pg['icon'])) {
<?php ?>
<i class="fa fa-<?php echo $pg['icon']; ?> fa-fw"></i>
<?php } ?>
<?php lang($pg['title']) ?>
</a>
</li>
<?php
}
} }
} }
?>
if ($counter > 4) {
?>
<li class="dropdown hidden-lg hidden-xs">
<a href="" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v fa-fw"></i> <?php lang("more"); ?></a>
<ul class="dropdown-menu"><?php echo $more; ?></ul>
</li>
<?php } ?>
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="home.php"><i class="fa fa-user fa-fw"></i> <?php echo $_SESSION['realname'] ?></a></li> <li><a href="home.php"><i class="fa fa-user fa-fw"></i> <span class=""><?php echo $_SESSION['realname'] ?></span></a></li>
<li><a href="action.php?action=signout"><i class="fa fa-sign-out fa-fw"></i> <?php lang("sign out") ?></a></li> <li><a href="action.php?action=signout"><i class="fa fa-sign-out fa-fw"></i> <span class=""><?php lang("sign out") ?></span></a></li>
</ul> </ul>
</div> </div>
</nav> </nav>
@ -135,12 +156,12 @@ if (!is_empty($_GET['page'])) {
<p> <p>
<a href="<?php echo $a['url']; ?>"> <a href="<?php echo $a['url']; ?>">
<img class="img-responsive app-icon" src="<?php <img class="img-responsive app-icon" src="<?php
if (strpos($a['icon'], "http") !== 0) { if (strpos($a['icon'], "http") !== 0) {
echo $a['url'] . $a['icon']; echo $a['url'] . $a['icon'];
} else { } else {
echo $a['icon']; echo $a['icon'];
} }
?>"/> ?>"/>
<span><?php echo $a['title']; ?></span> <span><?php echo $a['title']; ?></span>
</a> </a>
</p> </p>

1
lang/en_us.php
View File

@ -29,6 +29,7 @@ $STRINGS = [
"account security" => "Account security", "account security" => "Account security",
"security options" => "Security options", "security options" => "Security options",
"account options" => "Account options", "account options" => "Account options",
"sync" => "Sync settings",
"options" => "Options", "options" => "Options",
"sign out" => "Sign out", "sign out" => "Sign out",
"settings" => "Settings", "settings" => "Settings",

15
pages.php
View File

@ -12,9 +12,14 @@ define("PAGES", [
"icon" => "home" "icon" => "home"
], ],
"security" => [ "security" => [
"title" => "account options", "title" => "account security",
"navbar" => true, "navbar" => true,
"icon" => "cogs" "icon" => "lock"
],
"sync" => [
"title" => "sync",
"navbar" => true,
"icon" => "mobile"
], ],
"404" => [ "404" => [
"title" => "404 error", "title" => "404 error",
@ -33,10 +38,12 @@ define("APPS", [
"account_security" "account_security"
], ],
"security" => [ "security" => [
"sync_mobile",
"change_password", "change_password",
"change_pin",
"setup_2fa", "setup_2fa",
"change_pin" ],
"sync" => [
"sync_mobile",
], ],
"404" => [ "404" => [
"404_error" "404_error"