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

@@ -1,33 +0,0 @@
<form method="post" action="{{ link }}">
{{ csrf() }}
{% if action == 'edit' %}
<input type="hidden" name="id" value="{{ id }}" />
{% endif %}
<table width="100%" border="0" cellspacing="1" cellpadding="4">
<tr>
<td bgcolor="{{ config.vdarkborder }}" class="white"><b>{% if action == 'edit' %}Edit{% else %}Add{% endif %} image</b></td>
</tr>
<tr>
<td bgcolor="{{ config.darkborder }}">
<table border="0" cellpadding="1">
<tr>
<td>Comment:</td>
<td><textarea name="comment" maxlength="255" cols="50" rows="5">{% if comment is not null %}{{ comment }}{% endif %}</textarea></td>
<tr/>
<tr>
<td>Image URL:</td>
<td><input name="image" value="{% if image is not null %}{{ image }}{% endif %}" size="50" maxlength="255"/></td>
<tr/>
<tr>
<td>Author:</td>
<td><input name="author" value="{% if author is not null %}{{ author }}{% endif %}" size="50" maxlength="50"/></td>
<tr/>
<tr>
<td colspan="2" align="center"><input type="submit" value="Submit"/>
</tr>
</table>
</td>
</tr>
</table>
</form>
<br/><br/>

View File

@@ -1,15 +0,0 @@
<div style="position: relative; height: 15px; width: 100%;">
{% if next is not null %}
<a style="float: right;" href="{{ getLink('gallery') ~ '/' ~ next }}" >next <img src="images/arrow_right.gif" width=15 height=11 border=0 ></a>
{% endif %}
{% if previous is not null %}
<a style="position: absolute;" href="{{ getLink('gallery') ~ '/' ~ previous }}"><img src="images/arrow_left.gif" width=15 height=11 border=0 > previous</a>
{% endif %}
<div style="position: absolute; width: 80%; margin-left: 10%; margin-right: 10%; text-align: center;">
<a href="{{ getLink('gallery') }}" ><img src="images/arrow_up.gif" width=11 height=15 border=0 > back</a>
</div>
</div>
<div style="position: relative; text-align: center; top: 20px; ">
<img src="{{ image.image }}" />
<div style="margin-top: 15px; margin-bottom: 35px; ">{{ image.comment }}</div>
</div>

View File

@@ -1,38 +1,31 @@
Click on the image to enlarge.<br/><br/>
{% set i = 0 %}
{% for image in images %}
{% set i = i + 1 %}
<table>
<tr>
<td style="height: 120px;" >
<a href="{{ getLink('gallery') ~ '/' ~ image.id }}" >
<img src="{{ image.thumb }}" border="0" />
</a>
</td>
<td>{{ image.comment }}</td>
{% if canEdit %}
<td>
<a href="?subtopic=gallery&action=edit&id={{ image.id }}" title="Edit">
<img src="images/edit.png"/>Edit
</a>
<a id="delete" href="?subtopic=gallery&action=delete&id={{ image.id }}" onclick="return confirm('Are you sure?');" title="Delete">
<img src="images/del.png"/>Delete
</a>
<a href="?subtopic=gallery&action=hide&id={{ image.id }}" title="{% if image.hide != 1 %}Hide{% else %}Show{% endif %}">
<img src="images/{% if image.hide != 1 %}success{% else %}error{% endif %}.png"/>{% if image.hide != 1 %}Hide{% else %}Show{% endif %}
</a>
{% if i != 1 %}
<a href="?subtopic=gallery&action=moveup&id={{ image.id }}" title="Move up">
<img src="images/icons/arrow_up.gif"/>Move up
</a>
{% endif %}
{% if i != last %}
<a href="?subtopic=gallery&action=movedown&id={{ image.id }}" title="Move down">
<img src="images/icons/arrow_down.gif"/>Move down
</a>
{% endif %}
</td>
{% endif %}
</tr>
</table>
{% endfor %}
<!-- Slideshow container -->
<div class="slideshow-container">
{% set i = 1 %}
{% for image in images %}
<div class="mySlides fade-effect">
<div class="numbertext">{{ i }} / {{ images|length }}</div>
<img src="{{ constant('GALLERY_DIR') }}{{ image }}" style="width:100%">
</div>
{% set i = i + 1 %}
{% endfor %}
<!-- Next and previous buttons -->
<a class="prev" onclick="plusSlides(-1)">&#10094;</a>
<a class="next" onclick="plusSlides(1)">&#10095;</a>
</div>
<!-- The dots/circles -->
<div style="text-align:center">
{% set i = 1 %}
{% for image in images %}
<span class="dot" onclick="currentSlide({{ i }})"></span>
{% set i = i + 1 %}
{% endfor %}
</div>
<link rel="stylesheet" type="text/css" href="{{ constant('BASE_URL') }}tools/css/gallery.css" />
<script type="text/javascript" src="{{ constant('BASE_URL') }}tools/js/gallery.js"></script>