Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-17 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/new-router

Browse Source
This commit is contained in:
slawkens
2022-03-16 13:48:12 +01:00
parent f74c1ac247 091828e8f1
commit 34fa672c0f
8 changed files with 65 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system/functions.php
View File

@@ -462,7 +462,7 @@ function tickers()
*/
function template_place_holder($type)
{
global $template_place_holders;
global $twig, $template_place_holders;
$ret = '';
if(array_key_exists($type, $template_place_holders) && is_array($template_place_holders[$type]))
@@ -471,6 +471,9 @@ function template_place_holder($type)
if($type === 'head_start') {
$ret .= template_header();
}
elseif ($type === 'body_start') {
$ret .= $twig->render('browsehappy.html.twig');
}
elseif($type === 'body_end') {
$ret .= template_ga_code();
}

0
system/php_sessions/index.html Normal file
View File

3
system/templates/browsehappy.html.twig Normal file
View File

@@ -0,0 +1,3 @@
<!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->

2
system/templates/guilds.list.html.twig
View File

@@ -133,7 +133,7 @@
{% include('buttons.base.html.twig') %}
</form>
{% else %}
<b>Before you can create guild you must login.</b>
<b>Before you can create a guild you must login.</b>
<br/>
<form action="?subtopic=accountmanagement&redirect={{ getLink('guilds') }}" method="post">
{% include('buttons.login.html.twig') %}

2
system/templates/news.html.twig
View File

@@ -3,7 +3,7 @@
<img src="{{ constant('BASE_URL') }}images/news/icon_{{ icon }}.gif" class="NewsHeadlineIcon" />
<div class="NewsHeadlineDate">{{ date|date(config.news_date_format) }} - </div>
<div class="NewsHeadlineText">{{ title }}</div>
{% if author is not empty %}
{% if config.news_author and author is not empty %}
<div class="NewsHeadlineAuthor"><b>Author: </b><i>{{ author }}</i></div>
{% endif %}
</div>

4
system/templates/team.html.twig
View File

@@ -60,7 +60,7 @@
{% for member in group.members|reverse %}
{% set i = i + 1 %}
<tr bgcolor="{{ getStyle(i) }}" style="height: 32px;">
<td>{{ group.group_name }}</td>
<td>{{ group.group_name|capitalize }}</td>
{% if config.team_display_outfit %}
<td>
@@ -104,7 +104,7 @@
{% elseif config.team_style == 2 %}
{% for group in groupmember|reverse %}
{% if group.members is not empty %}
<div style="text-align:center"><h2>{{ group.group_name }}</h2></div>
<div style="text-align:center"><h2>{{ group.group_name|capitalize }}</h2></div>
<table cellspacing="1" cellpadding="4" border="0" width="100%">
<tr bgcolor="{{ config.vdarkborder }}">