Revision: 213
http://tutos.svn.sourceforge.net/tutos/?rev=213&view=rev
Author: gokohnert
Date: 2011-06-21 14:59:41 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
removed some unneccesary html/js code
Modified Paths:
--------------
trunk/php/admin_show.php
trunk/php/app_new.php
trunk/php/group/group2_new.php
trunk/php/location.pinc
trunk/php/res_cal_select.php
trunk/php/task_overview.php
trunk/php/user_new.php
trunk/php/webelements.p3
Modified: trunk/php/admin_show.php
===================================================================
--- trunk/php/admin_show.php 2011-06-21 14:15:43 UTC (rev 212)
+++ trunk/php/admin_show.php 2011-06-21 14:59:41 UTC (rev 213)
@@ -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
@@ -144,22 +144,22 @@
$adr = new tutos_user($this->dbconn);
$uid = $result->get($a, "id");
$adr = $adr->read($uid,$adr,1);
- $r .= ' <td colspan="1">'. (is_object($adr) ? $adr->getLink():$uid) .' </td>';
- $r .= ' <td colspan="1" align="right">'. makelink('user_new.php?uid='.$uid ,(is_object($adr) ? $adr->login:'??') );
+ $r .= ' <td>'. (is_object($adr) ? $adr->getLink():$uid) .' </td>';
+ $r .= ' <td align="right">'. makelink('user_new.php?uid='.$uid ,(is_object($adr) ? $adr->login:'??') );
if ($adr->isAdmin()) {
$r .= ' (ADMIN)';
}
$r .= '</td>';
$ls = $result->getDateTime($a, "last_seen");
- $r .= ' <td colspan="1">'. $ls->getLinkDateTime() .'</td>';
+ $r .= ' <td>'. $ls->getLinkDateTime() .'</td>';
$x1 = $result->get($a, "last_host");
$x2 = $x1;
if (($tutos['resolve_host'] == 1) && strstr($x1,".") && !strstr($x1," ")) {
$x2 = @gethostbyaddr($x1);
}
$x1l = makelink('admin_show.php?mode=logfile&filter='.$x1,$x1);
- $r .= " <td colspan=\"1\"> ". $x1l .($x2 != $x1 ? "<br />(".$x2.")":"") ."</td>";
- $r .= " <td align=\"center\">". ($adr->disabled == 0 ? $lang['no']:$lang['yes']) ."</td>";
+ $r .= ' <td> '. $x1l .($x2 != $x1 ? "<br />(".$x2.")":"") ."</td>";
+ $r .= ' <td align="center">'. ($adr->disabled == 0 ? $lang['no']:$lang['yes']) ."</td>";
$r .= $this->OverviewRowEnd($line++);
unset($adr);
$a++;
@@ -302,26 +302,26 @@
continue;
}
$r .= $this->OverviewRowStart($line);
- $r .= ' <td colspan="1">'. makelink('address_show.php?id='.$data['userid'],$data['username']) ."</td>\n";
- $r .= ' <td colspan="1">'. $data['path'] ."</td>\n";
- $r .= ' <td colspan="1">'. $data['server'] ."</td>\n";
+ $r .= ' <td>'. makelink('address_show.php?id='.$data['userid'],$data['username']) ."</td>\n";
+ $r .= ' <td>'. $data['path'] ."</td>\n";
+ $r .= ' <td>'. $data['server'] ."</td>\n";
$ago = ($ts - $data['lastseen']);
$x1 = $ago%60; // remaining seconds
$x2 = floor($ago/60)%60; // minutes;
$x3 = floor($ago/3600); // hours
$age = sprintf('%d:%02d:%02d',$x3,$x2,$x1);
- $r .= ' <td colspan="1" align="right">'. $age." ago</td>\n";
+ $r .= ' <td align="right">'. $age." ago</td>\n";
$x1 = $data['lasthost'];
$x2 = $x1;
if (($tutos['resolve_host'] == 1) && strstr($x1,".") && !strstr($x1," ")) {
$x2 = @gethostbyaddr($x1);
}
$x1l = makelink('admin_show.php?mode=logfile&filter='.$x1,$x1);
- $r .= ' <td colspan="1">'. $x1l.($x2 != $x1 ? "<br />(".$x2.")":"") ."</td>\n";
- $r .= ' <td colspan="1">'. $data['client'] ." </td>\n";
+ $r .= ' <td>'. $x1l.($x2 != $x1 ? "<br />(".$x2.")":"") ."</td>\n";
+ $r .= ' <td>'. $data['client'] ." </td>\n";
$u= addUrlParameter($this->link2,"action=kill");
$u= addUrlParameter($u,"mark=".$file);
- $r .= ' <td colspan="1" align="center"> '. makelink($u,"kill") ."</td>\n";
+ $r .= ' <td align="center"> '. makelink($u,"kill") ."</td>\n";
$r .= $this->OverviewRowEnd($line++);
}
$r .= $this->SubTableEnd();
@@ -730,5 +730,5 @@
?>
<!--
SVN Info $Id$
- $Author$
- -->
+$Author$
+-->
\ No newline at end of file
Modified: trunk/php/app_new.php
===================================================================
--- trunk/php/app_new.php 2011-06-21 14:15:43 UTC (rev 212)
+++ trunk/php/app_new.php 2011-06-21 14:59:41 UTC (rev 213)
@@ -169,7 +169,7 @@
$r .= " </td>\n";
// Voting
- $r .= " <td colspan=\"1\">\n";
+ $r .= " <td>\n";
$r .= '<input type="checkbox" name="trace" id="trace" value="1"'. ($this->obj->trace == 1 ? ' checked="checked"':'') ." />\n";
$r .= '<label for="trace">'. $lang['AppTrace'].'<br /><span class="small">'. $lang['AppTraceDesc'] ."</span></label></td>\n";
@@ -184,13 +184,13 @@
$r .= "</tr><tr>\n";
// check available
- $r .= "<td colspan=\"1\">\n";
+ $r .= "<td>\n";
$r .= '<input type="checkbox" name="check" id="check" value="1"' . ($this->obj->check == 1 ? ' checked="checked"':'') ." />\n";
$r .= '<label for="check">'.$lang['AppCheck'].'<br /><span class="small">'. $lang['AppCheckDesc'] ."</span></label></td>\n";
$r .= "</tr><tr>\n";
// email invite/inform
- $r .= " <td colspan=\"1\">\n";
+ $r .= " <td>\n";
$r .= '<input type="checkbox" name="email" id="email" value="1"'. ($this->obj->email == 1 ? ' checked="checked"':'') ." />\n";
$r .= "<label for=\"email\">";
if ( $this->obj->id > 0 ) {
Modified: trunk/php/group/group2_new.php
===================================================================
--- trunk/php/group/group2_new.php 2011-06-21 14:15:43 UTC (rev 212)
+++ trunk/php/group/group2_new.php 2011-06-21 14:59:41 UTC (rev 213)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2002 - 2010 by Gero Kohnert
+ * Copyright 2002 - 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
@@ -116,5 +116,5 @@
?>
<!--
SVN Info $Id$
- $Author$
- -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file
Modified: trunk/php/location.pinc
===================================================================
--- trunk/php/location.pinc 2011-06-21 14:15:43 UTC (rev 212)
+++ trunk/php/location.pinc 2011-06-21 14:59:41 UTC (rev 213)
@@ -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
@@ -645,7 +645,7 @@
$r .= "<tr>\n";
$r .= $layout->showfieldc($lang['City'],0,'city');
- $r .= ' <td colspan="1"><input size="30" maxlength="'. $table['location']['city'][size] .'" id="city" name="city" value="'. myentities($this->city) ."\" /></td>\n";
+ $r .= ' <td><input size="30" maxlength="'. $table['location']['city'][size] .'" id="city" name="city" value="'. myentities($this->city) ."\" /></td>\n";
$r .= $layout->showfieldc($lang['ZIP'],0,'zip');
$r .= ' <td colspan="2"><input size="10" maxlength="'. $table['location']['zip'][size] .'" id="zip" name="zip" value="'. myentities($this->zip) ."\" /></td>\n";
$r .= "</tr>\n";
Modified: trunk/php/res_cal_select.php
===================================================================
--- trunk/php/res_cal_select.php 2011-06-21 14:15:43 UTC (rev 212)
+++ trunk/php/res_cal_select.php 2011-06-21 14:59:41 UTC (rev 213)
@@ -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
@@ -33,7 +33,7 @@
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= " <td colspan=\"1\">\n";
+ $r .= " <td>\n";
$r .= ' <input name="f[]" value="'. usecalendar .'" type="checkbox" '.($this->do[usecalendar] ? 'checked="checked"':'').' />'. $lang['Calendar']."\n";
$r .= " </td>\n";
$r .= " <td align=\"left\" colspan=\"2\">\n";
@@ -46,7 +46,7 @@
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= " <td colspan=\"1\">\n";
+ $r .= " <td>\n";
$r .= ' <input name="f[]" value="'. usetaskmanagement .'" type="checkbox" '.($this->do[usetaskmanagement] ? 'checked="checked"':'').' />'. $lang['Tasks']."\n";
$r .= " </td>\n";
$r .= " <td align=\"left\" colspan=\"2\">\n";
@@ -61,7 +61,7 @@
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= " <td colspan=\"1\">\n";
+ $r .= " <td>\n";
$r .= ' <input name="f[]" value="'. useprojects .'" type="checkbox" '.($this->do[useprojects] ? 'checked="checked"':'').' />'. $lang['Product']."\n";
$r .= " </td>\n";
$r .= " <td align=\"left\" colspan=\"2\">\n";
@@ -208,5 +208,5 @@
?>
<!--
SVN Info $Id$
- $Author$
- -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file
Modified: trunk/php/task_overview.php
===================================================================
--- trunk/php/task_overview.php 2011-06-21 14:15:43 UTC (rev 212)
+++ trunk/php/task_overview.php 2011-06-21 14:59:41 UTC (rev 213)
@@ -307,9 +307,9 @@
$r .= ' <td colspan="2" class="desc" nowrap="nowrap"> '. $lang['TaskVolumeFull'] ." </td>\n";
$r .= ' <td colspan="2"> '. my_number_format($this->sum['volume'],2) .' '. $lang['hours'] ."</td>\n";
if ( $this->small == 0 ) {
- $r .= ' <th colspan="1" rowspan="2" nowrap="nowrap">'. $lang['AppStart'];
+ $r .= ' <th rowspan="2" nowrap="nowrap">'. $lang['AppStart'];
$r .= '<br />'. $this->start->getDate() ."</th>\n";
- $r .= ' <th colspan="1" rowspan="2" nowrap="nowrap">'. $lang['AppEnd'];
+ $r .= ' <th rowspan="2" nowrap="nowrap">'. $lang['AppEnd'];
$r .= '<br />'. $this->end->getDate() ."</th>\n";
}
if ( $this->sum['volume'] != 0 ) {
@@ -846,7 +846,7 @@
case "user":
case "team":
$x[url] = addUrlParameter($url,"fld=product");
- break;
+ break;
default:
$x[url] = addUrlParameter($url,"fld=worker");
break;
Modified: trunk/php/user_new.php
===================================================================
--- trunk/php/user_new.php 2011-06-21 14:15:43 UTC (rev 212)
+++ trunk/php/user_new.php 2011-06-21 14:59:41 UTC (rev 213)
@@ -131,9 +131,9 @@
$r .= "<tr>\n";
if ( $this->user->isAdmin() ) {
$r .= $this->showfieldc($lang['Username'],1,"login");
- $r .= " <td colspan=\"2\"><input id=\"login\" size=\"".min($table['people']['login'][size],20) ."\" maxlength=\"". $table['people']['login'][size] ."\" name=\"login\" value=\"". $this->obj->login ."\" /></td>\n";
+ $r .= ' <td colspan="2"><input id="login" size="'.min($table['people']['login'][size],20) .'" maxlength="'. $table['people']['login'][size] .'" name="login" value="'. $this->obj->login ."\" /></td>\n";
$r .= $this->showfieldc($lang['UserDisabled'],0,"disabled");
- $r .= " <td colspan=\"2\"><input id=\"disabled\" type=\"checkbox\" name=\"disabled\" value=\"1\"". ($this->obj->disabled == 1 ? ' checked="checked"':'') ." /></td>\n";
+ $r .= ' <td colspan="2"><input id="disabled" type="checkbox" name="disabled" value="1"'. ($this->obj->disabled == 1 ? ' checked="checked"':'') ." /></td>\n";
} else {
$r .= $this->showfieldc($lang['Username'],0,"login");
$r .= $this->showdata($this->obj->login,5);
@@ -146,15 +146,15 @@
// new entry
$r .= "<tr>\n";
$r .= $this->showfieldc($lang['AdrFirstName'],1,"fname");
- $r .= " <td colspan=\"8\"><input id=\"fname\" size=\"".min($table['address']['f_name'][size],40) ."\" maxlength=\"". $table['address']['f_name'][size] ."\" name=\"fname\" value=\"". myentities($this->obj->f_name) ."\" /></td>\n";
+ $r .= ' <td colspan="8"><input id="fname" size="'.min($table['address']['f_name'][size],40) .'" maxlength="'. $table['address']['f_name'][size] .'" name="fname" value="'. myentities($this->obj->f_name) ."\" /></td>\n";
$r .= "</tr>\n";
$r .= "<tr>\n";
$r .= $this->showfieldc($lang['AdrLastName'],1,"lname");
- $r .= " <td colspan=\"8\"><input id=\"lname\" size=\"".min($table['address']['l_name'][size],40) ."\" maxlength=\"". $table['address']['l_name'][size] ."\" name=\"lname\" value=\"". myentities($this->obj->l_name) ."\" /></td>\n";
+ $r .= ' <td colspan="8"><input id="lname" size="'.min($table['address']['l_name'][size],40) .'" maxlength="'. $table['address']['l_name'][size] .'" name="lname" value="'. myentities($this->obj->l_name) ."\" /></td>\n";
$r .= "</tr>\n";
$r .= "<tr>\n";
$r .= $this->showfieldc($lang['AdrEmail'],1,"email");
- $r .= " <td colspan=\"8\"><input id=\"email\" size=\"".min($table['location']['email_1'][size],40) ."\" maxlength=\"". $table['location']['email_1'][size] ."\" name=\"email\" value=\"". myentities($this->obj->email_1) ."\" /></td>\n";
+ $r .= ' <td colspan="8"><input id="email" size="'.min($table['location']['email_1'][size],40).'" maxlength="'. $table['location']['email_1'][size] .'" name="email" value="'. myentities($this->obj->email_1) ."\" /></td>\n";
$r .= "</tr>\n";
} else {
$r .= "<tr>\n";
@@ -175,9 +175,9 @@
if ( $this->user->isAdmin()) {
$achecked[0] ="";
$achecked[1] ="";
- $achecked[$this->obj->admin] ='checked="checked"';
- $r .= " <td colspan=\"1\" align=\"right\">". $lang['yes'] ." <input id=\"admin1\" type=\"radio\" name=\"admin\" value=\"1\" ". $achecked[1] ." /></td>";
- $r .= " <td colspan=\"4\" align=\"left\">". $lang['no'] ." <input id=\"admin2\" type=\"radio\" name=\"admin\" value=\"0\" ". $achecked[0] ." /></td>";
+ $achecked[$this->obj->admin] =' checked="checked"';
+ $r .= ' <td align="right">'. $lang['yes'] .' <input id="admin1" type="radio" name="admin" value="1"'. $achecked[1] ." /></td>\n";
+ $r .= ' <td colspan="4" align="left">'. $lang['no'] .' <input id="admin2" type="radio" name="admin" value="0"'. $achecked[0] ." /></td>\n";
} else {
$this->addHidden("admin",$this->obj->admin);
$r .= $this->showdata('<span id="admin1">'. ($this->obj->isAdmin() ? $lang['yes']:$lang['no']).'</span>',5);
@@ -244,7 +244,7 @@
$r .= " <th width=\"30%\" colspan=\"2\">". $lang['ACLread'] ."<br />". $lang['ACLuse'] ."<br />". $lang['ACLmodify'] ."<br />". $lang['ACLdelete'] ."</th>\n";
$r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= " <td colspan=\"1\"> </td>\n";
+ $r .= " <td> </td>\n";
$r .= " <td colspan=\"2\" align=\"center\">\n";
$r .= $this->acldefault_select(1,$tutos[useok],"r");
$r .= " </td>\n";
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2011-06-21 14:15:43 UTC (rev 212)
+++ trunk/php/webelements.p3 2011-06-21 14:59:41 UTC (rev 213)
@@ -1112,11 +1112,11 @@
if ( is_object($current_user) && $current_user->feature_ok(usepopup,PERM_SEE) && ($plus != "") ) {
$r = '';
$id = uniqid();
- $r .= sprintf ('<a class="nodeco" id="bt_'.$id."\" href=\"%s\" onmouseover=\"self.status='%s';return true;\" onmouseout=\"self.status=null;return true;\" title=\"%s\">%s</a>",$href,myentities($info,1),myentities($info),$text);
+ $r .= sprintf ('<a class="nodeco" id="bt_'.$id."\" href=\"%s\" title=\"%s\">%s</a>",$href,myentities($info),$text);
$tutos['pagescript'] .= "$('#bt_".$id."').bt('".addslashes($plus)."');\n";
return $r;
} else {
- return sprintf ("<a class=\"nodeco\" href=\"%s\" %s onmouseover=\"self.status='%s' ;return true;\" onmouseout=\"self.status='';return true;\" title=\"%s\">%s</a>",$href,$attr,myentities($info,1),myentities($info),$text);
+ return sprintf ("<a class=\"nodeco\" href=\"%s\" %s title=\"%s\">%s</a>",$href,$attr,myentities($info),$text);
}
}
@@ -1147,13 +1147,12 @@
if ( is_object($current_user) && $current_user->feature_ok(usepopup,PERM_SEE) && ($plus != '') ) {
$r = '';
if ($tag != '') {
- $id = 'bt_'.uniqid();
- } else {
$id = 'bt_'.$tag;
+ } else {
+ $id = 'bt_'.uniqid();
}
- $id = uniqid();
- $r .= sprintf ('<a id="bt_'.$id.'" href="%s" '.$target." onmouseover=\"self.status='%s';return true;\" onmouseout=\"self.status=null;return true;\" title=\"%s\">%s</a>",$href,myentities($info,1),myentities($info),$text);
- $tutos['pagescript'] .= "$('#bt_".$id."').bt('".addslashes($plus)."');\n";
+ $r .= sprintf ('<a id="'.$id.'" href="%s" '.$target." title=\"%s\">%s</a>",$href,myentities($info),$text);
+ $tutos['pagescript'] .= "$('#".$id."').bt('".addslashes($plus)."');\n";
return $r;
} else {
if ($tag != '') {
@@ -1161,7 +1160,7 @@
} else {
$id = '';
}
- return sprintf ('<a '.$id.'href="%s"'.$target." onmouseover=\"self.status='%s';return true;\" onmouseout=\"self.status=null;return true;\" title=\"%s\">%s</a>",$href,myentities($info,1),myentities($info),$text);
+ return sprintf ('<a class="smallinfo" '.$id.'href="%s"'.$target." title=\"%s\">%s</a>",$href,myentities($info),$text);
}
}
@@ -1180,11 +1179,11 @@
if ( $current_user->feature_ok(usepopup,PERM_SEE) && ($plus != "") ) {
$r = '';
$id = uniqid();
- $r .= sprintf ('<a id="bt_'.$id.'" calss="nodeco" href="%s" '.$target." onclick=\"if (! confirm('%s ?')) { return false };\" onmouseover=\"self.status='%s';return true;\" onmouseout=\"self.status=null;return true;\" title=\"%s\">%s</a>",$href,myentities($info,1),myentities($info),$text);
+ $r .= sprintf ('<a id="bt_'.$id.'" calss="nodeco" href="%s" '.$target." onclick=\"if (! confirm('%s ?')) { return false };\" title=\"%s\">%s</a>",$href,myentities($info,1),myentities($info),$text);
$tutos['pagescript'] .= "$('#bt_".$id."').bt('".addslashes($plus)."');\n";
return $r;
} else {
- return sprintf ("<a class=\"nodeco\" href=\"%s\" onclick=\"if (! confirm('%s ?')) { return false };\" onmouseover=\"self.status='%s' ;return true;\" onmouseout=\"self.status='';return true;\" title=\"%s\">%s</a>",$href,myentities($info,1),myentities($info,1),myentities($info),$text);
+ return sprintf ("<a class=\"nodeco\" href=\"%s\" onclick=\"if (! confirm('%s ?')) { return false };\" title=\"%s\">%s</a>",$href,myentities($info,1),myentities($info),$text);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
