From 2afd7f4b9f309afecd45b53f726844b588a2abab Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Tue, 18 Aug 2015 06:52:32 +0200
Subject: [PATCH] Linux Commit

---
 _sakura/changelog.json                     | 13 +++++++++-
 _sakura/sakura.php                         |  2 +-
 _sakura/templates/misaki/global/header.tpl | 30 +++++++++++-----------
 main/content/data/misaki/css/misaki.css    | 10 ++++----
 4 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/_sakura/changelog.json b/_sakura/changelog.json
index 3316bc9..8076478 100644
--- a/_sakura/changelog.json
+++ b/_sakura/changelog.json
@@ -41,7 +41,8 @@
                 "20150809",
                 "20150810",
                 "20150811",
-                "20150812"
+                "20150812",
+                "20150818"
 
             ]
 
@@ -2000,6 +2001,16 @@
                 "user":     "Flashwave"
             }
 
+        ],
+
+        "20150818": [
+
+            {
+                "type":     "FIX",
+                "change":   "Fixed urls in Misaki.",
+                "user":     "Flashwave"
+            }
+
         ]
 
     }
diff --git a/_sakura/sakura.php b/_sakura/sakura.php
index d79b2de..36a177a 100644
--- a/_sakura/sakura.php
+++ b/_sakura/sakura.php
@@ -8,7 +8,7 @@
 namespace Sakura;
 
 // Define Sakura version
-define('SAKURA_VERSION',    '20150811');
+define('SAKURA_VERSION',    '20150818');
 define('SAKURA_VLABEL',     'Eminence');
 define('SAKURA_COLOUR',     '#6C3082');
 define('SAKURA_STABLE',     false);
diff --git a/_sakura/templates/misaki/global/header.tpl b/_sakura/templates/misaki/global/header.tpl
index 6d1f4b2..eb99aaa 100644
--- a/_sakura/templates/misaki/global/header.tpl
+++ b/_sakura/templates/misaki/global/header.tpl
@@ -54,31 +54,31 @@
                 <div id="content">
                     <div id="navigation">
                         <ul class="nav-left floatLeft">
-                            <li><a href="//{{ sakura.urls.main }}/">Home</a></li>
-                            <li><a href="//{{ sakura.urls.main }}/news">News</a></li>
-                            <li><a href="//{{ sakura.urls.chat }}/">Chat</a></li>
-                            <li><a href="//{{ sakura.urls.main }}/forum">Forum</a></li>
-                            <li><a href="//{{ sakura.urls.main }}/members">Members</a></li>
-                            <li><a href="//{{ sakura.urls.main }}/search">Search</a></li>
-                            <li><a href="//{{ sakura.urls.main }}/donate">Donate</a></li>
+                            <li><a href="/">Home</a></li>
+                            <li><a href="/news">News</a></li>
+                            <li><a href="//chat.{{ sakura.url_main }}/">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="/donate">Donate</a></li>
                         </ul>
                         <ul class="nav-right floatRight">
                             <li class="nav-usermenu">
                                 <a href="#"{% if user.checklogin %} style="color: {{ user.colour }};"{% endif %}>{% if user.checklogin %}{{ user.data.username }}{% else %}Guest{% endif %}</a>
                                 <ul>
                                 {% if user.checklogin %}
-                                    <li><a href="//{{ sakura.urls.main }}/u/{{ user.data.id }}">My Profile</a></li>
-                                    <li><a href="//{{ sakura.urls.main }}/messages">View Messages</a></li>
-                                    <li><a href="//{{ sakura.urls.main }}/settings">User Settings</a></li>
-                                    <li><a href="//{{ sakura.urls.main }}/manage">Site Management</a></li>
-                                    <li><a href="//{{ sakura.urls.main }}/logout?mode=logout&time={{ php.time }}&session={{ php.sessionid }}&redirect={{ sakura.currentpage }}">Logout</a></li>
+                                    <li><a href="/u/{{ user.data.id }}">My Profile</a></li>
+                                    <li><a href="/messages">View 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>
                                 {% else %}
-                                    <li><a href="//{{ sakura.urls.main }}/login">Login</a></li>
-                                    <li><a href="//{{ sakura.urls.main }}/register">Register</a></li>
+                                    <li><a href="/login">Login</a></li>
+                                    <li><a href="/register">Register</a></li>
                                 {% endif %}
                                 </ul>
                             </li>
-                            <li><a href="#" class="ignore"><img src="//{{ sakura.urls.content }}/pixel.png" alt="{{ user.data.username }}" style="background-image: url('//{{ sakura.urls.main }}/a/{{ user.data.id }}');" class="nav-avatar" /></a></li>
+                            <li><a href="#" class="ignore"><img src="{{ sakura.content_path }}/pixel.png" alt="{{ user.data.username }}" style="background-image: url('/a/{{ user.data.id }}');" class="nav-avatar" /></a></li>
                         </ul>
                         <div class="clear"></div>
                     </div>
diff --git a/main/content/data/misaki/css/misaki.css b/main/content/data/misaki/css/misaki.css
index 210216b..b689c40 100644
--- a/main/content/data/misaki/css/misaki.css
+++ b/main/content/data/misaki/css/misaki.css
@@ -7,11 +7,11 @@
  * Import fonts
  */
 @import url('//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css'); /* Font Awesome */
-@import url('/fonts/springsteel-light/font.css'); /* Springsteel Light */
-@import url('/fonts/exo2-0-italic/font.css'); /* Exo 2.0 Italic */
-@import url('/fonts/exo2-0-light/font.css'); /* Exo 2.0 Light */
-@import url('/fonts/exo2-0-lightitalic/font.css'); /* Exo 2.0 Light Italic */
-@import url('/fonts/aller/font.css'); /* Aller */
+@import url('/content/fonts/springsteel-light/font.css'); /* Springsteel Light */
+@import url('/content/fonts/exo2-0-italic/font.css'); /* Exo 2.0 Italic */
+@import url('/content/fonts/exo2-0-light/font.css'); /* Exo 2.0 Light */
+@import url('/content/fonts/exo2-0-lightitalic/font.css'); /* Exo 2.0 Light Italic */
+@import url('/content/fonts/aller/font.css'); /* Aller */
 
 /*
  * Import markdown stylesheet