Commit 82f12d05 authored by Arnaud Bey's avatar Arnaud Bey
Browse files

fix conquer view

parent 86241a0d
...@@ -7,17 +7,17 @@ ...@@ -7,17 +7,17 @@
<ul class="nav nav-tabs nav-justified nav-fill" role="tablist"> <ul class="nav nav-tabs nav-justified nav-fill" role="tablist">
<li role="presentation" class="nav-item"> <li role="presentation" class="nav-item">
<a href="#find-words-tab" class="nav-link active" aria-controls="find-words-tab" role="tab" data-toggle="tab"> <a href="#find-words-tab" class="nav-link active" aria-controls="find-words-tab" role="tab" data-toggle="tab">
<i class="fa fa-binoculars" aria-hidden="true"></i> {{ 'find_words' | trans }} <i class="fas fa-binoculars" aria-hidden="true"></i> {{ 'find_words' | trans }}
</a> </a>
</li> </li>
<li role="presentation" class="nav-item"> <li role="presentation" class="nav-item">
<a href="#combos-tab" class="nav-link" aria-controls="combos-tab" role="tab" data-toggle="tab"> <a href="#combos-tab" class="nav-link" aria-controls="combos-tab" role="tab" data-toggle="tab">
<i class="fa fa-tachometer" aria-hidden="true"></i> {{ 'combos' | trans }} <i class="fas fa-tachometer-alt"></i> {{ 'combos' | trans }}
</a> </a>
</li> </li>
<li role="presentation" class="nav-item"> <li role="presentation" class="nav-item">
<a href="#constraints-tab" class="nav-link" aria-controls="constraints-tab" role="tab" data-toggle="tab"> <a href="#constraints-tab" class="nav-link" aria-controls="constraints-tab" role="tab" data-toggle="tab">
<i class="fa fa-map-o" aria-hidden="true"></i> {{ 'constraint' | trans }} <i class="fa fa-map"></i> {{ 'constraint' | trans }}
</a> </a>
</li> </li>
</ul> </ul>
......
...@@ -37,26 +37,18 @@ ...@@ -37,26 +37,18 @@
<li class="nav-item"><a class="nav-link" href="#misc" aria-controls="misc" role="tab" data-toggle="tab">{{ "properties" | trans }}</a></li> <li class="nav-item"><a class="nav-link" href="#misc" aria-controls="misc" role="tab" data-toggle="tab">{{ "properties" | trans }}</a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div role="tabpanel" class="tab-pane fade show active" id="grid-tab"> <div class="tab-pane fade show active mt-4" id="grid-tab">
<div class="card"> {% if round.discr == "rush" %}
<div class="card-body"> {% set rush = round %}
{% if round.discr == "rush" %} {% include "MagicWordBundle:Round/Rush:edit.html.twig" %}
{% set rush = round %} {% else %}
{% include "MagicWordBundle:Round/Rush:edit.html.twig" %} {% set conquer = round %}
{% else %} {% include "MagicWordBundle:Round/Conquer:edit.html.twig" %}
{% set conquer = round %} {% endif %}
{% include "MagicWordBundle:Round/Conquer:edit.html.twig" %}
{% endif %}
</div>
</div>
</div> </div>
<div role="tabpanel" class="tab-pane fade" id="misc"> <div role="tabpanel" class="tab-pane fade" id="misc">
<div class="card"> <input id="roundId" type="hidden" name="roundId" value="{{ round.id }}"/>
<div class="card-body"> {% include "MagicWordBundle:Round:misc.html.twig" %}
<input id="roundId" type="hidden" name="roundId" value="{{ round.id }}"/>
{% include "MagicWordBundle:Round:misc.html.twig" %}
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment