flash/sakura
flash/sakura
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
flash 2015-08-11 02:54:37 +02:00
parent 50805c253f
commit 1e7b0e46e6
6 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
_sakura/changelog.json
View file

@ -39,7 +39,8 @@
"20150731", "20150731",
"20150807", "20150807",
"20150809", "20150809",
"20150810" "20150810",
"20150811"
] ]
@ -1968,6 +1969,21 @@
"user": "Flashwave" "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"
}
] ]
} }

2
_sakura/sakura.php
View file

@ -8,7 +8,7 @@
namespace Sakura; namespace Sakura;
// Define Sakura version // Define Sakura version
define('SAKURA_VERSION', '20150810'); define('SAKURA_VERSION', '20150811');
define('SAKURA_VLABEL', 'Eminence'); define('SAKURA_VLABEL', 'Eminence');
define('SAKURA_COLOUR', '#6C3082'); define('SAKURA_COLOUR', '#6C3082');
define('SAKURA_STABLE', false); define('SAKURA_STABLE', false);

2
_sakura/templates/yuuno/global/footer.tpl
View file

@ -1,4 +1,4 @@
<a id="gotop" class="gotop fa fa-angle-double-up hidden" href="#top"></a> <a id="gotop" class="fa fa-angle-double-up hidden" href="#top"></a>
</div> </div>
<div class="footer"> <div class="footer">
<div class="ftsections"> <div class="ftsections">

13
main/content/data/yuuno/css/yuuno.css
View file

@ -243,7 +243,8 @@ a.default:active {
text-decoration: underline; text-decoration: underline;
} }
a.gotop { a#gotop,
a#changePageWidth {
display: inline-block; display: inline-block;
background: #111; background: #111;
color: #FFF; color: #FFF;
@ -265,23 +266,25 @@ a.gotop {
text-shadow: 0 0 5px #FFF; text-shadow: 0 0 5px #FFF;
} }
a.gotop:hover { a#gotop:hover,
a#changePageWidth:hover {
opacity: .8; opacity: .8;
box-shadow: 0 0 7px #FFF inset; box-shadow: 0 0 7px #FFF inset;
text-shadow: 0 0 7px #FFF; text-shadow: 0 0 7px #FFF;
} }
a.gotop:active { a#gotop:active,
a#changePageWidth:active {
box-shadow: 0 0 15px #FFF inset; box-shadow: 0 0 15px #FFF inset;
text-shadow: 0 0 10px #FFF; text-shadow: 0 0 10px #FFF;
opacity: .9; opacity: .9;
} }
a.gotop.enter { a#gotop.enter {
animation: slideInFromRight 1 .6s; animation: slideInFromRight 1 .6s;
} }
a.gotop.exit { a#gotop.exit {
animation: slideOutToBottom 1 .6s; animation: slideOutToBottom 1 .6s;
} }

2
main/index.php
View file

@ -28,7 +28,7 @@ $renderData['board'] = [
$renderData['stats'] = [ $renderData['stats'] = [
'userCount' => ($_INDEX_USER_COUNT = count($_INDEX_USERS = Users::getAllUsers(false))) .' user'. ($_INDEX_USER_COUNT == 1 ? '' : 's'), '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'), '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(), 'onlineUsers' => Users::checkAllOnline(),
'topicCount' => ($_TOPICS = count(Database::fetch('topics'))) .' topic'. ($_TOPICS != 1 ? 's' : ''), 'topicCount' => ($_TOPICS = count(Database::fetch('topics'))) .' topic'. ($_TOPICS != 1 ? 's' : ''),

2
main/settings.php
View file

@ -569,7 +569,7 @@ if(Users::checkLogin()) {
$pages = [ $pages = [
'home' => ['General', 'Home', ['Welcome to the Settings Panel. From here you can monitor, view and update your profile and preferences.']], '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.']], '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.']], 'friendlisting' => ['Friends', 'List', ['Manage your friends.']],
'friendrequests' => ['Friends', 'Requests', ['Handle friend requests.']], 'friendrequests' => ['Friends', 'Requests', ['Handle friend requests.']],
'notifications' => ['Notifications', 'History', ['This is the history of notifications that have been sent to you.']], 'notifications' => ['Notifications', 'History', ['This is the history of notifications that have been sent to you.']],