Removed some old stuff

This commit is contained in:
flash 2015-12-16 21:21:48 +01:00
parent 5c73e47908
commit 27d3bdf2dc
3 changed files with 2 additions and 7 deletions

View file

@ -136,9 +136,6 @@ if (!defined('SAKURA_NO_TPL')) {
'path' => Config::get('cookie_path'), 'path' => Config::get('cookie_path'),
], ],
'urlMain' => Config::get('url_main'),
'urlApi' => Config::get('url_api'),
'contentPath' => Config::get('content_path'), 'contentPath' => Config::get('content_path'),
'resources' => Config::get('content_path') . '/data/' . $templateName, 'resources' => Config::get('content_path') . '/data/' . $templateName,

View file

@ -47,7 +47,6 @@
}, },
"siteName": "{{ sakura.siteName }}", "siteName": "{{ sakura.siteName }}",
"urlMain": "{{ sakura.urlMain }}",
"content": "{{ sakura.contentPath }}", "content": "{{ sakura.contentPath }}",
"resources": "{{ sakura.resources }}", "resources": "{{ sakura.resources }}",
"recaptchaEnabled": "{{ sakura.recaptchaEnabled }}", "recaptchaEnabled": "{{ sakura.recaptchaEnabled }}",
@ -84,7 +83,7 @@
<ul class="site-menu"> <ul class="site-menu">
<li title="Home" class="logo"><a href="{{ urls.format('SITE_HOME') }}"></a></li> <li title="Home" class="logo"><a href="{{ urls.format('SITE_HOME') }}"></a></li>
<li title="News"><a href="{{ urls.format('SITE_NEWS') }}" class="fa fa-newspaper-o"></a></li> <li title="News"><a href="{{ urls.format('SITE_NEWS') }}" class="fa fa-newspaper-o"></a></li>
<li title="Chat"><a href="//chat.{{ sakura.urlMain }}/" class="fa fa-commenting"></a></li> <li title="Chat"><a href="{{ urls.format('INFO_PAGE', ['chat']) }}" class="fa fa-commenting"></a></li>
<li title="Forums"><a href="{{ urls.format('FORUM_INDEX') }}" class="fa fa-comments"></a></li> <li title="Forums"><a href="{{ urls.format('FORUM_INDEX') }}" class="fa fa-comments"></a></li>
<li title="Members"><a href="{{ urls.format('MEMBERLIST_INDEX') }}" class="fa fa-users"></a></li> <li title="Members"><a href="{{ urls.format('MEMBERLIST_INDEX') }}" class="fa fa-users"></a></li>
<li title="Search"><a href="{{ urls.format('SITE_SEARCH') }}" class="fa fa-search"></a></li> <li title="Search"><a href="{{ urls.format('SITE_SEARCH') }}" class="fa fa-search"></a></li>

View file

@ -44,7 +44,6 @@
}, },
"siteName": "{{ sakura.siteName }}", "siteName": "{{ sakura.siteName }}",
"urlMain": "{{ sakura.urlMain }}",
"content": "{{ sakura.contentPath }}", "content": "{{ sakura.contentPath }}",
"resources": "{{ sakura.resources }}", "resources": "{{ sakura.resources }}",
"recaptchaEnabled": "{{ sakura.recaptchaEnabled }}", "recaptchaEnabled": "{{ sakura.recaptchaEnabled }}",
@ -155,7 +154,7 @@
<!-- Navigation menu, displayed on left side of the bar. --> <!-- Navigation menu, displayed on left side of the bar. -->
<a class="menu-item fa-home" href="{{ urls.format('SITE_HOME') }}" title="Home"></a> <a class="menu-item fa-home" href="{{ urls.format('SITE_HOME') }}" title="Home"></a>
<a class="menu-item fa-newspaper-o" href="{{ urls.format('SITE_NEWS') }}" title="News"></a> <a class="menu-item fa-newspaper-o" href="{{ urls.format('SITE_NEWS') }}" title="News"></a>
<a class="menu-item fa-commenting" href="//chat.{{ sakura.urlMain }}/" title="Chat"></a> <a class="menu-item fa-commenting" href="{{ urls.format('INFO_PAGE', ['chat']) }}" title="Chat"></a>
<a class="menu-item fa-list" href="{{ urls.format('FORUM_INDEX') }}" title="Forums"></a> <a class="menu-item fa-list" href="{{ urls.format('FORUM_INDEX') }}" title="Forums"></a>
<a class="menu-item fa-search" href="{{ urls.format('SITE_SEARCH') }}" title="Search"></a> <a class="menu-item fa-search" href="{{ urls.format('SITE_SEARCH') }}" title="Search"></a>
{% if session.checkLogin %} {% if session.checkLogin %}