Merge branch 'master' of git://github.com/Chill-project/Person

Conflicts:
	Resources/config/routing.yml

Resources/views/Timeline/closing_period.html.twig

@@ -0,0 +1 @@
+<p><i class="fa fa-folder"></i>&nbsp;{{ 'An accompanying period is closed for %person% on %date%'|trans({'%person%': person, '%date%': period.dateClosing|localizeddate('long', 'none') } ) }}</p>

Resources/views/Timeline/index.html.twig

@@ -0,0 +1,32 @@
+{#
+ * 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 "ChillPersonBundle::layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_person_timeline' %}
+
+{#
+This view should receive those arguments:
+- person
+#}
+
+{% block title %}{{ 'Timeline for %name%'|trans({'%name%': person }) }}{% endblock %}
+
+
+{% block personcontent %}
+    {{ timeline|raw }}
+    
+{% endblock personcontent %}

Resources/views/Timeline/opening_period.html.twig

@@ -0,0 +1 @@
+<p><i class="fa fa-folder-open"></i>&nbsp;{{ 'An accompanying period is opened for %person% on %date%'|trans({'%person%': person, '%date%': period.dateOpening|localizeddate('long', 'none') } ) }}</p>