Merge branch 'develop' into feature/2fa

This commit is contained in:
slawkens
2026-01-31 17:45:40 +01:00
20 changed files with 262 additions and 464 deletions

View File

@@ -2,9 +2,9 @@
<div class="NewsHeadline">
<div class="NewsHeadlineBackground" style="background-image:url({{template_path }}/images/news/newsheadline_background.gif)">
<img src="{{ constant('BASE_URL') }}images/news/icon_{{ icon }}.gif" class="NewsHeadlineIcon" />
<div class="NewsHeadlineDate">{{ date|date(config.news_date_format) }} - </div>
<div class="NewsHeadlineDate">{{ date|date(setting('core.news_date_format')) }} - </div>
<div class="NewsHeadlineText">{{ title }}</div>
{% if author is not empty %}
{% if setting('core.news_author') and author is not empty %}
<div class="NewsHeadlineAuthor"><b>Author: </b><i>{{ author }}</i></div>
{% endif %}
</div>

View File

@@ -1,14 +1,12 @@
<?php
use MyAAC\Models\Gallery;
if(PAGE !== 'news') {
return;
}
$gallery = Gallery::find($config['gallery_image_id_from_database']);
if ($gallery) {
$configGalleryImageThumb = config('gallery_image_thumb');
if (!empty($configGalleryImageThumb)) {
$twig->display('gallery.html.twig', array(
'image' => $gallery->toArray()
'image' => GALLERY_DIR . $configGalleryImageThumb,
));
}

View File

@@ -1,6 +1,6 @@
<div id="GalleryBox" class="Themebox" style="background-image:url({{ template_path }}/images/themeboxes/gallery/gallerybox.gif);">
<a href="?subtopic=gallery&image={{ config['gallery_image_id_from_database'] }}" >
<img id="GalleryContent" class="ThemeboxContent" src="{{ image['thumb'] }}" alt="Screenshot of the Day" />
<a href="{{ getLink('gallery') }}" >
<img id="GalleryContent" class="ThemeboxContent" src="{{ image }}" alt="Screenshot of the Day" />
</a>
<div class="Bottom" style="background-image:url({{ template_path }}/images/general/box-bottom.gif);"></div>
</div>

View File

@@ -15,4 +15,4 @@ network_twitter = "tibia"
background_image = "background-artwork.jpg"
logo_image = "tibia-logo-artwork-top.gif"
gallery_image_id_from_database = 1
gallery_image_thumb = "demon_thumb.gif"