Changeset 3086


Ignore:
Timestamp:
Jan 29, 2013, 1:06:30 AM (8 years ago)
Author:
roux
Message:

better and more stable style / fix some alineas links

Location:
cpc/trunk/project
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpc/trunk/project/apps/frontend/modules/amendement/templates/showSuccess.php

    r3082 r3086  
    5454<div class="texte_intervention">
    5555  <?php $texte = $amendement->getTexte();
    56   if ($titreloi && preg_match('/alin..?as?..?(\d+)[^\d]/', $texte, $match)) {
     56  if ($titreloi && preg_match('/alin..?as?\D\D?(\d+)[^\d]/', $texte, $match)) {
    5757    $link = link_to('alinéa '.$match[1], '@loi_article?loi='.$titreloi->texteloi_id.'&article='.$art.'#alinea_'.$match[1]);
    58     $texte = preg_replace('/(alin..?as?..?\d+)([^\d])/', $link.'\2', $texte);
     58    $texte = preg_replace('/(alin..?as?\D\D?\d+)([^\d])/', $link.'\2', $texte);
    5959  }
    6060  echo myTools::escape_blanks($texte); ?>
  • cpc/trunk/project/apps/frontend/modules/loi/actions/actions.class.php

    r3082 r3086  
    4747        $amendements[$art.'tot'] = $adt['identiques']+1;
    4848      }
    49       if ($alineas && !(preg_match('/(avant|après)/', $art))) { if (preg_match("/alin..?as?..?(\d+)[^\d]/", $adt['texte'], $match)) {
     49      if ($alineas && !(preg_match('/(avant|après)/', $art)) && preg_match("/alin..?as?\D\D?(\d+)\D/", $adt['texte'], $match)) {
    5050        $al = $art.'-'.$match[1];
    5151        if (isset($amendements[$al])) {
     
    5757        }
    5858      }
    59     } }
     59    }
    6060    return $amendements;
    6161  }
  • cpc/trunk/project/web/css/xneth/style.css

    r3083 r3086  
    15011501}
    15021502.alineatexte small small {
     1503  padding-left: 0;
    15031504  font-size: 9px;
    15041505  color: #000;
     
    15111512  display: inline;
    15121513  font-weight: bold;
     1514}
     1515.alineatexte:hover .orange {
     1516  font-weight: normal;
    15131517}
    15141518.alineatexte .commentaire span {
Note: See TracChangeset for help on using the changeset viewer.