Changeset 1349

Timestamp:

Sep 11, 2010, 5:58:35 PM (10 years ago)

Author:

roux

Message:

amélioration présentation page intervention individuelle

Location:

cpc/trunk/project/apps/frontend/modules/intervention

Files:

• actions/actions.class.php (modified) (2 diffs)
• templates/_parlementaireIntervention.php (modified) (1 diff)
• templates/showSuccess.php (modified) (1 diff)

cpc/trunk/project/apps/frontend/modules/intervention/actions/actions.class.php

@@ -58 +58 @@
       ->fetchOne();
     $this->forward404Unless($this->intervention);
+
+    $titre = "";
+    $this->section = $this->intervention->getSection();
+    $this->secparent = $this->section->getSection();
+    $this->seance = $this->intervention->getSeance();
+    if ($this->intervention->getType() == 'commission') {
+      $this->orga = $this->seance->getOrganisme();
+      $titre .= $this->orga->getNom();
+    } else if ($this->secparent && !(preg_match('/questions/i', $this->secparent->getTitre())))
+      $titre .= $this->secparent->getTitre();
+    else 
+      $titre .= $this->section->getTitre();
+    $titre .= " - ".$this->seance->getTitre();
     $this->lois = $this->intervention->getTags(array('is_triple' => true,
                                                      'namespace' => 'loi',
@@ -66 +79 @@
                                                        'key' => 'amendement',
                                                        'return'    => 'value'));
-    $this->response->setTitle('Intervention de '.$this->intervention->getIntervenant()->nom);
+    $this->response->setTitle($titre.' - Intervention de '.$this->intervention->getIntervenant()->nom." - NosDéputés.fr");
     //    $this->response->setDescription($this->intervention->intervention);
   }

cpc/trunk/project/apps/frontend/modules/intervention/templates/_parlementaireIntervention.php

@@ -57 +57 @@
     }
     else {
-      echo '<span class="perso">'.$perso->nom.'&nbsp;:';
+      echo '<span class="perso">'.$intervention->getNomAndFonction().'&nbsp;:';
       echo '</span>';
     }

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

@@ -1 +1 @@
 <h1>Intervention de <?php echo $intervention->getIntervenant()->nom; ?></h1>
 <?php 
-$section = $intervention->getSection();
-$titre2 = $intervention->getSeance()->getTitre(0,0,$intervention->getMd5());
+$titre2 = $seance->getTitre(0,0,$intervention->getMd5());
 $titre2 .= ' <br/> ';
-if ($intervention->getType() == 'commission') {
-  $orga = $intervention->getSeance()->getOrganisme();
+if (isset($orga))
   $titre2 .= link_to($orga->getNom(), '@list_parlementaires_organisme?slug='.$orga->getSlug());
- }
-if ($section->getSection()) {
-  $titre2 .= link_to(ucfirst($section->getSection()->getTitre()), '@section?id='.$section->section_id);
-  $titre2 .= '&nbsp;- ';
- }
+if (isset($secparent))
+  $titre2 .= link_to(ucfirst($secparent->getTitre()), '@section?id='.$section->section_id).'&nbsp;&mdash; ';
 if ($section->getTitre())
   $titre2 .= link_to(ucfirst($section->getTitre()), '@section?id='.$section->id);