tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/php
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21057/php

Modified Files:
	appointment.pinc calendar.php task.pinc 
Added Files:
	cal_ajax.php 
Log Message:
first trial of drag and drop for appointment,task and reminder in calendar (month only)

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- task.pinc	24 Jan 2011 12:48:10 -0000	1.288
+++ task.pinc	26 Jan 2011 07:20:40 -0000	1.289
@@ -1736,9 +1736,13 @@
         global $lang,$tutos,$current_user;
 
         $r = '';
-        $class = "task". $this->state;
 
-        $r .= '<li class="dragable"><div class="formatted '.$class.'">';
+        if ($this->mod_ok()) {
+            $class = 'dragable';
+        } else {
+            $class = 'undragable';
+        }
+        $r .= '<li class="'.$class.'"><div class="formatted task'.$this->state.'" xid="'.$this->id.'">';
 
         $r .= $this->getLink() ."<br />\n";
 
@@ -1810,15 +1814,15 @@
         case 'Copy':
         case 'TaskPredecessor':
             $x = resolve_history_obj($f,$this->dbconn);
-        return $x;
-        break;
+            return $x;
+            break;
         case 'TaskS_Start':
         case 'TaskS_End':
         case 'TaskR_Start':
         case 'TaskR_End':
             $x = resolve_history_datetime($f,$this->dbconn);
-        return $x;
-        break;
+            return $x;
+            break;
         case 'TaskState':
             $x = resolve_history_lgarr ($f,'TaskStates');
             return $x;
@@ -2235,4 +2239,4 @@
     }
 }
 $tutos['classes'][usetaskmanagement] = 'task';
-?>
\ No newline at end of file
+?>

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- appointment.pinc	24 Jan 2011 14:45:51 -0000	1.241
+++ appointment.pinc	26 Jan 2011 07:20:39 -0000	1.242
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2010 by Gero Kohnert
+ *  Copyright 1999 - 2011 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -1452,8 +1452,13 @@
         } else {
             $class = 'app'.$this->outside;
         }
+        if ($this->mod_ok()) {
+            $class2 = 'dragable';
+        } else {
+            $class2 = 'undragable';
+        }
 
-        $r .= '<li class="dragable"><div class="formatted '.$class.'">';
+        $r .= '<li class="'.$class2.'"><div class="formatted '.$class.'" xid="'.$this->id.'">';
 
         if ( $this->repeat != APP_NOREP ) {
             $start = $this->start->getTime();
@@ -1491,8 +1496,7 @@
 
         $r .= '<span class="left"><b>'. $this->getLink($duration) .'</b></span>';
         $r .= '<span class="right"><b>'. $this->getLocation() .'</b></span>';
-        $r .= '<br />';
-        $r .= '<div style="clear: both;"></div>';
+        $r .= '<div style="clear: both;" />';
 
         $myself = false;
         foreach ( $this->participant as $i => $fp) {
@@ -1523,7 +1527,6 @@
                 }
                 $r .= "</span>\n";
             }
-            #            $r .= "  <br />\n";
             $r .= '<div style="clear: both;" />';
             unset($fp);
         }
@@ -1533,7 +1536,7 @@
             ) {
             $descr = preg_replace('#\n#m','<br />',$this->descr);
             if ($descr != '' ) {
-                $r .= urlReplace($descr);
+                $r .= '<span class="left">'.urlReplace($descr).'</span>';
             }
             if ( !(is_numeric($this->visitor) && $this->visitor == -1) ) {
                 $r .= '<br /><span class="left">';
@@ -1705,8 +1708,8 @@
         case 'StartTime':
         case 'EndTime':
             $x = resolve_history_datetime($f,$this->dbconn,false);
-        return $x;
-        break;
+            return $x;
+            break;
         default:
             return null;
         }
@@ -2119,4 +2122,4 @@
     }
 }
 $tutos['classes'][usecalendar] = 'Appointment';
-?>
\ No newline at end of file
+?>

Index: calendar.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- calendar.php	24 Jan 2011 13:12:27 -0000	1.106
+++ calendar.php	26 Jan 2011 07:20:40 -0000	1.107
@@ -91,7 +91,7 @@
 
             $r .= '<td class="'. $dinfo[color] .'" width="10%"'.">\n";
             $r .= ' <ul class="dropable">'."\n";
-            $r .= '<li>';
+            $r .= '<li date="'.$dd->getYYYY_MM_DD().'">';
             if ( isset($dinfo[Desc]) ) {
                 if ( $this->user->feature_ok(usecalendar,PERM_NEW) ) {
                     $r .= makelink('app_new.php?t='. $tref,$d,$lang['NewAppointInfo'],$dinfo[popinfo]) ."\n";
@@ -248,6 +248,13 @@
   accept: '.dragable',
   hoverClass: \"ui-state-active\",
   drop: function( event, ui ) {
+$.post(\"cal_ajax.php\",
+     { xid: $('div',ui.draggable).attr('xid'),
+       date: $('li',this).attr('date')
+     },
+     function(data){
+       alert(\"Data Loaded: \" + data);
+     });
         $( this ).find( \".placeholder\" ).remove();
         x = '<li>xxx</li>';
         $(ui.draggable).appendTo( this );

--- NEW FILE: cal_ajax.php ---
<?php
/**
 *  Copyright 1999 - 2011 by Gero Kohnert
 *
 *  This program is free software; you can redistribute it and/or modify it
 *  under the terms of the GNU General Public License as published by the
 *  Free Software Foundation; version 2 of the License.
 *
 *  CVS Info:  $Id: cal_ajax.php,v 1.1 2011/01/26 07:20:40 gokohnert Exp $
 *  $Author: gokohnert $
 */

include_once 'webelements.p3';
include_once 'permission.p3';
check_user();

header("Expires: 0");
header("Cache-Control: must-revalidate, post-check=0,pre-check=0");
header("Pragma: public");

$r = '';
if(!isset($_POST['xid'])) {
    return 'failed';
}

$obj = getObject($dbconn,$_POST['xid']);
if(!is_object($obj)) {
    return 'failed wrong xid';
}

if(!$obj->mod_ok()) {
    return 'failed permission';
}

$r .= "\r\n";
$r .= $obj->id ."\n";
$r .= $lang[$obj->getType()].': '.$obj->getFullName();

$dobj = new TUTOS_Date_Time($_POST['date']);
$r .= "\r\n";
$r .= 'New Date: '.$dobj->getYYYYMMDD();
$r .= "\r\n";


switch($obj->getTypeId()) {
case usecalendar:
    $dobj->hour = $obj->start->hour;
    $dobj->min  = $obj->start->min;
    $diff = $obj->start->getTimeStamp() - $dobj->getTimeStamp();

    $r .= "moving app start&end date by days ".$diff/86400;

    unset($dobj);
    $dobj = new TUTOS_Date_Time();
    $dobj->setDateTimeTS($obj->start->getTimeStamp() - $diff);
    $obj->setStartTime($dobj);
    unset($dobj);
    $dobj = new TUTOS_Date_Time();
    $dobj->setDateTimeTS($obj->end->getTimeStamp() - $diff);
    $obj->setEndTime($dobj);

    $r .= $obj->save();
    $r .= $lang[$obj->getType()].'->: '.$obj->getFullName();
    $r .= "\r\n";
    break;
case usetaskmanagement:
    $dobj->hour = 0;
    $dobj->min  = 0;
    $diff = $obj->s_start->getTimeStamp() - $dobj->getTimeStamp();

    $r .= "moving task start & end date".$diff;

    unset($dobj);
    $dobj = new TUTOS_Date_Time();
    $dobj->setDateTimeTS($obj->s_start->getTimeStamp() - $diff);
    $obj->setSStart($dobj);

    unset($dobj);
    $dobj = new TUTOS_Date_Time();
    $dobj->setDateTimeTS($obj->s_end->getTimeStamp() - $diff);
    $obj->setSEnd($dobj);

    $r .= $obj->save();
    $r .= "\r\n";
    break;
case usereminder:
    $dobj->hour = $obj->remind_date->hour;
    $dobj->min  = $obj->remind_date->min;
    $diff = $obj->remind_date->getTimeStamp() - $dobj->getTimeStamp();

    unset($dobj);
    $dobj = new TUTOS_Date_Time();
    $dobj->setDateTimeTS($obj->remind_date->getTimeStamp() - $diff);
    $obj->setRemindDate($dobj);

    $r .= $obj->save();
    $r .= "\r\n";
    break;

default:
    $r .= "do nothing";
    $r .= "\r\n";
    break;
}


foreach ($_POST as $j => $i) {
    $r .= "\r\n";
    $r.= ' P:'.$j.' '.$i;
}

echo 'RESULT:'.$r;
return;

foreach ($_GET as $j => $i) {
    echo "\r\n";
    echo ' G:'.$j.' '.$i;
}
foreach ($_SESSION as $j => $i) {
    echo "\r\n";
    echo ' S:'.$j.' '.$i;
}
foreach ($_COOKIE as $j => $i) {
    echo "\r\n";
    echo ' C:'.$j.' '.$i;
}

?>

Update of /cvsroot/tutos/tutos/php/reminder
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21057/php/reminder

Modified Files:
	reminder.pinc 
Log Message:
first trial of drag and drop for appointment,task and reminder in calendar (month only)

Index: reminder.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder.pinc,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- reminder.pinc	24 Jan 2011 12:48:11 -0000	1.55
+++ reminder.pinc	26 Jan 2011 07:20:40 -0000	1.56
@@ -358,7 +358,13 @@
         }
         $r .= '<div style="clear: both;"></div>';
 
-        $r = '<li class="dragable"><div class="formatted '.$class.'">'.$r.'</div></li>';
+
+        if ($this->mod_ok()) {
+            $class2 = 'dragable';
+        } else {
+            $class2 = 'undragable';
+        }
+        $r = '<li class="'.$class2.'"><div class="formatted '.$class.'" xid="'.$this->id.'">'.$r.'</div></li>';
         return $r;
     }
 
@@ -628,7 +634,7 @@
         case 'ReminderCreate':
         case 'ReminderReference':
             $x = resolve_history_obj($f,$this->dbconn);
-        break;
+            break;
         case 'ReminderAt':
             $x = $f;
             $x['field'] = isset( $lang[$f['field']]) ? $lang[$f['field']] : $f['field'];
@@ -990,4 +996,4 @@
         return $r;
     }
 }
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php/layout
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21057/php/layout

Modified Files:
	new2_layout.pinc 
Log Message:
first trial of drag and drop for appointment,task and reminder in calendar (month only)

Index: new2_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new2_layout.pinc,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- new2_layout.pinc	22 Jan 2011 13:39:27 -0000	1.58
+++ new2_layout.pinc	26 Jan 2011 07:20:40 -0000	1.59
@@ -699,22 +699,6 @@
         $r .= '<script type="text/javascript" language="JavaScript">loader = window.setTimeout("loading(1);",1500);</script>'."\n";
         $r .= '<script type="text/javascript" language="JavaScript">'."\n";
         $r .= "//<![CDATA[
-jQuery.bt.defaults.width = 400;
-jQuery.bt.defaults.positions = ['top','left','right','bottom'];
-jQuery.bt.defaults.padding = 0;
-jQuery.bt.defaults.shadow = true;
-jQuery.bt.defaults.shadowOffsetX = 4;
-jQuery.bt.defaults.shadowOffsetY = 4;
-jQuery.bt.defaults.shadowBlur = 8;
-jQuery.bt.defaults.trigger = ['hoverIntent mouseover','mouseout'];
-jQuery.bt.defaults.closeWhenOthersOpen = true;
-jQuery.bt.defaults.strokeWidth = 1;
-jQuery.bt.defaults.strokeStyle = '#111';
-jQuery.bt.defaults.spikeGirth = 15;
-jQuery.bt.defaults.spikeLength = 18;
-jQuery.bt.defaults.fill = '#222';
-jQuery.bt.defaults.cssStyles = { width: 'auto'};
-
 $(document).ready(function(){
     $(\"ul.sf-menu\").
        superfish({

Update of /cvsroot/tutos/tutos/html/css
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21057/html/css

Modified Files:
	superfish.css 
Log Message:
first trial of drag and drop for appointment,task and reminder in calendar (month only)

Index: superfish.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/css/superfish.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- superfish.css	22 Jan 2011 13:39:26 -0000	1.1
+++ superfish.css	26 Jan 2011 07:20:39 -0000	1.2
@@ -92,7 +92,7 @@
 	height:			10px;
 	text-indent: 	-999em;
 	overflow:		hidden;
-	background:		url('../html/arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+	background:		url('../../html/arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
 }
 a > .sf-sub-indicator {  /* give all except IE6 the correct values */
 	top:			.8em;
@@ -121,7 +121,7 @@
 
 /*** shadows for all but IE6 ***/
 .sf-shadow ul {
-	background:	url('../html/shadow.png') no-repeat bottom right;
+	background:	url('../../html/shadow.png') no-repeat bottom right;
 	padding: 0 8px 9px 0;
 	-moz-border-radius-bottomleft: 17px;
 	-moz-border-radius-topright: 17px;

Update of /cvsroot/tutos/tutos/html
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21057/html

Modified Files:
	default.css 
Log Message:
first trial of drag and drop for appointment,task and reminder in calendar (month only)

Index: default.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/default.css,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- default.css	22 Jan 2011 20:43:02 -0000	1.24
+++ default.css	26 Jan 2011 07:20:39 -0000	1.25
@@ -23,6 +23,8 @@
 }
 .dropable, .dragable {
     list-style-type: none;
+    padding: 0;
+    margin: 0;
 }
 
 ul.dropable {
@@ -34,11 +36,15 @@
 li.dragable div.formatted {
     border-top: 1px solid black;
     margin-top: 1px;
+    margin-left: 2px;
+    padding: 0px 2px 0px 2px;
+    max-width: 15em;
+    min-width: 15em;
+    float: left;
 }
 
 .dropable li {
     border: 0px;
-    margin-left: -40px;
 }
 
 #datepicker * {

Update of /cvsroot/tutos/tutos/php/resource
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3502/resource

Modified Files:
	resource.pinc 
Log Message:
layout update

Index: resource.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource.pinc,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- resource.pinc	24 Jan 2011 07:25:41 -0000	1.59
+++ resource.pinc	24 Jan 2011 14:45:52 -0000	1.60
@@ -343,10 +343,13 @@
             return $r;
         }
         resource::obj_read($obj);
+        $sep = '';
         if ( count($obj->resuselist) > 0 ) {
             foreach ($obj->resuselist as $i => $f) {
-                $r .= "<br />&#9658;" . $f->getLink();
+                $r .= $sep.'&#9658;'.$f->getLink();
+                $sep = '<br />';
             }
+            $r .= '<div style="clear: both;" />';
         }
         return $r;
     }

Update of /cvsroot/tutos/tutos/php
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3502

Modified Files:
	appointment.pinc mytutos.php product.pinc 
Log Message:
layout update

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- mytutos.php	19 Jan 2011 19:54:59 -0000	1.108
+++ mytutos.php	24 Jan 2011 14:45:51 -0000	1.109
@@ -132,30 +132,29 @@
             continue;
         }
         $r .= '<td class="'. $dinfo[color] ."\" width=\"10%\">\n";
+        $r .= '<ul class="dropable">';
+        $r .= ' <li>';
 
         if ( isset($dinfo[Desc]) ) {
             if ($current_user->feature_ok(usecalendar, PERM_NEW) ) {
-                $r .= ' ';
                 $r .= makelink('app_new.php?t='. $tref,
                                $d,
                                $lang['NewAppointInfo'],
                                $dinfo[popinfo]);
-                $r .= "\n";
             } else {
-                $r .= ' ' . $d ."\n";
+                $r .= $d;
             }
+            $r .= "\n";
             $r .= '<br /><span class="dinfo">'. $dinfo[Desc] ."</span>\n";
         } else {
             if ($current_user->feature_ok(usecalendar, PERM_NEW) ) {
-                $r .= ' ';
                 $r .= makelink('app_new.php?t='. $tref, $d, $lang['NewAppointInfo']);
-                $r .= "\n";
             } else {
-                $r .= ' ' . $d ."\n";
+                $r .= $d;
             }
+            $r .= "\n";
         }
 
-        $hastable = 0;
         foreach ($adr->callist as $idx => $x) {
             /* the correct day */
             if ( ! $adr->callist[$idx]->inside($dd) ) {
@@ -180,21 +179,11 @@
             if ( ($adr->callist[$idx]->gettype() == "task") && ($adr->callist[$idx]->state == 2) ) {
                 continue;
             }
-            if ( $hastable == 0 ) {
-                $r .= " <table class=\"formatted\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
-                $hastable = 1;
-            } else {
-                $r .= '  <tr><td class="'. $dinfo[color] .'" colspan="3">';
-                $r .= '  <img src="'. $tutos['base'] ."/html/black.png\" width=\"100%\" height=\"1\" alt=\"--------\" /></td></tr>\n";
-            }
             // Show appointments or task
             $r .= $adr->callist[$idx]->formatted();
         }
 
-        if ( $hastable == 1 ) {
-            $r .= " </table>\n";
-        }
-
+        $r .= " </ul>\n";
         $r .= "</td>\n";
         $day++;
         $ts = $next;
@@ -384,4 +373,4 @@
 <!--
 CVS Info:  $Id$
      $Author$
-     -->
+     -->
\ No newline at end of file

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- appointment.pinc	24 Jan 2011 07:27:12 -0000	1.240
+++ appointment.pinc	24 Jan 2011 14:45:51 -0000	1.241
@@ -1523,8 +1523,8 @@
                 }
                 $r .= "</span>\n";
             }
-            $r .= "  <br />\n";
-            $r .= '<div style="clear: both;"></div>';
+            #            $r .= "  <br />\n";
+            $r .= '<div style="clear: both;" />';
             unset($fp);
         }
 
@@ -1545,6 +1545,7 @@
                 $r .= '</span><span class="right">';
                 $r .= $this->visitor->getLink().'</span>';
             }
+            $r .= '<div style="clear: both;"></div>';
 
             $r .= product::small_infolist($current_user,$this);
             foreach($tutos[activemodules] as $i => $f) {

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- product.pinc	24 Jan 2011 07:27:12 -0000	1.242
+++ product.pinc	24 Jan 2011 14:45:51 -0000	1.243
@@ -1521,7 +1521,7 @@
         }
 
         if ( is_object($obj->product) ) {
-            $r .= '<br /><span class="right">&#8594;&nbsp;'. $obj->product->getLink() ."</span>\n";
+            $r .= '<span class="right">&#8594;&nbsp;'. $obj->product->getLink() .'</span><div style="clear: both;" />'."\n";
         }
         return $r;
     }

Update of /cvsroot/tutos/tutos/php/file
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3502/file

Modified Files:
	file.pinc 
Log Message:
layout update

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- file.pinc	24 Jan 2011 07:25:41 -0000	1.108
+++ file.pinc	24 Jan 2011 14:45:52 -0000	1.109
@@ -1312,11 +1312,13 @@
             return $r;
         }
         $r .= '<span class="right">';
-        $sep = "";
+        $sep = '';
         foreach ($obj->list[usedocmanagement] as $x) {
-            $r .= '<br />'.$lang['File'] ."&nbsp;". $x->getLink();
+            $r .= $sep.$lang['File'] ."&nbsp;". $x->getLink();
+            $sep = '<br />';
         }
         $r .= "</span>\n";
+        $r .= '<div style="clear: both;" />';
         return $r;
     }
 

Update of /cvsroot/tutos/tutos/php/note
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3502/note

Modified Files:
	note.pinc 
Log Message:
layout update

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- note.pinc	24 Jan 2011 12:48:11 -0000	1.103
+++ note.pinc	24 Jan 2011 14:45:51 -0000	1.104
@@ -573,11 +573,14 @@
             return $r;
         }
         note::obj_read($obj);
+        $sep = '';
         if ( count($obj->list[usenotes]) > 0 ) {
             foreach ($obj->list[usenotes] as $i => $f) {
-                $r .= '<br />-' . $f->getLink();
+                $r .= $sep.'-'.$f->getLink();
+                $sep = '<br />';
             }
             unset($f);
+            $r .= '<div style="clear: both;" />';
         }
         return $r;
     }

Update of /cvsroot/tutos/tutos/php/layout
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18276/layout

Modified Files:
	layout_base.pinc 
Log Message:
satisfy IE7

Index: layout_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/layout_base.pinc,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- layout_base.pinc	22 Jan 2011 13:39:27 -0000	1.83
+++ layout_base.pinc	24 Jan 2011 13:12:27 -0000	1.84
@@ -164,7 +164,7 @@
 
 $(function() {
 $.datepicker.setDefaults( $.datepicker.regional[ \"".$tutos[lang]."\" ] );
-$.datepicker.setDefaults({autoSize:true,changeYear:true,changeMonth:true,showOtherMonths:true,showWeek:true,dateFormat:\"".TUTOS_Date_Time::getDateFormat()."\",});
+$.datepicker.setDefaults({autoSize:true,changeYear:true,changeMonth:true,showOtherMonths:true,showWeek:true,dateFormat:\"".TUTOS_Date_Time::getDateFormat()."\"});
 });\n";
 
         return $r;
@@ -829,4 +829,4 @@
         return $ss['id'];
     }
 }
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18276

Modified Files:
	calendar.php 
Log Message:
satisfy IE7

Index: calendar.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- calendar.php	22 Jan 2011 20:43:02 -0000	1.105
+++ calendar.php	24 Jan 2011 13:12:27 -0000	1.106
@@ -242,7 +242,7 @@
   revert: \"invalid\",
   appendTo: \"body\",
   helper: \"clone\",
-  cursor: \"move\",
+  cursor: \"move\"
 });\n";
         $tutos['pagescript'] .= "$('.dropable').droppable({
   accept: '.dragable',
@@ -251,7 +251,7 @@
         $( this ).find( \".placeholder\" ).remove();
         x = '<li>xxx</li>';
         $(ui.draggable).appendTo( this );
-        },
+        }
 });\n";
         return $r;
     }
@@ -373,4 +373,4 @@
 <!--
 CVS Info:  $Id$
      $Author$
-     -->
\ No newline at end of file
+     -->

Update of /cvsroot/tutos/tutos/php
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13981

Modified Files:
	task.pinc webelements.p3 
Log Message:
update

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- task.pinc	22 Jan 2011 20:43:02 -0000	1.287
+++ task.pinc	24 Jan 2011 12:48:10 -0000	1.288
@@ -1750,6 +1750,7 @@
         } else {
             $r .= $this->getState()." → ". $this->parent->getLink();
         }
+        $r .= '<div style="clear: both;"></div>';
         $r .= '</div></li>';
 
         return $r;
@@ -1809,15 +1810,15 @@
         case 'Copy':
         case 'TaskPredecessor':
             $x = resolve_history_obj($f,$this->dbconn);
-            return $x;
-            break;
+        return $x;
+        break;
         case 'TaskS_Start':
         case 'TaskS_End':
         case 'TaskR_Start':
         case 'TaskR_End':
             $x = resolve_history_datetime($f,$this->dbconn);
-            return $x;
-            break;
+        return $x;
+        break;
         case 'TaskState':
             $x = resolve_history_lgarr ($f,'TaskStates');
             return $x;

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -d -r1.455 -r1.456
--- webelements.p3	22 Jan 2011 13:39:27 -0000	1.455
+++ webelements.p3	24 Jan 2011 12:48:11 -0000	1.456
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2010 Gero Kohnert
+ *  Copyright 1999 - 2011 Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -422,7 +422,7 @@
                 case 'integer':
                 case 'double':
                     $msg .= $a;
-                    break;
+                break;
                 case 'object':
                     if ($a instanceof tutos_base) {
                         $msg .= '<'.$a->getType().'>';
@@ -2578,4 +2578,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php/reminder
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13981/reminder

Modified Files:
	reminder.pinc 
Log Message:
update

Index: reminder.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder.pinc,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- reminder.pinc	22 Jan 2011 20:43:02 -0000	1.54
+++ reminder.pinc	24 Jan 2011 12:48:11 -0000	1.55
@@ -347,15 +347,18 @@
         $this->read_reference();
 
         $r = '';
-        $r .= '<li class="dragable"><div class="formatted">';
         if ($this->type == REMINDER_ADR_BIRTHDAY) {
-            $r .= '<span class="birthday left">'.$this->ref->getLink().'&nbsp;</span>';
-            $r .= '<span class="birthday right">&nbsp;'.$this->getLink('*'.$this->ref->birthday->getDate()).'</span>';
+            $r .= '<span class="left">'.$this->ref->getLink().'&nbsp;</span>';
+            $r .= '<span class="right">&nbsp;'.$this->getLink('*'.$this->ref->birthday->getDate()).'</span>';
+            $class = 'birthday';
         } else {
-            $r .= '<span class="note left">'.$this->getLink('#').'&nbsp;</span>';
-            $r .= '<span class="note right">&nbsp;'. $this->ref->getLink().'</span>';
+            $r .= '<span class="left">'.$this->getLink('#').'&nbsp;</span>';
+            $r .= '<span class="right">&nbsp;'. $this->ref->getLink().'</span>';
+            $class = 'note';
         }
-        $r .= '</div></li>';
+        $r .= '<div style="clear: both;"></div>';
+
+        $r = '<li class="dragable"><div class="formatted '.$class.'">'.$r.'</div></li>';
         return $r;
     }
 
@@ -625,7 +628,7 @@
         case 'ReminderCreate':
         case 'ReminderReference':
             $x = resolve_history_obj($f,$this->dbconn);
-            break;
+        break;
         case 'ReminderAt':
             $x = $f;
             $x['field'] = isset( $lang[$f['field']]) ? $lang[$f['field']] : $f['field'];

Update of /cvsroot/tutos/tutos/php/note
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13981/note

Modified Files:
	note.pinc 
Log Message:
update

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- note.pinc	24 Jan 2011 07:25:41 -0000	1.102
+++ note.pinc	24 Jan 2011 12:48:11 -0000	1.103
@@ -174,7 +174,13 @@
      * added by J. Baten
      */
     function formatted () {
-        return '<tr><td colspan="3" class="note">'. $this->getLink() ."</td></tr>\n";
+        global $lang;
+        $r = '';
+        $r .= '<li class="dragable"><div class="formatted note">';
+        $r .= $lang['Note'].': '.$this->getLink();
+        $r .= '<div style="clear: both;"></div>';
+        $r .= '</div></li>';
+        return $r;
     }
 
     /**

Update of /cvsroot/tutos/tutos/php
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20468

Modified Files:
	module_base.pinc appointment.pinc product.pinc 
Log Message:
some fixes for calendar display stuff 

Index: module_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/module_base.pinc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- module_base.pinc	19 Jan 2011 19:54:59 -0000	1.64
+++ module_base.pinc	24 Jan 2011 07:27:12 -0000	1.65
@@ -311,6 +311,13 @@
  */
 abstract class tutos_module extends tutos_base {
 
+    /**
+     * the type of this TUTOS object
+     */
+    function getType () {
+        return 'modulebase';
+    }
+
     /* ---------------------------------------------------------------------------
      * The following methods are abstract factory functions for groups
      * which handle the membership list of an object
@@ -363,7 +370,7 @@
      * create a small list of things attached to the given object
      * used in calendar subtables etc.
      */
-    static function small_infolist (&$user,&$obj,$cols,$class) {
+    static function small_infolist ($user,$obj) {
     }
 
     /**

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- appointment.pinc	22 Jan 2011 20:43:02 -0000	1.239
+++ appointment.pinc	24 Jan 2011 07:27:12 -0000	1.240
@@ -1546,10 +1546,10 @@
                 $r .= $this->visitor->getLink().'</span>';
             }
 
-            $r .= product::small_infolist($current_user,$this,3,$class);
+            $r .= product::small_infolist($current_user,$this);
             foreach($tutos[activemodules] as $i => $f) {
                 $x = new $tutos[modules][$f][name]($this->dbconn);
-                $r .= $x->small_infolist($current_user,$this,3,$class);
+                $r .= $x->small_infolist($current_user,$this);
             }
         }
         $r .= '</div></li>';
@@ -1704,8 +1704,8 @@
         case 'StartTime':
         case 'EndTime':
             $x = resolve_history_datetime($f,$this->dbconn,false);
-            return $x;
-            break;
+        return $x;
+        break;
         default:
             return null;
         }

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- product.pinc	22 Jan 2011 20:43:02 -0000	1.241
+++ product.pinc	24 Jan 2011 07:27:12 -0000	1.242
@@ -1277,8 +1277,8 @@
         case 'ProdStart':
         case 'ProdEnd':
             $x = resolve_history_datetime($f,$this->dbconn);
-            return $x;
-            break;
+        return $x;
+        break;
         default:
             return null;
         }
@@ -1512,7 +1512,7 @@
     /**
      * create a smalllist of products related to the given object
      */
-    static function small_infolist (&$user,&$obj,$cols,$class) {
+    static function small_infolist ($user,$obj) {
         global $lang;
 
         $r = '';

Update of /cvsroot/tutos/tutos/php/expense
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20468/expense

Modified Files:
	expense.pinc 
Log Message:
some fixes for calendar display stuff 

Index: expense.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense.pinc,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- expense.pinc	22 Jan 2011 13:39:27 -0000	1.53
+++ expense.pinc	24 Jan 2011 07:27:12 -0000	1.54
@@ -791,7 +791,7 @@
         case 'ExpenseReference':
         case 'ExpenseInvoice':
             $x = resolve_history_obj($f,$this->dbconn);
-            break;
+        break;
         case 'ExpenseCategory':
             $x = resolve_history_lgarr ($f,'ExpenseCategories');
             break;
@@ -801,7 +801,7 @@
         case 'ExpenseStartTime':
         case 'ExpenseEndTime':
             $x = resolve_history_datetime($f,$this->dbconn,false);
-            break;
+        break;
         default:
             return null;
         }
@@ -865,7 +865,7 @@
     /**
      * create a smalllist of expenses attached to the given object
      */
-    static function small_infolist (&$user,&$obj,$cols,$class) {
+    static function small_infolist ($user,$obj) {
         global $lang;
 
         $r = '';
@@ -876,14 +876,10 @@
         }
         expense::obj_read($obj);
         if ( count($obj->list[useexpenses]) > 0 ) {
-            $sep = "";
-            $r .= "  <tr><td class=\"". $class ."\" colspan=". $cols ." align=\"left\">";
             foreach ($obj->list[useexpenses] as $i => $f) {
-                $r .= $sep . "-" . $f->getLink();
-                $sep = "<br />\n";
+                $r .= '<br />+' . $f->getLink();
             }
             unset($f);
-            $r .= "</td></tr>\n";
         }
         return $r;
     }

Update of /cvsroot/tutos/tutos/php/file
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20244/file

Modified Files:
	file.pinc 
Log Message:
some fixes for calendar display stuff 

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- file.pinc	9 Dec 2010 14:46:56 -0000	1.107
+++ file.pinc	24 Jan 2011 07:25:41 -0000	1.108
@@ -1196,28 +1196,28 @@
         case 'FileCreate':
         case 'FileReference':
             $x = $f;
-            $x['field'] = isset( $lang[$f['field']]) ? $lang[$f['field']] : $f['field'];
-            if ( $f['old'] <= 0 ) {
-                $x['old'] = '';
+        $x['field'] = isset( $lang[$f['field']]) ? $lang[$f['field']] : $f['field'];
+        if ( $f['old'] <= 0 ) {
+            $x['old'] = '';
+        } else {
+            $b = getObject($this->dbconn,$f['old']);
+            if ( is_object($b) ) {
+                $x['old'] = $b->getLink();
             } else {
-                $b = getObject($this->dbconn,$f['old']);
-                if ( is_object($b) ) {
-                    $x['old'] = $b->getLink();
-                } else {
-                    $x['old'] = makelink("history_show.php?id=". $f['old'],$lang['HistoryDeleted']) ;
-                }
+                $x['old'] = makelink("history_show.php?id=". $f['old'],$lang['HistoryDeleted']) ;
             }
-            if ( $f['new'] <= 0 ) {
-                $x['new'] = '';
+        }
+        if ( $f['new'] <= 0 ) {
+            $x['new'] = '';
+        } else {
+            $b = getObject($this->dbconn,$f['new']);
+            if ( is_object($b) ) {
+                $x['new'] = $b->getLink();
             } else {
-                $b = getObject($this->dbconn,$f['new']);
-                if ( is_object($b) ) {
-                    $x['new'] = $b->getLink();
-                } else {
-                    $x['new'] = makelink("history_show.php?id=". $f['new'],$lang['HistoryDeleted']) ;
-                }
+                $x['new'] = makelink("history_show.php?id=". $f['new'],$lang['HistoryDeleted']) ;
             }
-            break;
+        }
+        break;
         }
         return $x;
     }
@@ -1297,7 +1297,7 @@
     /**
      * create a smalllist of products related to the given object
      */
-    static function small_infolist (&$user,&$obj,$cols,$class) {
+    static function small_infolist ($user,$obj) {
         global $lang;
 
         $r = '';
@@ -1311,13 +1311,12 @@
         if ( count($obj->list[usedocmanagement]) == 0 ) {
             return $r;
         }
-        $r .= "<tr><td class=\"". $class ."\" colspan=\"". $cols ."\" align=\"right\">";
+        $r .= '<span class="right">';
         $sep = "";
         foreach ($obj->list[usedocmanagement] as $x) {
-            $r .= $sep.$lang['File'] ."&nbsp;". $x->getLink();
-            $sep = "<br />\n";
+            $r .= '<br />'.$lang['File'] ."&nbsp;". $x->getLink();
         }
-        $r .= "</td></tr>\n";
+        $r .= "</span>\n";
         return $r;
     }
 

Update of /cvsroot/tutos/tutos/php/note
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20244/note

Modified Files:
	note.pinc 
Log Message:
some fixes for calendar display stuff 

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- note.pinc	22 Jan 2011 13:39:28 -0000	1.101
+++ note.pinc	24 Jan 2011 07:25:41 -0000	1.102
@@ -556,7 +556,7 @@
     /**
      * create a smalllist of notes attached to the given object
      */
-    static function small_infolist (&$user,&$obj,$cols,$class) {
+    static function small_infolist ($user,$obj) {
         global $lang;
 
         $r = '';
@@ -568,14 +568,10 @@
         }
         note::obj_read($obj);
         if ( count($obj->list[usenotes]) > 0 ) {
-            $sep = "";
-            $r .= '  <tr><td class="'. $class .'" colspan="'. $cols .'" align="left">';
             foreach ($obj->list[usenotes] as $i => $f) {
-                $r .= $sep . "-" . $f->getLink();
-                $sep = "<br />\n";
+                $r .= '<br />-' . $f->getLink();
             }
             unset($f);
-            $r .= "</td></tr>\n";
         }
         return $r;
     }

Update of /cvsroot/tutos/tutos/php/resource
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20244/resource

Modified Files:
	resource.pinc 
Log Message:
some fixes for calendar display stuff 

Index: resource.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource.pinc,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- resource.pinc	22 Jan 2011 20:43:02 -0000	1.58
+++ resource.pinc	24 Jan 2011 07:25:41 -0000	1.59
@@ -333,7 +333,7 @@
     /**
      * create a smalllist of resources used by the given object
      */
-    static function small_infolist (&$user,&$obj,$cols,$class) {
+    static function small_infolist ($user,$obj) {
         global $lang;
 
         $r = '';
@@ -362,7 +362,7 @@
         case 'ResUsage':
         case 'Resource':
             $x = resolve_history_obj($f,$this->dbconn);
-            break;
+        break;
         }
         return $x;
     }

Update of /cvsroot/tutos/tutos/php/rate
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20244/rate

Modified Files:
	rate.pinc 
Log Message:
some fixes for calendar display stuff 

Index: rate.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate.pinc,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- rate.pinc	22 Jan 2011 13:39:28 -0000	1.61
+++ rate.pinc	24 Jan 2011 07:25:41 -0000	1.62
@@ -616,10 +616,11 @@
         $r .= "</tr>\n";
         return $r;
     }
+
     /**
      * create a smalllist of rates attached to the given object
      */
-    static function small_infolist (&$user,&$obj,$cols,$class) {
+    static function small_infolist ($user,$obj) {
         global $lang;
 
         $r = '';
@@ -630,14 +631,10 @@
         }
         rate::obj_read($obj);
         if ( count($obj->list[userates]) > 0 ) {
-            $sep = "";
-            $r .= '  <tr><td class="'. $class .'" colspan="'. $cols .'" align="left">';
             foreach ($obj->list[userates] as $i => $f) {
-                $r .= $sep . "-" . $f->getLink();
-                $sep = "<br />\n";
+                $r .= '<br />-' . $f->getLink();
             }
             unset($f);
-            $r .= "</td></tr>\n";
         }
         return $r;
     }

Update of /cvsroot/tutos/tutos/php/doctracker
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20244/doctracker

Modified Files:
	doctracker.pinc 
Log Message:
some fixes for calendar display stuff 

Index: doctracker.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/doctracker/doctracker.pinc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- doctracker.pinc	22 Jan 2011 13:39:27 -0000	1.19
+++ doctracker.pinc	24 Jan 2011 07:25:41 -0000	1.20
@@ -781,7 +781,7 @@
         case 'DocTrackCreate':
         case 'DocTrackNewRev':
             $x = resolve_history_obj($f,$this->dbconn);
-            break;
+        break;
         }
         return $x;
     }
@@ -824,33 +824,6 @@
     }
 
     /**
-     * create a smalllist of doctrackers attached to the given object
-     */
-    static function small_infolist (&$user,&$obj,$cols,$class) {
-        global $lang;
-
-        $r = '';
-        if (! is_object($obj) ) return $r;
-        if ( $obj->id < 0 ) return $r;
-
-        if ( ! $user->feature_ok(usedoctracker,PERM_SEE) ) {
-            return $r;
-        }
-        note::obj_read($obj);
-        if ( count($obj->list[usedoctracker]) > 0 ) {
-            $sep = "";
-            $r .= "  <tr><td class=\"". $class ."\" colspan=\"". $cols ."\" align=\"left\">";
-            foreach ($obj->list[usedoctracker] as $i => $f) {
-                $r .= $sep . "-" . $f->getLink();
-                $sep = "<br />\n";
-            }
-            unset($f);
-            $r .= "</td></tr>\n";
-        }
-        return $r;
-    }
-
-    /**
      * Return Info about connected doctracker to a object
      */
     static function obj_read(&$obj) {

Update of /cvsroot/tutos/tutos/html
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22324/html

Modified Files:
	default.css 
Log Message:
prepare for calendar drag and drop

Index: default.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/default.css,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- default.css	22 Jan 2011 13:39:26 -0000	1.23
+++ default.css	22 Jan 2011 20:43:02 -0000	1.24
@@ -15,16 +15,42 @@
  *
  */
 
+.left {
+    float: left;
+}
+.right {
+    float: right;
+}
+.dropable, .dragable {
+    list-style-type: none;
+}
+
+ul.dropable {
+    min-height: 10em;
+    margin-bottom: 1px;
+    margin-top: 0px;
+}
+
+li.dragable div.formatted {
+    border-top: 1px solid black;
+    margin-top: 1px;
+}
+
+.dropable li {
+    border: 0px;
+    margin-left: -40px;
+}
+
 #datepicker * {
     font-size: 6pt;
 }
 
 .small{
-	font-size: x-small;
+    font-size: x-small;
 }
 
 .smaller {
-	font-size: xx-small;
+    font-size: xx-small;
 }
 
 
@@ -33,8 +59,8 @@
     background-repeat: no-repeat;
     background-position: center;
     font-family: monospace;
-	height: 255px;
-	white-space: pre;
+    height: 255px;
+    white-space: pre;
 }
 
 TH.icons {
@@ -51,29 +77,29 @@
 }
 
 SPAN.bugclass1 {
-	color: blue;
+    color: blue;
 }
 SPAN.bugclass2 {
-	color: #EE1111;
+    color: #EE1111;
 }
 SPAN.bugclass3 {
-	color: red;
+    color: red;
 }
 SPAN.bugclass4 {
-	color: green;
+    color: green;
 }
 
 SPAN.bugstate1 {
-	color: red;
+    color: red;
 }
 SPAN.bugstate2 {
-	color: blue;
+    color: blue;
 }
 SPAN.bugstate3 {
-	color: green;
+    color: green;
 }
 SPAN.bugstate4 {
-	color: gray;
+    color: gray;
 }
 
 .col0 { 
@@ -123,53 +149,53 @@
 .showbox {
     padding-left: 1px;
     padding-top: 1px;
-   	vertical-align: top;
+    vertical-align: top;
 }
 
 .overviewbox {
     padding-left: 5px;
     padding-top: 5px;
     padding-right: 5px;
-	vertical-align: top;
+    vertical-align: top;
 }
 
 .tcborder {
-	border-right: 1px solid black;
+    border-right: 1px solid black;
 }
 
 .XXautocomplete {
-	list-style-type: none;
-	/*
-	  position: absolute;
-	  z-index: 1000;
-	  */
-	padding-left: 2px;
-	padding-right: 2px;
-	padding-top: 2px;
-	margin-top: 0px;
-	background: white;
-	border-left: 1px solid black;
-	border-right: 1px solid black;
-	border-bottom: 1px solid black;
+    list-style-type: none;
+    /*
+      position: absolute;
+      z-index: 1000;
+      */
+    padding-left: 2px;
+    padding-right: 2px;
+    padding-top: 2px;
+    margin-top: 0px;
+    background: white;
+    border-left: 1px solid black;
+    border-right: 1px solid black;
+    border-bottom: 1px solid black;
 }
 
 UL.ajaxpopup {
-	/* position: absolute; */
-	background: white;
-	margin-top: 1px;
-	margin-left: 0px;
-	padding-left: 0px;
-	border-left: 1px solid black;
-	border-right: 1px solid black;
-	border-bottom: 1px solid black;
-	width:         15em;
+    /* position: absolute; */
+    background: white;
+    margin-top: 1px;
+    margin-left: 0px;
+    padding-left: 0px;
+    border-left: 1px solid black;
+    border-right: 1px solid black;
+    border-bottom: 1px solid black;
+    width:         15em;
 }
 
 UL.ajaxpopup LI {
-	background: #DDD;
-	list-style:  none;
-	margin-left:  0px;
-	padding-left: 0px;
+    background: #DDD;
+    list-style:  none;
+    margin-left:  0px;
+    padding-left: 0px;
 }
 
 .popupinfo TD {
@@ -179,12 +205,8 @@
 
 .popupinfo PRE {
     font-size: 7pt;
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
-#calendar-container TD {
-	font-size: 6pt;
+    margin-top: 0;
+    margin-bottom: 0;
 }
 
 

Update of /cvsroot/tutos/tutos/php/reminder
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22324/php/reminder

Modified Files:
	reminder.pinc 
Log Message:
prepare for calendar drag and drop

Index: reminder.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder.pinc,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- reminder.pinc	22 Jan 2011 13:39:28 -0000	1.53
+++ reminder.pinc	22 Jan 2011 20:43:02 -0000	1.54
@@ -347,17 +347,15 @@
         $this->read_reference();
 
         $r = '';
-        $r .= "  <tr>\n";
+        $r .= '<li class="dragable"><div class="formatted">';
         if ($this->type == REMINDER_ADR_BIRTHDAY) {
-            $r .= "   <td class=\"birthday\" nowrap=\"nowrap\" colspan=\"3\">". $this->ref->getLink() ."</td>\n";
-            $r .= "  </tr>\n";
-            $r .= "  <tr>\n";
-            $r .= "   <td class=\"birthday\" nowrap=\"nowrap\" colspan=\"3\">".  $this->getLink($lang['AdrBirthday']." ". $this->ref->birthday->getDate()) ."</td>\n";
+            $r .= '<span class="birthday left">'.$this->ref->getLink().'&nbsp;</span>';
+            $r .= '<span class="birthday right">&nbsp;'.$this->getLink('*'.$this->ref->birthday->getDate()).'</span>';
         } else {
-            $r .= "   <td colspan=\"1\">". $this->getLink("#")."</td>";
-            $r .= "   <td colspan=\"2\" class=\"note\">&nbsp;". $this->ref->getLink()."</td>";
+            $r .= '<span class="note left">'.$this->getLink('#').'&nbsp;</span>';
+            $r .= '<span class="note right">&nbsp;'. $this->ref->getLink().'</span>';
         }
-        $r .= "  </tr>\n";
+        $r .= '</div></li>';
         return $r;
     }
 

Update of /cvsroot/tutos/tutos/php
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22324/php

Modified Files:
	appointment.pinc calendar.php calendar_week.php product.pinc 
	task.pinc 
Log Message:
prepare for calendar drag and drop

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -d -r1.286 -r1.287
--- task.pinc	22 Jan 2011 13:39:27 -0000	1.286
+++ task.pinc	22 Jan 2011 20:43:02 -0000	1.287
@@ -1738,20 +1738,19 @@
         $r = '';
         $class = "task". $this->state;
 
-        $r .= "  <tr>\n";
-        $r .= '   <td class="'. $class .'" colspan="3">'. $this->getLink() ."</td>\n";
-        $r .= "  </tr>\n";
-        $r .= "  <tr>\n";
+        $r .= '<li class="dragable"><div class="formatted '.$class.'">';
+
+        $r .= $this->getLink() ."<br />\n";
+
         if ( $this->parent->getType() == "address" ) {
-            if ( $this->parent->id == $current_user->id ) {
-                $r .= "   <td nowrap=\"nowrap\" class=\"". $class ."\" colspan=\"3\" align=\"right\">".$this->getState() ."</td>\n";
-            } else {
-                $r .= "   <td nowrap=\"nowrap\" class=\"". $class ."\" colspan=\"3\" align=\"right\">".$this->getState()."&nbsp;(". $this->parent->getLink() .")</td>\n";
+            $r .= $this->getState();
+            if ( $this->parent->id != $current_user->id ) {
+                $r .= "&nbsp;(". $this->parent->getLink();
             }
         } else {
-            $r .= "   <td nowrap=\"nowrap\" class=\"". $class ."\" colspan=\"3\" align=\"right\">".$this->getState()."&nbsp;&#8594;&nbsp;". $this->parent->getLink() ."</td>\n";
+            $r .= $this->getState()."&nbsp;&#8594;&nbsp;". $this->parent->getLink();
         }
-        $r .= "  </tr>\n";
+        $r .= '</div></li>';
 
         return $r;
     }

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- appointment.pinc	23 Dec 2010 08:55:32 -0000	1.238
+++ appointment.pinc	22 Jan 2011 20:43:02 -0000	1.239
@@ -1444,13 +1444,17 @@
     function formatted () {
         global $lang,$tutos,$current_user;
 
+
         $r = '';
+
         if ( $this->mod_allow == 3 ) {
             $class = 'privapp';
         } else {
             $class = 'app'.$this->outside;
         }
 
+        $r .= '<li class="dragable"><div class="formatted '.$class.'">';
+
         if ( $this->repeat != APP_NOREP ) {
             $start = $this->start->getTime();
             $end = $this->end->getTime();
@@ -1485,47 +1489,42 @@
             $duration = sprintf($duration," ");
         }
 
-        $r .= "  <tr>\n";
-        $r .= '   <td class="'. $class .'" colspan="2"><b>'. $this->getLink($duration) ."</b></td>\n";
-        $r .= '   <td class="'. $class .'" align="right"><b>'. $this->getLocation() ."</b></td>\n";
-        $r .= "  </tr>\n";
+        $r .= '<span class="left"><b>'. $this->getLink($duration) .'</b></span>';
+        $r .= '<span class="right"><b>'. $this->getLocation() .'</b></span>';
+        $r .= '<br />';
+        $r .= '<div style="clear: both;"></div>';
 
         $myself = false;
         foreach ( $this->participant as $i => $fp) {
             $fp = &$this->participant[$i];
-            $r .= "  <tr>\n";
-            if ( ($this->trace == 1) && ( ($fp->gettype() == "address") || ($fp->gettype() == "user") )) {
-                $cols = 2;
-            } else {
-                $cols = 3;
-            }
+
+            $r .= '<span class="left">';
             if ( ($fp->gettype() == "address") || ($fp->gettype() == "user") ) {
-                $r .= "   <td nowrap=\"nowrap\" class=\"". $class ."\" width=\"100%\" colspan=\"". $cols ."\">";
                 /* for adresses show link with first + last name */
                 $r .= $fp->getLink( $fp->getShortName());
                 if ($fp->id == $current_user->id) {
                     $myself = true;
                 }
             } else if ( $fp->gettype() == "team" ) {
-                $r .= '   <td class="'. $class .'" width="100%" colspan="'. $cols ."\">";
                 /* for teams show link name */
                 $r .= $fp->getLink();
             } else {
-                $r .= '   <td class="'. $class .'" width="100%" colspan="'. $cols ."\">";
                 $r .= gettype($fp);
             }
-            $r .= "</td>\n";
+            $r .= '</span>';
+
             if ( ($this->trace == 1) && ( ($fp->gettype() == "address") || ($fp->gettype() == "user") ) ) {
                 $s = sprintf("text%d",$this->participant_state[$i]);
-                $r .= "   <td class=\"". $class ."\" align=\"right\"><span class=\"". $s ."\">";
+                $r .= "<span class=\"right ". $s ."\">";
                 if ( $fp->id == $current_user->id ) {
-                    $r .= makelink('app_vote.php?id='. $this->id .'&adr_id='. $fp->id,$lang['AppState'][$this->participant_state[$i]],$lang['AppVoteInfo']);
+                    $r .= makelink('app_vote.php?id='. $this->id .'&amp;adr_id='. $fp->id,$lang['AppState'][$this->participant_state[$i]],$lang['AppVoteInfo']);
                 } else {
                     $r .= $lang['AppState'][$this->participant_state[$i]];
                 }
-                $r .= "</span></td>\n";
+                $r .= "</span>\n";
             }
-            $r .= "  </tr>\n";
+            $r .= "  <br />\n";
+            $r .= '<div style="clear: both;"></div>';
             unset($fp);
         }
 
@@ -1534,16 +1533,17 @@
             ) {
             $descr = preg_replace('#\n#m','<br />',$this->descr);
             if ($descr != '' ) {
-                $r .= '  <tr><td class="'. $class .'" colspan="3">'. urlReplace($descr) ."</td></tr>\n";
+                $r .= urlReplace($descr);
             }
             if ( !(is_numeric($this->visitor) && $this->visitor == -1) ) {
-                $r .= '  <tr><td class="'. $class .'" colspan="3">';
+                $r .= '<br /><span class="left">';
                 if ( $this->outside ) {
-                    $r .= $lang['VisitAt'] .":";
+                    $r .= $lang['VisitAt'] .':';
                 } else {
-                    $r .= $lang['VisitFrom'] .":";
+                    $r .= $lang['VisitFrom'] .':';
                 }
-                $r .= "<br />". $this->visitor->getLink() ."</td></tr>\n";
+                $r .= '</span><span class="right">';
+                $r .= $this->visitor->getLink().'</span>';
             }
 
             $r .= product::small_infolist($current_user,$this,3,$class);
@@ -1552,6 +1552,7 @@
                 $r .= $x->small_infolist($current_user,$this,3,$class);
             }
         }
+        $r .= '</div></li>';
         return $r;
     }
 
@@ -1593,6 +1594,7 @@
         }
         return $r;
     }
+
     /**
      * checks if the appointment happens that day
      * Date d   true if appointment happens that day
@@ -1654,6 +1656,7 @@
         }
         return true;
     }
+
     /**
      * Transfer reference ids according to given table
      */
@@ -1675,6 +1678,7 @@
         }
         return;
     }
+
     /**
      * resolve a history Tag (to be called from history_show)
      */
@@ -1727,6 +1731,7 @@
     function getHtmlIcon () {
         return "appointments";
     }
+
     /* ---------------------------------------------------------------------------
      * The following methods are abstract factory functions for groups
      * which handle the membership list of an object

Index: calendar.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- calendar.php	22 Jan 2011 13:39:27 -0000	1.104
+++ calendar.php	22 Jan 2011 20:43:02 -0000	1.105
@@ -89,25 +89,24 @@
             }
             $dinfo = GetDaysInfo($ts);
 
-            $r .= '<td class="'. $dinfo[color] .'" width="10%"';
-#          echo ' app_new.php?t=". $tref,false).'\';return false;"';
-            $r .= ">\n";
-
+            $r .= '<td class="'. $dinfo[color] .'" width="10%"'.">\n";
+            $r .= ' <ul class="dropable">'."\n";
+            $r .= '<li>';
             if ( isset($dinfo[Desc]) ) {
                 if ( $this->user->feature_ok(usecalendar,PERM_NEW) ) {
-                    $r .= ' '.makelink('app_new.php?t='. $tref,$d,$lang['NewAppointInfo'],$dinfo[popinfo]) ."\n";
+                    $r .= makelink('app_new.php?t='. $tref,$d,$lang['NewAppointInfo'],$dinfo[popinfo]) ."\n";
                 } else {
-                    $r .= ' '.$d."\n";
+                    $r .= $d."\n";
                 }
                 $r .= '<br /><span class="dinfo">'. $dinfo[Desc] ."</span>\n";
             } else {
                 if ( $this->user->feature_ok(usecalendar,PERM_NEW) ) {
-                    $r .= ' '.makelink('app_new.php?t='. $tref,$d,$lang['NewAppointInfo']) ."\n";
+                    $r .= makelink('app_new.php?t='. $tref,$d,$lang['NewAppointInfo']) ."\n";
                 } else {
-                    $r .= ' '.$d."\n";
+                    $r .= $d."\n";
                 }
             }
-            $hastable = 0;
+            $r .= '</li>';
             $a = 0;
 
             foreach ($this->user->callist as $idx => $x) {
@@ -121,25 +120,16 @@
                     continue;
                 }
 
-                if ( $hastable == 0 ) {
-                    $r .= "\n <table class=\"formatted\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
-                    $hastable = 1;
-                } else {
-                    $r .= '  <tr><td class="'. $dinfo[color] .'" colspan="3"><img src="'. $tutos['base'] ."/html/black.png\" width=\"100%\" height=\"1\" alt=\"--------\"></td></tr>\n";
-                }
-
                 $r .= $this->user->callist[$idx]->formatted();
 
                 $a++;
             }
-
-            if ( $hastable == 1 ) {
-                $r .= "</table>\n";
-            }
-            while ( $a < 2 ) {
-                $r .= " <br />\n";
-                $a++;
-            }
+            //             while ( $a < 2 ) {
+            //                 $r .= "  <li class=\"placeholder\"><br /><br /></li>\n";
+            //                 $a++;
+            //             }
+            //             $r .= "  <li class=\"xplaceholder\"><br /><br /></li>\n";
+            $r .= " </ul>\n";
 
             $r .= "</td>\n";
 
@@ -247,6 +237,22 @@
         $r .= hiddenFormElements();
         $r .= $this->getHidden();
         $r .= "</form>\n";
+
+        $tutos['pagescript'] .= "$('.dragable').draggable({
+  revert: \"invalid\",
+  appendTo: \"body\",
+  helper: \"clone\",
+  cursor: \"move\",
+});\n";
+        $tutos['pagescript'] .= "$('.dropable').droppable({
+  accept: '.dragable',
+  hoverClass: \"ui-state-active\",
+  drop: function( event, ui ) {
+        $( this ).find( \".placeholder\" ).remove();
+        x = '<li>xxx</li>';
+        $(ui.draggable).appendTo( this );
+        },
+});\n";
         return $r;
     }
 
@@ -264,8 +270,8 @@
         }
 
         $format = "%Y-%m-%d";
-        $r .= '<td>';
-        $r .= '<div style="float: right; margin-left: 0em; margin-bottom: -1em;margin-top:8em" id="datepicker"></div>';
+        $r .= '<tr><td>';
+        $r .= '<div style="float: right; margin-left: 0em; margin-bottom: -1em;margin-top:8em" id="datepicker"></div></td></tr>';
         $tutos['pagescript'] .= '$(function() {
   $( "#datepicker" ).datepicker({
     defaultDate    : "'.$this->tobj->getYYYYMMDD().'",

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- product.pinc	19 Jan 2011 19:54:59 -0000	1.240
+++ product.pinc	22 Jan 2011 20:43:02 -0000	1.241
@@ -1521,9 +1521,7 @@
         }
 
         if ( is_object($obj->product) ) {
-            $r .= '<tr><td class="'. $class .'" colspan="'. $cols .'" align="right">';
-            $r .= '&#8594;&nbsp;'. $obj->product->getLink();
-            $r .= "</td></tr>\n";
+            $r .= '<br /><span class="right">&#8594;&nbsp;'. $obj->product->getLink() ."</span>\n";
         }
         return $r;
     }

Index: calendar_week.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_week.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- calendar_week.php	19 Jan 2011 19:54:59 -0000	1.61
+++ calendar_week.php	22 Jan 2011 20:43:02 -0000	1.62
@@ -107,11 +107,10 @@
                 $r .= " <tr>\n";
             }
             $r .= "  <td class=\"". $dinfo[color] ."\" width=\"50%\">\n";
+            $r .= ' <ul class="dropable">'."\n";
+            $r .= '<li>';
 
             // DAY-TABLE STARTS
-            $r .= "<table class=\"single\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" width=\"100%\">\n";
-            $r .= " <tr>\n";
-            $r .= "  <th>\n";
             $url = addUrlParameter($navurl,'t='.$tref,false);
             $r .= menulink($url,$lang['Day'. Date("w",$ts)],strftime($lang['DateFormatTitle'],$ts));
             if ( isset($dinfo[Desc]) ) {
@@ -119,14 +118,8 @@
             } else {
                 $r .= " " . menulink('app_new.php?t='. $tref,$d,$lang['NewAppointInfo']) ."\n";
             }
-            $r .= "  </th>\n";
-            $r .= " </tr>\n";
-            $r .= " <tr>\n";
-            $r .= '  <td class="'. $dinfo[color] ."\" width=\"50%\">\n";
-            if ( isset($dinfo[Desc]) ) {
-                $r .= '<span class="dinfo">'. $dinfo[Desc] ."</span>\n";
-            }
-            $hastable = false;
+            $r .= '<span class="dinfo">'. $dinfo[Desc] ."</span>\n";
+            $r .= '</li>';
             foreach ($this->user->callist as $idx => $x) {
                 if ( ! $this->user->callist[$idx]->see_ok() ) continue;
                 /* the correct day */
@@ -140,27 +133,12 @@
                 if ( ($this->user->callist[$idx]->gettype() == "task") && ($this->user->callist[$idx]->state == 2) ) {
                     continue;
                 }
-                if ( !$hastable ) {
-                    $r .= "<table  class=\"formatted\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\"  width=\"100%\">\n";
-                    $hastable = true;
-                } else {
-                    $r .= '  <tr><td class="'. $dinfo[color] .'" colspan="3"><img src="'. $tutos['base'] ."/html/black.png\" width=\"100%\" height=\"1\" alt=\"--------\"></td></tr>\n";
-                }
                 // Show appointments or task or whatever
                 $r .= $this->user->callist[$idx]->formatted();
             }
 
-            if ( $hastable ) {
-                $r .= " </table>\n";
-            } else {
-                $r .= "<br /><br /><br /><br />\n";
-            }
-
-            // DAY-TABLE ENDS
-            $r .= "</td></tr>\n";
-            $r .= "</table>\n";
 
-            $r .= "  </td>\n";
+            $r .= "</ul></td>\n";
             if ( $col == 2 ) {
                 $r .= " </tr>\n";
                 $col = 0;

Update of /cvsroot/tutos/tutos/php/resource
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22324/php/resource

Modified Files:
	resource.pinc 
Log Message:
prepare for calendar drag and drop

Index: resource.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource.pinc,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- resource.pinc	16 Dec 2010 10:04:23 -0000	1.57
+++ resource.pinc	22 Jan 2011 20:43:02 -0000	1.58
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2010 by Gero Kohnert
+ *  Copyright 2001 - 2011 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -344,14 +344,9 @@
         }
         resource::obj_read($obj);
         if ( count($obj->resuselist) > 0 ) {
-            $sep = "";
-            @reset($obj->resuselist);
-            $r .= "  <tr><td class=\"". $class ."\" colspan=\"". $cols ."\" align=\"left\">";
-            while ( list ($i,$f) = @each ($obj->resuselist) ) {
-                $r .= $sep . "&#9658;" . $f->getLink();
-                $sep = "<br />\n";
+            foreach ($obj->resuselist as $i => $f) {
+                $r .= "<br />&#9658;" . $f->getLink();
             }
-            $r .= "</td></tr>\n";
         }
         return $r;
     }
@@ -367,7 +362,7 @@
         case 'ResUsage':
         case 'Resource':
             $x = resolve_history_obj($f,$this->dbconn);
-        break;
+            break;
         }
         return $x;
     }