add search possibility throught all bundles, and remove deps between mainbundle and person bundle.

refs #223
This commit is contained in:
2014-11-25 14:49:15 +01:00
parent 27903423da
commit 51d6bed43d
11 changed files with 336 additions and 3 deletions

View File

@@ -28,6 +28,10 @@ chill_main_admin_central:
order: 20
label: Admin Menu
icons: [gears]
chill_main_search:
pattern: /{_locale}/person/search
defaults: { _controller: ChillMainBundle:Search:search }
login:
path: /login

View File

@@ -54,3 +54,7 @@ services:
- "@request_stack"
tags:
- { name: form.type, alias: select2_chill_country }
chill.main.search_provider:
class: Chill\MainBundle\Search\SearchProvider

View File

@@ -1,4 +1,4 @@
Search a person: Rechercher une personne
Search: Rechercher
Person name: Nom / Prénom de la personne
Login: Connexion
Logout: Se déconnecter

View File

@@ -0,0 +1,25 @@
{#
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "ChillMainBundle::layout.html.twig" %}
{% block content %}
{% for result in results %}
{{ result|raw }}
{% endfor %}
{% endblock %}

View File

@@ -32,8 +32,8 @@
</ul>
</div>
<div class="grid-4 navigation-search">
<form action="{{ path('chill_person_search') }}" method="get">
<input name="q" type="search" placeholder="{{ 'Search a person'|trans }}" />
<form action="{{ path('chill_main_search') }}" method="get">
<input name="q" type="search" placeholder="{{ 'Search'|trans }}" />
<button type="submit" class="sc-button white border"><i class="fa fa-search"></i></button>
</form>
</div>