This commit is contained in:
flash 2016-09-20 21:14:22 +02:00
parent 1435b8e007
commit 55577f8ad0
2 changed files with 2 additions and 21 deletions

View file

@ -9,13 +9,10 @@
<meta http-equiv="refresh" content="{{ redirectTimeout ? redirectTimeout : '3' }}; URL={{ redirect }}"> <meta http-equiv="refresh" content="{{ redirectTimeout ? redirectTimeout : '3' }}; URL={{ redirect }}">
{% endif %} {% endif %}
{{ block('meta') }} {{ block('meta') }}
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" type="text/css"> <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" type="text/css" href="/css/libraries.css">
<link rel="stylesheet" type="text/css" href="/css/yuuno.css"> <link rel="stylesheet" type="text/css" href="/css/yuuno.css">
{{ block('css') }} {{ block('css') }}
<script type="text/javascript" src="/js/app.js"></script> <script type="text/javascript" src="/js/app.js"></script>
<script type="text/javascript" src="/js/yuuno.js"></script> <script type="text/javascript" src="/js/yuuno.js"></script>
{{ block('js') }} {{ block('js') }}
@ -48,7 +45,7 @@
<!-- User menu, displayed on right side of the bar. --> <!-- User menu, displayed on right side of the bar. -->
{% if user.isActive %} {% if user.isActive %}
<a class="menu-item avatar" href="{{ route('user.profile', user.id) }}" title="Logged in as {{ user.username }}" style="background-image: url('{{ route('user.avatar', user.id) }}'); width: auto; color: {{ user.colour }}; border-color: {{ user.colour }}; font-weight: 700;"></a> <a class="menu-item avatar" href="{{ route('user.profile', user.id) }}" title="Logged in as {{ user.username }}" style="background-image: url('{{ route('user.avatar', user.id) }}'); width: auto; color: {{ user.colour }}; border-color: {{ user.colour }}; font-weight: 700;"></a>
{#<a class="menu-item fa-envelope" href="#" title="Messages"></a>#} <a class="menu-item fa-envelope" href="#" title="Messages"></a>
<a class="menu-item fa-bell" href="javascript:;" title="Notifications"></a> <a class="menu-item fa-bell" href="javascript:;" title="Notifications"></a>
{% if user.permission(constant('Sakura\\Perms\\Manage::USE_MANAGE'), constant('Sakura\\Perms::MANAGE')) %} {% if user.permission(constant('Sakura\\Perms\\Manage::USE_MANAGE'), constant('Sakura\\Perms::MANAGE')) %}
<a class="menu-item fa-gavel" href="{{ route('manage.index') }}" title="Manage"></a> <a class="menu-item fa-gavel" href="{{ route('manage.index') }}" title="Manage"></a>
@ -105,7 +102,7 @@
</noscript> </noscript>
{% if config('general.cover') %} {% if config('general.cover') %}
<div class="headerAnnouncement" style="background-image: url('{{ config('cover') }}');"></div> <div class="headerAnnouncement" style="background-image: url('{{ config('general.cover') }}');"></div>
{% endif %} {% endif %}
{% block content %} {% block content %}

View file

@ -3,8 +3,6 @@
* A set of utility helper functions * A set of utility helper functions
*/ */
use Phroute\Phroute\Exception\HttpMethodNotAllowedException;
use Phroute\Phroute\Exception\HttpRouteNotFoundException;
use Sakura\Config; use Sakura\Config;
use Sakura\Exceptions\ConfigValueNotFoundException; use Sakura\Exceptions\ConfigValueNotFoundException;
use Sakura\Net; use Sakura\Net;
@ -54,20 +52,6 @@ function view($name, $vars = [])
return Template::render($name); return Template::render($name);
} }
// Abort response
function abort($status = 200)
{
http_response_code($status);
switch ($status) {
case 403:
throw new HttpMethodNotAllowedException;
case 404:
throw new HttpRouteNotFoundException;
}
}
function clean_string($string, $lower = false, $noSpecial = false, $replaceSpecial = '') function clean_string($string, $lower = false, $noSpecial = false, $replaceSpecial = '')
{ {
// Run common sanitisation function over string // Run common sanitisation function over string