Changeset 1687

Timestamp:

Oct 5, 2010, 7:47:53 PM (10 years ago)

Author:

goya

Message:

correction erreur js, affichage titre dossiers et hauteur graphe

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/solr/actions/actions.class.php (modified) (1 diff)
• apps/frontend/modules/solr/templates/searchSuccess.php (modified) (4 diffs)
• web/css/xneth/style.css (modified) (1 diff)

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

@@ -205 +205 @@
       $res = $this->results['docs'][$i];
       $obj = $res['object'];
+      $objclass = get_class($obj);
       $this->results['docs'][$i]['link'] = $obj->getLink();
-      if (get_class($obj) === 'Commentaire')
+      if ($objclass === 'Commentaire')
         $this->results['docs'][$i]['link'] .= "#commentaire_".$obj->id;
       $this->results['docs'][$i]['photo'] = $this->getPhoto($obj);
       $this->results['docs'][$i]['titre'] = $obj->getTitre();
-      switch(get_class($obj)) {
-        case 'Section':
-          $this->results['docs'][$i]['titre'] = "Dossier : ".$this->results['docs'][$i]['titre'];
-        case 'Commentaire':
-          $this->results['docs'][$i]['titre'] = "Commentaire ".preg_replace('/^./', strtolower($this->results['docs'][$i]['titre']{0}), $this->results['docs'][$i]['titre']);
-      }
+      if ($objclass === 'Section')
+        $this->results['docs'][$i]['titre'] = "Dossier : ".$this->results['docs'][$i]['titre'];
+      else if ($objclass === 'Commentaire')
+        $this->results['docs'][$i]['titre'] = "Commentaire ".preg_replace('/^./', strtolower($this->results['docs'][$i]['titre']{0}), $this->results['docs'][$i]['titre']);
       $this->results['docs'][$i]['personne'] = $obj->getPersonne();
       if (isset($results['highlighting'][$res['id']]['text'])) {

cpc/trunk/project/apps/frontend/modules/solr/templates/searchSuccess.php

@@ -119 +119 @@
   return lien;
 }
-
+<?php if ($vue != "jour") : ?>
 $(document).ready(function() {
   $(".date li").each(function() {
@@ -170 +170 @@
         });
 });
+<?php endif; ?>
 //-->
 </script>
@@ -216 +217 @@
 </div>
 <?php } 
-endif;
 ///////////////////// FIN SANS AJAX /////////////////////
 ?>
@@ -235 +235 @@
        <td><a href="<?php $newargs_rss = $selected; $newargs_rss['format']['rss'] = 'rss'; if (isset($newargs_rss['date'])) unset($newargs_rss['date']); if (isset($newargs_rss['sort'])) unset($newargs_rss['sort']); echo url_for(url_search($query, $newargs_rss)); ?>"><?php echo image_tag('xneth/rss_obliq.png', 'alt="Flux rss"'); ?></a><br/><a href="<?php echo url_for(url_search($query, $newargs_rss)); ?>">par RSS</a></td>
 </tr></table></div></div>
-<?php
+<?php endif;
 global $facetName2HumanName;
 $facetName2HumanName = array(

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

@@ -39 +39 @@
         border-bottom: 1px solid #E0E0DD;
         width: 650px;
-        max-height: 200px;
-        min-height: 80px;
+        max-height: 80px;
+        min-height: 70px;
         margin: 0;
         padding: 0;