merge du dimanche de Will

.gitignore

 /tmp
 app/config.php
 tests/tmp
+*~

.htaccess

@@ -5,13 +5,19 @@ RewriteEngine On
 # In such cases, it should be the path (relative to the document root)
 # containing this .htaccess file
 #
-# RewriteBase /
+#RewriteBase 
 
-RewriteCond %{REQUEST_URI} \.ini$
-RewriteRule \.ini$ - [R=404]
-
-RewriteCond %{REQUEST_FILENAME} !-l
+#RewriteBase /piphone/
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-l
 RewriteRule .* index.php [L,QSA]
-RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
+
+#RewriteCond %{REQUEST_URI} \.ini$
+#RewriteRule \.ini$ - [R=404]
+
+#RewriteCond %{REQUEST_FILENAME} !-l
+#RewriteCond %{REQUEST_FILENAME} !-f
+#RewriteCond %{REQUEST_FILENAME} !-d
+#RewriteRule .* index.php [L,QSA]
+#RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]

app/routes.ini

@@ -17,4 +17,4 @@ GET|POST @call:/call/@id=Main->call
 
 GET @contactslist:/contactslist=Main->contactslist
 
-POST @feedbacksip:/feedbacksip=Main->feedbacksip
\ No newline at end of file
+POST @feedbacksip:/feedbacksip=Main->feedbacksip

templates/contact.html

 <!-- contact page -->
-<p class="left"><img src="http://www.europarl.europa.eu/mepphoto/108570.jpg" alt="mep"></p>
 
+<h3>Random MEP</h3>
+<p class="left"><img src="http://www.europarl.europa.eu/mepphoto/108570.jpg" alt="mep"></p>
 <p id="name">{{ @contact.first_name }} {{ @contact.last_name }}</p>
 <ul id="resume">
-    <li id="phone">Phone number: <a href="tel:+322 28 45922 ">{{ @contact.tel }}</a></li>
+    <li id="phone">Phone number: <a href="tel:{{ @contact.tel }} ">{{ @contact.tel }}</a></li>
     <repeat group="{{ @contact.groups }}" value="{{ @group }}">
         <check if="{{ @group.type!='Committee' }}">
-        <li id="group"><span>{{ @group.type }}:</span><a href="https://memopol.lqdn.fr/europe/parliament/group/Greens/EFA/"><img src="https://memopol.lqdn.fr/static/img/groups/eu/GreensEFA.png" height="24" alt="Greens/EFA" /></a> - {{ @group.name }}</li>
+        <li id="group"><span>{{ @group.type }}:</span><a href="https://memopol.lqdn.fr/europe/parliament/group/{{ @group.name }}">{{ @group.name }}</a> </li>
         </check>
     </repeat>
 </ul>
+
+<a href="/call/{{ @contact.id }}">Use Piphone</a>
+
 <ul id="committee">
     <repeat group="{{ @contact.groups }}" value="{{ @group }}">
         <check if="{{ @group.type=='Committee' }}">
-    <li title="Committee on Industry, Research and Energy"><a href="https://memopol.lqdn.fr/europe/parliament/committee/ITRE/">{{ @group.name }}</a></li>
+    <li title="Committee"><a href="https://memopol.lqdn.fr/europe/parliament/committee/{{ @group.name }}/">{{ @group.name }}</a></li>
         </check>
     </repeat>
 </ul>

templates/feedbackform.html

+<h2>{{ _("Sale Form") }}</h2>
+<!-- Add here the Sale form your campaign -->
+
+<p>{{ _("Here is some argument in order to help you talking with your interlocutor.") }}</p>
+
 <h2>{{ _("Feedback Form") }}</h2>
 
-<!-- error message -->
+<!-- Form in order to feedback your call -->
 
 <p>{{ _("Please tell us what happened if you was able to talk to someone. Your feedback is important to us.") }}</p>
 
@@ -16,4 +21,4 @@
     </p>
     <input type="submit" name="go" value="{{ _("Send my feedback") }}" />
 
-</form>
\ No newline at end of file
+</form>

templates/thankyou.html

 <p>{{ _("thank you! <3") }}</p>
 
-<input type="button" value="{{ _("Call another deputy") }}"/>
-
-
+<p><a href="/">{{ _("Call another deputy") }}</a></p>