mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-13 16:44:36 +02:00
Code Issues Releases Wiki Activity

fix(admin-plugin): fix incorrect data merging of manifest and settings for plugins and themes #404

Browse Source
This commit is contained in:
Awilum
2020-03-08 23:17:07 +03:00
parent ef7cd1ad46
commit f949199ad4
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
site/plugins/admin/templates/extends/themes/index.html
View File

@@ -28,13 +28,13 @@
<i class="icon">{{ icon('fas fa-palette') }}</i>
</td>
<td class="pl-0 {% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">
<a href="{{ path_for('admin.templates.index') }}?theme={{ key }}">{{ theme.name }}</a>
<a href="{{ path_for('admin.templates.index') }}?theme={{ key }}">{{ theme.manifest.name }}</a>
</td>
<td class="{% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">{{ theme.description }}</td>
<td class="{% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">{{ theme.manifest.description }}</td>
<td class="{% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">
<a href="{{ theme.author.url }}" target="_blank">{{ theme.author.name }}</a>
<a href="{{ theme.author.url }}" target="_blank">{{ theme.manifest.author.name }}</a>
</td>
<td class="{% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">{{ theme.version }}</td>
<td class="{% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">{{ theme.manifest.version }}</td>
<td class="text-right">
<button type="button" class="js-dropdown-btn" data-dropdown="dropdown-{{ key }}">
<i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
@@ -72,4 +72,4 @@
</div>
</div>
{% endif %}
{% endblock %}
{% endblock %}

6
site/plugins/admin/templates/system/tools/registry.html
View File

@@ -15,10 +15,12 @@
{{ key }}
</td>
<td>
{{ value }}
{% if value is not iterable %}
{{ value }}
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endblock %}
{% endblock %}