Thread: [xoops-svn] SF.net SVN: xoops:[8868] XoopsModules/extcal/branches/jjdai/extcal

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 8868
          http://xoops.svn.sourceforge.net/xoops/?rev=8868&view=rev
Author:   beckmi
Date:     2012-02-01 12:35:49 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Updating to 2.36 Beta 2 (JJDai)

Modified Paths:
--------------
    XoopsModules/extcal/branches/jjdai/extcal/class/event.php
    XoopsModules/extcal/branches/jjdai/extcal/docs/changelog.txt
    XoopsModules/extcal/branches/jjdai/extcal/edit_event.php
    XoopsModules/extcal/branches/jjdai/extcal/header.php
    XoopsModules/extcal/branches/jjdai/extcal/include/functions.php
    XoopsModules/extcal/branches/jjdai/extcal/language/french/changelog.txt
    XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_event_list1.html
    XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_info_bulle.html
    XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-day.html
    XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-week.html
    XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-month.html
    XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-week.html
    XoopsModules/extcal/branches/jjdai/extcal/view_year.php
    XoopsModules/extcal/branches/jjdai/extcal/xoops_version.php

Added Paths:
-----------
    XoopsModules/extcal/branches/jjdai/extcal/class/colorTools.php
    XoopsModules/extcal/branches/jjdai/extcal/css/images/
    XoopsModules/extcal/branches/jjdai/extcal/css/images/Critical.png
    XoopsModules/extcal/branches/jjdai/extcal/css/images/Help.png
    XoopsModules/extcal/branches/jjdai/extcal/css/images/Info.png
    XoopsModules/extcal/branches/jjdai/extcal/css/images/Warning.png
    XoopsModules/extcal/branches/jjdai/extcal/css/infobulle.css

Added: XoopsModules/extcal/branches/jjdai/extcal/class/colorTools.php
===================================================================

--- XoopsModules/extcal/branches/jjdai/extcal/class/colorTools.php	                        (rev 0)
+++ XoopsModules/extcal/branches/jjdai/extcal/class/colorTools.php	2012-02-01 12:35:49 UTC (rev 8868)
@@ -0,0 +1,223 @@
+<?PHP
+
+class ColorTools{         
+  
+  function __construct(){
+  }
+
+
+/**************************************************************
+Ajoute ou rtir un icrement sur chaque compsante RGB d'une couleur
+Les valeur sont limiter au bornes inf\xE9rieure et sup\xE9rieure 0 et 255
+***************************************************************/
+Function modifierCouleur($colorHexa, 
+            $incrementRouge, $incrementVert, $incrementBleu, 
+            $plancherRouge = 0, $plafondRouge = 255, 
+            $plancherVert  = 0, $plafondVert  = 255, 
+            $plancherBleu  = 0, $plafondBleu  = 255 
+            ) {
+
+
+    $t10 = $this->hexa2rgbA($colorHexa);
+    
+    $t10[1] = $this->bornerValeur($t10[1] + $incrementRouge, $plancherRouge, $plafondRouge);
+    $t10[2] = $this->bornerValeur($t10[2] + $incrementVert,  $plancherVert,  $plafondVert);
+    $t10[3] = $this->bornerValeur($t10[3] + $incrementBleu,  $plancherBleu,  $plafondBleu);
+    
+    $newColorHexa = $this->getHexaColorFromA($t10);
+    
+    return $newColorHexa;
+
+ }
+
+
+/**************************************************************
+Eclairci une couleur 
+elle born\xE9 pa un plancher et un plafond pur \xE9vite le tout blanc ou tout blanc
+ou les blocage sur une couleur pur (ex #FF0000) 
+***************************************************************/
+Function eclaircir($colorHexa, $plancher = 0, $plafond = 255){
+
+    $tMin = Array('', $plancher, $plancher, $plancher);
+    $tMax = Array('', $plafond,  $plafond,  $plafond);
+    
+    $t10 = $this->hexa2rgbA($colorHexa);
+// echo "<hr>";
+// ext_echoArray($t10);    
+    $max = $plancher;
+    For ($h = 1 ; $h <= 3 ; $h++){
+        If ($max < $t10[$h]) {
+          $max = $t10[$h];
+        }
+    }
+
+
+    $increment = $plafond - $max;
+     
+//     $t10[1] = $t10[1] + $increment;
+//     $t10[2] = $t10[2] + $increment;
+//     $t10[3] = $t10[3] + $increment;
+    
+    $min = 0;
+    For ($h = 1 ; $h <= 3 ; $h++){
+       $t10[$h] = $t10[$h] + $increment;
+       If ($t10[$h] < $tMin[$h] && $min < ($tMin[$h] - $t10[$h])) {
+            $min = ($tMin[$h] - $t10[$h]);
+        }
+    }
+
+// echo "{$colorHexa}-{$plancher}-{$plafond}<br>";    
+// echo "{$min}-{$max}-{$increment}<br>";    
+
+    $t10[1] = $this->bornerValeur($t10[1] + $min, $plancher, $plafond);
+    $t10[2] = $this->bornerValeur($t10[2] + $min, $plancher, $plafond);
+    $t10[3] = $this->bornerValeur($t10[3] + $min, $plancher, $plafond);
+    
+// ext_echoArray($t10);    
+    
+    $newColorHexa = $this->getHexaColorFromA($t10);
+// echo "colorHexa = {$newColorHexa}-{$colorHexa}<br>";    
+    return  $newColorHexa;
+}
+
+/**************************************************************
+Fonce une couleur 
+elle born\xE9 pa un plancher et un plafond pur \xE9vite le tout blanc ou tout blanc
+ou les blocage sur une couleur pur (ex #FFFF00) 
+***************************************************************/
+Function foncer($colorHexa, $plancher = 0, $plafond = 255){
+
+    $tMin = Array('', $plancher, $plancher, $plancher);
+    $tMax = Array('', $plafond,  $plafond,  $plafond);
+
+    
+    $t10 = $this->hexa2rgbA($colorHexa);
+    $max = 255;
+    
+    For ($h = 1 ; $h <= 3 ; $h++){
+        If ($max > $t10[$h]) {
+          $max = $t10[$h];
+        }
+    }
+    
+    $increment = -$max;
+    
+//     $t10[1] = $t10[1] + $increment;
+//     $t10[2] = $t10[2] + $increment;
+//     $t10[3] = $t10[3] + $increment;
+    
+    $min = 0;
+    For ($h = 1 ; $h <= 3 ; $h++){
+       $t10[$h] = $t10[$h] + $increment;
+       If ($t10[$h] > $tMax[$h] && $min < ($t10[$h] - $tMax[$h])) {
+            $min = ($t10[$h] - $tMax[$h]);
+        }
+    }
+
+    $t10[1] = $this->bornerValeur($t10[1] - $min, $plancher, $plafond);
+    $t10[2] = $this->bornerValeur($t10[2] - $min, $plancher, $plafond);
+    $t10[2] = $this->bornerValeur($t10[3] - $min, $plancher, $plafond);
+    
+    $colorHexa = $this->getHexaColorFromA($t10);
+    
+    return $colorHexa;
+
+}
+
+
+/**************************************************************
+Renvoi une couleur RGB en hexa a partir du tableau passe en parametr
+Description du tableau
+0 = doit contenir '#' ou ''
+1 = int red
+2 = int vert
+3 = int bleu 
+***************************************************************/
+Function getHexaColorFromA($aColors) {
+    
+    $tHex = array("","","","");
+
+    $tHex[0] = $aColors[0];
+    $tHex[1] = substr('00' . dechex($aColors[1]), -2);
+    $tHex[2] = substr('00' . dechex($aColors[2]), -2);
+    $tHex[3] = substr('00' . dechex($aColors[3]), -2);
+    
+    $colorHexa = implode('', $tHex);
+    return $colorHexa;
+}
+
+/**************************************************************
+Transforme les composante d'une couleur en valeu hexa
+prefixe doit contenir '#'  ou ''
+***************************************************************/
+Function rgb2hexa($r, $g, $b, $prefixe = ''){
+    
+    $colorHexa = $this->getHexaColorFromA(Array($prefixe, $r, $g, $b));
+    
+    return $colorHexa;
+    
+}
+
+/**************************************************************
+renvoi un tableau d'entier des valeur rgbd d'une couleur a partir d'un hexa
+Description du tableau renvoy\xE9
+0 = contient '#' ou ''  (selon premier cactere de la couleur hexa)
+1 = int red
+2 = int vert
+3 = int bleu 
+***************************************************************/
+Function hexa2rgbA($colorHexa){
+
+    $t = array("","","","");
+  
+    If (substr($colorHexa, 0, 1) == '#'){
+        $t[0] = '#';
+        $offsetCar = 1;
+    }else{
+        $t[0] = '';
+        $offsetCar = 0;
+    } 
+
+    $t[1] = hexdec(substr($colorHexa, $offsetCar + 0, 2));
+    $t[2] = hexdec(substr($colorHexa, $offsetCar + 2, 2));
+    $t[3] = hexdec(substr($colorHexa, $offsetCar + 4, 2));
+    
+    return $t;
+}
+ 
+/**************************************************************
+Renvoi les composante rgb d'une couleur par r\xE9f\xE9rence
+***************************************************************/
+Function hexa2rgb($colorHexa, &$r, &$v, &$b, &$diese){
+    
+  $t = $this->hexa2rgbA($colorHexa);
+  $r = $t[1];
+  $v = $t[2];
+  $v = $t[3];
+  $diese = $t[0];
+  
+  return true;
+}
+
+
+/**************************************************************
+Borne les valeurs max et min d'une valeur
+***************************************************************/
+Function bornerValeur($val, $min, $max){
+    
+    If ($val < $min){
+        $val = $min;
+    } else if($val >  $max){
+        $val = $max;
+    }
+    
+    return $val;
+    
+}
+
+//--------------------------------------------------------
+}  // --- fin de la classe colors
+//--------------------------------------------------------
+
+
+?>

Modified: XoopsModules/extcal/branches/jjdai/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/class/event.php	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/class/event.php	2012-02-01 12:35:49 UTC (rev 8868)
@@ -303,6 +303,8 @@
       while(list($k,$v)=each($events)){
          $ordre[] = intval($v['event_start']);
          $this->formatEventDate($v, $extcalConfig['event_date_week']);
+         //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
+         $v['cat']['cat_light_color'] = eclaircirCouleur($v['cat']['cat_color'],180,250);
          $eventArray[]= $v;
       }
       array_multisort($eventArray, SORT_ASC, SORT_NUMERIC, $ordre, SORT_ASC, SORT_NUMERIC);
@@ -1993,6 +1995,8 @@
       while ($myrow = $xoopsDB->fetchArray($result)) {
         $myrow['cat']['cat_name'] = $myrow['cat_name']; 
         $myrow['cat']['cat_color'] = $myrow['cat_color']; 
+        $myrow['cat']['cat_light_color'] = eclaircirCouleur($myrow['cat']['cat_color'],180,250);
+                  
         $ret[] = $myrow;
       }
       return $ret;

Added: XoopsModules/extcal/branches/jjdai/extcal/css/images/Critical.png
===================================================================
(Binary files differ)


Property changes on: XoopsModules/extcal/branches/jjdai/extcal/css/images/Critical.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: XoopsModules/extcal/branches/jjdai/extcal/css/images/Help.png
===================================================================
(Binary files differ)


Property changes on: XoopsModules/extcal/branches/jjdai/extcal/css/images/Help.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: XoopsModules/extcal/branches/jjdai/extcal/css/images/Info.png
===================================================================
(Binary files differ)


Property changes on: XoopsModules/extcal/branches/jjdai/extcal/css/images/Info.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: XoopsModules/extcal/branches/jjdai/extcal/css/images/Warning.png
===================================================================
(Binary files differ)


Property changes on: XoopsModules/extcal/branches/jjdai/extcal/css/images/Warning.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: XoopsModules/extcal/branches/jjdai/extcal/css/infobulle.css
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/css/infobulle.css	                        (rev 0)
+++ XoopsModules/extcal/branches/jjdai/extcal/css/infobulle.css	2012-02-01 12:35:49 UTC (rev 8868)
@@ -0,0 +1,80 @@
+
+.tooltip {
+	border-bottom: 1px dotted #000000; color: #000000; outline: none;
+	cursor: help; text-decoration: none;
+	position: relative;
+}
+.tooltip span {
+	margin-left: -999em;
+	position: absolute;
+}
+.tooltip:hover span {
+	border-radius: 5px 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; 
+	box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 5px 5px rgba(0, 0, 0, 0.1); -moz-box-shadow: 5px 5px rgba(0, 0, 0, 0.1);
+	font-family: Calibri, Tahoma, Geneva, sans-serif;
+	position: absolute; left: 1em; top: 2em; z-index: 99;
+	margin-left: 0; width: 300px;
+}
+
+
+
+.tooltip:hover span[width50] {
+	width: 50px;
+}
+.tooltip:hover span[width100] {
+	width: 100px;
+}
+.tooltip:hover span[width150] {
+	width: 150px;
+}
+.tooltip:hover span[width200] {
+	width: 200px;
+}
+.tooltip:hover span[width250] {
+	width: 250px;
+}
+.tooltip:hover span[width300] {
+	width: 300px;
+}
+.tooltip:hover span[width350] {
+	width: 350px;
+}
+.tooltip:hover span[width400] {
+	width: 400px;
+}
+
+
+.tooltip:hover img:first-child {
+	border: 0; margin: -10px 0 0 -55px;
+	float: left; position: absolute;
+}
+.tooltip:hover em {
+	font-family: Candara, Tahoma, Geneva, sans-serif; font-size: 1.2em; font-weight: bold;
+	display: block; padding: 0.2em 0 0.6em 0;
+}
+.classic { padding: 0.8em 1em; }
+.custom { padding: 0.5em 0.8em 0.8em 2em; }
+* html a:hover { background: transparent; }
+.classic {background: #FFFFAA; border: 1px solid #FFAD33; }
+.critical { background: #FFCCAA; border: 1px solid #FF3334;	}
+.help { background: #9FDAEE; border: 1px solid #2BB0D7;	}
+.info { background: #9FDAEE; border: 1px solid #2BB0D7;	}
+.warning { background: #FFFFAA; border: 1px solid #FFAD33; }
+
+.custom img:first-child { 
+src:url(images/Critical.png);
+ height:48px; 
+ width:48px;
+}
+
+
+.tooltip:hover   img[alinea] {
+margin-bottom: 5px; 
+margin-right: 5px;
+position: relative;
+width:120px;
+align:left;
+float:left; 
+ background-repeat: no-repeat;
+}
+

Modified: XoopsModules/extcal/branches/jjdai/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/docs/changelog.txt	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/docs/changelog.txt	2012-02-01 12:35:49 UTC (rev 8868)
@@ -1,3 +1,8 @@
+2012/01/31: Version 2.36 (JJD.fr)
+===================================
+- Fixed display
+- Replacement of infobulle by another model more pro
+
 2012/01/21: Version 2.35 (JJD.fr)
 ===================================
 - Réintrégation file update extcal_2_34.php omitted in the previous version

Modified: XoopsModules/extcal/branches/jjdai/extcal/edit_event.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/edit_event.php	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/edit_event.php	2012-02-01 12:35:49 UTC (rev 8868)
@@ -24,7 +24,7 @@
 
 // Tooltips include
 $xoTheme->addScript('modules/extcal/include/ToolTips.js');
-$xoTheme->addStylesheet('modules/extcal/include/style.css');
+$xoTheme->addStylesheet('modules/extcal/css/infobulle.css');
 
 
 

Modified: XoopsModules/extcal/branches/jjdai/extcal/header.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/header.php	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/header.php	2012-02-01 12:35:49 UTC (rev 8868)
@@ -28,7 +28,7 @@
 //------------------------------------------------------
 // Tooltips include
 $xoTheme->addScript('modules/extcal/include/ToolTips.js');
-$xoTheme->addStylesheet('modules/extcal/include/style.css');
+$xoTheme->addStylesheet('modules/extcal/css/infobulle.css');
 
 //////////////////////////////////////////////////////////////
 

Modified: XoopsModules/extcal/branches/jjdai/extcal/include/functions.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/include/functions.php	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/include/functions.php	2012-02-01 12:35:49 UTC (rev 8868)
@@ -368,7 +368,81 @@
 
 
 /**************************************************************************/
+function eclaircirCouleur($color, $plancher, $plafond){
+include_once(XOOPS_ROOT_PATH . '/modules/extcal/class/colorTools.php');
+  
+  $ct = new ColorTools();
+   return $ct->eclaircir($color,$plancher,$plafond);
+//   if (substr($color,0,1) == "#"){
+//     $color = substr($color,1);
+//     $diese = "#";
+//   }else{
+//     $diese = "";
+//   }
+// 
+//   $r16 = hexdec(substr($color,0,2)); //conversion du canal rouge
+//   $v16 = hexdec(substr($color,2,4)); //conversion du canal vert
+//   $b16 = hexdec(substr($color,4,6)); //conversion du canal bleu
+// 
+// 
+// 
+//   // Initialisation
+//   $gain = 0.2;    // 0.2 = 20%
+//   $gain = 0.1;
+// 
+// // Affichage
+// // echo "<div style='background-color:#",$r16,$v16,$b16,"'>";
+// // echo "composante 1 : ".$r16."<br />";
+// // echo "composante 2 : ".$v16."<br />";
+// // echo "composante 3 : ".$b16."<br />";
+// // echo "</div><br />";
+// 
+//   // Conversion HEX -> DEC
+//   $r10 = hexdec($r16);
+//   $v10 = hexdec($v16);
+//   $b10 = hexdec($b16);
+//   
+//   // Eclaircissement
+//   $r10 = floor($r10 * (0.5));
+//   $v10 = floor($v10 * (0.5));
+//   $b10 = floor($b10 * (0.5));
+// //   $r10 = floor($r10 * (1 + $gain));
+// //   $v10 = floor($v10 * (1 + $gain));
+// //   $b10 = floor($b10 * (1 + $gain));
+//   
+//   // Limitations
+//   if ($r10>255) $r10=255;
+//   if ($v10>255) $v10=255;
+//   if ($b10>255) $b10=255;
+//   
+//   if ($r10<0) $r10=0;
+//   if ($v10<0) $v10=0;
+//   if ($b10<0) $b10=0;
+//   
+//   // Conversion DEC -> HEX
+// //   $r16 = dechex($r10);
+// //   $v16 = dechex($v10);
+// //   $b16 = dechex($b10);
+//   $r16 = substr('00' . dechex($r10),-2);
+//   $v16 = substr('00' . dechex($v10),-2);
+//   $b16 = substr('00' . dechex($b10),-2);
+//   
+//   $newColor =  strtoupper($diese.$r16.$v16.$b16);
+// 
+// // Affichage
+// // echo "<div style='background-color:#",$r16,$v16,$b16,"'>";
+// // echo "<div>";
+// // echo "composante 1 : ".$r16."<br />";
+// // echo "composante 2 : ".$v16."<br />";
+// // echo "composante 3 : ".$b16."<br />";
+// // echo "</div>";
+// // echo "{$color} : {$newColor}<br>";  
+// 
+//   //$newColor =  strtoupper($diese.'220000');
+// 
+//   return $newColor;
+}
+/**************************************************************************/
 
 
-
 ?>

Modified: XoopsModules/extcal/branches/jjdai/extcal/language/french/changelog.txt
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/language/french/changelog.txt	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/language/french/changelog.txt	2012-02-01 12:35:49 UTC (rev 8868)
@@ -1,3 +1,8 @@
+2012/01/31: Version 2.36 (JJD.fr)
+===================================
+- Correction d'affichage
+- Remplacement des infobulle par une autre modèle plus pro
+
 2012/01/21: Version 2.35 (JJD.fr)
 ===================================
 - Réintrégation du fichier de mise à jour extcal_2_34.php omis dans la version précédente

Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_event_list1.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_event_list1.html	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_event_list1.html	2012-02-01 12:35:49 UTC (rev 8868)
@@ -12,12 +12,7 @@
           </td>
           <td class="odd" style="vertical-align:middle;">
   
-              <a  href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
-                  class="extcalTips infobulle"
-                  title="">
                 <{include file="db:extcal_info_bulle.html"}>
-                <{$event.event_title}>
-              </a>
   
   
           </td>

Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_info_bulle.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_info_bulle.html	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_info_bulle.html	2012-02-01 12:35:49 UTC (rev 8868)
@@ -3,7 +3,7 @@
   <div style="height:12px; width:12px; background-color:#<{$event.cat.cat_color}>; border:1px solid black; float:left; margin-right:5px;" >
   </div>
 
-
+<!--
   <{if $event.event_picture1!=""}>
     <span infoBulle_zone1>
       <img align=left style="border:1px solid #333333;margin-right:6px" src="<{$xoops_url}>/uploads/extcal/<{$event.event_picture1}>" width="150px" height="150px" />
@@ -16,12 +16,31 @@
   <{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}><br />
   <b><{$smarty.const._MD_EXTCAL_START}></b> <{$event.formated_event_start}><br />
   <b><{$smarty.const._MD_EXTCAL_END}></b> <{$event.formated_event_end}><br />
-  <{$event.event_desc}>
   </span>
+-->
 
 
+
+      <a class="tooltip" href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>">
+        <{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}><br />
+        <span class="custom info" width350 style="background: #<{$event.cat.cat_light_color}>;">
+          <img src="css/images/Info.png" alt="Information" />
+            <em><{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}></em>
+  <{if $event.event_picture1!=""}>
+    <img src="<{$xoops_url}>/uploads/extcal/<{$event.event_picture1}>" alinea/>
+  <{/if}>
+  <{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}><br />
+  <b><{$smarty.const._MD_EXTCAL_START}></b> <{$event.formated_event_start}><br />
+  <b><{$smarty.const._MD_EXTCAL_END}></b> <{$event.formated_event_end}><br />
+
+        </span>
+      </a>
+
+
+
 <{else}>
   <div style="height:12px; width:12px; background-color:#<{$event.cat.cat_color}>; border:1px solid black; float:left; margin-right:5px;" 
   title='<{if $showId}>(#<{$event.event_id}>)<{/if}>  <{$event.formated_event_start}> - <{$event.formated_event_end}> : <{$event.event_title}>'>
   </div>
 <{/if}>
+

Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-day.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-day.html	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-day.html	2012-02-01 12:35:49 UTC (rev 8868)
@@ -42,13 +42,8 @@
       <td class='<{$trancheHeure.class}>' style="border: 1px solid #808080;">
        
         <{foreach item=event from=$jour.events}>
-            <a  href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
-                class="extcalTips infobulle"
-                title="">
               <{include file="db:extcal_info_bulle.html"}>
-              <{$event.event_title}>
-            </a>
-                <br />
+             <br />
         <{/foreach}>
       </td>
         <{/foreach}>

Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-week.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-week.html	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-week.html	2012-02-01 12:35:49 UTC (rev 8868)
@@ -50,11 +50,7 @@
         <{foreach item=jour from=$trancheHeure.jours}>
       <td class='<{$trancheHeure.class}>' style="border: 1px solid #808080;" width='<{$params.colJourWidth}>%' <{$jour.bg}>>
         <{foreach item=event from=$jour.events}>
-            <a  class='extcalTips infobulle'  
-                href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
-                title="">
               <{include file="db:extcal_info_bulle.html"}>              
-            </a>&nbsp;
                
         <{/foreach}>
       </td>

Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-month.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-month.html	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-month.html	2012-02-01 12:35:49 UTC (rev 8868)
@@ -26,22 +26,20 @@
         <{foreachq item=cell from=$row.week}>
         <td class="<{if $cell.isEmpty}>even<{else}>odd<{/if}>"
             style="width:14%; height:80px; vertical-align:top;<{if $cell.isSelected}> background-color:#B6CDE4;<{/if}>">
-            <{if $cell.isEmpty}>&nbsp;<{else}><a
-                href="<{$xoops_url}>/modules/extcal/view_day.php?year=<{$year}>&amp;month=<{$month}>&amp;day=<{$cell.number}>"><{$cell.number}></a><{/if}><br/>
-            <{foreach item=event from=$cell.events}>
-            <{if $event}>
-            
-            <a  href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
-                class="extcalTips infobulle"
-                title="">
-
-              <{include file="db:extcal_info_bulle.html"}>
-              <{$event.event_title}>
-            </a>
-            
-            <div style="background-color:#<{$event.cat.cat_color}>; height:2px; font-size:2px;">
-                &nbsp;</div>
+            <{if $cell.isEmpty}>&nbsp;
+            <{else}>
+              <a href="<{$xoops_url}>/modules/extcal/view_day.php?year=<{$year}>&amp;month=<{$month}>&amp;day=<{$cell.number}>"><{$cell.number}></a>
+              <br/>
             <{/if}>
+            
+            <{foreach item=event from=$cell.events}>
+              <{if $event}>
+              
+                <{include file="db:extcal_info_bulle.html"}>
+              
+              <div style="background-color:#<{$event.cat.cat_color}>; height:2px; font-size:2px;">
+                  &nbsp;</div>
+              <{/if}>
             <{/foreach}>
         </td>
         <{/foreach}>

Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-week.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-week.html	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-week.html	2012-02-01 12:35:49 UTC (rev 8868)
@@ -26,12 +26,7 @@
             <{foreach item=event from=$day.events}>
             <{if $event}>
 
-            <a  href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
-                class="extcalTips infobulle"
-                title="">
               <{include file="db:extcal_info_bulle.html"}>
-              <{$event.event_title}>
-            </a>
 
             <div style="background-color:#<{$event.cat.cat_color}>; height:2px; font-size:2px;">
                 &nbsp;</div>

Modified: XoopsModules/extcal/branches/jjdai/extcal/view_year.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/view_year.php	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/view_year.php	2012-02-01 12:35:49 UTC (rev 8868)
@@ -16,9 +16,8 @@
 
 // Tooltips include
 $xoTheme->addScript('modules/extcal/include/ToolTips.js');
-$xoTheme->addStylesheet('modules/extcal/include/style.css');
+$xoTheme->addStylesheet('modules/extcal/css/infobulle.css');
 
-
 $form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
 $form->addElement(getListYears($year,$xoopsModuleConfig['agenda_nb_years_before'],$xoopsModuleConfig['agenda_nb_years_after']));
 
@@ -62,6 +61,9 @@
 // // Sort event array by event start
 // usort($eventsArray, "orderEvents");
 
+// $t=print_r($eventsArray,true);
+// echo "<pre>{$t}</pre>";
+
 // Assigning events to the template
 $xoopsTpl->assign('events', $eventsArray);
 

Modified: XoopsModules/extcal/branches/jjdai/extcal/xoops_version.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/xoops_version.php	2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/xoops_version.php	2012-02-01 12:35:49 UTC (rev 8868)
@@ -16,7 +16,7 @@
 // @author      Gregory Mage (Aka Mage)
 //***************************************************************************************
 $modversion['name'] = _MI_EXTCAL_NAME;
-$modversion['version'] = '2.35';
+$modversion['version'] = '2.36';
 $modversion['description'] = _MI_EXTCAL_DESC;
 $modversion['credits'] = 'Zoullou';
 $modversion['author'] = 'Zoullou, Mage, Mamba, JJ Delalandre(JJDai)';
@@ -41,7 +41,7 @@
 //about
 $modversion["module_website_url"] = "http://www.xoops.org/";
 $modversion["module_website_name"] = "XOOPS";
-$modversion["release_date"] = "2012/01/22";
+$modversion["release_date"] = "2012/01/31";
 $modversion['module_status'] = "Beta 2";
 $modversion['min_php'] = '5.2';
 $modversion['min_xoops'] = "2.5.0";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [xoops-svn] SF.net SVN: xoops:[8868] XoopsModules/extcal/branches/jjdai/extcal

The world's leading content management systems (CMS) written in PHP

xoops-svn