skobkin/magnetico-web
1
1
Fork 0
Code Issues Pull requests 2 Releases Activity

Merged in composer-update (pull request #18)

Browse source 
composer update and UI/UX improvements
This commit is contained in:
Alexey Eschenko 2018-11-03 22:41:48 +00:00
parent eccf815faa 9f77163de2
commit ac90163d09
2 changed files with 227 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

411
composer.lock generated
View file

File diff suppressed because it is too large Load diff

25
templates/base.html.twig
View file

@ -42,18 +42,29 @@
</li> </li>
</ul> </ul>
{% endif %} {% endif %}
{% if is_granted('ROLE_USER') %}
<form class="form-inline my-2 my-lg-0" action="{{ path('torrents_search') }}" method="get">
<input name="query" class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search"
value="{% if searchQuery is defined %}{{ searchQuery }}{% endif %}">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> Search</button>
</form>
{% endif %}
</div> </div>
</nav> </nav>
<main id="content" role="main" class="container"> <main id="content" role="main" class="container">
{% if is_granted('ROLE_USER') %}
<div class id="form-search">
<form class="" action="{{ path('torrents_search') }}" method="get">
<div class="input-group mb-3">
<input name="query" class="form-control" type="text" placeholder="Torrent" aria-label="Search"
value="{% if searchQuery is defined %}{{ searchQuery }}{% endif %}"
{# @var app \Symfony\Bridge\Twig\AppVariable #}
{% if 'index' == app.request.get('_route') %}autofocus{% endif %} />
<div class="input-group-append">
<button class="btn btn-outline-primary my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> Search</button>
</div>
</div>
</form>
</div>
{% endif %}
<div>
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div>
</main><!-- /.container --> </main><!-- /.container -->
{% block javascript %} {% block javascript %}