i apparently changed all this shit except i only modified misaki

_sakura/sakura.php

@@ -104,6 +104,12 @@ $urls = new Urls();
 $templateName =
 defined('SAKURA_MANAGE') ?
 Configuration::getConfig('manage_style') :
+(
+    isset($currentUser->data['user_data']['userOptions']['useMisaki']) &&
+    $currentUser->data['user_data']['userOptions']['useMisaki'] &&
+    $currentUser->checkPermission('SITE', 'ALTER_PROFILE')
+) ?
+'misaki' :
 Configuration::getConfig('site_style');
 
 if (!defined('SAKURA_NO_TPL')) {

_sakura/templates/misaki/elements/newsPost.tpl

@@ -1,18 +1,18 @@
-<div class="news-post" id="n{{ newsPost.id }}">
+<div class="news-post" id="n{{ post.news_id }}">
     <div class="news-header">
-        <a class="news-title floatLeft" href="/news/{{ newsPost.id }}">{{ newsPost.title }}</a>
+        <a class="news-title floatLeft" href="{{ urls.format('SITE_NEWS_POST', [post.news_id]) }}">{{ post.news_title }}</a>
         <div class="news-details floatRight">
-            <div>{{ newsPost.date|date("D Y-m-d H:i:s T") }}</div>
-            <div>Posted by <a style="color: {{ newsPost.rdata.colour }};" href="/u/{{ newsPost.uid }}">{{ newsPost.udata.username }}</a>{% if newsPosts|length > 1 %} / <a class="default" href="/news/{{ newsPost.id }}#disqus_thread">View comments</a>{% endif %}</div>
+            <div>{{ post.news_timestamp|date(sakura.dateFormat) }}</div>
+            <div>Posted by <a class="username" style="color: {{ post.news_poster.colour }};" href="{{ urls.format('USER_PROFILE', [post.news_poster.data.user_id]) }}">{{ post.news_poster.data.username }}</a>{% if posts|length > 1 %} / <a class="default" href="{{ urls.format('SITE_NEWS_POST', [post.news_id]) }}#comments">View comments</a>{% endif %}</div>
         </div>
         <div class="clear"></div>
     </div>
     <div class="news-content">
         <div class="news-avatar">
-            <img src="/a/{{ newsPost.uid }}" alt="{{ newsPost.udata.username }}" />
+            <img src="{{ urls.format('IMAGE_AVATAR', [post.news_poster.data.user_id]) }}" alt="{{ post.news_poster.data.username }}" />
         </div>
         <div class="news-text">
-            {{ newsPost.parsed|raw }}
+            {{ post.news_content_parsed|raw }}
         </div>
         <div class="clear"></div>
     </div>

_sakura/templates/misaki/elements/statsHeader.tpl

@@ -0,0 +1,17 @@
+<div class="frontStats">
+    <div title="We have {{ stats.userCount }} user{% if stats.userCount != 1 %}s{% endif %}">
+        <div><span class="fa fa-line-chart"></span> <span>{{ stats.userCount }}</span></div>
+    </div>
+    <div title="Active in the last 5 minutes: {% for amount,onlineUser in stats.onlineUsers %}{{ onlineUser.username }}{% if amount != (stats.onlineUsers|length - 1) %}, {% endif %}{% endfor %}">
+        <div><span class="fa fa-users"></span> <span>{{ stats.onlineUsers|length }}</span></div>
+    </div>
+    <div title="Our newest user is {{ stats.newestUser.data.username }}">
+        <div><span class="fa fa-user-plus"></span> <a href="/u/{{ stats.newestUser.data.user_id }}" style="color: {{ stats.newestUser.colour }}">{{ stats.newestUser.data.username }}</a></div>
+    </div>
+    <div title="It has been {{ stats.lastRegDate }} since the last user registered">
+        <div><span class="fa fa-clock-o"></span> <span>{{ stats.lastRegDate }}</span></div>
+    </div>
+    <div title="The forum has {{ stats.topicCount }} thread{% if stats.topicCount != 1 %}s{% endif %} consisting out of {{ stats.postCount }} post{% if stats.postCount != 1 %}s{% endif %}">
+        <div><span class="fa fa-list"></span> <span>{{ stats.topicCount }}</span><span style="font-size: .5em; line-height: 1em">/ {{ stats.postCount }}</span></div>
+    </div>
+</div>

_sakura/templates/misaki/errors/information.tpl

@@ -1,7 +0,0 @@
-{% include 'global/header.tpl' %}
-    <div class="content standalone">
-        <h1 class="sectionHead">Information</h1>
-        {{ page.message }}
-        {% if page.redirect %}<br /><a href="{{ page.redirect }}" class="default">Click here if you aren't being redirected.</a>{% endif %}
-    </div>
-{% include 'global/footer.tpl' %}

_sakura/templates/misaki/global/footer.tpl

@@ -1,13 +0,0 @@
-            </div>
-        </div>
-        <div id="footer">
-            <div class="inner">
-                <div class="ft-logo"></div>
-                <div class="ft-text">
-                    <div>Copyright &copy; 2013-2015 <a href="http://flash.moe/" target="_blank">Flashwave</a> &amp; <a href="http://circlestorm.net/" target="_blank">Circlestorm</a>, <a href="/credits">et al</a>.</div>
-                    <div><a href="/p/terms">Terms of Service</a> | <a href="/contact">Contact</a> | <a href="/faq">FAQ</a> | <a href="/feedback">Feedback</a> | <a href="/p/rules">Rules</a> | <a href="/changelog">Changelog</a> | <a href="http://status.flashii.net/">Status</a></div>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>

_sakura/templates/misaki/global/information.tpl

@@ -0,0 +1,9 @@
+{% extends 'global/master.tpl' %}
+
+{% block title %}Information{% endblock %}
+
+{% block content %}
+    <h1 class="sectionHead">Information</h1>
+    {{ page.message }}
+    {% if page.redirect %}<br /><a href="{{ page.redirect }}" class="default">Click here if you aren't being redirected.</a>{% endif %}
+{% endblock %}

_sakura/templates/misaki/global/master.tpl

@@ -3,16 +3,16 @@
     <head>
         <!-- META -->
         <meta charset="{{ sakura.charset }}" />
-        <title>{{ page.title }}</title>
-        <meta name="description" content="{{ sakura.sitedesc }}" />
-        <meta name="keywords" content="{{ sakura.sitetags }}" />
+        <title>{% block title %}{{ sakura.siteName }}{% endblock %}</title>
+        <meta name="description" content="{{ sakura.siteDesc }}" />
+        <meta name="keywords" content="{{ sakura.siteTags }}" />
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-        <meta name="msapplication-TileColor" content="#fbeeff" />
+        <meta name="msapplication-TileColor" content="#9475b2" />
         <meta name="msapplication-TileImage" content="/content/images/icons/ms-icon-144x144.png" />
         <meta name="theme-color" content="#9475B2" />
-        {% if page.redirect %}
-            <meta http-equiv="refresh" content="3; URL={{ page.redirect }}" />
-        {% endif %}
+{% if page.redirect %}
+        <meta http-equiv="refresh" content="{{ page.redirectTimeout ? page.redirectTimeout : '3' }}; URL={{ page.redirect }}" />
+{% endif %}
         <link rel="apple-touch-icon" sizes="57x57" href="/content/images/icons/apple-icon-57x57.png" />
         <link rel="apple-touch-icon" sizes="60x60" href="/content/images/icons/apple-icon-60x60.png" />
         <link rel="apple-touch-icon" sizes="72x72" href="/content/images/icons/apple-icon-72x72.png" />
@@ -27,19 +27,10 @@
         <link rel="icon" type="image/png" sizes="96x96" href="/content/images/icons/favicon-96x96.png" />
         <link rel="icon" type="image/png" sizes="16x16" href="/content/images/icons/favicon-16x16.png" />
         <link rel="manifest" href="/manifest.json" />
+{{ block('meta') }}
         <!-- CSS -->
         <link rel="stylesheet" type="text/css" href="{{ sakura.resources }}/css/misaki.css" />
-        {% if page.style %}
-        <style type="text/css">
-            {% for element,properties in page.style %}
-                {{ element|raw }} {
-                    {% for property,value in properties %}
-                        {{ property|raw }}: {{ value|raw }};
-                    {% endfor %}
-                }
-            {% endfor %}
-        </style>
-        {% endif %}
+{{ block('css') }}
         <!-- JS -->
         <script type="text/javascript" src="{{ sakura.resources }}/js/misaki.js"></script>
         <script type="text/javascript">
@@ -55,6 +46,7 @@
 
                 },
 
+                "siteName":         "{{ sakura.siteName }}",
                 "urlMain":          "{{ sakura.urlMain }}",
                 "content":          "{{ sakura.contentPath }}",
                 "resources":        "{{ sakura.resources }}",
@@ -70,13 +62,14 @@
             // Space for things that need to happen onload
             window.addEventListener("load", function() {
 
-                {% if php.self == '/profile.php' ? (profile.data.userData.profileBackground and not profile.data.userData.userOptions.disableProfileParallax) : (user.checkPermission('SITE', 'CREATE_BACKGROUND') and user.data.userData.userOptions.profileBackgroundSiteWide and user.data.userData.profileBackground and not user.data.userData.userOptions.disableProfileParallax) %}
+                {% if php.self == '/profile.php' ? (profile.data.user_data.profileBackground and not profile.data.user_data.userOptions.disableProfileParallax) : (user.checkPermission('SITE', 'CREATE_BACKGROUND') and user.data.user_data.userOptions.profileBackgroundSiteWide and user.data.user_data.profileBackground and not user.data.user_data.userOptions.disableProfileParallax) %}
                     initialiseParallax('userBackground');
                 {% endif %}
 
             });
 
         </script>
+{{ block('js') }}
     </head>
     <body>
         <div id="container">
@@ -84,8 +77,8 @@
             <div class="header-fade"></div>
             <div id="notifications"></div>
             <div id="header">
-                <a href="/">
-                    <div class="logo"></div>
+                <a href="/" title="{{ sakura.siteName }}">
+                    <div class="logo"{% if sakura.siteLogo %} style="background-image: url('{{ sakura.siteLogo }}');"{% endif %}></div>
                 </a>
                 <div class="social">
                     <ul>
@@ -100,36 +93,51 @@
                 </div>
             </div>
             <div id="wrapper">
-                {% if php.self == '/profile.php' ? profile.data.userData.profileBackground : (user.checkPermission('SITE', 'CREATE_BACKGROUND') and user.data.userData.userOptions.profileBackgroundSiteWide and user.data.userData.profileBackground) %}
-                    <div id="userBackground" style="background-image: url('/bg/{{ (php.self == '/profile.php' ? profile : user).data.id }}');"></div>
+                {% if php.self == '/profile.php' ? profile.data.user_data.profileBackground : (user.checkPermission('SITE', 'CREATE_BACKGROUND') and user.data.user_data.userOptions.profileBackgroundSiteWide and user.data.user_data.profileBackground) %}
+                    <div id="userBackground" style="background-image: url('{{ urls.format('IMAGE_BACKGROUND', [(php.self == '/profile.php' ? profile : user).data.user_id]) }}');"></div>
                 {% endif %}
                 <div id="content">
                     <div id="navigation">
                         <ul class="nav-left floatLeft">
-                            <li><a href="/">Home</a></li>
-                            <li><a href="/news">News</a></li>
+                            <li><a href="{{ urls.format('SITE_HOME') }}">Home</a></li>
+                            <li><a href="{{ urls.format('SITE_NEWS') }}">News</a></li>
                             <li><a href="//chat.{{ sakura.urlMain }}/">Chat</a></li>
-                            <li><a href="/forum">Forum</a></li>
-                            <li><a href="/members">Members</a></li>
-                            <li><a href="/search">Search</a></li>
-                            <li><a href="/support">Support us</a></li>
+                            <li><a href="{{ urls.format('FORUM_INDEX') }}">Forum</a></li>
+                            <li><a href="{{ urls.format('MEMBERLIST_INDEX') }}">Members</a></li>
+                            <li><a href="{{ urls.format('SITE_SEARCH') }}">Search</a></li>
+                            <li><a href="{{ urls.format('SITE_PREMIUM') }}">Support us</a></li>
                         </ul>
                         <ul class="nav-right floatRight">
                             <li class="nav-usermenu">
                                 <a href="#"{% if session.checkLogin %} style="color: {{ user.colour }};"{% endif %}>{% if session.checkLogin %}{{ user.data.username }}{% else %}Guest{% endif %}</a>
                                 <ul>
                                 {% if session.checkLogin %}
-                                    <li><a href="/u/{{ user.data.id }}">My Profile</a></li>
-                                    <li><a href="/messages">Private Messages</a></li>
-                                    <li><a href="/settings">User Settings</a></li>
-                                    <li><a href="/manage">Site Management</a></li>
-                                    <li><a href="/logout?mode=logout&amp;time={{ php.time }}&amp;session={{ php.sessionid }}&amp;redirect={{ sakura.currentPage }}">Logout</a></li>
+                                    <li><a href="{{ urls.format('USER_PROFILE', [user.data.user_id]) }}">My Profile</a></li>
+                                    <li><a href="{{ urls.format('SETTING_CAT', ['messages']) }}">Private Messages</a></li>
+                                    <li><a href="{{ urls.format('SETTINGS_INDEX') }}">User Settings</a></li>
+                                    <li><a href="{{ urls.format('MANAGE_INDEX') }}">Site Management</a></li>
+                                    <li><a href="{{ urls.format('USER_LOGOUT', [php.time, php.sessionid, sakura.currentPage]) }}">Logout</a></li>
                                 {% else %}
-                                    <li><a href="/login">Login</a></li>
-                                    <li><a href="/register">Register</a></li>
+                                    <li><a href="{{ urls.format('SITE_LOGIN') }}">Login or Register</a></li>
                                 {% endif %}
                                 </ul>
                             </li>
-                            <li><a href="/u/{{ user.data.id }}" class="ignore"><img src="{{ sakura.contentPath }}/pixel.png" alt="{{ user.data.username }}" style="background-image: url('/a/{{ user.data.id }}');" class="nav-avatar" /></a></li>
+                            <li><a href="{{ urls.format('USER_PROFILE', [user.data.user_id]) }}" class="ignore"><img src="{{ sakura.contentPath }}/pixel.png" alt="{{ user.data.username }}" style="background-image: url('{{ urls.format('IMAGE_AVATAR', [user.data.user_id]) }}');" class="nav-avatar" /></a></li>
                         </ul>
                     </div>
+{% block content %}
+    <h1>{{ php.self }} is now printing!</h1>
+{% endblock %}
+            </div>
+        </div>
+        <div id="footer">
+            <div class="inner">
+                <div class="ft-logo"></div>
+                <div class="ft-text">
+                    <div>Copyright &copy; 2013-2015 <a href="http://flash.moe/" target="_blank">Flashwave</a>, <a href="http://circlestorm.net/" target="_blank">et al</a>.</div>
+                    <div><a href="{{ urls.format('INFO_PAGE', ['terms']) }}">Terms of Service</a> | <a href="{{ urls.format('INFO_PAGE', ['contact']) }}">Contact</a> | <a href="{{ urls.format('SITE_FAQ') }}">FAQ</a> | <a href="{{ urls.format('INFO_PAGE', ['rules']) }}">Rules</a> | <a href="{{ urls.format('CHANGELOG') }}">Changelog</a> | <a href="https://fiistat.us/">Status</a></div>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>

_sakura/templates/misaki/global/notfound.tpl

@@ -6,10 +6,6 @@
 		<link rel="stylesheet" type="text/css" href="{{ sakura.resources }}/css/error.css" />
 	</head>
 	<body>
-		<audio autoplay="">
-			<source src="//{{ sakura.urls.content }}/sounds/notfound.ogg" type="audio/ogg" />
-			<source src="//{{ sakura.urls.content }}/sounds/notfound.mp3" type="audio/mp3" />
-		</audio>
 		<div id="wrap">
 			<h1>
 				<img src="{{ sakura.resources }}/images/404-info.gif" />

_sakura/templates/misaki/main/index.tpl

@@ -1,28 +1,13 @@
-{% include 'global/header.tpl' %}
-<div class="homepage">
-    <div class="frontStats">
-        <div title="We have {{ stats.userCount }} user{% if stats.userCount != 1 %}s{% endif %}">
-            <div><span class="fa fa-line-chart"></span> <span>{{ stats.userCount }}</span></div>
-        </div>
-        <div title="Active in the last 5 minutes: {% for amount,onlineUser in stats.onlineUsers %}{{ onlineUser.username }}{% if amount != (stats.onlineUsers|length - 1) %}, {% endif %}{% endfor %}">
-            <div><span class="fa fa-users"></span> <span>{{ stats.onlineUsers|length }}</span></div>
-        </div>
-        <div title="Our newest user is {{ stats.newestUser.data.username }}">
-            <div><span class="fa fa-user-plus"></span> <a href="/u/{{ stats.newestUser.data.id }}" style="color: {{ stats.newestUser.colour }}">{{ stats.newestUser.data.username }}</a></div>
-        </div>
-        <div title="It has been {{ stats.lastRegDate }} since the last user registered">
-            <div><span class="fa fa-clock-o"></span> <span>{{ stats.lastRegDate }}</span></div>
-        </div>
-        <div title="The forum has {{ stats.topicCount }} thread{% if stats.topicCount != 1 %}s{% endif %} consisting out of {{ stats.postCount }} post{% if stats.postCount != 1 %}s{% endif %}">
-            <div><span class="fa fa-list"></span> <span>{{ stats.topicCount }}</span><span style="font-size: .5em; line-height: 1em">/ {{ stats.postCount }}</span></div>
+{% extends 'global/master.tpl' %}
+
+{% block content %}
+    <div class="homepage">
+        {% include 'elements/statsHeader.tpl' %}
+        <div class="frontNews">
+            {% for post in news.getPosts(0, newsCount) %}
+                {% include 'elements/newsPost.tpl' %}
+            {% endfor %}
         </div>
+        <div class="clear"></div>
     </div>
-    <div class="frontNews">
-        {% for newsPost in newsPosts %}
-            {% include 'elements/newsPost.tpl' %}
-        {% endfor %}
-    </div>
-    <div class="clear"></div>
-    <!--<script type="text/javascript" src="{{ sakura.resources }}/js/ybabstat.js"></script>-->
-</div>
-{% include 'global/footer.tpl' %}
+{% endblock %}

_sakura/templates/misaki/main/infopage.tpl

@@ -1,5 +1,11 @@
-{% include 'global/header.tpl' %}
+{% extends 'global/master.tpl' %}
+
+{% block title %}{% if page.title %}{{ page.title }}{% else %}Not found!{% endif %}{% endblock %}
+
+{% block content %}
     <div class="markdown">
-        {{ page.content|raw }}
+        <div>
+            {{ page.content|raw }}
+        </div>
     </div>
-{% include 'global/footer.tpl' %}
+{% endblock %}

_sakura/templates/misaki/main/profile.tpl

@@ -1,23 +1,33 @@
-{% include 'global/header.tpl' %}
-    {% if profile.checkPermission('SITE', 'DEACTIVATED') or profile.data.password_algo == 'nologin' or (profile.checkPermission('SITE', 'RESTRICTED') and (user.data.id != profile.data.id and not user.checkPermission('MANAGE', 'USE_MANAGE'))) %}
-    <div class="userNotFound">
-        <h1 class="sectionHead">user not found!</h1>
-        There are a few possible reasons for this:
-        <ul>
-            <li>They changed their username.</li>
-            <li>They may have been <a href="/faq#abyss" class="default">abyss'd</a>.</li>
-            <li>You made a typo.</li>
-            <li>They never existed.</li>
-        </ul>
-    </div>
+{% extends 'global/master.tpl' %}
+
+{% set profileHidden = profile.checkPermission('SITE', 'DEACTIVATED') or profile.data.password_algo == 'nologin' or (profile.checkPermission('SITE', 'RESTRICTED') and (user.data.user_id != profile.data.user_id and not user.checkPermission('MANAGE', 'USE_MANAGE'))) %}
+
+{% set noUserpage = profile.userPage|length < 1 %}
+
+{% set profileView = noUserpage and profileView == 'index' ? 'comments' : profileView %}
+
+{% block title %}{% if profileHidden %}User not found!{% else %}Profile of {{ profile.data.username }}{% endif %}{% endblock %}
+
+{% block content %}
+    {% if profileHidden %}
+        <div class="userNotFound">
+            <h1 class="sectionHead">user not found!</h1>
+            There are a few possible reasons for this:
+            <ul>
+                <li>They changed their username.</li>
+                <li>They may have been <a href="{{ urls.format('SITE_FAQ') }}#abyss" class="default">abyss'd</a>.</li>
+                <li>You made a typo.</li>
+                <li>They never existed.</li>
+            </ul>
+        </div>
     {% else %}
         <div class="profile" id="u{{ profile.data.user_id }}">
-            <div class="profileHeader" style="background-image: url('/u/{{ profile.data.user_id }}/header');">
+            <div class="profileHeader" style="background-image: url('{{ urls.format('IMAGE_HEADER', [profile.data.user_id]) }}');">
                 <div class="profileFade"></div>
                 <div class="headerLeft">
-                    <img class="userAvatar" src="/a/{{ profile.data.user_id }}" alt="{{ profile.data.username }}'s Avatar" />
+                    <img class="userAvatar" src="{{ urls.format('IMAGE_AVATAR', [profile.data.user_id]) }}" alt="{{ profile.data.username }}'s Avatar" />
                     <div class="userData">
-                        <div class="profileUsername" style="color: {{ profile.colour }};">
+                        <div class="profileUsername" style="color: {{ profile.colour }};"{% if profile.getUsernameHistory %} title="Known as {{ profile.getUsernameHistory[0]['username_old'] }} before {{ profile.getUsernameHistory[0]['change_time']|date(sakura.dateFormat) }}."{% endif %}>
                             {{ profile.data.username }}
                         </div>
                         <div class="profileUsertitle">
@@ -26,8 +36,8 @@
                     </div>
                 </div>
                 <div class="joinedLast">
-                    <div>Joined {{ profile.data.regdate|date(sakura.dateFormat) }}</div>
-                    <div>{% if profile.data.lastdate == 0 %}User hasn't logged in yet.{% else %}Last Active {{ profile.data.lastdate|date(sakura.dateFormat) }}{% endif %}</div>
+                    <div>Joined <span title="{{ profile.data.user_registered|date(sakura.dateFormat) }}">{{ profile.elapsed.joined }}</span></div>
+                    <div>{% if profile.data.user_last_online < 1 %}User hasn't logged in yet.{% else %}Last Active <span title="{{ profile.data.user_last_online|date(sakura.dateFormat) }}">{{ profile.elapsed.lastOnline }}</span>{% endif %}</div>
                 </div>
                 <div class="clear"></div>
             </div>
@@ -115,13 +125,13 @@
                 {% if not profile.checkPermission('SITE', 'DEACTIVATED') %}
                     <div class="statsRow">
                         <div class="profilePlatform">
-                            <a class="inner" href="/u/{{ profile.data.user_id }}/friends">
+                            <a class="inner" href="{{ urls.format('USER_FRIENDS', [profile.data.user_id]) }}">
                                 <div>Friends</div>
                                 <div class="count">{{ profile.getFriends|length }}</div>
                             </a>
                         </div>
                         <div class="profilePlatform">
-                            <a class="inner" href="/u/{{ profile.data.user_id }}/groups">
+                            <a class="inner" href="{{ urls.format('USER_GROUPS', [profile.data.user_id]) }}">
                                 <div>Groups</div>
                                 <div class="count">n/a</div>
                             </a>
@@ -130,16 +140,18 @@
                             <div class="inner">
                                 <div class="forumStatTitle">Forum stats</div>
                                 <div class="forumStatCount">
-                                    <a class="posts" href="/u/{{ profile.data.user_id }}/posts">{{ profile.forumStats.posts }} post{% if profile.forumStats.posts != 1 %}s{% endif %}</a>
-                                    <a class="threads" href="/u/{{ profile.data.user_id }}/threads">{% if profile.forumStats.topics %}{{ profile.forumStats.topics }}{% else %}0{% endif %} thread{% if profile.forumStats.topics != 1 %}s{% endif %}</a>
+                                    <a class="posts" href="{{ urls.format('USER_POSTS', [profile.data.user_id]) }}">{{ profile.forumStats.posts }} post{% if profile.forumStats.posts != 1 %}s{% endif %}</a>
+                                    <a class="threads" href="{{ urls.format('USER_THREADS', [profile.data.user_id]) }}">{% if profile.forumStats.topics %}{{ profile.forumStats.topics }}{% else %}0{% endif %} thread{% if profile.forumStats.topics != 1 %}s{% endif %}</a>
                                 </div>
                                 <div class="clear"></div>
                             </div>
                         </div>
                         <div class="clear"></div>
                     </div>
-                    <div class="userPage profilePlatform markdown{% if profile.userPage|length < 1 %} hidden{% endif %}">
-                        <div class="inner">{{ profile.userPage|raw }}</div>
+                    <div class="userPage profilePlatform">
+                        <div class="inner">
+                            {% include 'profile/' ~ profileView ~ '.tpl' %}
+                        </div>
                     </div>
                 {% endif %}
                 </div>
@@ -147,4 +159,4 @@
             </div>
         </div>
     {% endif %}
-{% include 'global/footer.tpl' %}
+{% endblock %}

_sakura/templates/misaki/main/search.tpl

@@ -1,16 +1,20 @@
-{% include 'global/header.tpl' %}
-<h1 class="sectionHead">search</h1>
-<script>
-    (function() {
-        var cx = '013363332951923767879:krqdp_wt-eg';
-        var gcse = document.createElement('script');
-        gcse.type = 'text/javascript';
-        gcse.async = true;
-        gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + '//cse.google.com/cse.js?cx=' + cx;
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(gcse, s);
-    })();
-</script>
-<gcse:searchbox></gcse:searchbox>
-<gcse:searchresults></gcse:searchresults>
-{% include 'global/footer.tpl' %}
+{% extends 'global/master.tpl' %}
+
+{% block title %}Search{% endblock %}
+
+{% block content %}
+    <h1 class="sectionHead">search</h1>
+    <script>
+        (function() {
+            var cx = '013363332951923767879:krqdp_wt-eg';
+            var gcse = document.createElement('script');
+            gcse.type = 'text/javascript';
+            gcse.async = true;
+            gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + '//cse.google.com/cse.js?cx=' + cx;
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(gcse, s);
+        })();
+    </script>
+    <gcse:searchbox></gcse:searchbox>
+    <gcse:searchresults></gcse:searchresults>
+{% endblock %}

_sakura/templates/misaki/main/settings.tpl

@@ -1,12 +1,16 @@
-{% include 'global/header.tpl' %}
+{% extends 'global/master.tpl' %}
+
+{% block title %}{{ page.category }} / {{ page.mode }}{% endblock %}
+
+{% block content %}
     <div class="content settings messages">
         <div class="content-right content-column">
             {% include 'elements/settingsNavigation.tpl' %}
         </div>
         <div class="content-left content-column">
-            <div class="head">
-                {{ page.title }}
-            </div>
+            <h1 class="sectionHead">
+                {{ page.category }} / {{ page.mode }}
+            </h1>
             <div class="settings-explanation">
             {% for descline in page.description %}
                 <div>{{ include(template_from_string(descline)) }}</div>
@@ -16,4 +20,4 @@
         </div>
         <div class="clear"></div>
     </div>
-{% include 'global/footer.tpl' %}
+{% endblock %}

_sakura/templates/misaki/profile/index.tpl

@@ -1,150 +1,3 @@
-{% include 'global/header.tpl' %}
-    {% if profile.checkPermission('SITE', 'DEACTIVATED') or profile.data.password_algo == 'nologin' or (profile.checkPermission('SITE', 'RESTRICTED') and (user.data.id != profile.data.id and not user.checkPermission('MANAGE', 'USE_MANAGE'))) %}
-    <div class="userNotFound">
-        <h1 class="sectionHead">user not found!</h1>
-        There are a few possible reasons for this:
-        <ul>
-            <li>They changed their username.</li>
-            <li>They may have been <a href="/faq#abyss" class="default">abyss'd</a>.</li>
-            <li>You made a typo.</li>
-            <li>They never existed.</li>
-        </ul>
-    </div>
-    {% else %}
-        <div class="profile" id="u{{ profile.data.id }}">
-            <div class="profileHeader" style="background-image: url('/u/{{ profile.data.id }}/header');">
-                <div class="profileFade"></div>
-                <div class="headerLeft">
-                    <img class="userAvatar" src="/a/{{ profile.data.id }}" alt="{{ profile.data.username }}'s Avatar" />
-                    <div class="userData">
-                        <div class="profileUsername" style="color: {{ profile.colour }};">
-                            {{ profile.data.username }}
-                        </div>
-                        <div class="profileUsertitle">
-                            {{ profile.userTitle }}
-                        </div>
-                    </div>
-                </div>
-                <div class="joinedLast">
-                    <div>Joined {{ profile.data.regdate|date(sakura.dateFormat) }}</div>
-                    <div>{% if profile.data.lastdate == 0 %}User hasn't logged in yet.{% else %}Last Active {{ profile.data.lastdate|date(sakura.dateFormat) }}{% endif %}</div>
-                </div>
-                <div class="clear"></div>
-            </div>
-            <div class="profileContent">
-                <div class="userDataBar">
-                {% if not profile.checkPermission('SITE', 'DEACTIVATED') and (profile.checkPremium[0] or profile.checkPermission('MANAGE', 'USE_MANAGE')) %}
-                    <div class="profilePlatform hierarchyContainer">
-                        <div class="inner">
-                            <ul class="hierarchies">
-                                {% if profile.checkPremium[0] %}
-                                    <li class="tenshi">Tenshi</li>
-                                {% endif %}
-                                {% if profile.checkPermission('MANAGE', 'USE_MANAGE') %}
-                                    <li class="staff">Staff</li>
-                                {% endif %}
-                                {% if false %}
-                                    <li class="developer">Developer</li>
-                                {% endif %}
-                                {% if false %}
-                                    <li class="alumnii">Alumnii</li>
-                                {% endif %}
-                            </ul>
-                        </div>
-                    </div>
-                    <div class="profilePlatform userAccounts">
-                        <div class="inner">
-                            {% if session.checkLogin %}
-                                {% if profile.profileFields %}
-                                    {% for name,field in profile.profileFields %}
-                                    <div class="field">
-                                        <div>{{ field.name }}</div>
-                                        <div>
-                                        {% if name == 'youtube' %}
-                                            <a href="https://youtube.com/{% if field.youtubetype == 'true' %}channel{% else %}user{% endif %}/{{ field.value }}" class="default">{% if field.youtubetype == 'true' %}{{ profile.data.username }}'s Channel{% else %}{{ field.value }}{% endif %}</a>
-                                        {% else %}
-                                            {% if field.islink %}
-                                                <a href="{{ field.link }}">
-                                            {% endif %}
-                                            {{ field.value }}
-                                            {% if field.islink %}
-                                                </a>
-                                            {% endif %}
-                                        {% endif %}
-                                        </div>
-                                        <div class="clear"></div>
-                                    </div>
-                                    {% endfor %}
-                                {% else %}
-                                    <div class="noAccounts">
-                                        <div class="fa fa-question"></div>
-                                        <div class="notif">This user has not set any links yet.</div>
-                                    </div>
-                                {% endif %}
-                            {% else %}
-                                <div class="noAccounts">
-                                    <div class="fa fa-exclamation-circle"></div>
-                                    <div class="notif">Log in to view the full profile.</div>
-                                </div>
-                            {% endif %}
-                        </div>
-                    </div>
-                {% endif %}
-                    <div class="profilePlatform accountStanding">
-                        <div class="inner">
-                            <div class="title">Account Standing</div>
-                            {% if profile.checkPermission('SITE', 'DEACTIVATED') %}
-                                <div class="standing" style="color: #800;">Deactivated</div>
-                            {% elseif profile.checkBan %}
-                                <h2 class="standing" style="color: #222;">Banned</h2>
-                            {% else %}
-                                {% if profile.getWarnings %}
-                                    <div class="standing" style="color: #A22;">Bad</div>
-                                {% else %}
-                                    <div class="standing" style="color: #2A2;">Good</div>
-                                {% endif %}
-                            {% endif %}
-                            {% if profile.getWarnings %}
-                                <div>This user has <b>{{ profile.getWarnings|length }}</b> warning{% if profile.getWarnings|length != 1 %}s{% endif %}!</div>
-                                <div>After <b>10 warnings</b> a user may be permanently banned.</div>
-                            {% endif %}
-                        </div>
-                    </div>
-                </div>
-                <div class="userPage">
-                {% if not profile.checkPermission('SITE', 'DEACTIVATED') %}
-                    <div class="statsRow">
-                        <div class="profilePlatform">
-                            <a class="inner" href="/u/{{ profile.data.id }}/friends">
-                                <div>Friends</div>
-                                <div class="count">{{ profile.getFriends|length }}</div>
-                            </a>
-                        </div>
-                        <div class="profilePlatform">
-                            <a class="inner" href="/u/{{ profile.data.id }}/groups">
-                                <div>Groups</div>
-                                <div class="count">n/a</div>
-                            </a>
-                        </div>
-                        <div class="profilePlatform forumStats">
-                            <div class="inner">
-                                <div class="forumStatTitle">Forum stats</div>
-                                <div class="forumStatCount">
-                                    <a class="posts" href="/u/{{ profile.data.id }}/posts">{{ profile.forumStats.posts }} post{% if profile.forumStats.posts != 1 %}s{% endif %}</a>
-                                    <a class="threads" href="/u/{{ profile.data.id }}/threads">{% if profile.forumStats.topics %}{{ profile.forumStats.topics }}{% else %}0{% endif %} thread{% if profile.forumStats.topics != 1 %}s{% endif %}</a>
-                                </div>
-                                <div class="clear"></div>
-                            </div>
-                        </div>
-                        <div class="clear"></div>
-                    </div>
-                    <div class="userPage profilePlatform markdown{% if profile.userPage|length < 1 %} hidden{% endif %}">
-                        <div class="inner">{{ profile.userPage|raw }}</div>
-                    </div>
-                {% endif %}
-                </div>
-                <div class="clear"></div>
-            </div>
-        </div>
-    {% endif %}
-{% include 'global/footer.tpl' %}
+<div class="markdown">
+    {{ profile.userPage|raw }}
+</div>

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

@@ -6,13 +6,13 @@
         {% for field in options.fields %}
             <div class="profile-field">
                 <div>
-                    <h2>{{ field.name }}</h2>
+                    <h2>{{ field.option_name }}</h2>
                     <div style="font-size: .8em; line-height: 110%;">
-                        {{ field.description }}
+                        {{ field.option_description }}
                     </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] %} checked="checked" value="option_{{ field.id }}"{% else %} value="{{ options.user[field.id] }}"{% endif %}{% endif %} />
+                    <input type="{{ field.option_type }}" name="option_{{ field.option_id }}" class="inputStyling"{% if user.data.user_data.userOptions[field.option_id] %}{% if field.option_type == 'checkbox' and user.data.user_data.userOptions[field.option_id] %} checked="checked" value="option_{{ field.option_id }}"{% else %} value="{{ user.data.user_data.userOptions[field.option_id] }}"{% endif %}{% endif %} />
                 </div>
             </div>
         {% endfor %}
@@ -21,6 +21,13 @@
             <input type="reset" value="Reset" name="reset" class="inputStyling" />
         </div>
     </form>
+    <script type="text/javascript">
+    window.addEventListener("load", function() {
+
+        prepareAjaxForm('optionsForm', 'Changing Options...');
+
+    });
+    </script>
 {% else %}
     <h1 class="stylised" style="margin: 2em auto; text-align: center;">There are currently no changeable options.</h1>
 {% endif %}

_sakura/templates/yuuno/global/master.tpl

@@ -7,7 +7,7 @@
         <meta name="description" content="{{ sakura.siteDesc }}" />
         <meta name="keywords" content="{{ sakura.siteTags }}" />
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-        <meta name="msapplication-TileColor" content="#fbeeff" />
+        <meta name="msapplication-TileColor" content="#9475b2" />
         <meta name="msapplication-TileImage" content="/content/images/icons/ms-icon-144x144.png" />
         <meta name="theme-color" content="#9475B2" />
 {% if page.redirect %}

_sakura/templates/yuuno/main/profile.tpl

@@ -10,16 +10,16 @@
 
 {% block content %}
     {% if profileHidden %}
-    <div class="content standalone" style="padding: 20px;">
-        <h1>The requested user does not exist!</h1>
-        There are a few possible reasons for this:
-        <ul style="padding-left: 40px;">
-            <li>They changed their username.</li>
-            <li>They may have been <a href="{{ urls.format('SITE_FAQ') }}#abyss" class="default">abyss'd</a>.</li>
-            <li>You made a typo.</li>
-            <li>They never existed.</li>
-        </ul>
-    </div>
+        <div class="content standalone" style="padding: 20px;">
+            <h1>The requested user does not exist!</h1>
+            There are a few possible reasons for this:
+            <ul style="padding-left: 40px;">
+                <li>They changed their username.</li>
+                <li>They may have been <a href="{{ urls.format('SITE_FAQ') }}#abyss" class="default">abyss'd</a>.</li>
+                <li>You made a typo.</li>
+                <li>They never existed.</li>
+            </ul>
+        </div>
     {% else %}
         <div class="content profile">
             <div class="content-right content-column">
@@ -40,8 +40,9 @@
                             {% endif %}
                             <hr class="default" />
                             <a class="fa fa-file-text-o" title="View {{ profile.data.username }}'s profile page" href="{{ urls.format('USER_PROFILE', [profile.data.user_id]) }}"></a>
-                            <a class="fa fa-plus-square" title="View {{ profile.data.username }} threads" href="{{ urls.format('USER_THREADS', [profile.data.user_id]) }}"></a>
-                            <a class="fa fa-reply" title="View {{ profile.data.username }} posts" href="{{ urls.format('USER_POSTS', [profile.data.user_id]) }}"></a>
+                            <a class="fa fa-plus-square" title="View {{ profile.data.username }}'s threads" href="{{ urls.format('USER_THREADS', [profile.data.user_id]) }}"></a>
+                            <a class="fa fa-reply" title="View {{ profile.data.username }}'s posts" href="{{ urls.format('USER_POSTS', [profile.data.user_id]) }}"></a>
+                            <a class="fa fa-users" title="View {{ profile.data.username }}'s friends" href="{{ urls.format('USER_FRIENDS', [profile.data.user_id]) }}"></a>
                             {% if not noUserpage %}
                                 <a class="fa fa-comments-o" title="View {{ profile.data.username }}'s profile comments" href="{{ urls.format('USER_COMMENTS', [profile.data.user_id]) }}"></a>
                             {% endif %}