From e5032174823127832b50b2f770e53869f0d4beba Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Sun, 11 Dec 2016 02:36:17 +0100
Subject: [PATCH] move indexPanel into index, it's no longer shared

---
 .../views/yuuno/elements/indexPanel.twig      | 44 ------------------
 resources/views/yuuno/meta/index.twig         | 45 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 46 deletions(-)
 delete mode 100644 resources/views/yuuno/elements/indexPanel.twig

diff --git a/resources/views/yuuno/elements/indexPanel.twig b/resources/views/yuuno/elements/indexPanel.twig
deleted file mode 100644
index eb81df2..0000000
--- a/resources/views/yuuno/elements/indexPanel.twig
+++ /dev/null
@@ -1,44 +0,0 @@
-<div id="indexPanel">
-    {% if user.isActive %}
-        <div class="user" style="background-image: url({{ route('user.header', user.id) }});">
-            <div class="avatar avatar--border user__avatar" style="background-image: url({{ route('user.avatar', user.id) }}); box-shadow: 0 0 5px {{ user.colour }};">
-                <a href="{{ route('user.profile', user.id) }}" class="user__avatar-link"></a>
-            </div>
-            <div class="user__info">
-                <a href="{{ route('user.profile', user.id) }}" class="link link--clean user__link">
-                    <h1 style="color: {{ user.colour }}; text-shadow: 0 0 7px {% if user.colour != 'inherit' %}{{ user.colour }}{% else %}#222{% endif %};">{{ user.username }}</h1>
-                </a>
-                {% set friendRequests = user.friends(-1, true)|length %}
-                {% if friendRequests %}
-                    <a href="{{ route('settings.friends.requests') }}" title="Pending friend requests">{{ friendRequests }} new friend requests</a>
-                {% endif %}
-            </div>
-        </div>
-    {% endif %}
-    <div class="content__header content__header--alt">Stats</div>
-    We have <b>{{ stats.userCount }} user{% if stats.userCount != 1 %}s{% endif %}</b>,
-    <b><a href="{{ route('user.profile', stats.newestUser.id) }}" style="color: {{ stats.newestUser.colour }};">{{ stats.newestUser.username }}</a></b> is the newest user,
-    it has been <b>{{ stats.lastRegDate }} day{{ stats.lastRegDate == 1 ? '' : 's' }}</b> since the last user registered and the forum has <b>{{ stats.topicCount }} topic{% if stats.topicCount != 1 %}s{% endif %}</b> and <b>{{ stats.postCount }} post{% if stats.postCount != 1 %}s{% endif %}</b>.
-    <div class="content__header content__header--alt">Online Users</div>
-    {% if stats.onlineUsers %}
-        All active users in the past 2 minutes
-        <table class="sidepanel-table">
-            {% for amount,onlineUser in stats.onlineUsers %}
-            <tr>
-                <td class="sidepanel-table__column sidepanel-table__column--align-left">
-                    <a href="{{ route('user.profile', onlineUser.id) }}" style="font-weight: bold; color: {{ onlineUser.colour }};">
-                        {{ onlineUser.username }}
-                    </a>
-                </td>
-                <td class="sidepanel-table__column sidepanel-table__column--align-right">
-                    <time class="time-ago" datetime="{{ onlineUser.lastOnline|date('r') }}">
-                        {{ onlineUser.lastOnline|date(config('general.date_format')) }}
-                    </time>
-                </td>
-            </tr>
-            {% endfor %}
-        </table>
-    {% else %}
-        There were no online users in the past 2 minutes.
-    {% endif %}
-</div>
diff --git a/resources/views/yuuno/meta/index.twig b/resources/views/yuuno/meta/index.twig
index 79c454b..a4dcbce 100644
--- a/resources/views/yuuno/meta/index.twig
+++ b/resources/views/yuuno/meta/index.twig
@@ -2,8 +2,49 @@
 
 {% block content %}
     <div class="content homepage">
-        <div class="content--right">
-            {% include 'elements/indexPanel.twig' %}
+        <div class="content--right" id="indexPanel">
+            {% if user.isActive %}
+                <div class="user" style="background-image: url({{ route('user.header', user.id) }});">
+                    <div class="avatar avatar--border user__avatar" style="background-image: url({{ route('user.avatar', user.id) }}); box-shadow: 0 0 5px {{ user.colour }};">
+                        <a href="{{ route('user.profile', user.id) }}" class="user__avatar-link"></a>
+                    </div>
+                    <div class="user__info">
+                        <a href="{{ route('user.profile', user.id) }}" class="link link--clean user__link">
+                            <h1 style="color: {{ user.colour }}; text-shadow: 0 0 7px {% if user.colour != 'inherit' %}{{ user.colour }}{% else %}#222{% endif %};">{{ user.username }}</h1>
+                        </a>
+                        {% set friendRequests = user.friends(-1, true)|length %}
+                        {% if friendRequests %}
+                            <a href="{{ route('settings.friends.requests') }}" title="Pending friend requests">{{ friendRequests }} new friend requests</a>
+                        {% endif %}
+                    </div>
+                </div>
+            {% endif %}
+            <div class="content__header content__header--alt">Stats</div>
+            We have <b>{{ stats.userCount }} user{% if stats.userCount != 1 %}s{% endif %}</b>,
+            <b><a href="{{ route('user.profile', stats.newestUser.id) }}" style="color: {{ stats.newestUser.colour }};">{{ stats.newestUser.username }}</a></b> is the newest user,
+            it has been <b>{{ stats.lastRegDate }} day{{ stats.lastRegDate == 1 ? '' : 's' }}</b> since the last user registered and the forum has <b>{{ stats.topicCount }} topic{% if stats.topicCount != 1 %}s{% endif %}</b> and <b>{{ stats.postCount }} post{% if stats.postCount != 1 %}s{% endif %}</b>.
+            <div class="content__header content__header--alt">Online Users</div>
+            {% if stats.onlineUsers %}
+                All active users in the past 2 minutes
+                <table class="sidepanel-table">
+                    {% for amount, onlineUser in stats.onlineUsers %}
+                    <tr>
+                        <td class="sidepanel-table__column sidepanel-table__column--align-left">
+                            <a href="{{ route('user.profile', onlineUser.id) }}" style="font-weight: bold; color: {{ onlineUser.colour }};">
+                                {{ onlineUser.username }}
+                            </a>
+                        </td>
+                        <td class="sidepanel-table__column sidepanel-table__column--align-right">
+                            <time class="time-ago" datetime="{{ onlineUser.lastOnline|date('r') }}">
+                                {{ onlineUser.lastOnline|date(config('general.date_format')) }}
+                            </time>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </table>
+            {% else %}
+                There were no online users in the past 2 minutes.
+            {% endif %}
         </div>
         <div class="content--left">
             <div class="content__header">News</div>