Skip to content

Commit

Permalink
work on vvt appearance
Browse files Browse the repository at this point in the history
  • Loading branch information
KaydenLiss committed Dec 6, 2023
1 parent d275048 commit 88c6f96
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 15 deletions.
2 changes: 1 addition & 1 deletion templates/assign/__assign.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
{% else %}
<div class="card card-outlined bg-primary-50 block flex-none">
<p class="text-sm">
<strong>{% trans from 'general' %}assignedTo{% endtrans %}:</strong>
<strong>{% trans from 'general' %}assignedTo{% endtrans %}: </strong>
<span>{{ data.assignedUser.email }}</span>
<a href="{{ path(path,{'id':data.id}) }}" title="{{ 'removeAssign'|trans }}" class="float-right underline">
{{ 'removeAssign'|trans }}
Expand Down
24 changes: 11 additions & 13 deletions templates/base/__inheritanceInfo.html.twig
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{% trans_default_domain domain|default('general') %}
{% if inherited %}
{% if currentTeam.children.count and team == currentTeam %}
<div class="alert alert-info" role="alert">
{% trans %}inheritance.infoText.inherited{% endtrans %}
</div>
{% elseif team != currentTeam and used %}
<div class="alert alert-info" role="alert">
{% trans %}inheritance.infoText.active.long{% endtrans %}
</div>
{% elseif team != currentTeam %}
<div class="alert alert-danger" role="alert">
{% trans %}inheritance.infoText.inactive.long{% endtrans %}
</div>
{% endif %}
<div class="card card-outlined bg-primary-50 block flex-none mb-5" role="alert">
<p class="text-sm">
{% if currentTeam.children.count and team == currentTeam %}
{% trans %}inheritance.infoText.inherited{% endtrans %}
{% elseif team != currentTeam and used %}
{% trans %}inheritance.infoText.active.long{% endtrans %}
{% elseif team != currentTeam %}
{% trans %}inheritance.infoText.inactive.long{% endtrans %}
{% endif %}
</p>
</div>
{% endif %}
1 change: 0 additions & 1 deletion templates/vvt/edit.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<a href="{{ path('vvt_clone', {'id':vvt.id}) }}" class="btn">
<span>{% trans %}processing.duplicate{% endtrans %}</span>
</a>
<a href="{{ path('bericht_vvt', {'id':vvt.id}) }}" class="btn">
{% if isEditable %}
<a class="btn" href="{{ path('vvt_clone', {'id':vvt.id}) }}">
<span>{% trans %}processing.duplicate{% endtrans %}</span>
Expand Down

0 comments on commit 88c6f96

Please sign in to comment.