From 3e8843dc61722e2c4358a0660ae49cfd5d983d8b Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc@champs-libres.coop>
Date: Thu, 13 Nov 2014 15:04:31 +0100
Subject: [PATCH] Improving layout

---
 Resources/translations/messages.en.yml |  2 ++
 Resources/translations/messages.fr.yml |  2 ++
 Resources/views/layout.html.twig       | 20 ++++++++++++--------
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 Resources/translations/messages.en.yml

diff --git a/Resources/translations/messages.en.yml b/Resources/translations/messages.en.yml
new file mode 100644
index 000000000..929078db2
--- /dev/null
+++ b/Resources/translations/messages.en.yml
@@ -0,0 +1,2 @@
+Search a person: Search a person
+Person name: Person name
\ No newline at end of file
diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index a80fb337e..fe5f841fa 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -10,3 +10,5 @@ views:
         edit: Modifier
         show: Voir
         actions: Actions
+Search a person: Rechercher une personne
+Person name: Nom / Prénom de la personne
\ No newline at end of file
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index 07e2ac2bc..5c0ea4d9b 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -29,12 +29,12 @@
     <header class="navigation container">
         <div class="nav grid-2">
             <ul id="navigation-menu">
-                <li class="nav-link nav-title"><a href="javascript:void(0)">Chill</a>
+                <li class="nav-link nav-title"><a href="{{ path('chill_main_homepage') }}">Chill</a>
             </ul>
         </div>
         <div class="grid-4 navigation-search">
             <form action="{{ path('chill_person_search') }}" method="get">
-                <input name="q" type="search" placeholder="{{ 'Chercher une personne'|trans }}" />
+                <input name="q" type="search" placeholder="{{ 'Search a person'|trans }}" />
                 <button type="submit" class="sc-button white border"><i class="fa fa-search"></i></button>
             </form>
         </div>
@@ -97,20 +97,24 @@
 
                 <div class="container">
                     <div class="grid-8 centered">
+                        <h2>{{ 'Search a person'|trans }}</h2>
+
                         <form action="{{ path('chill_person_search') }}" method="get">
-                            <input name="q" type="search" placeholder="{{ 'Nom / Prénom de la personne'|trans }}" />
+                            <input name="q" type="search" placeholder="{{ 'Person Name'|trans }}" />
                             <center>
-                                <button type="submit" class="sc-button orange">{{ 'Chercher une personne'|trans }}</button>
+                                <button type="submit" class="sc-button orange"><i class="fa fa-search"></i> {{ 'Search a person'|trans }}</button>
                             </center>
                         </form>
                     </div>
                 </div>
 
-                {{ chill_menu('homepage', {
-                    'layout': 'ChillMainBundle::Menu/homepage.html.twig',
-                }) }}
+                <div style="padding-top:2em; padding-bottom:2em;">
+                    {{ chill_menu('homepage', {
+                        'layout': 'ChillMainBundle::Menu/homepage.html.twig',
+                    }) }}
 
-                {% endblock %}
+                    {% endblock %}
+                </div>
             </div> 
         {% endblock %}