Changeset 1355


Ignore:
Timestamp:
Sep 11, 2010, 8:52:54 PM (10 years ago)
Author:
roux
Message:

corrections mineures

Location:
cpc/trunk/project
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • cpc/trunk/project/apps/frontend/modules/parlementaire/templates/tagSuccess.php

    r1333 r1355  
    11<?php if (!$tag) {
    2    $titre = 'Trouver un député par mots-clés prononcés'; ?>
     2   $titre = 'Trouver un député par mots-clés prononcé'; ?>
    33<h1><?php echo $titre; ?></h1>
    44<div class="liste_deputes_tags">
  • cpc/trunk/project/apps/frontend/modules/section/actions/actions.class.php

    r1353 r1355  
    134134      $this->order = 'plus';
    135135    $query = Doctrine::getTable('Section')->createQuery('s')
    136       ->where('s.id = s.section_id')
    137       ->andWhere('s.nb_interventions > 5');
     136      ->where('s.id = s.section_id');
    138137    if ($this->order == 'date') {
    139138      $query->orderBy('s.max_date DESC');
    140       $this->titre = 'Les derniers dossiers à l\'Assemblée';
     139      $this->titre = 'Les derniers dossiers traités à l\'Assemblée';
    141140    } else if ($this->order == 'plus') {
    142141      $query->orderBy('s.nb_interventions DESC');
  • cpc/trunk/project/apps/frontend/modules/section/templates/listSuccess.php

    r1333 r1355  
    1414  }
    1515  echo '<li>'.link_to(ucfirst($s->titre), '@section?id='.$s->id);
    16   echo ' (<span class="list_inter">'.$s->nb_interventions.'&nbsp;intervention';
    17   if ($s->nb_interventions > 1) echo 's';
    18   echo '</span>';
    19   if ($s->nb_commentaires > 0) echo ', <span class="list_com">'.$s->nb_commentaires.'&nbsp;commentaire';
    20   if ($s->nb_commentaires > 1) echo 's';
    21   if ($s->nb_commentaires > 0) echo '</span>';
    22   if ($order == 'plus') echo ', '.$moisactuel;
    23   if ($s->url_an) echo myTools::getLinkDossier($s->url_an);
    24 if (!$s->url_an && !preg_match('/dé(bat|claration) /i', $s->titre)) echo '<strong style="color: #FF0000;">! ! ! !</strong>';
    25   echo ')</li>';
    26  }
    27  if ($order == 'date') echo '</ul>'; ?>
    28  </ul></div>
     16  if ($s->nb_interventions > 0 || $s->nb_commentaires) {
     17    echo ' (<span class="list_inter">'.$s->nb_interventions.'&nbsp;intervention';
     18    if ($s->nb_interventions > 1) echo 's';
     19    echo '</span>';
     20    if ($s->nb_commentaires > 0) echo ', <span class="list_com">'.$s->nb_commentaires.'&nbsp;commentaire';
     21    if ($s->nb_commentaires > 1) echo 's';
     22    if ($s->nb_commentaires > 0) echo '</span>';
     23    if ($order == 'plus') echo ', '.$moisactuel;
     24    echo ')';
     25  }
     26  echo '</li>';
     27}
     28if ($order == 'date') echo '</ul>'; ?>
     29</ul></div>
  • cpc/trunk/project/apps/frontend/modules/section/templates/showSuccess.php

    r1353 r1355  
     1<?php if ($section->url_an) echo '<span class="source">'.myTools::getLinkDossier($section->url_an)."</span>"; ?>
    12<h1 class="orange"><?php
    23   $titre = '';
    34if ($section->getSection()) {
    4   echo link_to($section->getSection()->getTitre(), '@section?id='.$section->section_id).'</h1><h2>';
     5  echo link_to($section->getSection()->getTitre(), '@section?id='.$section->section_id).'</h1><h2 class="aligncenter">';
    56  $titre = ', '.$section->getSection()->getTitre();
    67 }
     
    1112else echo '</h1>';
    1213?>
    13 <?php if ($section->url_an) echo '<span class="source">'.myTools::getLinkDossier($section->url_an)."</span>"; ?>
    1414<div class="numeros_textes">
    1515<?php if ($section->nb_commentaires) { ?>
  • cpc/trunk/project/apps/frontend/modules/tag/templates/_tagcloud.php

    r1153 r1355  
    1919echo $nom; ?></a> <?php
    2020                 ?></span><?php endforeach;
    21 if(isset($hide) && $hide)
    22   echo '<span class="hide">finfinfinfinfinfinfinfinfinfinfinfinfinfinfinf</span>';
    23  } else { ?>
     21} else { ?>
    2422<span><em>Désolé, aucun mot-clé pertinent trouvé</em></span>
    2523<?php } ?></div>
  • cpc/trunk/project/bin/updateDB3.1.sql

    r1348 r1355  
    55UPDATE intervention SET section_id = 1 WHERE id IN (161761,161762,161763);
    66UPDATE intervention SET section_id = 1 WHERE id IN (457894,457895,457896);
     7UPDATE intervention SET section_id = 1 WHERE id IN (436326,436327,436328);
    78
    89
     
    2728DELETE ta FROM `tagging` ta join tag t on t.id = ta.tag_id join intervention i on i.id = ta.taggable_id where taggable_model = "Intervention" and t.triple_key = "numero" and i.seance_id = 206;
    2829DELETE ta FROM `tagging` ta join tag t on t.id = ta.tag_id join section s on s.id = ta.taggable_id where taggable_model = "Section" and t.triple_key = "numero" and s.section_id in (2626);
     30DELETE ta FROM `tagging` ta join tag t on t.id = ta.tag_id join section s on s.id = ta.taggable_id where taggable_model = "Section" and t.triple_key = "numero" and s.section_id in (11343,11349);
    2931
    3032
  • cpc/trunk/project/bin/updateDB3.2.sql

    r1341 r1355  
    66UPDATE intervention SET section_id = 4185 WHERE id IN (161761,161762,161763);
    77UPDATE intervention SET section_id = 10334 WHERE id IN (457894,457895,457896);
     8UPDATE intervention SET section_id = 1213 WHERE id IN (436326,436327,436328);
    89
    910
  • cpc/trunk/project/bin/updateDB3.sh

    r1341 r1355  
    77#cat bin/updateDB3.model.sql | mysql $MYSQLID $DBNAME
    88php symfony doctrine:build --all --no-confirmation
    9 zcat ../prod/data/sql/dumps/nosdeputes_prod.100910.sql.gz | mysql --default-character-set=utf8 $MYSQLID $DBNAME
     9zcat data/sql/dumps/nosdeputes_prod.100910.sql.gz | mysql --default-character-set=utf8 $MYSQLID $DBNAME
    1010
    1111cat bin/updateDB3.1.sql | mysql $MYSQLID $DBNAME
     
    4747php symfony move:Seance 2903 7751 7573
    4848php symfony move:Seance 3639 10334 2
     49php symfony move:Seance 3473 1213 2
    4950
    5051cat bin/updateDB3.2.sql | mysql $MYSQLID $DBNAME
  • cpc/trunk/project/lib/model/doctrine/Intervention.class.php

    r1333 r1355  
    171171      if ($this->section_id != 1) {
    172172        $titre = $this->Section->Section->getTitre();
    173         if (!(preg_match('/(cloture|ouverture|question|ordre du jour|calendrier|élection.*nouveau|démission|cessation.*mandat|proclamation|souhaits)/i', $titre))) {
     173        if (!(preg_match('/(cloture|ouverture|question|ordre du jour|calendrier|élection.*nouveau|démission|reprise|examen simplifié|cessation.*mandat|proclamation|souhaits)/i', $titre))) {
    174174          foreach($lois as $loi) {
    175175            $tag = 'loi:numero='.$loi;
  • cpc/trunk/project/web/css/xneth/style.css

    r1354 r1355  
    10501050}
    10511051
     1052.aligncenter {
     1053  text-align: center;
     1054}
     1055
    10521056.alineatexte .center {
    10531057  text-align: center;
Note: See TracChangeset for help on using the changeset viewer.