bunch of unstable shit

_sakura/templates/yuuno/settings/friends.listing.tpl

@@ -7,7 +7,7 @@
                     <div class="friends-list-name" style="color: {% if friend.user.name_colour %}{{ friend.user.name_colour }}{% else %}{{ friend.rank.colour }}{% endif %};">{{ friend.user.username }}</div>
                 </a>
                 <div class="friends-list-actions">
-                    <a class="remove fill fa fa-remove" title="Remove friend" href="/friends?remove={{ friend.user.id }}&amp;session={{ php.sessionid }}&amp;time={{ php.time }}&amp;redirect=/settings/friends&amp;direct=true"></a>
+                    <a class="remove fill fa fa-remove" title="Remove friend" href="/friends?remove={{ friend.user.id }}&amp;session={{ php.sessionid }}&amp;time={{ php.time }}&amp;redirect=/settings/listing/friends&amp;direct=true"></a>
                     <div class="clear"></div>
                 </div>
             </div>
@@ -18,13 +18,13 @@
         <div>
             <div class="pagination" style="float: right;">
                 {% if page.currentPage > 0 %}
-                    <a href="/settings/friends/p{{ page.currentPage }}"><span class="fa fa-step-backward"></span></a>
+                    <a href="/settings/friends/listing/p{{ page.currentPage }}"><span class="fa fa-step-backward"></span></a>
                 {% endif %}
                 {% for id,npage in friends %}
-                    <a href="/settings/friends/p{{ id + 1 }}"{% if id == page.currentPage %} class="current"{% endif %}>{{ id + 1 }}</a>
+                    <a href="/settings/friends/listing/p{{ id + 1 }}"{% if id == page.currentPage %} class="current"{% endif %}>{{ id + 1 }}</a>
                 {% endfor %}
                 {% if page.currentPage + 1 < friends|length %}
-                    <a href="/settings/friends/p{{ page.currentPage + 2 }}"><span class="fa fa-step-forward"></span></a>
+                    <a href="/settings/friends/listing/p{{ page.currentPage + 2 }}"><span class="fa fa-step-forward"></span></a>
                 {% endif %}
             </div>
             <div class="clear"></div>

_sakura/templates/yuuno/settings/friends.requests.tpl

@@ -8,7 +8,7 @@
                 </a>
                 <div class="friends-list-actions">
                     <a class="add fa fa-check" title="Add friend" href="/friends?add={{ friend.user.id }}&amp;session={{ php.sessionid }}&amp;time={{ php.time }}&amp;redirect=/settings/friendrequests&amp;direct=true"></a>
-                    <a class="remove fa fa-remove" title="Remove friend" href="/friends?remove={{ friend.user.id }}&amp;session={{ php.sessionid }}&amp;time={{ php.time }}&amp;redirect=/settings/friendrequests&amp;direct=true"></a>
+                    <a class="remove fa fa-remove" title="Remove friend" href="/friends?remove={{ friend.user.id }}&amp;session={{ php.sessionid }}&amp;time={{ php.time }}&amp;redirect=/settings/friends/requests&amp;direct=true"></a>
                     <div class="clear"></div>
                 </div>
             </div>
@@ -19,13 +19,13 @@
         <div>
             <div class="pagination" style="float: right;">
                 {% if page.currentPage > 0 %}
-                    <a href="/settings/friends/p{{ page.currentPage }}"><span class="fa fa-step-backward"></span></a>
+                    <a href="/settings/friends/requests/p{{ page.currentPage }}"><span class="fa fa-step-backward"></span></a>
                 {% endif %}
                 {% for id,npage in friends %}
-                    <a href="/settings/friends/p{{ id + 1 }}"{% if id == page.currentPage %} class="current"{% endif %}>{{ id + 1 }}</a>
+                    <a href="/settings/friends/requests/p{{ id + 1 }}"{% if id == page.currentPage %} class="current"{% endif %}>{{ id + 1 }}</a>
                 {% endfor %}
                 {% if page.currentPage + 1 < friends|length %}
-                    <a href="/settings/friends/p{{ page.currentPage + 2 }}"><span class="fa fa-step-forward"></span></a>
+                    <a href="/settings/friends/requests/p{{ page.currentPage + 2 }}"><span class="fa fa-step-forward"></span></a>
                 {% endif %}
             </div>
             <div class="clear"></div>

_sakura/templates/yuuno/settings/general.home.tpl

@@ -2,20 +2,20 @@
 <h1 class="stylised">Common Tasks</h1>
 <h2>Profile</h2>
 <ul>
-    <li><a href="/settings/avatar" class="default">Change Avatar</a></li>
-    <li><a href="/settings/userpage" class="default">Change Userpage</a></li>
-    <li><a href="/settings/signature" class="default">Change Signature</a></li>
-    <li><a href="/settings/profile" class="default">Change Profile Details</a></li>
+    <li><a href="/settings/appearance/avatar" class="default">Change Avatar</a></li>
+    <li><a href="/settings/appearance/userpage" class="default">Change Userpage</a></li>
+    <li><a href="/settings/appearance/signature" class="default">Change Signature</a></li>
+    <li><a href="/settings/general/profile" class="default">Change Profile Details</a></li>
 </ul>
 <h2>Messaging</h2>
 <ul>
-    <li><a href="/messages/index" class="default">View Inbox</a></li>
+    <li><a href="/messages/inbox" class="default">View Inbox</a></li>
     <li><a href="/messages/compose" class="default">Send PM</a></li>
 </ul>
 <h2>Account</h2>
 <ul>
-    <li><a href="/settings/sessions" class="default">Manage Active Sessions</a></li>
-    <li><a href="/settings/password" class="default">Change Password</a></li>
+    <li><a href="/settings/advanced/sessions" class="default">Manage Active Sessions</a></li>
+    <li><a href="/settings/account/password" class="default">Change Password</a></li>
 </ul>
 <br />
 <h1 class="stylised">Personal Statistics</h1>
@@ -26,7 +26,7 @@
     <li>You have <b>{{ settings.friends|length - (settings.friends.online ? 1 : 0) - (settings.friends.offline ? 1 : 0) }} friend{% if settings.friends|length - (settings.friends.online ? 1 : 0) - (settings.friends.offline ? 1 : 0) != 1 %}s{% endif %}</b>.</li>
 </ul>
 <br />
-<h1 class="stylised"><a class="clean" href="/settings/friendlisting">Friends</a></h1>
+<h1 class="stylised"><a class="clean" href="/settings/friends/listing">Friends</a></h1>
 <h2 style="color: #080;">Online</h2>
 {% if settings.friends.online %}
     {% for key,friend in settings.friends.online %}

_sakura/templates/yuuno/settings/general.options.tpl

@@ -12,7 +12,7 @@
                     </div>
                 </div>
                 <div style="padding: 8px 0;">
-                    <input type="{{ field.formtype }}" name="option_{{ field.id }}" class="inputStyling"{% if options.user[field.id] %}{% if field.formtype == 'checkbox' and options.user[field.id] == 'true' %} checked="checked"{% else %} value="{{ options.user[field.id] }}"{% endif %}{% endif %} />
+                    <input type="{{ field.formtype }}" name="option_{{ field.id }}" class="inputStyling"{% if options.user[field.id] %}{% if field.formtype == 'checkbox' and options.user[field.id] %} checked="checked" value="option_{{ field.id }}"{% else %} value="{{ options.user[field.id] }}"{% endif %}{% endif %} />
                 </div>
             </div>
         {% endfor %}

_sakura/templates/yuuno/settings/general.profile.tpl

@@ -0,0 +1,46 @@
+{% if profile.fields %}
+    <form enctype="multipart/form-data" method="post" action="{{ sakura.currentPage }}" id="editProfileForm">
+        <input type="hidden" name="sessid" value="{{ php.sessionid }}" />
+        <input type="hidden" name="timestamp" value="{{ php.time }}" />
+        <input type="hidden" name="mode" value="profile" />
+        {% for field in profile.fields %}
+            <div class="profile-field">
+                <div>
+                    <h2>{{ field.name }}</h2>
+                </div>
+                <div>
+                    <input type="{{ field.formtype }}" name="profile_{{ field.ident }}" class="inputStyling" placeholder="{{ field.description }}"{% if profile.user[field.ident].value %}{% if field.formtype == 'checkbox' and profile.user[field.ident].value == 'true' %} checked="checked"{% else %} value="{{ profile.user[field.ident].value }}"{% endif %}{% endif %} />
+                </div>
+                {% if field.addit %}
+                    {% for id,addit in field.addit %}
+                        <div>
+                            <input type="{{ addit[0] }}" id="{{ id }}" name="profile_additional_{{ id }}"{% if profile.user[field.ident][id] %}{% if addit[0] == 'checkbox' and profile.user[field.ident][id] == 'true' %} checked="checked"{% else %} value="{{ profile.user[field.ident][id] }}"{% endif %}{% endif %} />
+                            <label for="{{ id }}" style="font-size: 10px;">{{ addit[1]|raw }}</label>
+                        </div>
+                    {% endfor %}
+                {% endif %}
+            </div>
+        {% endfor %}
+        <div class="profile-save">
+            <input type="submit" value="Save" name="submit" class="inputStyling" />
+            <input type="reset" value="Reset" name="reset" class="inputStyling" />
+        </div>
+    </form>
+    <script type="text/javascript">
+    window.addEventListener("load", function() {
+        var editProfileForm = document.getElementById('editProfileForm');
+        var createInput     = document.createElement('input');
+        var submit          = editProfileForm.querySelector('[type="submit"]');
+
+        createInput.setAttribute('name', 'ajax');
+        createInput.setAttribute('value', 'true');
+        createInput.setAttribute('type', 'hidden');
+        editProfileForm.appendChild(createInput);
+
+        submit.setAttribute('type', 'button');
+        submit.setAttribute('onclick', 'submitPost(\''+ editProfileForm.action +'\', formToObject(\'editProfileForm\'), true, \'Updating Profile...\');');
+    });
+    </script>
+{% else %}
+    <h1 class="stylised" style="margin: 2em auto; text-align: center;">There are no changeable profile fields.</h1>
+{% endif %}

_sakura/templates/yuuno/settings/messages.inbox.tpl

@@ -0,0 +1,23 @@
+{% if messages|length %}
+    <table class="msgTable">
+        <thead>
+            <tr>
+                <th>From</th>
+                <th>Subject</th>
+                <th>Sent on</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for message in messages %}
+            <tr>
+                <td><a href="/u/{{ message.data.from.user.id }}" class="default" style="font-weight: 700; color: {% if message.data.from.user.name_colour == null %}{{ message.data.from.rank.colour }}{% else %}{{ message.data.from.user.name_colour }}{% endif %};">{{ message.data.from.user.username }}</a></td>
+                <td><a href="/messages/read/{{ message.id }}" class="default">{{ message.subject }}</a></td>
+                <td>{{ message.time|date(sakura.dateFormat) }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+{% else %}
+    <h1 class="stylised"style="line-height: 1.8em; text-align: center;">Nothing to view!</h1>
+{% endif %}
+<h3 style="text-align: center;">Click Compose in the menu on the right side to write a new message!</h3>

_sakura/templates/yuuno/settings/notfound.tpl

@@ -1 +0,0 @@
-<h1 class="stylised" style="margin: 2em auto; text-align: center;">Could not find what you were looking for.</h1>

_sakura/templates/yuuno/settings/notifications.history.tpl

@@ -30,13 +30,13 @@
         <div>
             <div class="pagination" style="float: right;">
                 {% if page.currentPage > 0 %}
-                    <a href="/settings/notifications/p{{ page.currentPage }}"><span class="fa fa-step-backward"></span></a>
+                    <a href="/settings/notifications/history/p{{ page.currentPage }}"><span class="fa fa-step-backward"></span></a>
                 {% endif %}
                 {% for id,npage in notifs %}
-                    <a href="/settings/notifications/p{{ id + 1 }}"{% if id == page.currentPage %} class="current"{% endif %}>{{ id + 1 }}</a>
+                    <a href="/settings/notifications/history/p{{ id + 1 }}"{% if id == page.currentPage %} class="current"{% endif %}>{{ id + 1 }}</a>
                 {% endfor %}
                 {% if page.currentPage + 1 < notifs|length %}
-                    <a href="/settings/notifications/p{{ page.currentPage + 2 }}"><span class="fa fa-step-forward"></span></a>
+                    <a href="/settings/notifications/history/p{{ page.currentPage + 2 }}"><span class="fa fa-step-forward"></span></a>
                 {% endif %}
             </div>
             <div class="clear"></div>

_sakura/templates/yuuno/settings/profile.tpl

@@ -1,42 +0,0 @@
-<form enctype="multipart/form-data" method="post" action="{{ sakura.currentPage }}" id="editProfileForm">
-    <input type="hidden" name="sessid" value="{{ php.sessionid }}" />
-    <input type="hidden" name="timestamp" value="{{ php.time }}" />
-    <input type="hidden" name="mode" value="profile" />
-    {% for field in profile.fields %}
-        <div class="profile-field">
-            <div>
-                <h2>{{ field.name }}</h2>
-            </div>
-            <div>
-                <input type="{{ field.formtype }}" name="profile_{{ field.ident }}" class="inputStyling" placeholder="{{ field.description }}"{% if profile.user[field.ident].value %}{% if field.formtype == 'checkbox' and profile.user[field.ident].value == 'true' %} checked="checked"{% else %} value="{{ profile.user[field.ident].value }}"{% endif %}{% endif %} />
-            </div>
-            {% if field.addit %}
-                {% for id,addit in field.addit %}
-                    <div>
-                        <input type="{{ addit[0] }}" id="{{ id }}" name="profile_additional_{{ id }}"{% if profile.user[field.ident][id] %}{% if addit[0] == 'checkbox' and profile.user[field.ident][id] == 'true' %} checked="checked"{% else %} value="{{ profile.user[field.ident][id] }}"{% endif %}{% endif %} />
-                        <label for="{{ id }}" style="font-size: 10px;">{{ addit[1]|raw }}</label>
-                    </div>
-                {% endfor %}
-            {% endif %}
-        </div>
-    {% endfor %}
-    <div class="profile-save">
-        <input type="submit" value="Save" name="submit" class="inputStyling" />
-        <input type="reset" value="Reset" name="reset" class="inputStyling" />
-    </div>
-</form>
-<script type="text/javascript">
-window.addEventListener("load", function() {
-    var editProfileForm = document.getElementById('editProfileForm');
-    var createInput     = document.createElement('input');
-    var submit          = editProfileForm.querySelector('[type="submit"]');
-
-    createInput.setAttribute('name', 'ajax');
-    createInput.setAttribute('value', 'true');
-    createInput.setAttribute('type', 'hidden');
-    editProfileForm.appendChild(createInput);
-
-    submit.setAttribute('type', 'button');
-    submit.setAttribute('onclick', 'submitPost(\''+ editProfileForm.action +'\', formToObject(\'editProfileForm\'), true, \'Updating Profile...\');');
-});
-</script>