Changeset 1591

Timestamp:

Oct 3, 2010, 9:06:06 PM (10 years ago)

Author:

teymour

Message:

Lien Javascriptisé partageable

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/solr/templates/searchSuccess.php (modified) (5 diffs)
• web/js/fonctions.js (modified) (1 diff)

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

@@ -108 +108 @@
 }
 
+function constructLien(date) {
+  lien = document.location+'';
+  lien = lien.replace(/\??date=[^&]+/, '');
+  lien = lien.replace(/#.*/, '');
+  if (!lien.match(/\?/))
+    lien += '?';
+  else
+    lien += '&';
+  lien += 'date='+date;
+  return lien;
+}
+
 $(document).ready(function() {
   $(".date li").each(function() {
     if($(this).height() > bh) { bh = $(this).height(); }
-    date_li = $(this).find('a').attr("title").split(':');
+    date_li = $(this).attr("title").split('--');
     date_href[nb_li] = $(this).find('a').attr("href");
     $(this).find(".hover_graph").attr("onclick", "document.location.replace('http://"+location.host+date_href[nb_li]+"')");
@@ -140 +152 @@
                           to = to["date"].split('%2C');
                           parametre["date"] = from[0]+'%2C'+to[0];
-                          
-                          lien = document.location+'';
-                          lien = lien.replace(/date=[^&]+/, '');
-                          if (!lien.match(/\?/))
-                            lien += '?';
-                          else
-                            lien += '&';
-                          lien += 'date='+parametre['date'];
+
+                          lien = constructLien(parametre['date']);
+                          document.location = '#date='+parametre['date'];
 
                           if(ui.values[0] == ui.values[1]) { 
@@ -190 +197 @@
     $i++;
     $height = round($nb['pc']*100/($fdates['max']) * 2);
-    $padding = 200-$height; ?>
-    <li<?php echo ' style="list-style-image: none; width: '.$width.'px; height: '.$height.'px; left: '.$left.'px;">'; 
+    $padding = 200-$height; 
     $left = $left + $width; if($i < (count($fdates['values']))) { $left = $left + $espacement; }
     $newargs = $selected;
@@ -198 +204 @@
     
     if(($vue == 'jour') or ($vue == 'par_jour') or ($vue == 'mois')){ 
-      $title_date = myTools::displayShortDate($date).' : '.$nb['nb'].' résultats';
+      $title_date = myTools::displayShortDate($date).' -- '.$nb['nb'].' résultats';
     }
     if($vue == 'par_mois') { 
-      $title_date = ucfirst(myTools::displayMoisAnnee($date)).' : '.$nb['nb'].' résultats';
+      $title_date = ucfirst(myTools::displayMoisAnnee($date)).' -- '.$nb['nb'].' résultats';
     }
     if($vue == 'par_mois') { 
@@ -207 +213 @@
     }
     
-    echo '<div class="hover_graph" title="'.$title_date.'" style="width: '.$width.'px; height: '.$padding.'px;  bottom: '.$height.'px;"></div><span class="text_graph">'.link_search($nb['nb'], $query, $newargs, array('title' => $title_date)).'</span>'; 
+    echo '<li title="'.$title_date.'" class="jstitle" style="list-style-image: none; width: '.$width.'px; height: '.$height.'px; left: '.$left.'px;">'; 
+    echo '<div class="hover_graph" title="'.$title_date.'" style="width: '.$width.'px; height: '.$padding.'px;  bottom: '.$height.'px;"></div><span class="text_graph">'.link_search($nb['nb'], $query, $newargs, array()).'</span>'; 
     
     # echo ' '.$nb['nb'].' résultats ('; printf('%02d', $nb['pc']*100/($fdates['max'])); echo '%)';

cpc/trunk/project/web/js/fonctions.js

@@ -76 +76 @@
     $('#jstitle').css('display', 'none');
   });
+  //Redirection d'un lien envoyé depuis une page ajax
+  url = document.location+'';
+  if (url.match(/#date=/) && constructLien) {
+      document.location = constructLien(url.replace(/.*#date=/, ''));
+  }
 
 }); // fin document ready