[PLUGINS][AttachmentCollections] Fixed "Error: Expected Doctrine\ORM\Query\Lexer::T_IDENTIFIER, got 'Plugin\AttachmentCollections\Entity\AttachmentCollection'"
[TWIG] Cards are now divided into blocks and macros, additional macros done, attachments page no longer inside cards directory [CARDS][Navigation] Now using macros to create section, details, and nav elements
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{% import '/cards/note/view.html.twig' as noteView %}
|
||||
{% import '/cards/macros/note.html.twig' as noteView %}
|
||||
|
||||
{# Backwards compatibility with hAtom 0.1 #}
|
||||
{% if pinnednotes is not empty %}
|
||||
@@ -8,9 +8,9 @@
|
||||
{% for conversation in pinnednotes %}
|
||||
{% block current_note %}
|
||||
{% if conversation is instanceof('array') %}
|
||||
{{ noteView.macro_note(conversation['note'], conversation['replies']) }}
|
||||
{{ noteView.note_vanilla(conversation['note'], conversation['replies']) }}
|
||||
{% else %}
|
||||
{{ noteView.macro_note(conversation) }}
|
||||
{{ noteView.note_vanilla(conversation) }}
|
||||
{% endif %}
|
||||
<hr tabindex="0" title="{{ 'End of note and replies.' | trans }}">
|
||||
{% endblock current_note %}
|
||||
|
@@ -1,5 +1,5 @@
|
||||
{% extends 'stdgrid.html.twig' %}
|
||||
{% import "/cards/note/view.html.twig" as noteView %}
|
||||
{% import "/cards/macros/note.html.twig" as noteView %}
|
||||
|
||||
{% block title %}{{ title }}{% endblock %}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
{{ parent() }}
|
||||
<div class="page">
|
||||
<div class="main">
|
||||
{{ noteView.macro_note_minimal(note) }}
|
||||
{{ noteView.note_compact(note) }}
|
||||
{{ form(toggle_form) }}
|
||||
</div>
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user