From 8d013a7769ecc09a2be874fe9673e820e188c69b Mon Sep 17 00:00:00 2001 From: flashwave Date: Mon, 22 Jun 2015 19:44:14 +0200 Subject: [PATCH] unflat betrays the law --- .../templates/yuuno/elements/settingsNav.tpl | 2 ++ _sakura/templates/yuuno/settings/avatar.tpl | 18 +++++++++++++++++- _sakura/templates/yuuno/settings/friends.tpl | 17 +++++++++++++++++ _sakura/templates/yuuno/settings/groups.tpl | 18 ++++++++++++++++++ main/settings.php | 7 +++++++ 5 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 _sakura/templates/yuuno/settings/friends.tpl create mode 100644 _sakura/templates/yuuno/settings/groups.tpl diff --git a/_sakura/templates/yuuno/elements/settingsNav.tpl b/_sakura/templates/yuuno/elements/settingsNav.tpl index 7e2f690..193106e 100644 --- a/_sakura/templates/yuuno/elements/settingsNav.tpl +++ b/_sakura/templates/yuuno/elements/settingsNav.tpl @@ -5,6 +5,8 @@
General
Home Edit Profile + Friends + Groups
Messages
Inbox Sent diff --git a/_sakura/templates/yuuno/settings/avatar.tpl b/_sakura/templates/yuuno/settings/avatar.tpl index f3feaee..1b019fb 100644 --- a/_sakura/templates/yuuno/settings/avatar.tpl +++ b/_sakura/templates/yuuno/settings/avatar.tpl @@ -11,7 +11,23 @@
Your avatar which is displayed all over the site and on your profile.
Maximum image size is 500x500, minimum image size is 20x20, maximum file size is 10 MB.
- +
+ + + + +
+
+ Your Avatar +
+
+ +
+
+ +
+
+
diff --git a/_sakura/templates/yuuno/settings/friends.tpl b/_sakura/templates/yuuno/settings/friends.tpl new file mode 100644 index 0000000..722dc95 --- /dev/null +++ b/_sakura/templates/yuuno/settings/friends.tpl @@ -0,0 +1,17 @@ +{% include 'global/header.tpl' %} +
+
+ {% include 'elements/settingsNav.tpl' %} +
+
+
+ {{ page.title }} +
+
+
Manage your friends.
+
+ +
+
+
+{% include 'global/footer.tpl' %} diff --git a/_sakura/templates/yuuno/settings/groups.tpl b/_sakura/templates/yuuno/settings/groups.tpl new file mode 100644 index 0000000..5793039 --- /dev/null +++ b/_sakura/templates/yuuno/settings/groups.tpl @@ -0,0 +1,18 @@ +{% include 'global/header.tpl' %} +
+
+ {% include 'elements/settingsNav.tpl' %} +
+
+
+ {{ page.title }} +
+
+
The background that is displayed on your profile.
+
Maximum image size is 2560x1440, minimum image size is 20x20, maximum file size is 10 MB.
+
+ +
+
+
+{% include 'global/footer.tpl' %} diff --git a/main/settings.php b/main/settings.php index 13207ab..821f3e8 100644 --- a/main/settings.php +++ b/main/settings.php @@ -195,6 +195,8 @@ if(Users::checkLogin()) { $pages = [ 'home' => ['General', 'Home'], 'profile' => ['General', 'Edit Profile'], + 'friends' => ['General', 'Friends'], + 'groups' => ['General', 'Groups'], 'notifications' => ['Notifications', 'History'], 'avatar' => ['Aesthetics', 'Avatar'], 'background' => ['Aesthetics', 'Background'], @@ -221,6 +223,11 @@ if(Users::checkLogin()) { // Section specific switch($currentPage) { + // Notification history + case 'friends': + $renderData['friends'] = Users::getFriends(); + break; + // Notification history case 'notifications': $renderData['notifs'] = array_reverse(Users::getNotifications(null, 0, false, true));