From 90b16702bb03c8d7115fa0cc6ea8d3aba5863f46 Mon Sep 17 00:00:00 2001
From: Minteck <contact@minteck.org>
Date: Thu, 5 Jan 2023 22:20:18 +0100
Subject: Update - This is an automated commit

---
 includes/navigation.inc     | 64 +++++++++++++++------------------------------
 includes/system/species.inc |  3 +--
 2 files changed, 22 insertions(+), 45 deletions(-)

(limited to 'includes')

diff --git a/includes/navigation.inc b/includes/navigation.inc
index fe1c9ee..1d312e5 100644
--- a/includes/navigation.inc
+++ b/includes/navigation.inc
@@ -39,13 +39,6 @@ $navigation_admin = [
                     "invert" => false,
                     "link" => "/-/wakeup",
                     "stepped" => "rgb(13,202,240)"
-                ],
-                [
-                    "name" => $pages["pleasure"]["name"][$lang["_name"]],
-                    "icon" => "/assets/icons/pleasure.svg",
-                    "invert" => false,
-                    "link" => "/-/pleasure",
-                    "stepped" => "rgb(25,135,84)"
                 ]
             ]
         ],
@@ -74,13 +67,6 @@ $navigation_admin = [
                     "link" => "/-/profiles",
                     "stepped" => null
                 ],
-                [
-                    "name" => $pages["actions"]["name"][$lang["_name"]],
-                    "icon" => "/assets/icons/actions.svg",
-                    "invert" => true,
-                    "link" => "/-/actions",
-                    "stepped" => null
-                ],
                 [
                     "name" => $pages["rules"]["name"][$lang["_name"]],
                     "icon" => "/assets/icons/rules.svg",
@@ -103,19 +89,25 @@ $navigation_admin = [
                     "stepped" => null
                 ],
                 [
-                    "name" => $pages["nicknames"]["name"][$lang["_name"]],
-                    "icon" => "/assets/icons/nicknames.svg",
+                    "name" => $pages["travelling"]["name"][$lang["_name"]],
+                    "icon" => "/assets/icons/travelling.svg",
                     "invert" => true,
-                    "link" => "/-/nicknames",
+                    "link" => "/-/travelling",
                     "stepped" => null
                 ],
                 [
-                    "name" => $pages["together"]["name"][$lang["_name"]],
-                    "icon" => "/assets/icons/together.svg",
+                    "name" => $pages["stats"]["name"][$lang["_name"]],
+                    "icon" => "/assets/icons/stats.svg",
                     "invert" => true,
-                    "link" => "/-/together",
+                    "link" => "/-/stats",
                     "stepped" => null
-                ],
+                ]
+            ]
+        ],
+        "sort" => [
+            "name" => "Sorted members lists",
+            "minimal" => false,
+            "items" => [
                 [
                     "name" => $pages["splitting"]["name"][$lang["_name"]],
                     "icon" => "/assets/icons/splitting.svg",
@@ -131,29 +123,22 @@ $navigation_admin = [
                     "stepped" => null
                 ],
                 [
-                    "name" => $pages["travelling"]["name"][$lang["_name"]],
-                    "icon" => "/assets/icons/travelling.svg",
+                    "name" => $pages["alphabet"]["name"][$lang["_name"]],
+                    "icon" => "/assets/icons/alphabet.svg",
                     "invert" => true,
-                    "link" => "/-/travelling",
+                    "link" => "/-/alphabet",
                     "stepped" => null
                 ],
                 [
-                    "name" => $pages["stats"]["name"][$lang["_name"]],
-                    "icon" => "/assets/icons/stats.svg",
+                    "name" => $pages["s:species"]["name"][$lang["_name"]],
+                    "icon" => "/assets/icons/species.svg",
                     "invert" => true,
-                    "link" => "/-/stats",
+                    "link" => "/-/byspecies",
                     "stepped" => null
                 ],
-                [
-                    "name" => $pages["toys"]["name"][$lang["_name"]],
-                    "icon" => "/assets/icons/toys.svg",
-                    "invert" => true,
-                    "link" => "/-/toys",
-                    "stepped" => null
-                ]
             ]
         ],
-        "debug" => [
+        /*"debug" => [
             "name" => $lang["navigation"]["debug"],
             "minimal" => false,
             "items" => [
@@ -186,7 +171,7 @@ $navigation_admin = [
                     "stepped" => null
                 ]
             ]
-        ]
+        ]*/
     ]
 ];
 $navigation_global = [
@@ -227,13 +212,6 @@ $navigation_global = [
                     "link" => "/-/government",
                     "stepped" => null
                 ] : null),
-                [
-                    "name" => $pages["alphabet"]["name"][$lang["_name"]],
-                    "icon" => "/assets/icons/alphabet.svg",
-                    "invert" => true,
-                    "link" => "/-/alphabet",
-                    "stepped" => null
-                ],
                 [
                     "name" => $pages["terminology"]["name"][$lang["_name"]],
                     "icon" => "/assets/icons/terminology.svg",
diff --git a/includes/system/species.inc b/includes/system/species.inc
index 8f4368e..b5fdee6 100644
--- a/includes/system/species.inc
+++ b/includes/system/species.inc
@@ -25,8 +25,7 @@ function species(array $members, string $id, string $name) { global $systemID; g
 
         <div class="relation-item" style="margin-left:10px;padding:0 20px;">
             <?php if (count($members) > 0): ?>
-                <?php $index = 0; foreach ($members as $member): ?>
-                <a class="member-link" href="/<?= $member["name"] ?>"><img src="<?= getAsset($member["_system"], $member["id"], "heads") ?>" style="width:24px;"> <?= getMiniName($member["display_name"] ?? $member["name"]) ?></a><?php if ($index + 2 <= count($members)) echo('<span class="list-separator-desktop">, &nbsp;</span><span class="list-separator-mobile"><br></span>'); $index++; endforeach; ?>
+                <?php $index = 0; foreach ($members as $member): ?><a class="member-link" href="/<?= $member["name"] ?>"><img src="<?= getAsset($member["_system"], $member["id"], "heads") ?>" style="width:24px;"> <?= getMiniName($member["display_name"] ?? $member["name"]) ?></a><?php if ($index + 2 <= count($members)) echo('<span class="list-separator-desktop">, </span><span class="list-separator-mobile"><br></span>'); $index++; endforeach; ?>
             <?php else: ?>-<?php endif; ?>
         </div>
     </div>
-- 
cgit