From 1e7b0e46e6bd337fa8d9a3cb27b72bf4e58db6c1 Mon Sep 17 00:00:00 2001 From: flashwave Date: Tue, 11 Aug 2015 02:54:37 +0200 Subject: [PATCH] fix --- _sakura/changelog.json | 18 +++++++++++++++++- _sakura/sakura.php | 2 +- _sakura/templates/yuuno/global/footer.tpl | 2 +- main/content/data/yuuno/css/yuuno.css | 13 ++++++++----- main/index.php | 2 +- main/settings.php | 2 +- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/_sakura/changelog.json b/_sakura/changelog.json index 2b55114..1f0bb8f 100644 --- a/_sakura/changelog.json +++ b/_sakura/changelog.json @@ -39,7 +39,8 @@ "20150731", "20150807", "20150809", - "20150810" + "20150810", + "20150811" ] @@ -1968,6 +1969,21 @@ "user": "Flashwave" } + ], + + "20150811": [ + + { + "type": "REM", + "change": "Remove unneeded rules from .htaccess in the content folder.", + "user": "Flashwave" + }, + { + "type": "FIX", + "change": "Fixed error caused by users table being empty on front page.", + "user": "Flashwave" + } + ] } diff --git a/_sakura/sakura.php b/_sakura/sakura.php index 3818680..d79b2de 100644 --- a/_sakura/sakura.php +++ b/_sakura/sakura.php @@ -8,7 +8,7 @@ namespace Sakura; // Define Sakura version -define('SAKURA_VERSION', '20150810'); +define('SAKURA_VERSION', '20150811'); define('SAKURA_VLABEL', 'Eminence'); define('SAKURA_COLOUR', '#6C3082'); define('SAKURA_STABLE', false); diff --git a/_sakura/templates/yuuno/global/footer.tpl b/_sakura/templates/yuuno/global/footer.tpl index 9e6cdaf..db7f439 100644 --- a/_sakura/templates/yuuno/global/footer.tpl +++ b/_sakura/templates/yuuno/global/footer.tpl @@ -1,4 +1,4 @@ - +
diff --git a/main/content/data/yuuno/css/yuuno.css b/main/content/data/yuuno/css/yuuno.css index 0037e65..2abcebe 100644 --- a/main/content/data/yuuno/css/yuuno.css +++ b/main/content/data/yuuno/css/yuuno.css @@ -243,7 +243,8 @@ a.default:active { text-decoration: underline; } -a.gotop { +a#gotop, +a#changePageWidth { display: inline-block; background: #111; color: #FFF; @@ -265,23 +266,25 @@ a.gotop { text-shadow: 0 0 5px #FFF; } -a.gotop:hover { +a#gotop:hover, +a#changePageWidth:hover { opacity: .8; box-shadow: 0 0 7px #FFF inset; text-shadow: 0 0 7px #FFF; } -a.gotop:active { +a#gotop:active, +a#changePageWidth:active { box-shadow: 0 0 15px #FFF inset; text-shadow: 0 0 10px #FFF; opacity: .9; } -a.gotop.enter { +a#gotop.enter { animation: slideInFromRight 1 .6s; } -a.gotop.exit { +a#gotop.exit { animation: slideOutToBottom 1 .6s; } diff --git a/main/index.php b/main/index.php index 237421c..5f3712b 100644 --- a/main/index.php +++ b/main/index.php @@ -28,7 +28,7 @@ $renderData['board'] = [ $renderData['stats'] = [ 'userCount' => ($_INDEX_USER_COUNT = count($_INDEX_USERS = Users::getAllUsers(false))) .' user'. ($_INDEX_USER_COUNT == 1 ? '' : 's'), - 'newestUser' => ($_INDEX_NEWEST_USER = max($_INDEX_USERS)), + 'newestUser' => ($_INDEX_NEWEST_USER = empty($_INDEX_USERS) ? Users::getUser(0) : max($_INDEX_USERS)), 'lastRegDate' => ($_INDEX_LAST_REGDATE = date_diff(date_create(date('Y-m-d', $_INDEX_NEWEST_USER['regdate'])), date_create(date('Y-m-d')))->format('%a')) .' day'. ($_INDEX_LAST_REGDATE == 1 ? '' : 's'), 'onlineUsers' => Users::checkAllOnline(), 'topicCount' => ($_TOPICS = count(Database::fetch('topics'))) .' topic'. ($_TOPICS != 1 ? 's' : ''), diff --git a/main/settings.php b/main/settings.php index 85d7250..9dbcd11 100644 --- a/main/settings.php +++ b/main/settings.php @@ -569,7 +569,7 @@ if(Users::checkLogin()) { $pages = [ 'home' => ['General', 'Home', ['Welcome to the Settings Panel. From here you can monitor, view and update your profile and preferences.']], 'profile' => ['General', 'Edit Profile', ['These are the external account links etc. on your profile, shouldn\'t need any additional explanation for this one.']], - 'groups' => ['General', 'Groups', []], + 'groups' => ['General', 'Groups', ['{{ user.colour }}']], 'friendlisting' => ['Friends', 'List', ['Manage your friends.']], 'friendrequests' => ['Friends', 'Requests', ['Handle friend requests.']], 'notifications' => ['Notifications', 'History', ['This is the history of notifications that have been sent to you.']],