Merge branch 'master' into resume-page

src/Bundle/ChillMainBundle/Resources/views/Menu/defaultMenu.html.twig

@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
  <info@champs-libres.coop> / <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 #}
 
 <ul>
-{% for route in routes %}
-    <li><a href="{{ path(route.key, args ) }}" class="{%- if activeRouteKey == route.key -%}active{%- endif -%}">{{ route.label }}</a></li>
+{% for menu in menus %}
+    <li><a href="{{ menu.uri }}">{{ menu.label }}</a></li>
 {% endfor %}
-</ul>
+</ul>

src/Bundle/ChillMainBundle/Resources/views/layout.html.twig

@@ -70,6 +70,9 @@
                         </center>
                     </form>
                 </div>
+                <div class="col-8">
+                    <a href="{{ path('chill_crud_aside_activity_new', {'type' : 7, 'duration' : '600', 'note' : 'Pas des remarques' }) }}"><div class="bloc btn btn-success btn-md btn-block">Appel téléphonique</div></a>
+                </div>
 
                 {{  chill_widget('homepage', {} ) }}
                 {% endblock %}