Changeset 1391

Timestamp:

Sep 19, 2010, 7:30:30 PM (10 years ago)

Author:

roux

Message:

validation w3C tables deputes & citoyens

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/circonscription/templates/showSuccess.php (modified) (1 diff)
• apps/frontend/modules/citoyen/templates/indexSuccess.php (modified) (3 diffs)
• apps/frontend/modules/documents/templates/showSuccess.php (modified) (1 diff)
• apps/frontend/modules/parlementaire/templates/_paginate.php (modified) (2 diffs)
• apps/frontend/modules/parlementaire/templates/_table.php (modified) (2 diffs)
• lib/model/doctrine/CitoyenTable.class.php (modified) (1 diff)
• web/css/xneth/style.css (modified) (3 diffs)

cpc/trunk/project/apps/frontend/modules/circonscription/templates/showSuccess.php

@@ -1 @@
-<h1 class="list_inter">Les députés par circonscriptions</h1>
+<h1 class="list_inter">Les députés par circonscription</h1>
 <h2><?php echo $circo.' ('.$departement_num.')'; ?></h2>
-<?php $sf_response->setTitle($circo.' ('.$departement_num.') : Les députés par circonscriptions'); ?>
+<?php $sf_response->setTitle($circo.' ('.$departement_num.') : Les députés par circonscription'); ?>
 <?php include_partial('map', array('num'=>strtolower($departement_num))); ?>
 <p><?php echo $total; ?> députés trouvés :</p>

cpc/trunk/project/apps/frontend/modules/citoyen/templates/indexSuccess.php

@@ -5 +5 @@
       $types = array("date"  => "date d'inscription",
                      "alpha" => "ordre alphabétique",
-                     "comm"  => "commentaires postés",
-                     "last"  => "derniers commentaires"); ?>
+                     "comm"  => "commentaires postés"); ?>
 <div class="list_choix">Ordonner par&nbsp;:
 <?php foreach($types as $type => $texte) {
@@ -13 +12 @@
   $ct++;
   if ($ct != count($types)) echo ', ';
-} ?>
+} 
+echo ', '.link_to('derniers commentaires', '@commentaires');
+?>
+  
 </div>
 <p><?php echo $total; ?> citoyens se sont inscrits sur NosDéputés.fr depuis l'ouverture du site le 14 septembre 2009. <?php echo $comments['auteurs']; ?> d'entre eux ont laissé un total de <?php echo link_to($comments['comments'].'&nbsp;commentaires', '@commentaires'); ?>.<?php if (!$sf_user->isAuthenticated()) echo '<br/>Vous n\'avez pas encore de compte&nbsp;? Cliquez <a href="'.url_for('@inscription').'">ici pour vous inscrire</a> ou <a href="'.url_for('@signin').'">vous connecter</a>.'; ?></p>
@@ -22 +24 @@
 <?php $ct = 0;
   foreach($pager->getResults() as $citoyen) {
-    $ct++; ?>
-    <td><a href="<?php echo url_for('@citoyen?slug='.$citoyen->slug); ?>"><div class="list_cit">
-      <div class="list_img_left"><?php
-        if (!$citoyen->photo) echo ''.image_tag('xneth/avatar_citoyen.png', array('alt' => 'Avatar par défaut', 'height' => '50px'));
-        else echo '<img src="'.url_for('@photo_citoyen?slug='.$citoyen->slug).'" alt="avatar de '.$citoyen->login.'" height="50px"/>';
-      ?></div>
-      <div class="list_nom">
-        <?php echo $citoyen->login; ?>
-      </div>
-      <div class="list_right">
-        <?php echo preg_replace('/membre/', 'inscrit', $citoyen->role).($citoyen->sexe === "F" ? "e" : "").'&nbsp;&nbsp;<br/>le '.myTools::displayVeryShortDate($citoyen->created_at); ?>
-      </div>
-      <div class="list_left"><?php
-        if (!empty($citoyen->activite))
-          echo '<i>'.truncate_text(html_entity_decode(strip_tags($citoyen->activite), ENT_NOQUOTES, "UTF-8"), 25).'</i>';
-      ?></div>
-      <div class="list_right"><?php
-        if (!$citoyen->nb_comment)
-          echo "0&nbsp;commentaire";
-        else {
-          echo '<span class="list_com">'.$citoyen->nb_comment.'&nbsp;commentaire';
-          if ($citoyen->nb_comment > 1) echo 's';
-          echo '</span>';
-        }
-      ?></div>
-    </div></a></td>
-    <?php if ($ct % 3 == 0 && $ct != $total) echo '</tr><tr>';
-  } ?>
-  </td><?php while ($ct % 3 != 0) { $ct++; echo '<td/>'; } ?></tr></table>
+    $ct++;
+    if ($ct % 3 == 1 && $ct != 1) echo '</tr><tr>'; ?>
+<td onclick="document.location='<?php echo url_for('@citoyen?slug='.$citoyen->slug); ?>'">
+<div class="list_cit"><span class="list_img_left"><a href="<?php echo url_for('@citoyen?slug='.$citoyen->slug); ?>"><?php
+if (!$citoyen->photo) echo ''.image_tag('xneth/avatar_citoyen.png', array('alt' => 'Avatar par défaut', 'height' => '50px'));
+else echo '<img src="'.url_for('@photo_citoyen?slug='.$citoyen->slug).'" alt="avatar de '.$citoyen->login.'" height="50px"/>';
+?></a></span>
+<span class="list_nom"><a href="<?php echo url_for('@citoyen?slug='.$citoyen->slug); ?>">
+<?php echo truncate_text($citoyen->login, 26);
+if (!empty($citoyen->activite))
+  echo '</a><br/><small><i><a href="'.url_for('@citoyen?slug='.$citoyen->slug).'">'.truncate_text(html_entity_decode(strip_tags($citoyen->activite), ENT_NOQUOTES, "UTF-8"), 25).'</a>i</i></small>';
+else echo '</a>';?>
+</span>
+<span class="list_right"><a href="<?php echo url_for('@citoyen?slug='.$citoyen->slug); ?>">
+<?php echo preg_replace('/membre/', 'inscrit', $citoyen->role).($citoyen->sexe === "F" ? "e" : "").'&nbsp;&nbsp;<br/>le '.myTools::displayVeryShortDate($citoyen->created_at); ?>
+</a><br/>
+<a href="<?php echo url_for('@citoyen?slug='.$citoyen->slug); ?>"><?php
+if (!$citoyen->nb_comment)
+  echo "0&nbsp;commentaire";
+else {
+  echo '<strong><span class="list_com">'.$citoyen->nb_comment.'&nbsp;commentaire';
+  if ($citoyen->nb_comment > 1) echo 's';
+  echo '</span></strong>';
+}
+?></a></span></div>
+</td>
+<?php } ?>
+<?php while ($ct % 3 != 0) { $ct++; echo '<td/>'; } ?></tr></table>
 </div>
 <?php if ($pager->haveToPaginate()) include_partial('parlementaire/paginate', array('pager'=>$pager, 'link'=>'@list_citoyens?order='.$order.'&')); ?>

cpc/trunk/project/apps/frontend/modules/documents/templates/showSuccess.php

@@ -36 +36 @@
 </div>
 <div class="left">
-<?php if ((isset($texte) && $texte > 0) || count($annexes)) { ?>
+<?php if ((isset($texte) && $texte > 0) || count($annexes) || $amendements) { ?>
 <h3>Documents associés</h3><ul>
 <?php if (isset($texte) && $texte > 0)

cpc/trunk/project/apps/frontend/modules/parlementaire/templates/_paginate.php

@@ -1 +1 @@
 <?php if ($pager->haveToPaginate()) : ?>
 <div class="pagination">
-   <?php if ($pager->getPage() != 1) echo link_to('<img src="'.$sf_request->getRelativeUrlRoot().'/images/xneth/min2.png"/>&nbsp; ', $link.'page=1'); ?>
-    <?php if ($pager->getPage() != 1)  echo link_to('<img src="'.$sf_request->getRelativeUrlRoot().'/images/xneth/left.png"/>&nbsp; ', $link.'page='.$pager->getPreviousPage()); ?>
+   <?php if ($pager->getPage() != 1) echo link_to('<img alt="first" src="'.$sf_request->getRelativeUrlRoot().'/images/xneth/min2.png"/>&nbsp; ', $link.'page=1'); ?>
+    <?php if ($pager->getPage() != 1)  echo link_to('<img alt="left" src="'.$sf_request->getRelativeUrlRoot().'/images/xneth/left.png"/>&nbsp; ', $link.'page='.$pager->getPreviousPage()); ?>
     <?php foreach ($pager->getLinks() as $page): ?>
       <?php if ($page == $pager->getPage()): ?>
@@ -10 +10 @@
       <?php endif; ?>
     <?php endforeach; ?>
-    <?php if ($pager->getPage() != $pager->getLastPage()) echo link_to('<img src="'.$sf_request->getRelativeUrlRoot().'/images/xneth/right.png"/>', $link.'page='.$pager->getNextPage()); ?>
-    <?php if ($pager->getPage() != $pager->getLastPage()) echo link_to('<img src="'.$sf_request->getRelativeUrlRoot().'/images/xneth/max2.png"/> ', $link.'page='.$pager->getLastPage()); ?>
+    <?php if ($pager->getPage() != $pager->getLastPage()) echo link_to('<img alt="right" src="'.$sf_request->getRelativeUrlRoot().'/images/xneth/right.png"/>', $link.'page='.$pager->getNextPage()); ?>
+    <?php if ($pager->getPage() != $pager->getLastPage()) echo link_to('<img alt="last" src="'.$sf_request->getRelativeUrlRoot().'/images/xneth/max2.png"/> ', $link.'page='.$pager->getLastPage()); ?>
 </div>
 <?php endif; ?>

cpc/trunk/project/apps/frontend/modules/parlementaire/templates/_table.php

@@ -17 +17 @@
 foreach($deputes as $depute) {
   $ct++; ?>
-  <a href="<?php echo url_for('@parlementaire?slug='.$depute->slug); ?>"><div class="list_dep">
-    <div class="list_nom">
-      <?php echo $depute->getNomPrenom(); ?>
-    </div>
-    <div class="list_right"><?php
+  <div class="list_dep" onclick="document.location='<?php echo url_for('@parlementaire?slug='.$depute->slug); ?>'">
+    <span class="list_nom">
+      <a href="<?php echo url_for('@parlementaire?slug='.$depute->slug); ?>"><?php echo $depute->getNomPrenom(); ?></a>
+    </span>
+    <span class="list_right"><a href="<?php echo url_for('@list_parlementaires_departement?departement='.$depute->nom_circo); ?>"><?php
       if (isset($circo)) {
         echo '<span class="list_num_circo">';
@@ -27 +27 @@
         if (isset($dept))
           $string = $depute->getNumDepartement().'&nbsp;&mdash;&nbsp;'.preg_replace("/nscription/", "", $string);
-        echo $string.'</span>';
+        echo $string.'</span></a>';
       } else echo $depute->nom_circo; 
-    ?></div><div class="clear"/>
-    <div class="list_left">
+    ?></a></span><br/>
+    <span class="list_left">
       <?php if (isset($imp)) {
           echo ' '.$depute->fonction;
           if (!isset($nogroupe))
-            echo '&nbsp;&mdash;&nbsp;<span class="couleur_'.strtolower($depute->getGroupeAcronyme()).'">'.$depute->getGroupeAcronyme().'</span>';
+            echo '&nbsp;&mdash;&nbsp;<a href="'.url_for('@list_parlementaires_groupe?acro='.$depute->groupe_acronyme).'"><span class="couleur_'.strtolower($depute->getGroupeAcronyme()).'">'.$depute->getGroupeAcronyme().'</span></a>';
         } else
-          echo preg_replace('/\s([A-Z]+)$/', ' <span class="couleur_'.strtolower($depute->getGroupeAcronyme()).'">'."\\1</span>", $depute->getStatut()); ?>
-    </div>
-    <div class="list_right"><?php
+          echo preg_replace('/\s([A-Z]+)$/', ' <a href="'.url_for('@list_parlementaires_groupe?acro='.$depute->groupe_acronyme).'"><span class="couleur_'.strtolower($depute->getGroupeAcronyme()).'">'."\\1</span></a>", $depute->getStatut()); ?>
+    </span>
+    <span class="list_right"><?php
       if (!$depute->nb_commentaires)
         echo "0&nbsp;commentaire";
       else {
-        echo '<span class="list_com">'.$depute->nb_commentaires.'&nbsp;commentaire';
-        if ($depute->nb_commentaires > 1) echo 's'; echo '</span>';
+        echo '<a href="'.url_for('@parlementaire_commentaires?slug='.$depute->slug).'"><span class="list_com">'.$depute->nb_commentaires.'&nbsp;commentaire';
+        if ($depute->nb_commentaires > 1) echo 's';
+        echo '</span></a>';
       }
-    ?></div>
-    </div>
-  </div></a>
+    ?>
+    </span><br/>
+  </div>
   <?php if (isset($list) && $ct % $div == 0 && $ct != $totaldep && $totaldep != 1) {
     $td++;

cpc/trunk/project/lib/model/doctrine/CitoyenTable.class.php

@@ -6 +6 @@
 {
   public function getPager($request, $query = NULL) {
-    $pager = new sfDoctrinePager('Citoyen', 36);
+    $pager = new sfDoctrinePager('Citoyen', 24);
     $pager->setQuery($query);
     $pager->setPage($request->getParameter('page', 1));

cpc/trunk/project/web/css/xneth/style.css

@@ -1684 +1684 @@
   font-size: 10px;
 }
+.list_bordertop {
+  border-top: thin solid;
+} 
+
 .list_borderleft {
   border-left: thin solid;
 }
 .list_cit {
-  margin: 8px;
+  padding: 4px;
   min-height: 58px;
 }
@@ -1727 +1731 @@
 .list_left {
   float: left;
+  display: block;
+  clear: both;
   padding-left: 4px;
 }
@@ -1736 +1742 @@
 .list_right {
   font-size: 9px;
+  float: right;
   text-align: right;
   padding-right: 2px;