tutos-commits Mailing List for TUTOS
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
Menu
▾
▴
tutos-commits — SVN commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(13) |
Aug
(214) |
Sep
(144) |
Oct
(22) |
Nov
(22) |
Dec
(93) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(25) |
Feb
(31) |
Mar
(92) |
Apr
(70) |
May
(103) |
Jun
(130) |
Jul
(265) |
Aug
(325) |
Sep
(233) |
Oct
(244) |
Nov
(261) |
Dec
(157) |
| 2003 |
Jan
(101) |
Feb
(135) |
Mar
(148) |
Apr
(164) |
May
(53) |
Jun
(116) |
Jul
(149) |
Aug
(126) |
Sep
(45) |
Oct
(109) |
Nov
(36) |
Dec
(61) |
| 2004 |
Jan
(131) |
Feb
(236) |
Mar
(278) |
Apr
(259) |
May
(92) |
Jun
(110) |
Jul
(150) |
Aug
(64) |
Sep
(141) |
Oct
(141) |
Nov
(146) |
Dec
(65) |
| 2005 |
Jan
(70) |
Feb
(77) |
Mar
(129) |
Apr
(153) |
May
(161) |
Jun
(63) |
Jul
(42) |
Aug
(16) |
Sep
(30) |
Oct
(3) |
Nov
(8) |
Dec
(40) |
| 2006 |
Jan
(114) |
Feb
(16) |
Mar
(12) |
Apr
(15) |
May
(4) |
Jun
(9) |
Jul
(69) |
Aug
(27) |
Sep
(12) |
Oct
(80) |
Nov
(62) |
Dec
(41) |
| 2007 |
Jan
(34) |
Feb
(2) |
Mar
(38) |
Apr
(82) |
May
(61) |
Jun
(37) |
Jul
(16) |
Aug
(64) |
Sep
(7) |
Oct
(52) |
Nov
(18) |
Dec
(28) |
| 2008 |
Jan
(168) |
Feb
(26) |
Mar
(27) |
Apr
(19) |
May
(10) |
Jun
(58) |
Jul
(58) |
Aug
(91) |
Sep
(14) |
Oct
(23) |
Nov
(56) |
Dec
(38) |
| 2009 |
Jan
(58) |
Feb
(90) |
Mar
(204) |
Apr
(90) |
May
(27) |
Jun
(177) |
Jul
(116) |
Aug
(53) |
Sep
(42) |
Oct
(120) |
Nov
(51) |
Dec
(58) |
| 2010 |
Jan
(117) |
Feb
(231) |
Mar
(163) |
Apr
(90) |
May
(40) |
Jun
(139) |
Jul
(49) |
Aug
(118) |
Sep
(25) |
Oct
(80) |
Nov
(102) |
Dec
(99) |
| 2011 |
Jan
(176) |
Feb
(42) |
Mar
(60) |
Apr
(52) |
May
(30) |
Jun
(29) |
Jul
(27) |
Aug
(16) |
Sep
(51) |
Oct
(70) |
Nov
(63) |
Dec
(58) |
| 2012 |
Jan
(28) |
Feb
(26) |
Mar
(7) |
Apr
(12) |
May
(41) |
Jun
(61) |
Jul
(59) |
Aug
(38) |
Sep
(30) |
Oct
(28) |
Nov
(14) |
Dec
(31) |
| 2013 |
Jan
(24) |
Feb
(54) |
Mar
(45) |
Apr
(22) |
May
(35) |
Jun
(8) |
Jul
(18) |
Aug
(38) |
Sep
(11) |
Oct
(8) |
Nov
(19) |
Dec
(20) |
| 2014 |
Jan
(20) |
Feb
(22) |
Mar
(4) |
Apr
(6) |
May
(13) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2015 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
(4) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(8) |
Aug
(13) |
Sep
(12) |
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2021 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
|
2
|
3
|
4
|
5
(4) |
|
6
|
7
(3) |
8
(3) |
9
(7) |
10
(4) |
11
(1) |
12
(4) |
|
13
(3) |
14
(4) |
15
(4) |
16
(2) |
17
|
18
(2) |
19
|
|
20
|
21
(4) |
22
(6) |
23
(2) |
24
(2) |
25
|
26
|
|
27
(1) |
28
(1) |
29
(1) |
30
(5) |
|
|
|
|
From: <gok...@us...> - 2011-11-30 11:26:55
|
Revision: 445
http://tutos.svn.sourceforge.net/tutos/?rev=445&view=rev
Author: gokohnert
Date: 2011-11-30 11:26:48 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
support print media type in CSS / hide menus etc.
Modified Paths:
--------------
trunk/html/new2_layout.css
trunk/html/new_layout.css
trunk/php/layout/layout_base.pinc
Modified: trunk/html/new2_layout.css
===================================================================
--- trunk/html/new2_layout.css 2011-11-30 10:56:20 UTC (rev 444)
+++ trunk/html/new2_layout.css 2011-11-30 11:26:48 UTC (rev 445)
@@ -13,7 +13,7 @@
*/
@media print {
- .headline,.navigate,.historyline,.updaterow ,.upd_field,.handler {
+ .headline,.navigate,.historyline,.updaterow ,.upd_field,.handler,.subsessionnav {
display:none;
}
.dtable TD{
Modified: trunk/html/new_layout.css
===================================================================
--- trunk/html/new_layout.css 2011-11-30 10:56:20 UTC (rev 444)
+++ trunk/html/new_layout.css 2011-11-30 11:26:48 UTC (rev 445)
@@ -12,7 +12,7 @@
*
*/
@media print {
- .headline,.navigate,.historyline,.updaterow ,.upd_field,.handler {
+ .headline,.navigate,.historyline,.updaterow ,.upd_field,.handler,.subsessionnav {
display:none;
}
.dtable TD{
Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc 2011-11-30 10:56:20 UTC (rev 444)
+++ trunk/php/layout/layout_base.pinc 2011-11-30 11:26:48 UTC (rev 445)
@@ -971,7 +971,7 @@
}
$r = makelink(addUrlParameter($this->nav['link'],$arg),myentities(sprintf($lang['NavBackTo'],$this->nav['title']))).$r;
}
- return $r;
+ return '<span class="subsessionnav">'.$r.'</span>';
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-30 10:56:27
|
Revision: 444
http://tutos.svn.sourceforge.net/tutos/?rev=444&view=rev
Author: gokohnert
Date: 2011-11-30 10:56:20 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
support print media type in CSS / hide menus etc.
Modified Paths:
--------------
trunk/html/new2_layout.css
trunk/html/new_layout.css
trunk/php/address_tools.p3
trunk/php/base.pinc
trunk/php/cia_factbook/cia.pinc
trunk/php/company_show.php
trunk/php/fax/fax.pinc
trunk/php/group/group.pinc
trunk/php/layout/layout_base.pinc
trunk/php/layout/new2_layout.pinc
trunk/php/layout/new_layout.pinc
trunk/php/map24/map24.pinc
trunk/php/mapquest/mapquest.pinc
trunk/php/oanda/oanda.pinc
trunk/php/sipgate/sipgate.pinc
trunk/php/sms/sms.pinc
trunk/php/team.pinc
trunk/php/webelements.p3
trunk/php/yahoo/yahoo_currency_converter.pinc
Modified: trunk/html/new2_layout.css
===================================================================
--- trunk/html/new2_layout.css 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/html/new2_layout.css 2011-11-30 10:56:20 UTC (rev 444)
@@ -12,6 +12,17 @@
*
*/
+@media print {
+ .headline,.navigate,.historyline,.updaterow ,.upd_field,.handler {
+ display:none;
+ }
+ .dtable TD{
+ border:1px solid lightgray;
+ }
+ .dtable TH{
+ border:2px solid grey;
+ }
+}
#tutosversion {
font-size: 6pt;
Modified: trunk/html/new_layout.css
===================================================================
--- trunk/html/new_layout.css 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/html/new_layout.css 2011-11-30 10:56:20 UTC (rev 444)
@@ -11,6 +11,18 @@
* $Author$
*
*/
+@media print {
+ .headline,.navigate,.historyline,.updaterow ,.upd_field,.handler {
+ display:none;
+ }
+ .dtable TD{
+ border:1px solid lightgray;
+ }
+ .dtable TH{
+ border:2px solid grey;
+ }
+}
+
#tutosversion {
font-size: 6pt;
color: #666;
Modified: trunk/php/address_tools.p3
===================================================================
--- trunk/php/address_tools.p3 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/address_tools.p3 2011-11-30 10:56:20 UTC (rev 444)
@@ -474,7 +474,7 @@
$r .= show_custom_overview_data($layout,'address',$address);
if ( ($tutos[massupdate] == 1) && !empty($target) ) {
- $r .= " <td align=\"center\">\n";
+ $r .= " <td class=\"upd_field\" align=\"center\">\n";
if ( $address->mod_ok() ) {
$r .= '<input class="m_field" name="mark[]" type="checkbox" value="'. $address->id ."\" />\n";
} else {
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/base.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -973,7 +973,7 @@
$r = '';
if ( $current_user->feature_ok(usehistory,PERM_SEE) ) {
if ($cols > 0) {
- $r .= "<tr>\n";
+ $r .= "<tr class=\"historyline\">\n";
$r .= ' <td colspan="'. $cols .'"><br />';
}
$r .= makelink('history_show.php?id='. $this->id,$lang['HistoryLink'],sprintf($lang['HistoryLinkI'],$this->getFullname()));
Modified: trunk/php/cia_factbook/cia.pinc
===================================================================
--- trunk/php/cia_factbook/cia.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/cia_factbook/cia.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -71,7 +71,7 @@
if ($cnt == 1) {
return '<a href="'. $url .'" target="map">'. $arg .' '. $link2 .'</a>';
} else {
- return ' [<a href="'. $url .'" target="map">'. $link2 .'</a>]';
+ return '<span class="handler"> [<a href="'. $url .'" target="map">'. $link2 .'</a>]</span>';
}
}
/**
Modified: trunk/php/company_show.php
===================================================================
--- trunk/php/company_show.php 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/company_show.php 2011-11-30 10:56:20 UTC (rev 444)
@@ -68,8 +68,8 @@
// Locations
if ( isset($this->obj->location) && count($this->obj->location) > 0 ) {
// Location's Header and Direkt Links to Modify and Delete
- $r .= "<tr><td colspan=\"".$cols."\"></td></tr>\n";
- $r .= "<tr><td colspan=\"".$cols."\"></td></tr>\n";
+ // $r .= "<tr><td colspan=\"".$cols."\"></td></tr>\n";
+ // $r .= "<tr><td colspan=\"".$cols."\"></td></tr>\n";
$r .= Show_LocFields($this->user,'',$this,"ModifyDelete",9);
Modified: trunk/php/fax/fax.pinc
===================================================================
--- trunk/php/fax/fax.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/fax/fax.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2009 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
@@ -34,9 +34,9 @@
$add = "";
}
if ($cnt == 1) {
- return makelink("fax/fax_new.php?nr=". UrlEncode($obj).$add,$arg,sprintf($lang['FaxSendTo'],$to));
+ return makelink('fax/fax_new.php?nr='. UrlEncode($obj).$add,$arg,sprintf($lang['FaxSendTo'],$to));
} else {
- return " [". makelink("fax/fax_new.php?nr=". UrlEncode($obj).$add,"fax",sprintf($lang['FaxSendTo'],$to)) ."]";
+ return '<span class="handler">['. makelink("fax/fax_new.php?nr=". UrlEncode($obj).$add,"fax",sprintf($lang['FaxSendTo'],$to)) .']</span>';
}
}
/**
Modified: trunk/php/group/group.pinc
===================================================================
--- trunk/php/group/group.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/group/group.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -218,7 +218,7 @@
if ($f[0]->getType() == "address") {
$e = $f[0]->default_email();
if ( !empty($e) ) {
- $x .= $sep . $f[0]->getFullName() .' '. $this->getFullName() .' <'. trim($e) .'>';
+ $x .= $sep . $f[0]->getFullName() .' '. $this->getFullName() .' <'. trim($e) .'>';
$sep = ',';
}
} else if ($f[0]->getType() == "team") {
@@ -226,7 +226,7 @@
foreach($f[0]->member as $xx) {
$e = $xx->default_email();
if ( !empty($e) ) {
- $x .= $sep . $xx->getFullName() .' '. $this->getFullName() .' <'. trim($e) .'>';
+ $x .= $sep . $xx->getFullName() .' '. $this->getFullName() .' <'. trim($e) .'>';
$sep = ',';
}
}
Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/layout/layout_base.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -442,7 +442,7 @@
$r = '';
if ( $tutos[massupdate] == 1 ) {
- $r .= ' <td align="center"'.($rs > 1 ? ' rowspan="'.$rs.'"':'') .">\n";
+ $r .= ' <td class="upd_field" align="center"'.($rs > 1 ? ' rowspan="'.$rs.'"':'') .">\n";
if ( method_exists($obj,"mod_ok") && $obj->mod_ok() ) {
if ( $obj->getType() == "user" ) {
$r .= '<input class="m_field" name="mark[]" type="checkbox" value="'. $obj->uid ."\" />\n";
Modified: trunk/php/layout/new2_layout.pinc
===================================================================
--- trunk/php/layout/new2_layout.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/layout/new2_layout.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -176,7 +176,7 @@
* start a massupdate row
*/
function UpdateRowStart($cols) {
- $r = "<tr>\n";
+ $r = "<tr class=\"updaterow\">\n";
$r .= ' <td align="right" colspan="'. $cols ."\">\n";
return $r;
}
Modified: trunk/php/layout/new_layout.pinc
===================================================================
--- trunk/php/layout/new_layout.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/layout/new_layout.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -196,7 +196,7 @@
* start a massupdate row
*/
function UpdateRowStart($cols) {
- $r = "<tr>\n";
+ $r = "<tr class=\"updaterow\">\n";
$r .= ' <td align="right" colspan="'. $cols ."\">\n";
return $r;
}
Modified: trunk/php/map24/map24.pinc
===================================================================
--- trunk/php/map24/map24.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/map24/map24.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -1,7 +1,11 @@
<?php
/**
- * Copyright 2003 - 2009 by Gero Kohnert
+ * Copyright 2003 - 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.
+ *
* SVN Info $Id$
* $Author$
*/
@@ -20,28 +24,28 @@
return;
}
if (is_Object($obj) && $obj->gettype() == "location" ) {
- $url = "map24/map_select.php?id=". $obj->id;
+ $url = 'map24/map_select.php?id='. $obj->id;
} else {
- $url = "map24/map_select.php?city=". $arg;
+ $url = 'map24/map_select.php?city='. $arg;
}
-
+
if ($cnt == 1) {
return makelink($url ,$arg,$arg);
} else {
- return " [". makelink($url ,"map24",$arg) ."]";
+ return '<span class="handler"> ['. makelink($url ,"map24",$arg) .']</span>';
}
}
/**
* check if all is ok
*/
function check(&$obj,$arg) {
- global $lang,$current_user;
-
- if ( ! $current_user->feature_ok(usemaplink,PERM_SEE) ) {
- return false;
- }
- return true;
+ global $lang,$current_user;
+
+ if ( ! $current_user->feature_ok(usemaplink,PERM_SEE) ) {
+ return false;
+ }
+ return true;
}
-}
+ }
?>
\ No newline at end of file
Modified: trunk/php/mapquest/mapquest.pinc
===================================================================
--- trunk/php/mapquest/mapquest.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/mapquest/mapquest.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -1,14 +1,18 @@
<?php
- /**
- * Copyright 1999 - 2009 by Gero Kohnert
- *
- * SVN Info $Id$
- * $Author$
- */
+/**
+ * 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.
+ *
+ * SVN Info $Id$
+ * $Author$
+ */
- /**
- * link to mapquest map service
- */
+/**
+ * link to mapquest map service
+ */
class mapquest extends tutos_handler {
/**
* run the handler
@@ -21,27 +25,28 @@
}
if (is_Object($obj) && $obj->gettype() == "location" ) {
- $url = "mapquest/map_select.php?id=". $obj->id;
+ $url = 'mapquest/map_select.php?id='. $obj->id;
} else {
- $url = "mapquest/map_select.php?city=". $arg;
+ $url = 'mapquest/map_select.php?city='. $arg;
}
if ($cnt == 1) {
return makelink($url ,$arg,$arg);
} else {
- return " [". makelink($url ,"map",$arg) ."]";
+ return '<span class="handler"> ['. makelink($url ,"map",$arg) .']</span>';
}
}
+
/**
* check if all is ok
*/
function check(&$obj,$arg) {
- global $lang,$current_user;
-
- if ( ! $current_user->feature_ok(usemaplink,PERM_SEE) ) {
- return false;
- }
- return true;
+ global $lang,$current_user;
+
+ if ( ! $current_user->feature_ok(usemaplink,PERM_SEE) ) {
+ return false;
+ }
+ return true;
}
-}
+ }
?>
\ No newline at end of file
Modified: trunk/php/oanda/oanda.pinc
===================================================================
--- trunk/php/oanda/oanda.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/oanda/oanda.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2003 - 2010 by Gero Kohnert
+ * Copyright 2003 - 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
@@ -48,9 +48,9 @@
# $url = addUrlParameter($url,"user=sebastian");
if ($cnt == 1) {
- return "<a target=\"map\" href=\"". $url ."\">". $arg ."</a>";
+ return '<a target="map" href="'. $url .'">'. $arg ."</a>";
} else {
- return " [<a target=\"map\" href=\"". $url ."\">oanda</a>]";
+ return '<span class="handler"> [<a target="map" href="'. $url ."\">oanda</a>]</span>";
}
}
/**
Modified: trunk/php/sipgate/sipgate.pinc
===================================================================
--- trunk/php/sipgate/sipgate.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/sipgate/sipgate.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -50,9 +50,9 @@
';
}
if ($cnt == 1) {
- $r .= "<a href=\"". $url ."\">". $arg ."</a>";
+ $r .= '<a href="'. $url .'">'. $arg .'</a>';
} else {
- $r .= " [<a href=\"". $url ."\">SIPGATE</a>]";
+ $r .= '<span class="handler"> [<a href="'. $url .'">SIPGATE</a>]</span>';
}
return $r;
}
Modified: trunk/php/sms/sms.pinc
===================================================================
--- trunk/php/sms/sms.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/sms/sms.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -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
@@ -25,12 +25,12 @@
}
if ($tutos[smsmail] == "") {
- $url = "sms/sms_new.php";
+ $url = 'sms/sms_new.php';
if (is_Object($obj) && $obj->gettype() == "location" ) {
$url= addUrlParameter($url,"l=". $obj->id);
}
} else {
- $url = "mail_new.php";
+ $url = 'mail_new.php';
}
$p = $arg;
@@ -67,7 +67,7 @@
if ($cnt == 1) {
return makelink($url,$arg,sprintf($lang['SMSSendTo'],$arg));
} else {
- return " [". makelink($url,"sms",sprintf($lang['SMSSendTo'],$arg)) ."]";
+ return '<span class="handler"> ['. makelink($url,"sms",sprintf($lang['SMSSendTo'],$arg)) .']</span>';
}
}
Modified: trunk/php/team.pinc
===================================================================
--- trunk/php/team.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/team.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -287,15 +287,14 @@
$e = $f->default_email();
if ( !empty($e) ) {
$fn = $f->getFullname();
- $x .= $sep . $fn ."<". trim($e) .">";
+ $x .= $sep . $fn .'<'. trim($e) .'>';
$sep = ",";
}
}
- $b = ereg_replace("&","%26",$lang['Team'] ." ". $this->getFullName());
- $b = ereg_replace(" ","%20",$b);
+ $b = myentities($lang['Team'] .' '. $this->getFullName());
$sep = "?";
$x .= $sep."subject=". $b;
- return "mailto:".$x;
+ return 'mailto:'.$x;
}
/**
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/webelements.p3 2011-11-30 10:56:20 UTC (rev 444)
@@ -438,7 +438,7 @@
case 'integer':
case 'double':
$msg .= $a;
- break;
+ break;
case 'boolean':
if (true === $a){
$msg .= 'T';
@@ -937,7 +937,7 @@
} else if ( $tutos[usemail] == 2 ) {
return makelink($tutos[squirrelurl].'src/compose.php?send_to='. UrlEncode(trim($email))."&subject=".UrlEncode($subject) ,$fn,sprintf($lang['MailSendTo'],$email), '', '_blank');
} else {
- return makelink('mailto:'. $name .'<'. trim($email) .'>?subject='.$subject ,$fn,sprintf($lang['MailSendTo'],$email) );
+ return makelink('mailto:'. $name .'<'. trim($email) .'>?subject='.$subject ,$fn,sprintf($lang['MailSendTo'],$email) );
}
}
Modified: trunk/php/yahoo/yahoo_currency_converter.pinc
===================================================================
--- trunk/php/yahoo/yahoo_currency_converter.pinc 2011-11-30 09:19:58 UTC (rev 443)
+++ trunk/php/yahoo/yahoo_currency_converter.pinc 2011-11-30 10:56:20 UTC (rev 444)
@@ -1,7 +1,11 @@
<?php
/**
- * Copyright 2003 - 2010 by Gero Kohnert
+ * Copyright 2003 - 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.
+ *
* SVN Info $Id$
* $Author$
*/
@@ -61,9 +65,9 @@
$url = addUrlParameter($url,"submit=Convert");
if ($cnt == 1) {
- return "<a target=\"map\" href=\"". $url ."\">". $arg ."</a>";
+ return '<a target="map" href="'. $url .'">'. $arg .'</a>';
} else {
- return " [<a target=\"map\" href=\"". $url ."\">yahoo!</a>]";
+ return '<span class="handler"> [<a target="map" href="'. $url .'">yahoo!</a>]</span>';
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-30 09:20:04
|
Revision: 443
http://tutos.svn.sourceforge.net/tutos/?rev=443&view=rev
Author: gokohnert
Date: 2011-11-30 09:19:58 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
better naming
Modified Paths:
--------------
trunk/php/user_new.php
Modified: trunk/php/user_new.php
===================================================================
--- trunk/php/user_new.php 2011-11-30 09:19:51 UTC (rev 442)
+++ trunk/php/user_new.php 2011-11-30 09:19:58 UTC (rev 443)
@@ -205,7 +205,7 @@
}
$r .= '</tfoot>';
- $r .= '<tbody><tr><td class="tg0" colspan="'.$this->width.'"><a>BASE</a></td></tr></tbody>'."\n";
+ $r .= '<tbody><tr><td class="tg0" colspan="'.$this->width.'"><a>'.$lang['Password'].'</a></td></tr></tbody>'."\n";
$r .= '<tbody class="tg0">';
$r .= "<tr>\n";
$r .= $this->showfieldc($lang['UserAdmin'],1,"admin1");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-30 09:19:57
|
Revision: 442
http://tutos.svn.sourceforge.net/tutos/?rev=442&view=rev
Author: gokohnert
Date: 2011-11-30 09:19:51 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/help.php
Modified: trunk/php/help.php
===================================================================
--- trunk/php/help.php 2011-11-30 09:16:54 UTC (rev 441)
+++ trunk/php/help.php 2011-11-30 09:19:51 UTC (rev 442)
@@ -28,6 +28,8 @@
function date(TUTOS_Date_Time $d) {}
function datetime(TUTOS_Date_Time $d) {}
function nextid($name = "id") {}
+ function Like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {}
+ function Like2($fld,$name,$not=false) {}
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-30 09:17:01
|
Revision: 441
http://tutos.svn.sourceforge.net/tutos/?rev=441&view=rev
Author: gokohnert
Date: 2011-11-30 09:16:54 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
some cleanup and code minimize
Modified Paths:
--------------
trunk/html/default.css
trunk/html/js/new2_layout.js
trunk/html/tutos.css
trunk/php/layout/layout_base.pinc
trunk/php/layout/new2_layout.pinc
trunk/php/layout/new_layout.pinc
Added Paths:
-----------
trunk/html/js/new_layout.js
Modified: trunk/html/default.css
===================================================================
--- trunk/html/default.css 2011-11-29 07:39:28 UTC (rev 440)
+++ trunk/html/default.css 2011-11-30 09:16:54 UTC (rev 441)
@@ -15,6 +15,26 @@
*
*/
+#loading {
+ z-index: 10;
+ position: absolute;
+ left: 10%;
+ top: 10%;
+ text-align: center;
+ width: 80%;
+ height: 80%;
+ background-color: #000;
+ border: 0px solid black;
+ display: none;
+ color: white;
+ font-size: 30pt;
+ font-weight: bold;
+ opacity: 0.3;
+ -moz-opacity: 0.5;
+ -khtml-opacity: 0.5;
+ filter: alpha(opacity=50);
+}
+
.ui-tabs .ui-tabs-panel { padding: 0.2em 0.2em; }
.ui-tabs { padding: 0em; }
Modified: trunk/html/js/new2_layout.js
===================================================================
--- trunk/html/js/new2_layout.js 2011-11-29 07:39:28 UTC (rev 440)
+++ trunk/html/js/new2_layout.js 2011-11-30 09:16:54 UTC (rev 441)
@@ -10,6 +10,26 @@
* SVN Info: $Id: tutos.js 373 2011-10-25 18:47:11Z gokohnert $
* $Author: gokohnert $
*/
+
+jQuery.bt.defaults.width = 200;
+jQuery.bt.defaults.positions = ['most'];
+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',color: 'white'};
+jQuery.bt.defaults.windowMargin = '0px';
+jQuery.bt.defaults.padding = '0px';
+jQuery.bt.defaults.noShadowOpts = {strokeStyle: '#999', strokeWidth: 2};
+
$(document).ready(function(){
$("ul.sf-menu").
superfish({
Added: trunk/html/js/new_layout.js
===================================================================
--- trunk/html/js/new_layout.js (rev 0)
+++ trunk/html/js/new_layout.js 2011-11-30 09:16:54 UTC (rev 441)
@@ -0,0 +1,40 @@
+/**
+ * Copyright 2005 - 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.
+ *
+ * Collection of Javascript functions used in new2 layout
+ *
+ * SVN Info: $Id: tutos.js 373 2011-10-25 18:47:11Z gokohnert $
+ * $Author: gokohnert $
+ */
+jQuery.bt.defaults.width = 200;
+jQuery.bt.defaults.positions = ['most'];
+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',color: 'white'};
+jQuery.bt.defaults.windowMargin = '0px';
+jQuery.bt.defaults.padding = '0px';
+jQuery.bt.defaults.noShadowOpts = {strokeStyle: '#999', strokeWidth: 2};
+
+$(".line1,.line2").mouseenter(function(){
+ $(this).addClass("line_active");
+}).mouseleave(function(){
+ $(this).removeClass("line_active");
+});
+
+$(".m_field").change(function(){
+ $(this).closest('tr').toggleClass("line_selected");
+});
Modified: trunk/html/tutos.css
===================================================================
--- trunk/html/tutos.css 2011-11-29 07:39:28 UTC (rev 440)
+++ trunk/html/tutos.css 2011-11-30 09:16:54 UTC (rev 441)
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright 1999 - 2011 by Gero Kohnert
*
* SVN Info $Id$
@@ -11,7 +11,7 @@
}
.tickerlink:visited {
- color: #3e7c80;
+ color: #3e7c80;
}
A {
Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc 2011-11-29 07:39:28 UTC (rev 440)
+++ trunk/php/layout/layout_base.pinc 2011-11-30 09:16:54 UTC (rev 441)
@@ -208,25 +208,6 @@
}
$tutos['pagescript'] = "
- jQuery.bt.defaults.width = 200;
- jQuery.bt.defaults.positions = ['most'];
- 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',color: 'white'};
- jQuery.bt.defaults.windowMargin = '0px';
- jQuery.bt.defaults.padding = '0px';
- jQuery.bt.defaults.noShadowOpts = {strokeStyle: '#999', strokeWidth: 2};
-
$(function() {
$.datepicker.setDefaults( $.datepicker.regional[ \"".$x."\" ] );
$.datepicker.setDefaults({autoSize:true,changeYear:true,changeMonth:true,showOtherMonths:true,showWeek:true,dateFormat:\"".TUTOS_Date_Time::getDateFormat()."\"});
@@ -251,11 +232,12 @@
* and add it if it exists
*/
function add_css_link($path) {
+ global $tutos;
$c = " />\n";
$r = '';
if (is_readable(getcwd()."/".$path) ) {
$r .= ' <link rel="stylesheet" href="'. $path .'" type="text/css"'.$c;
- } else {
+ } else if ( $tutos[debug] == 1 ) {
$r .= "\n<!-- NO CSS ". $path ." found -->\n";
}
return $r;
Modified: trunk/php/layout/new2_layout.pinc
===================================================================
--- trunk/php/layout/new2_layout.pinc 2011-11-29 07:39:28 UTC (rev 440)
+++ trunk/php/layout/new2_layout.pinc 2011-11-30 09:16:54 UTC (rev 441)
@@ -624,8 +624,8 @@
$r .= ' dir="ltr"';
$r .= '>'."\n";
- $r .= "<!-- Copyright 1999 - 2011 by Gero Kohnert gok...@us... et al -->\n";
- $r .= "<!-- all rights reserved -->\n";
+ $r .= "<!-- \nCopyright 1999 - 2011 by Gero Kohnert gok...@us... et al\n";
+ $r .= "all rights reserved\n-->\n";
$r .= " <head>\n";
$r .= " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=". $lang['content_encoding'] ."\"".$c;
$r .= ' <title>TUTOS -- '. myentities($this->name);
@@ -650,7 +650,7 @@
}
$x = $_SERVER['REQUEST_URI'];
$x = htmlentities(delUrlParameter($x,"th"));
- if(isset($lang['UserTheme'])) {
+ if(false && isset($lang['UserTheme'])) {
foreach ($tutos[themes] as $i) {
if ($i == $this->theme->name) continue;
$r .= ' <link rel="alternate stylesheet" title="TUTOS '. $i .' '. $lang['UserTheme'] .'" href="'. $tutos['base'] .'/html/'.$i.'.css" type="text/css"'. $c;
@@ -662,16 +662,16 @@
$r .= ' <link rev="Made" href="https://sourceforge.net/project/memberlist.php?group_id=8047" hreflang="en" target="url" title="TUTOS Team"'.$c;
$x = $_SERVER['REQUEST_URI'];
$x = htmlentities(delUrlParameter($x,"lg"));
-# Skip this as some browsers will call all alternatives
-# foreach($lang['lang'] as $i => $f) {
-# echo " <link rel=\"Alternate\" href=\"". addUrlParaMeter($x,"lg=".$i) ."\" title=\"". myentities($lang['UserLanguage'] .": ".$f) ."\"". $c ."\n";
- # }
+ // Skip this as some browsers will call all alternatives
+ // foreach($lang['lang'] as $i => $f) {
+ // echo " <link rel=\"Alternate\" href=\"". addUrlParaMeter($x,"lg=".$i) ."\" title=\"". myentities($lang['UserLanguage'] .": ".$f) ."\"". $c ."\n";
+ // }
$r .= $this->add_js_links_head();
$r .= " </head>\n";
// Start Body
$r .= " <body>\n";
- $r .= '<div style="z-index:10;position:absolute;left:10%;top:10%;text-align:center;opacity:0.3;-moz-opacity:0.5;-khtml-opacity:0.5;filter: alpha(opacity=50);width:80%;height:80%;background-color:#000;border:0px solid black;display:none;color:white;font-size:30pt;font-weight:bold" id="loading"><br /><br /><div id="scrollme">...Loading...</div><br /><img src="'.$tutos['base'].'/html/loading.gif'.'" alt="loading" /></div>';
+ $r .= '<div id="loading"><br /><br /><div id="scrollme">...Loading...</div><br /><img src="'.$tutos['base'].'/html/loading.gif'.'" alt="loading" /></div>';
$r .= '<script type="text/javascript" language="JavaScript">loader = window.setTimeout("loading(1);",1500);</script>'."\n";
$tutos['pagescript'] .= "loading(0);\n";
return $r;
@@ -695,7 +695,7 @@
$r .= "//]]>\n";
$r .= ' </script>'."\n";
$r .= " </body>\n";
- $r .= " </html>\n";
+ $r .= "</html>\n";
return $r;
}
@@ -1026,7 +1026,7 @@
global $tutos,$lang,$msg,$info;
$r = '';
- $r .= "<!-- layout_start -->\n";
+ //$r .= "<!-- layout_start -->\n";
$r .= " <table id=\"maintable\" cellspacing=\"0\" border=\"0\">\n";
$r .= " <tr>\n";
$r .= ' <td class="headline" valign="middle" align="left">';
@@ -1082,9 +1082,9 @@
$r .= " <td width=\"10%\" class=\"navigate\" id=\"nl_navigate\">\n";
#$r .= " <td class=\"navigate\" id=\"nl_navigate\">\n";
$r .= "<table id=\"nl_menu\">\n";
- $r .= "<!-- outside navigation -->\n";
+ //$r .= "<!-- outside navigation -->\n";
$r .= $this->navigate();
- $r .= "<!-- end of outside navigation -->\n";
+ //$r .= "<!-- end of outside navigation -->\n";
$r .= "<tr><td>\n";
$r .= '<br />';
$r .= '<br />';
@@ -1203,7 +1203,7 @@
$r .= '<div class="info">'. StripSlashes($info) ."</div>\n";
}
$r .= $this->actionresult;
- $r .= "<!-- end of layout_start -->\n";
+ //$r .= "<!-- end of layout_start -->\n";
return $r;
}
@@ -1214,7 +1214,7 @@
global $tutos,$lang,$g_hash;
$r = '';
- $r .= "<!-- layout_stop -->\n";
+ //$r .= "<!-- layout_stop -->\n";
if ($this->center) $r .= '</center>';
$r .= " </td>\n";
if ( function_exists('tutos_side_banner') && (tutos_side_banner() != '') ) {
@@ -1271,7 +1271,7 @@
$r .= " </td>\n";
$r .= " </tr>\n";
$r .= " </table>\n";
- $r .= "<!-- end of layout_stop -->\n";
+ //$r .= "<!-- end of layout_stop -->\n";
return $r;
}
Modified: trunk/php/layout/new_layout.pinc
===================================================================
--- trunk/php/layout/new_layout.pinc 2011-11-29 07:39:28 UTC (rev 440)
+++ trunk/php/layout/new_layout.pinc 2011-11-30 09:16:54 UTC (rev 441)
@@ -585,19 +585,9 @@
$r .= " </head>\n";
$r .= " <body>\n";
- $r .= '<div style="z-index:1;position:absolute;left:10%;top:10%;text-align:center;opacity:0.3;-moz-opacity:0.5;-khtml-opacity:0.5;filter: alpha(opacity=50);width:80%;height:80%;background-color:#000;border:0px solid black;display:none;color:white;font-size:30pt;font-weight:bold" id="loading"><br /><br /><div id="scrollme">...Loading...</div><br /><img src="'.$tutos['base'].'/html/loading.gif'.'" alt="loading" /></div>';
+ $r .= '<div id="loading"><br /><br /><div id="scrollme">...Loading...</div><br /><img src="'.$tutos['base'].'/html/loading.gif'.'" alt="loading" /></div>';
$r .= '<script type="text/javascript" language="JavaScript">loader = window.setTimeout("loading(1);",1500);</script>'."\n";
- $tutos['pagescript'] .= "
- $(\".line1,.line2\").mouseenter(function(){
- $(this).addClass(\"line_active\");
- }).mouseleave(function(){
- $(this).removeClass(\"line_active\");
- });
-
- $(\".m_field\").change(function(){
- $(this).closest('tr').toggleClass(\"line_selected\");
- });
-loading(0);\n";
+ $tutos['pagescript'] .= "loading(0);\n";
return $r;
}
@@ -607,12 +597,14 @@
$r = '';
$r .= $this->add_css_links_end();
$r .= $this->add_js_links_end();
+ $r .= ' <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/new_layout.js"></script>'."\n";
$r .= ' <script type="text/javascript" language="JavaScript">'."\n";
$r .= "//<![CDATA[\n";
$r .= $tutos['pagescript'];
$r .= "//]]>\n";
$r .= ' </script>'."\n";
- $r .= " </body>\n</html>\n";
+ $r .= " </body>\n";
+ $r .= "</html>\n";
return $r;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-29 07:39:34
|
Revision: 440
http://tutos.svn.sourceforge.net/tutos/?rev=440&view=rev
Author: gokohnert
Date: 2011-11-29 07:39:28 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
color block in timetrack overview
Modified Paths:
--------------
trunk/php/product.pinc
trunk/php/timetrack/timetrack.pinc
trunk/php/timetrack/timetrack_overview.php
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2011-11-28 07:34:02 UTC (rev 439)
+++ trunk/php/product.pinc 2011-11-29 07:39:28 UTC (rev 440)
@@ -1063,7 +1063,7 @@
global $tutos,$lang;
$r = '';
- if ( empty($s) ) {
+ if ( $s == '' ) {
$s = $this->state;
}
Modified: trunk/php/timetrack/timetrack.pinc
===================================================================
--- trunk/php/timetrack/timetrack.pinc 2011-11-28 07:34:02 UTC (rev 439)
+++ trunk/php/timetrack/timetrack.pinc 2011-11-29 07:39:28 UTC (rev 440)
@@ -27,8 +27,9 @@
$stc = getObject($current_user->dbconn,$tutos['timetrack_state_stc']);
if (!is_object($stc)) {
+ $x = new timetrack($current_user->dbconn);
$stc = new Stc(null);
- $stc->initByArray('TTStates',null);
+ $stc->initByArray('TTStates',$x->c_state);
}
$additional = array();
@@ -155,6 +156,12 @@
*/
protected $showurl = 'timetrack/timetrack_overview.php';
+ public $c_state = array(TT_STATE_CHECKED => "lightgreen",
+ TT_STATE_BILLED => "orange",
+ TT_STATE_PAYED => "green",
+ TT_STATE_NOBILL => "red",
+ );
+
/**
*/
function timetrack(&$dbconn) {
@@ -396,28 +403,53 @@
/**
* get current state of this timetrack as HTML
*/
- function getState ($s = '',$html = true) {
+ function getState ($s = '') {
global $tutos,$lang;
$r = '';
- if ( empty($s) ) {
+ if ( $s == '' ) {
$s = $this->state;
}
- if ($html)
- $r .= '<span class="ttstate'. $s .'">';
$stc = getObject($this->dbconn,$tutos['timetrack_state_stc']);
if (!is_object($stc)) {
$stc = new Stc(null);
- $stc->initByArray('TTStates',null);
+ $stc->initByArray('TTStates',$this->c_state);
}
$r .= $stc->getState($s);
- if ($html)
- $r .= '</span>';
+
return $r;
}
/**
+ * get current state color of this bug
+ */
+ function getStateColor ($s = '') {
+ global $tutos,$lang;
+
+ $r = '';
+ if ( $s == '' ) {
+ $s = $this->state;
+ }
+
+ $stc = getObject($this->dbconn,$tutos['timetrack_state_stc']);
+ if (!is_object($stc)) {
+ $stc = new stc(null);
+ $stc->initByArray('TTStates',$this->c_state);
+ }
+ if (isset($stc->states[$s]))
+ $r .= $stc->states[$s]->color;
+ return $r;
+ }
+
+ /**
+ * get a state color block
+ */
+ function getStateColorBlock($s = '') {
+ return '<span style="font-size:0.8em;background:'.$this->getStateColor($s).';">  </span> ';
+ }
+
+ /**
* create a select list with possible states
*/
function askState () {
@@ -427,7 +459,7 @@
$stc = getObject($this->dbconn,$tutos['timetrack_state_stc']);
if (!is_object($stc)) {
$stc = new Stc(null);
- $stc->initByArray('TTStates',null);
+ $stc->initByArray('TTStates',$this->c_state);
if ($this->state == -1) {
$this->state = $tutos['timetrack_default_state'];
}
Modified: trunk/php/timetrack/timetrack_overview.php
===================================================================
--- trunk/php/timetrack/timetrack_overview.php 2011-11-28 07:34:02 UTC (rev 439)
+++ trunk/php/timetrack/timetrack_overview.php 2011-11-29 07:39:28 UTC (rev 440)
@@ -294,14 +294,14 @@
}
$r .= "</td>\n";
- $r .= ' <td class="over_l">'. $this->mark_filter(myentities($tt->desc),'description') ." </td>\n";
+ $r .= ' <td class="over_l">'. $this->mark_filter(myentities($tt->desc),'description') ."</td>\n";
if ($this->head['state']) {
- $r .= ' <td class="over_l">'. $tt->getState() ."</td>\n";
+ $r .= ' <td class="over_l">'. $tt->getStateColorBlock().$tt->getState() ."</td>\n";
}
$x= array($tt->cph * $tt->volume,$tt->currency);
- $r .= ' <td class="over_r">'. handle('money',$x,my_number_format($tt->cph * $tt->volume,2) ." ". myentities($tt->currency)) ."</td>\n";
+ $r .= ' <td class="over_r">'. handle('money',$x,my_number_format($tt->cph * $tt->volume,2) .' '. myentities($tt->currency)) ."</td>\n";
$r .= show_custom_overview_data($this,'timetrack',$tt);
$r .= get_module_overview_data($this,$tt);
@@ -482,7 +482,12 @@
$e = array();
$e['val'] = hour_format($f) ." ". $lang['hours'];
$e['cnt'] = $f;
- $e['title'] = $lang['TTStates'][$i];
+ $e['title'] = $this->stc->getState($i);
+ if (isset($this->stc->states[$i]))
+ $e['color'] = $this->stc->states[$i]->color;
+ else
+ $e['color'] = 'white';
+
$spie['data'][] = $e;
}
@@ -497,9 +502,6 @@
$spie['title'] = $lang['TimetrackRef'];
$spie['ytitle'] = $lang['hours'];
foreach ($p as $i => $f) {
- if ( $c == 0 ) {
- $links[$rx] = addUrlParameter($links[$rx],"ytitle=".$lang['hours']);
- }
$e = array();
$e['val'] = hour_format($f) ." ". $lang['hours'];
$e['cnt'] = $f;
@@ -627,10 +629,11 @@
$this->ext = 0;
}
- $stc = getObject($this->dbconn,$tutos['timetrack_state_stc']);
- if (!is_object($stc)) {
- $stc = new Stc(null);
- $stc->initByArray('TTStates',null);
+ $this->stc = getObject($this->dbconn,$tutos['timetrack_state_stc']);
+ if (!is_object($this->stc)) {
+ $x = new timetrack($this->dbconn);
+ $this->stc = new Stc(null);
+ $this->stc->initByArray('TTStates',$x->c_state);
}
$this->link1 = 'timetrack/timetrack_overview.php';
@@ -736,7 +739,7 @@
$this->link1 = addUrlParameter($this->link1,"state[]=".$s);
$this->addHidden("state[]",$s);
$_SESSION[usetimetrack.'__state'][] = $s;
- $h .= $hpre.$stc->getState($s);
+ $h .= $hpre.$this->stc->getState($s);
$cnt ++;
$pre = ',';
$hpre = ' / ';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-28 07:34:13
|
Revision: 439
http://tutos.svn.sourceforge.net/tutos/?rev=439&view=rev
Author: gokohnert
Date: 2011-11-28 07:34:02 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
more check
Modified Paths:
--------------
trunk/php/testmanager/testsuite_show.php
Modified: trunk/php/testmanager/testsuite_show.php
===================================================================
--- trunk/php/testmanager/testsuite_show.php 2011-11-27 08:39:33 UTC (rev 438)
+++ trunk/php/testmanager/testsuite_show.php 2011-11-28 07:34:02 UTC (rev 439)
@@ -314,7 +314,11 @@
$r .= "<tr>\n";
$r .= $this->showfield($lang['TestsuiteCopyOf']);
- $r .= $this->showdata($this->theme->getImage($this->obj->orig->getHtmlIcon(),'menu').$this->obj->orig->getLink(),3);
+ if (is_object($this->obj->orig)) {
+ $r .= $this->showdata($this->theme->getImage($this->obj->orig->getHtmlIcon(),'menu').$this->obj->orig->getLink(),3);
+ } else {
+ $r .= $this->showdata($lang['HistoryDeleted'],3);
+ }
$r .= "</tr>\n";
}
if (is_object($this->obj->prev)) {
@@ -487,4 +491,4 @@
$l = new Testsuite_show($current_user);
$l->display();
$dbconn->Close();
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-27 08:39:40
|
Revision: 438
http://tutos.svn.sourceforge.net/tutos/?rev=438&view=rev
Author: gokohnert
Date: 2011-11-27 08:39:33 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
allow per user configs (maxshow,CSV formatting, ...)
Modified Paths:
--------------
trunk/php/admin/main_config.php
trunk/php/user_ins.php
trunk/php/user_new.php
trunk/php/webelements.p3
Added Paths:
-----------
trunk/php/admin/admin.pinc
Removed Paths:
-------------
trunk/php/admin/admin.pinc
Deleted: trunk/php/admin/admin.pinc
===================================================================
--- trunk/php/admin/admin.pinc 2011-11-24 11:28:12 UTC (rev 437)
+++ trunk/php/admin/admin.pinc 2011-11-27 08:39:33 UTC (rev 438)
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright 1999 - 2003 by Gero Kohnert
- *
- * SVN Info $Id$
- * $Author$
- */
-
-class admin extends tutos_module {
-}
-?>
\ No newline at end of file
Added: trunk/php/admin/admin.pinc
===================================================================
--- trunk/php/admin/admin.pinc (rev 0)
+++ trunk/php/admin/admin.pinc 2011-11-27 08:39:33 UTC (rev 438)
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright 1999 - 2003 by Gero Kohnert
+ *
+ * SVN Info $Id$
+ * $Author$
+ */
+
+
+// type,length,min,max,help
+$tutos['cfg']['maxshow'] = array(
+ 'section' => 'main',
+ type => 'int',
+ size => '2',
+ 'min' => 5,
+ 'max' => 50,
+ 'help' => 'ConfigHelpMaxShow'
+ );
+$tutos['cfg']['maxshort'] = array(
+ 'section' => 'main',
+ type => 'int',
+ size => '2',
+ 'min' => 5,
+ 'max' => 15,
+ 'help' => 'ConfigHelpMaxShort'
+ );
+$tutos['cfg']['CSV_delimiter'] = array(
+ 'section' => 'main',
+ type => 'sel',
+ 'values' => array(',',';'),
+ 'default' => ',',
+ 'help' => 'ConfigHelpCSVdelimiter'
+ );
+$tutos['cfg']['CSV_enclosure'] = array(
+ 'section' => 'main',
+ type => 'sel',
+ 'values' => array('"','\''),
+ 'default' => '"',
+ 'help' => 'ConfigHelpCSVenclosure'
+ );
+
+
+/**
+ * print a input field to enter a config variable input
+ */
+function config_field_input(layout $ly,$fld,$line) {
+ global $tutos,$lang;
+
+ $r = '';
+ $r .= $ly->OverviewRowStart($line);
+ $r .= $ly->showfield($fld);
+ $r .= '<td>'."\n";
+ switch ($tutos['cfg'][$fld][type]) {
+ case 'int':
+ $r .= '<input name="'.$fld.'" value="'.$tutos[$fld].'"';
+ if (isset($tutos['cfg'][$fld][size])) {
+ $r .= ' size="'.$tutos['cfg'][$fld][size].'"';
+ $r .= ' maxlength="'.$tutos['cfg'][$fld][size].'"';
+ }
+ $r .= ' />';
+ break;
+ case 'sel':
+ $r .= '<select name="'.$fld.'">'."\n";
+ foreach ($tutos['cfg'][$fld]['values'] as $i) {
+ $r .= ' <option value="'.$i.'"'.($tutos[$fld] == $i ? ' selected="selected"':'').'> '.$i.' </option>'."\n";
+ }
+ $r .= '</select></td>';
+ break;
+ }
+ $r .= '</td>'."\n";
+ $r .= '<td colspan="'.($ly->width-2).'" class="pre"><pre>'.urlReplace($lang[$tutos['cfg'][$fld]['help']]).'</pre></td>'."\n";
+ $r .= $ly->OverviewRowEnd($line++);
+ return $r;
+}
+
+function config_field_parse($dbconn,$fld,$id = null) {
+ global $tutos,$msg,$info;
+
+
+ if (!isset($tutos[$fld]) && isset($tutos['cfg'][$fld]['default']) )
+ $tutos[$fld] = $tutos['cfg'][$fld]['default'];
+
+ $tutos[$fld] = $_REQUEST[$fld];
+ write_config_value($dbconn,$fld,$tutos['cfg'][$fld]['section'],$id);
+
+}
+
+class admin extends tutos_module {
+}
+?>
\ No newline at end of file
Modified: trunk/php/admin/main_config.php
===================================================================
--- trunk/php/admin/main_config.php 2011-11-24 11:28:12 UTC (rev 437)
+++ trunk/php/admin/main_config.php 2011-11-27 08:39:33 UTC (rev 438)
@@ -29,6 +29,8 @@
function info() {
global $lang,$table,$tutos;
+ $this->width = 4;
+
$r = '';
$r .= "<form id=\"mainconfig\" name=\"mainconfig\" action=\"main_config.php\" method=\"post\">\n";
@@ -54,27 +56,9 @@
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpTimeToLive']).'</pre></td>';
$r .= $this->OverviewRowEnd($line++);
// CSV delimiter
- $r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('CSV_delimiter');
- $r .= '<td><select name="CSV_delimiter" value="'.$tutos['CSV_delimiter'] .'">'."\n";
- $arr = array(';',',');
- foreach ($arr as $i) {
- $r .= ' <option value="'.$i.'"'.($tutos['CSV_delimiter'] == $i ? ' selected="selected"':'').'>'.$i.'</option>'."\n";
- }
- $r .= '</select></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpCSVdelimiter']).'</pre></td>';
- $r .= $this->OverviewRowEnd($line++);
+ $r .= config_field_input($this,'CSV_delimiter',$line);
// CSV enclosure
- $r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('CSV_enclosure');
- $r .= '<td><select name="CSV_enclosure" value="'.$tutos['CSV_enclosure'] .'">'."\n";
- $arr = array('"','\'');
- foreach ($arr as $i) {
- $r .= ' <option value="'.$i.'"'.($tutos['CSV_enclosure'] == $i ? ' selected="selected"':'').'>'.$i.'</option>'."\n";
- }
- $r .= '</select></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpCSVenclosure']).'</pre></td>';
- $r .= $this->OverviewRowEnd($line++);
+ $r .= config_field_input($this,'CSV_enclosure',$line);
$r .= $this->DataTableEnd();
$r .= '</div>';
@@ -170,12 +154,7 @@
$r .= $this->OverviewRowEnd($line++);
// maxshow
- $r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('maxshow');
- $r .= '<td><input name="maxshow" value="'.$tutos['maxshow'] .'">';
- $r .= '</input></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpMaxShow']).'</pre></td>';
- $r .= $this->OverviewRowEnd($line++);
+ $r .= config_field_input($this,'maxshow',$line);
// maxselect
$r .= $this->OverviewRowStart($line);
@@ -186,12 +165,8 @@
$r .= $this->OverviewRowEnd($line++);
// maxshort
- $r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('maxshort');
- $r .= '<td><input name="maxshort" value="'.$tutos['maxshort'] .'">';
- $r .= '</input></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpMaxShort']).'</pre></td>';
- $r .= $this->OverviewRowEnd($line++);
+ $r .= config_field_input($this,'maxshort',$line);
+
$r .= $this->DataTableEnd();
$r .= '</div>';
@@ -484,8 +459,6 @@
if (!isset($tutos['smtp_username'])) $tutos['smtp_username'] = 'change this';
if (!isset($tutos['smtp_password'])) $tutos['smtp_password'] = 'change this';
- if (!isset($tutos['CSV_delimiter'])) $tutos['CSV_delimiter'] = ',';
- if (!isset($tutos['CSV_enclosure'])) $tutos['CSV_enclosure'] = '"';
if ( ! $this->user->isAdmin() ) {
$msg .= $this->error("Only admins are allowed to see this");
@@ -535,15 +508,9 @@
$tutos['fiscal_start_month'] = $_REQUEST['fiscal_start_month'];
write_config_value($this->dbconn,'fiscal_start_month','main');
- $tutos['maxshow'] = $_REQUEST['maxshow'];
- write_config_value($this->dbconn,'maxshow','main');
-
$tutos['maxselect'] = $_REQUEST['maxselect'];
write_config_value($this->dbconn,'maxselect','main');
- $tutos['maxshort'] = $_REQUEST['maxshort'];
- write_config_value($this->dbconn,'maxshort','main');
-
$tutos['tasksincalendar'] = ( isset($_REQUEST['tasksincalendar']) ? $_REQUEST['tasksincalendar']:0 );
write_config_value($this->dbconn,'tasksincalendar','task');
@@ -583,12 +550,10 @@
$tutos['logolink'] = $_REQUEST['logolink'];
write_config_value($this->dbconn,'logolink','main');
- $tutos['CSV_delimiter'] = $_REQUEST['CSV_delimiter'];
- write_config_value($this->dbconn,'CSV_delimiter','main');
-
- $tutos['CSV_enclosure'] = $_REQUEST['CSV_enclosure'];
- write_config_value($this->dbconn,'CSV_enclosure','main');
-
+ config_field_parse($this->dbconn,'maxshow');
+ config_field_parse($this->dbconn,'maxshort');
+ config_field_parse($this->dbconn,'CSV_delimiter');
+ config_field_parse($this->dbconn,'CSV_enclosure');
$msg .= ' saving done ';
}
}
Modified: trunk/php/user_ins.php
===================================================================
--- trunk/php/user_ins.php 2011-11-24 11:28:12 UTC (rev 437)
+++ trunk/php/user_ins.php 2011-11-27 08:39:33 UTC (rev 438)
@@ -13,6 +13,7 @@
require_once 'webelements.p3';
require_once 'permission.p3';
require_once 'appointment.pinc';
+require_once 'admin/admin.pinc'; // let us load the pseudo module
/* Check if user is allowed to use it */
check_user();
@@ -210,6 +211,7 @@
}
}
+
#
# Parse additional custom fields
#
@@ -241,6 +243,15 @@
$msg .= $u->save_permissions();
$msg .= $u->save();
+ //
+ // Parse per user config settings
+ // (this requires a user id)
+ //
+ config_field_parse($dbconn,'maxshow',$u->id);
+ config_field_parse($dbconn,'maxshort',$u->id);
+ config_field_parse($dbconn,'CSV_delimiter',$u->id);
+ config_field_parse($dbconn,'CSV_enclosure',$u->id);
+
team::obj_read($u);
// get teams
// when user is saved handle
Modified: trunk/php/user_new.php
===================================================================
--- trunk/php/user_new.php 2011-11-24 11:28:12 UTC (rev 437)
+++ trunk/php/user_new.php 2011-11-27 08:39:33 UTC (rev 438)
@@ -14,6 +14,7 @@
*/
require_once 'webelements.p3';
require_once 'permission.p3';
+require_once 'admin/mconfig.pinc'; // let us load the pseudo module
// Check if user is allowed to use it
check_user();
@@ -25,6 +26,23 @@
*/
class User_new extends layout {
/**
+ * per user chnageabe standard config fields
+ */
+ function user_config() {
+ global $lang,$tutos;
+
+ $line = 0;
+ $r = '';
+ $r .= '<tr><th colspan="'.$this->width.'"></th></tr>'."\n";
+ $r .= config_field_input($this,'maxshow',$line);
+ $r .= config_field_input($this,'maxshort',$line);
+ $r .= config_field_input($this,'CSV_delimiter',$line);
+ $r .= config_field_input($this,'CSV_enclosure',$line);
+
+ return $r;
+ }
+
+ /**
* helpfunction to generate an option-field
*/
Function acldefault_select($min,$max,$name) {
@@ -434,6 +452,13 @@
$r .= "</tr>\n";
$r .= '</tbody>';
+ // per user settings
+ $r .= '<tbody><tr><td class="tg6" colspan="'.$this->width.'"><a>'.$lang['AdminMainConfig'].'</a></td></tr></tbody>'."\n";
+ $r .= '<tbody class="tg6">';
+ $r .= $this->user_config();
+ $r .= '</tbody>';
+
+
// Edit additional custom fields
$rx = edit_custom_fields($this,"people",$this->obj,$this->width);
if ($rx != '') {
@@ -461,6 +486,7 @@
tbodyswitcher('.tg3');
tbodyswitcher('.tg4');
tbodyswitcher('.tg5');
+tbodyswitcher('.tg6');
";
return $r;
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2011-11-24 11:28:12 UTC (rev 437)
+++ trunk/php/webelements.p3 2011-11-27 08:39:33 UTC (rev 438)
@@ -438,7 +438,7 @@
case 'integer':
case 'double':
$msg .= $a;
- break;
+ break;
case 'boolean':
if (true === $a){
$msg .= 'T';
@@ -2481,10 +2481,19 @@
/**
* write a config value
*/
-function write_config_value($dbconn,$name,$tag,$id = 'null') {
+function write_config_value($dbconn,$name,$tag,$id = null) {
global $tutos,$table;
- delete_config_value($dbconn,$name);
+ if ($id == null) $id = 'null';
+
+
+ $q = 'DELETE from '. $dbconn->prefix. $table['tutos_config'][name];
+ $q .= " where cname = '". $name ."'";
+ $q .= " and ctag = '". $tag ."'";
+ $q .= ' and obj_id = '. $id;
+ $r = $dbconn->Exec($q);
+ $r->free();
+
$q = 'INSERT into '. $dbconn->prefix. $table['tutos_config'][name] .' (cname,cvalue,ctag,obj_id) values (';
$q .= "'".$name."',";
$q .= "'".$tutos[$name]."',";
@@ -2496,17 +2505,6 @@
}
/**
- * delete a config value
- */
-function delete_config_value($dbconn,$name) {
- global $tutos,$table;
-
- $q = 'DELETE from '. $dbconn->prefix. $table['tutos_config'][name] .' WHERE cname = \''. $name .'\'';
- $r = $dbconn->Exec($q);
- $r->free();
-}
-
-/**
* leave a insert script
*/
function leave_insert($dbconn,$gotourl,$msg,$info = '') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-24 11:28:21
|
Revision: 437
http://tutos.svn.sourceforge.net/tutos/?rev=437&view=rev
Author: gokohnert
Date: 2011-11-24 11:28:12 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
refix
Modified Paths:
--------------
trunk/php/bugtracking/bug_overview.php
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2011-11-24 11:24:13 UTC (rev 436)
+++ trunk/php/bugtracking/bug_overview.php 2011-11-24 11:28:12 UTC (rev 437)
@@ -901,7 +901,7 @@
$pre = ',';
}
} else {
- if (substr($sn,0,1) == "!") {
+ if (substr($name,0,1) == "!") {
$this->header .= $this->hpre.$lang['AdrName'] .' ≠ '.myentities(substr($name,1)) ;
} else {
$this->header .= $this->hpre.$lang['AdrName'] .' = '.myentities($name) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-24 11:24:19
|
Revision: 436
http://tutos.svn.sourceforge.net/tutos/?rev=436&view=rev
Author: gokohnert
Date: 2011-11-24 11:24:13 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/bugtracking/bug_overview.php
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2011-11-23 14:14:50 UTC (rev 435)
+++ trunk/php/bugtracking/bug_overview.php 2011-11-24 11:24:13 UTC (rev 436)
@@ -902,9 +902,9 @@
}
} else {
if (substr($sn,0,1) == "!") {
+ $this->header .= $this->hpre.$lang['AdrName'] .' ≠ '.myentities(substr($name,1)) ;
+ } else {
$this->header .= $this->hpre.$lang['AdrName'] .' = '.myentities($name) ;
- } else {
- $this->header .= $this->hpre.$lang['AdrName'] .' ≠ '.myentities(substr($name,1)) ;
}
}
$this->hpre = '<br />';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-23 14:15:01
|
Revision: 435
http://tutos.svn.sourceforge.net/tutos/?rev=435&view=rev
Author: gokohnert
Date: 2011-11-23 14:14:50 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
reworked more search to support negated searches
Modified Paths:
--------------
trunk/html/js/tutos.js
trunk/php/ajax.php
trunk/php/bugtracking/bug_overview.php
trunk/php/invoice/invoice_overview.php
trunk/php/invoice/invoice_select.php
trunk/php/product.pinc
trunk/php/product_overview.php
trunk/php/webelements.p3
Modified: trunk/html/js/tutos.js
===================================================================
--- trunk/html/js/tutos.js 2011-11-23 10:21:17 UTC (rev 434)
+++ trunk/html/js/tutos.js 2011-11-23 14:14:50 UTC (rev 435)
@@ -448,7 +448,7 @@
tt = Base64.decode(t);
// li.setAttribute("onclick","setInputField('"+name+"','" + td +"');");
ar.setAttribute("title",tt+": "+td);
- if (i < 0) {
+ if (i.substr(0,1) == '-') {
ar.setAttribute("href","javascript:setInputField('"+name+"','!" + td +"','"+ i +"');");
ar.setAttribute("style","text-decoration: line-through;");
} else {
Modified: trunk/php/ajax.php
===================================================================
--- trunk/php/ajax.php 2011-11-23 10:21:17 UTC (rev 434)
+++ trunk/php/ajax.php 2011-11-23 14:14:50 UTC (rev 435)
@@ -32,6 +32,7 @@
$txt2 = base64_encode($obj->getFullName());
$id = $obj->id;
} else if (is_array($obj)) {
+ // subteam
$id = $obj[0];
$txt1 = base64_encode($obj[1]);
$txt2 = base64_encode($obj[2]);
@@ -169,8 +170,13 @@
// offer all
foreach ($lang['ProdRole'] as $role => $f) {
if ( $tutos[rolecheck][$role] != "p") {
- if (stristr($f,$item)) {
- $r .= add_item (array((-1 * $role),$f,$f));
+ $not = (substr($item,0,1) == "!") ;
+ if ($not)
+ $sitem = substr($item,1);
+ else
+ $sitem = $item;
+ if (stristr($f,$sitem)) {
+ $r .= add_item (array('T'.(-1 * (10+$role)),$f,$f),$not);
}
}
}
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2011-11-23 10:21:17 UTC (rev 434)
+++ trunk/php/bugtracking/bug_overview.php 2011-11-23 14:14:50 UTC (rev 435)
@@ -439,7 +439,7 @@
$x = $this->mark_filter(myentities($b->parent->getFullName()),'target_id');
$r .= $b->target->getLink($x);
} else {
- $r .= '<i>'.$lang['HistoryDeleted'].'</i>';
+ $r .= ' ';
}
$r .= "</td>\n";
}
@@ -807,7 +807,8 @@
$this->filter['name'] = '';
$this->head['state'] = true;
- # $this->head['stateage'] = true;
+ $this->head['stateage'] = false;
+ $this->head['target_id'] = false;
$this->head['class'] = true;
$this->head['product_id'] = true;
$this->head['solver'] = true;
@@ -852,11 +853,7 @@
if ( isset($_GET['pid']) && is_numeric($_GET['pid']) ) {
$pid = $_GET['pid'];
}
- // if ( isset($_GET['solverid']) && is_int($_GET['solverid']) ) {
- // $solverid = $_GET['solverid'];
- // }
-
if ( isset($_GET['name']) ) {
$name = $_GET['name'];
} else {
@@ -1106,7 +1103,7 @@
if ( 0 == $n) {
- $msg .= $lang['Err0048'];
+ $msg .= $lang['Err0048'].'<br />';
$this->redirect = 'bug_select.php';
if ($this->ext != 0) {
$this->redirect = addUrlParameter($this->redirect,'ext=1',true);
Modified: trunk/php/invoice/invoice_overview.php
===================================================================
--- trunk/php/invoice/invoice_overview.php 2011-11-23 10:21:17 UTC (rev 434)
+++ trunk/php/invoice/invoice_overview.php 2011-11-23 14:14:50 UTC (rev 435)
@@ -311,8 +311,8 @@
overview_arg($this,'state',OVERVIEW_ARG_INT,'invoice',array('state'),array('InvoiceState','InvoiceStates'));
// Customer
- overview_arg($this,'customerfn',OVERVIEW_ARG_FN,'invoice',array('customer'),'InvoiceCustomer','','atcd');
- overview_arg($this,'customerid',OVERVIEW_ARG_OBJID,'invoice',array('customer'),'InvoiceCustomer','');
+ overview_arg($this,'customerfn',OVERVIEW_ARG_FN,'invoice',array('customer'),'InvoiceCustomer','','atcdD');
+ overview_arg($this,'customerid',OVERVIEW_ARG_OBJID,'invoice',array('customer'),'InvoiceCustomer','','atcdD');
check_dbacl($this->dbconn, $this->q, $this->user->id);
@@ -321,10 +321,14 @@
$xxx = "";
$this->link2 = $this->link1;
order_parse($this->q,$this->link1,$xxx,$xxx,"name");
-
+ // $msg .= $this->q;
$this->result = $this->dbconn->Exec($this->q);
if ( 0 == $this->result->numrows()) {
- $this->redirect = "invoice_select.php?msg=". UrlEncode($lang['Err0048']);
+ $msg .= $lang['Err0048'].'<br />';
+ $this->redirect = 'invoice_select.php';
+ if ($this->ext != 0) {
+ $this->redirect = addUrlParameter($this->redirect,'ext=1',true);
+ }
$this->result->free();
}
Modified: trunk/php/invoice/invoice_select.php
===================================================================
--- trunk/php/invoice/invoice_select.php 2011-11-23 10:21:17 UTC (rev 434)
+++ trunk/php/invoice/invoice_select.php 2011-11-23 14:14:50 UTC (rev 435)
@@ -46,10 +46,8 @@
$r .= " <td align=\"center\">\n";
$r .= ' <input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForInv'] ."\" /></td>\n";
$r .= "</tr><tr>\n";
- $r .= ' <td colspan="2" align="center"><span class="small">'. $lang['InvSelInfo']."</span></td>\n";
+ $r .= ' <td colspan="3"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
- $r .= ' <td align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
-
$tutos['pagescript'] .= "
$( \"#toggler\" ).click(function() {
$(\".ext\").toggle();
@@ -85,7 +83,7 @@
$r .= "</tr><tr class=\"ext\">\n";
$r .= $this->showfieldc(sprintf($lang['InvoiceCustomer'],''),0,"customerid");
$r .= '<td colspan="2">';
- $r .= select_from_array_or_input($this->obj,"customer",null,1,'atcd');
+ $r .= select_from_array_or_input($this->obj,"customer",null,1,'atcdD');
$r .= "</td>\n";
// add custom selectors
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2011-11-23 10:21:17 UTC (rev 434)
+++ trunk/php/product.pinc 2011-11-23 14:14:50 UTC (rev 435)
@@ -625,7 +625,7 @@
/**
* search for a subteam (i.e. Rolename)
- * fill a array with possible entries
+ * fill a array with possible entries based on used roles in that project
*/
function search_subteams_by_name(&$arr,&$user,$name) {
global $tutos,$lang;
@@ -636,7 +636,7 @@
if ( $tutos[rolecheck][$r] != "p") {
$x = $lang['ProdRole'][$r];
if (stristr($x,$name)) {
- $arr[(-1 * ($r+1))] = array((-1 * ($r+10)),$x,$x);
+ $arr[(-1 * ($r+10))] = array((-1 * ($r+10)),$x,$x);
$n++;
}
}
@@ -646,7 +646,7 @@
/**
* search for a subteam (i.e. Rolename)
- * fill a array with possible entries
+ * fill a array with possible entries based on all roles
*/
function search_subteams_by_name_2(&$arr,&$user,$name) {
global $tutos,$lang;
@@ -655,7 +655,7 @@
foreach($lang['ProdRole'] as $r => $x) {
if ( $tutos[rolecheck][$r] != "p") {
if (stristr($x,$name)) {
- $arr[(-1 * ($r+1))] = array((-1 * ($r+10)),$x,$x);
+ $arr[(-1 * ($r+10))] = array((-1 * ($r+10)),$x,$x);
$n++;
}
}
Modified: trunk/php/product_overview.php
===================================================================
--- trunk/php/product_overview.php 2011-11-23 10:21:17 UTC (rev 434)
+++ trunk/php/product_overview.php 2011-11-23 14:14:50 UTC (rev 435)
@@ -881,7 +881,7 @@
$this->q = preg_replace('# where#i',','.$s.' WHERE',$this->q);
}
}
- // $msg .= $this->q;
+ // $msg .= $this->q;
check_dbacl($this->dbconn, $this->q, $this->user->id);
// Order of output
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2011-11-23 10:21:17 UTC (rev 434)
+++ trunk/php/webelements.p3 2011-11-23 14:14:50 UTC (rev 435)
@@ -2634,6 +2634,9 @@
foreach($s as $idx => $sn) {
if ( (substr($s[$idx],0,1) == "!") ) {
$sn = substr($s[$idx],1);
+ if($not) {
+ $pre = ' AND ';
+ }
$not = true;
} else {
$not = false;
@@ -2693,12 +2696,14 @@
$sn = substr($sn,1);
if ($not)
$obj->header .= $pre.htmlentities($sn);
- else
+ else {
+ if ($pre != '') $pre = ' , ';
$obj->header .= $pre.'<span class="missing"> '.htmlentities($sn).' </span>';
+ }
} else {
$obj->header .= $pre.htmlentities($sn);
}
- $pre = '|';
+ $pre = ' | ';
}
$obj->hpre = '<br />';
return true;
@@ -2708,65 +2713,101 @@
if (!isset($_REQUEST[$arg])) return false;
$x = $_REQUEST[$arg];
$q = ''; // the search part of the query
+ $expanded = array();
+ $header = ' = ';
- $header = '=';
+ // some modes require expand of args
+ if (is_numeric($x) && ($mode != null) && strstr($mode,'D')) {
+ // Departments of a company
+ $xid = $x;
+ $xo = getObject($obj->dbconn,abs($x));
+ $x = array($xid);
+ if (is_object($xo) && $xo->getTypeId() == usecompany) {
+ department::obj_read($xo);
+ foreach($xo->list[usedepartment] as $i => $xi) {
+ if ($xid < 0)
+ $x[] = -$i;
+ else
+ $x[] = $i;
+ $expanded[] = $i;
+ }
+ $show = true;
+ $header .= $lang['Departments'].' & ';
+ }
+ }
- if (is_array($x)) {
- if ($not)
- $q = ' not in (';
- else
- $q = ' in (';
- $header .= ' (';
- $pre = '';
+ if (substr($x,0,1) == "T") {
+ // subteam selection happend
+ $q = ' = ';
+ $header = ' = ';
+ $q .= substr($x,1);
+ $header .= $lang['ProdRole'][(-1* (substr($x,1)))-10];
+ $show = false;
+ } elseif (substr($x,0,2) == "-T") {
+ // negated subteam selection happend
+ $q = ' != ';
+ $header = ' ≠ ';
+ $q .= substr($x,2);
+ $header .= $lang['ProdRole'][(-1* (substr($x,2)))-10];
+ $show = true;
+ } else if (is_array($x)) {
+ $q1 = '';
+ $q2 = '';
+ $header .= '';
+ $hpre = '';
+ $pre1 = ' not in (';
+ $pre2 = ' in(';
+ $hcnt = 0;
foreach($x as $i) {
- if (!is_numeric($i)) die('overview_arg: non numeric argument -> '.$i);
- $q .= $pre.$i;
- $xo = getObject($obj->dbconn,$i);
- if (is_object($xo)) {
- $header .= $pre.$lang[$xo->getType()].' '.$xo->getLink();
- } else if (method_exists($obj,$resolver)) {
- $header .= $pre.$obj->$resolver($i);
+ if (!is_numeric($i)) die('overview_arg: non numeric argument (A) -> '.$i);
+ if ($i < 0) {
+ $q1 .= $pre1.abs($i);
+ $pre1 = ',';
+ $not = true;
} else {
- $header .= $pre.$i;
+ $q2 .= $pre2.$i;
+ $pre2 = ',';
+ $not = false;
}
- $pre = ',';
+ if (!in_array(abs($i),$expanded)) {
+ // ignore expanded stuff
+ $xo = getObject($obj->dbconn,abs($i));
+ $header .= $hpre;
+ if (is_object($xo)) {
+ $header .= $lang[$xo->getType()].($not ? ' <span class="missing">':' ').$xo->getLink();
+ } else if (method_exists($obj,$resolver)) {
+ $header .= ($not ? '<span class="missing">':'').$obj->$resolver($i);
+ } else {
+ $header .= ($not ? '<span class="missing">':'').$i;
+ }
+ if ($not) $header .= '</span>';
+ $hcnt++;
+ }
$obj->link1 = addUrlParameter($obj->link1,$arg.'[]='.$i);
$obj->addHidden($arg.'[]',$i);
}
- $q .= ')';
- $header .= ')';
+ if ($q1 != '') {
+ $q = $q1.')';
+ }
+ if ($q2 != '') {
+ $q = $q2.')';
+ }
+ if ($hcnt > 1)
+ $header = '('.$header.')';
$show = true;
} else {
$show = false;
- if (!is_numeric($x)) die('overview_arg: non numeric argument -> '.$x);
- // if mode includes D (we also accept departments)
- if ($mode != null && strstr($mode,'D')) {
- if ($not)
- $q = ' not in (';
- else
- $q = ' in (';
- $q .= $x;
- $xo = getObject($obj->dbconn,$x);
- if (is_object($xo) && $xo->getTypeId() == usecompany) {
- department::obj_read($xo);
- foreach($xo->list[usedepartment] as $i => $xi) {
- $q .= ','.$i;
- }
- $show = true;
- }
- $q .= ')';
- $header .= $lang['Departments'].' & ';
+ if (!is_numeric($x)) die('overview_arg: non numeric argument (B)-> '.$x);
+ if ($x < 0) {
+ $q = ' != ';
+ $header = ' ≠ ';
+ $show = true;
} else {
- if ($x < 0) {
- $q = ' != ';
- $header = ' ≠ ';
- $show = true;
- } else {
- $q = ' = ';
- $header = ' = ';
- }
- $q .= abs($x);
+ $q = ' = ';
+ $header = ' = ';
}
+ $q .= abs($x);
+
$xo = getObject($obj->dbconn,abs($x));
if (is_object($xo)) {
$header .= $lang[$xo->getType()].' '.$xo->getLink() ;
@@ -2779,6 +2820,7 @@
$obj->addHidden($arg,$x);
$obj->filter[$cnames[0]] = $xo;
}
+
if (count($cnames) == 1) {
// search only in one field
$obj->q .= $obj->qpre . $prefix.$cnames[0].$q;
@@ -2871,7 +2913,7 @@
$pre = '';
foreach($x as $i) {
if ($i == -1) return false;
- if (!is_numeric($i)) die('overview_arg: non numeric argument -> '.$i);
+ if (!is_numeric($i)) die('overview_arg: non numeric argument (C) -> '.$i);
$q .= $pre.$i;
if (method_exists($obj,$resolver)) {
$header .= $pre.$obj->$resolver($i);
@@ -2891,7 +2933,7 @@
$show = (count($x) > 1);
} else {
if ($x == -1) return false; // ANY
- if (!is_numeric($x)) die('overview_arg: non numeric argument -> '.$x);
+ if (!is_numeric($x)) die('overview_arg: non numeric argument (D) -> '.$x);
$q = ' = '.$x;
if (method_exists($obj,$resolver)) {
$header = ' = '.$obj->$resolver($x);
@@ -3072,8 +3114,8 @@
foreach($t1 as $i=>$x) if ($x>'') $r1[$x][]=$i;
foreach($t2 as $i=>$x) if ($x>'') $r2[$x][]=$i;
- $a1=0; $a2=0; # start at beginning of each list
- $actions=array();
+ $a1=0; $a2=0; // start at beginning of each list
+ $actions=array();
// walk this loop until we reach the end of one of the lists
while ($a1<count($t1) && $a2<count($t2)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-23 10:21:27
|
Revision: 434
http://tutos.svn.sourceforge.net/tutos/?rev=434&view=rev
Author: gokohnert
Date: 2011-11-23 10:21:17 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
reworked more search to support negated searches
Modified Paths:
--------------
trunk/ChangeLog
trunk/html/js/tutos.js
trunk/php/ajax.php
trunk/php/app_overview.php
trunk/php/appointment.pinc
trunk/php/bugtracking/bug.pinc
trunk/php/bugtracking/bug_overview.php
trunk/php/company.pinc
trunk/php/custom.pinc
trunk/php/department.pinc
trunk/php/installation/installation.pinc
trunk/php/module_template/AAA.pinc
trunk/php/product.pinc
trunk/php/scrum/scrum.pinc
trunk/php/stuff/stuff.pinc
trunk/php/task.pinc
trunk/php/team.pinc
trunk/php/webelements.p3
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/ChangeLog 2011-11-23 10:21:17 UTC (rev 434)
@@ -1,4 +1,9 @@
#$Id$
+ * Update jquery version
+ * use jqplot for some statistics
+ * files will show a popup picture if possible
+ * Searches allow "mostly" the use of negation (just put a ! in front of searchstring)
+ * Searches allow the use of multiple searchstrings (just put a | (pipesign) between)
* Loginfom will only offer databases where server is in $tutos[servernames][dbnr] array (if defined)
Use this to autoset database depending on the servername
* Disable autocomplete on non debug logins
Modified: trunk/html/js/tutos.js
===================================================================
--- trunk/html/js/tutos.js 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/html/js/tutos.js 2011-11-23 10:21:17 UTC (rev 434)
@@ -447,8 +447,13 @@
td = Base64.decode(n);
tt = Base64.decode(t);
// li.setAttribute("onclick","setInputField('"+name+"','" + td +"');");
- ar.setAttribute("href","javascript:setInputField('"+name+"','" + td +"','"+ i +"');");
ar.setAttribute("title",tt+": "+td);
+ if (i < 0) {
+ ar.setAttribute("href","javascript:setInputField('"+name+"','!" + td +"','"+ i +"');");
+ ar.setAttribute("style","text-decoration: line-through;");
+ } else {
+ ar.setAttribute("href","javascript:setInputField('"+name+"','" + td +"','"+ i +"');");
+ }
ar.appendChild(document.createTextNode( td ));
li.appendChild(ar);
Modified: trunk/php/ajax.php
===================================================================
--- trunk/php/ajax.php 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/ajax.php 2011-11-23 10:21:17 UTC (rev 434)
@@ -23,7 +23,7 @@
Header('Content-Type: text/xml;charset='. $lang['content_encoding']);
Header("Connection: close");
-function add_item ($obj) {
+function add_item ($obj,$not=false) {
global $lang;
$r = '';
@@ -38,7 +38,10 @@
}
$r .= ' <result>'."\n";
- $r .= ' <id>'. $id .'</id>'."\n";
+ if ($not)
+ $r .= ' <id>-'. $id .'</id>'."\n";
+ else
+ $r .= ' <id>'. $id .'</id>'."\n";
$r .= ' <type>'. $txt1 .'</type>'."\n";
$r .= ' <name>'. $txt2 .'</name>'."\n";
# $r .= " <!-- |". base64_decode ($txt1).':'. base64_decode($txt2) ."| -->\n"; // Problems when containing "--"
@@ -210,7 +213,7 @@
# error_log('Found '.$xcnt."\r\n",3,$tutos[errlog]);
foreach ($res as $a => $b) {
if (! $b->see_ok()) continue;
- $r .= add_item ($b);
+ $r .= add_item ($b,($a<0));
if($cnt++ == 5) {
$cut = true;
break;
Modified: trunk/php/app_overview.php
===================================================================
--- trunk/php/app_overview.php 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/app_overview.php 2011-11-23 10:21:17 UTC (rev 434)
@@ -68,7 +68,7 @@
$r .= $this->orderHeader("product",$lang['ProductP'],$this->link2);
$r .= $this->orderHeader("",$lang['Participants'],$this->link2);
- $r .= show_custom_overview_headers($this,Appointment::getType(),$this->link2);
+ $r .= show_custom_overview_headers($this,'appointment1',$this->link2);
$r .= $this->MassUpdateHeader();
$r .= "</tr>\n";
$r .= "</thead>\n";
@@ -143,7 +143,7 @@
}
$r .= " </td>\n";
- $r .= show_custom_overview_data($this,Appointment::getType(),$f);
+ $r .= show_custom_overview_data($this,'appointment1',$f);
$r .= $this->MassUpdateField($f);
$r .= $this->OverviewRowEnd($line++);
unset($f);
@@ -202,10 +202,18 @@
$this->css_class = 'overviewbox';
$this->link1 = "app_overview.php";
+ if (isset($_GET['ext'])) {
+ $this->ext = $_GET['ext'];
+ $this->link1 = addUrlParameter($this->link1,"ext=".$this->ext);
+ } else {
+ $this->ext = 2; // call from somewhere else
+ }
+
+
$this->filter = array();
$this->filter['name'] = "";
if ( isset($_GET['myapps']) && ($_GET['myapps'] = 1) ) {
- $this->q = "SELECT * from ". $this->dbconn->prefix ."calendar c, ". $this->dbconn->prefix ."participants p";
+ $this->q = "SELECT c.* from ". $this->dbconn->prefix ."calendar c, ". $this->dbconn->prefix ."participants p";
$pre = " WHERE c.id = p.app_id AND ";
team::obj_read($this->user);
$this->q .= $pre."p.adr_id in ( ". $this->user->id;
@@ -213,24 +221,18 @@
$this->q .= ",". $i;
}
$this->q .= ")";
- $pre = " AND ";
+ $this->qpre = " AND ";
$this->link1 = addUrlParameter($this->link1,"myapps=".$_GET['myapps']);
$this->addHidden("myapps",$_GET['myapps']);
$this->filter['myapps'] = $_GET['myapps'];
} else {
- $this->q = "SELECT * from ". $this->dbconn->prefix ."calendar";
- $pre = " WHERE";
+ $this->q = "SELECT c.* from ". $this->dbconn->prefix ."calendar c";
+ $this->qpre = " WHERE ";
}
// Text Search
- if ( isset($_GET['name']) && !empty($_GET['name']) && ($_GET['name'] != "*") ) {
- $this->q .= " " . $pre ."(". $this->dbconn->Like("description",$_GET['name']) .")";
- $pre = " AND";
- $this->link1 = addUrlParameter($this->link1,"name=". urlencode($_GET['name']));
- $this->addHidden("name",$_GET['name']);
- $this->filter['name'] = $_GET['name'];
- }
+ overview_arg($this,'name',OVERVIEW_ARG_STRING,'appointment1',array('description'),'Description','c.');
// Show all apps with given link (addr,company or department)
@@ -242,26 +244,27 @@
$obj = getObject($this->dbconn,$_GET['link_id']);
if ( $obj->id > 0 ) {
if ( $obj->getType() == "product" ) {
- $this->q .= $pre . " product = ". $_GET['link_id'];
- $pre = " AND";
+ $this->q .= $this->qpre . " product = ". $_GET['link_id'];
+ $this->qpre = " AND ";
} else if ( $obj->getType() == "company" ) {
$obj->read_members();
- $this->q .= $pre . " visitor in (". $_GET['link_id'];
+ $this->q .= $this->qpre . " visitor in (". $_GET['link_id'];
while ( list ($i,$f) = @each ($obj->member) ) {
$this->q .= ",". $i;
}
$this->q .= " )";
- $pre = " AND";
+ $this->qpre = " AND ";
} else if ( $obj->getType() == "department" ) {
$obj->read_members();
- $this->q .= $pre . " visitor in (". $_GET['link_id'];
+ $this->q .= $this->qpre . " visitor in (". $_GET['link_id'];
while ( list ($i,$f) = @each ($obj->member) ) {
$this->q .= ",". $i;
}
$this->q .= " )";
- $pre = " AND";
+ $this->qpre = " AND ";
} else if ( $obj->getType() == "address" ) {
- $this->q .= $pre . " visitor = ". $_GET['link_id'];
+ $this->q .= $this->qpre . " visitor = ". $_GET['link_id'];
+ $this->qpre = " AND ";
}
$this->name .= " : ".$obj->getFullName();
}
@@ -269,44 +272,18 @@
$this->addHidden("link_id",$_GET['link_id']);
}
// Start Date for search
- $from = new TUTOS_Date_Time(0);
- if ( isset($_GET['fd']) ) {
- $from->setDateTime($_GET['fd']);
- } else {
- $from->setDateTimeF("f");
- // remember this
- $_SESSION['appsearchfrom'] = $from->getYYYYMMDD();
+ if ($this->ext != 0) {
+ overview_arg($this,'f',OVERVIEW_ARG_D_FROM,'appointment1',array('a_start'),'Date','c.');
}
- if ( $from->notime == 0 ) {
- $this->q .= $pre ."(a_start >= ". $this->dbconn->Date($from) .")";
- $pre = "AND ";
- $this->link1 = addUrlParameter($this->link1,"fd=".$from->getYYYYMMDD());
- $this->addHidden("fd",$from->getYYYYMMDD());
- $this->filter['from'] = $from;
- }
+
// End Date for search
- $to = new TUTOS_Date_Time(0);
- if ( isset($_GET['td']) ) {
- $to->setDateTime($_GET['td']);
- } else {
- $to->setDateTimeF("t");
- // remember this
- $_SESSION['appsearchto'] = $to->getYYYYMMDD();
+ if ($this->ext != 0) {
+ overview_arg($this,'t',OVERVIEW_ARG_D_TO,'appointment1',array('a_end'),'Date','c.');
}
- if ( $to->notime == 0 ) {
- $this->q .= $pre ."(a_end <= ". $this->dbconn->Date($to) .")";
- $pre = " AND ";
- $this->link1 = addUrlParameter($this->link1,"td=".$to->getYYYYMMDD());
- $this->addHidden("td",$to->getYYYYMMDD());
- $this->filter['to'] = $to;
+
+ if ($this->ext != 0) {
+ overview_arg($this,'loc',OVERVIEW_ARG_INT,'appointment1',array('outside'),array('Location2','AppLoc'),'c.');
}
- if ( isset($_GET['loc']) && ($_GET['loc'] != -1) ) {
- $this->q .= $pre ."(outside = ". $_GET['loc'] .")";
- $pre = " AND ";
- $this->link1 = addUrlParameter($this->link1,"loc=".$_GET['loc']);
- $this->addHidden("loc",$_GET['loc']);
- $this->filter['loc'] = $_GET['loc'];
- }
check_dbacl($this->dbconn, $this->q, $this->user->id);
Modified: trunk/php/appointment.pinc
===================================================================
--- trunk/php/appointment.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/appointment.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -548,6 +548,12 @@
global $table;
if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
// search for a given object ID
$qx = '';
@@ -571,11 +577,17 @@
if ($mode == 1) {
$x = new appointment($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
@@ -1694,8 +1706,8 @@
case 'StartTime':
case 'EndTime':
$x = resolve_history_datetime($f,$this->dbconn,false);
- return $x;
- break;
+ return $x;
+ break;
default:
return null;
}
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/bugtracking/bug.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -534,6 +534,12 @@
global $table,$tutos;
if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
// search for a given object ID
$qx = '';
@@ -556,11 +562,18 @@
if ($mode == 1) {
$x = new Bug($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
+
}
$a++;
}
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/bugtracking/bug_overview.php 2011-11-23 10:21:17 UTC (rev 434)
@@ -892,8 +892,24 @@
$this->link1 = addUrlParameter($this->link1,"name=".UrlEncode($name));
$this->addHidden("name",$name);
-
- $this->header .= $this->hpre.$lang['AdrName'] .' = '.myentities($name) ;
+ if (count($s) > 1) {
+ $this->header .= $this->hpre.$lang['AdrName'] .' = ';
+ $pre = '';
+ foreach ($s as $sn) {
+ if (substr($sn,0,1) == "!") {
+ $this->header .= $pre.'<span class="missing">'.myentities(substr($sn,1)).'</span>' ;
+ } else {
+ $this->header .= $pre.myentities($sn) ;
+ }
+ $pre = ',';
+ }
+ } else {
+ if (substr($sn,0,1) == "!") {
+ $this->header .= $this->hpre.$lang['AdrName'] .' = '.myentities($name) ;
+ } else {
+ $this->header .= $this->hpre.$lang['AdrName'] .' ≠ '.myentities(substr($name,1)) ;
+ }
+ }
$this->hpre = '<br />';
// on non extended search look also for references
if ($this->ext == 0) {
@@ -948,9 +964,19 @@
// Parent to display
if ( isset($pid) ) {
- $ref = getObject($this->dbconn,$pid);
+ $ref = getObject($this->dbconn,abs($pid));
$this->name .= " : ".$ref->getFullName();
- $this->q .= $this->qpre ." b.product_id in (". $pid;
+ $this->header .= $this->hpre.$lang['BugReference'];
+ if ($pid < 0) {
+ $this->q .= $this->qpre ." b.product_id not in (". $pid;
+ $this->header .= ' ≠ ';
+ $this->head['product_id'] = true;
+ } else {
+ $this->q .= $this->qpre ." b.product_id in (". $pid;
+ $this->header .= ' = ';
+ $this->head['product_id'] = false;
+ }
+ $this->header .= $ref->getLink() ;
$this->qpre = " AND ";
$sep = ",";
@@ -966,9 +992,7 @@
$this->filter['parent'] = $pid;
$this->addHidden("pid",$pid);
- $this->header .= $this->hpre.$lang['BugReference'] .' = '.$ref->getLink() ;
$this->hpre = '<br />';
- $this->head['product_id'] = false;
}
// projects to display
Modified: trunk/php/company.pinc
===================================================================
--- trunk/php/company.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/company.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -157,6 +157,13 @@
global $table;
if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
+
// search for a given object ID
$qx = '';
if (preg_match('/#([0-9]*)/',trim($name),$regs)) {
@@ -177,11 +184,17 @@
if ($mode == 1) {
$x = new company($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/custom.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -263,7 +263,11 @@
$layout->filter['_fld_'.$ti] = $name;
} else if ($tx[type] == 'VARCHAR') {
foreach ($s as $sn) {
- $q .= ' '.$pre.' '. $layout->dbconn->Like($ti,$sn);
+ if (substr($sn,0,1) == "!") {
+ $q .= ' '.$pre.' '. $layout->dbconn->unLike($ti,substr($sn,1));
+ } else {
+ $q .= ' '.$pre.' '. $layout->dbconn->Like($ti,$sn);
+ }
$layout->filter['_fld_'.$ti][] = $sn;
}
}
@@ -424,9 +428,14 @@
foreach($s as $ss) {
$ss = trim($ss);
if ($ss == '') continue; // ANY
- $x .= $xpre.$current_user->dbconn->like($pre.$ti,$ss);
+ if (substr($ss,0,1) == "!") {
+ $x .= $xpre.$current_user->dbconn->unLike($pre.$ti,substr($ss,1));
+ $txt .= $txtpre.'<span class="missing">'.substr($ss,1).'</span>';
+ } else {
+ $x .= $xpre.$current_user->dbconn->Like($pre.$ti,$ss);
+ $txt .= $txtpre.$ss;
+ }
$xpre = ' OR ';
- $txt .= $txtpre.$ss;
$txtpre = ' / ';
$layout->filter['_fld_'.$ti][] = $ss;
}
Modified: trunk/php/department.pinc
===================================================================
--- trunk/php/department.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/department.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -132,6 +132,12 @@
global $table;
if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
$pos = strpos($name," / ");
if ( $pos === false ) {
@@ -164,11 +170,17 @@
if ($mode == 1) {
$x = new department($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/installation/installation.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -277,6 +277,12 @@
$qid = '';
if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
if (preg_match('/#([0-9]*)/',trim($name),$regs)) {
if(is_numeric($regs[1])) {
@@ -295,11 +301,17 @@
if ($mode == 1) {
$x = new installation($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
Modified: trunk/php/module_template/AAA.pinc
===================================================================
--- trunk/php/module_template/AAA.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/module_template/AAA.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -78,6 +78,63 @@
}
/**
+ * search for a object
+ * fill a array with possible objects
+ * mode 1 fill objects
+ * mode 0 do not fill objects
+ */
+ function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ global $table,$tutos;
+
+ if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
+
+ // search for a given object ID
+ $qx = '';
+ if (preg_match('/#([0-9]*)/',trim($name),$regs)) {
+ if(is_numeric($regs[1])) {
+ $qx = ' id = '.$regs[1];
+ }
+ } else {
+ $qx = $user->dbconn->Like("name",$name);
+ }
+ $q = 'SELECT '.($mode == 1 ? '*':'id').' from '. $user->dbconn->prefix .$table['AAA'][name] .' WHERE ';
+ $q .= $qx;
+ $q .= ' order by name ';
+ check_dbacl($user->dbconn, $q, $user->id);
+ $r = $user->dbconn->Exec($q);
+ $n = $r->numrows();
+ $a = 0;
+
+ while ( $a < $n ) {
+ if ($mode == 1) {
+ $x = new AAA($user->dbconn);
+ $x->read_result($r,$a);
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
+ unset($x);
+ } else {
+ $id = $r->get($a,'id');
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
+
+ }
+ $a++;
+ }
+ $r->free();
+ return $n;
+ }
+
+ /**
* set the AAA name
*/
function setName($value) {
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/product.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -698,6 +698,12 @@
global $table,$tutos;
if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
// search for a given object ID
$qx = '';
@@ -733,11 +739,17 @@
if ($mode == 1) {
$x = new Product($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
@@ -764,11 +776,17 @@
if ($mode == 1) {
$x = new Product($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
@@ -1374,8 +1392,8 @@
case 'ProdStart':
case 'ProdEnd':
$x = resolve_history_datetime($f,$this->dbconn);
- return $x;
- break;
+ return $x;
+ break;
default:
return null;
}
Modified: trunk/php/scrum/scrum.pinc
===================================================================
--- trunk/php/scrum/scrum.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/scrum/scrum.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -908,6 +908,12 @@
global $table,$tutos;
if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
// search for a given object ID
$qx = '';
@@ -930,11 +936,17 @@
if ($mode == 1) {
$x = new ScrumSprint($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
Modified: trunk/php/stuff/stuff.pinc
===================================================================
--- trunk/php/stuff/stuff.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/stuff/stuff.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -101,6 +101,12 @@
global $table,$tutos;
if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
$q = 'SELECT '.($mode == 1 ? '*':'id').' from '. $user->dbconn->prefix .$table['stuff'][name] .' WHERE ';
// search for a given object ID
@@ -123,11 +129,17 @@
if ($mode == 1) {
$x = new Stuff($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
@@ -335,8 +347,8 @@
case 'StuffUser':
case 'StuffSource':
$x = resolve_history_obj($f,$this->dbconn);
- return $x;
- break;
+ return $x;
+ break;
default:
return null;
}
Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/task.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -795,6 +795,12 @@
global $table,$tutos;
if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
// search for a given object ID
$qx = '';
@@ -817,11 +823,17 @@
if ($mode == 1) {
$x = new Task($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
@@ -839,11 +851,17 @@
if ($mode == 1) {
$x = new Task($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
@@ -2276,9 +2294,9 @@
$x1 = $obj->dbconn->DateTime($from);
$x2 = $obj->dbconn->DateTime($to);
#
- #
- #
- $q = 'SELECT c.* FROM '. $obj->dbconn->prefix .$table['task'][name].' c ';
+ #
+ #
+ $q = 'SELECT c.* FROM '. $obj->dbconn->prefix .$table['task'][name].' c ';
$pre = " WHERE";
if ( ($obj->getType() == "address") || ($obj->getType() == "user") ) {
// Select the workers and all his teams tasks
@@ -2288,7 +2306,7 @@
}
$q .= ")";
#
- $qq = 'SELECT DISTINCT t_id FROM '. $obj->dbconn->prefix .$table['taskworker'][name]. " WHERE w_id in (".$obj->id;
+ $qq = 'SELECT DISTINCT t_id FROM '. $obj->dbconn->prefix .$table['taskworker'][name]. " WHERE w_id in (".$obj->id;
foreach ($obj->teamlist as $i => $f) {
$qq .= "," . $i;
}
@@ -2309,7 +2327,7 @@
}
$r->free();
#
- $q .= ")";
+ $q .= ")";
$pre = " AND";
}
$q .= $pre. "(";
Modified: trunk/php/team.pinc
===================================================================
--- trunk/php/team.pinc 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/team.pinc 2011-11-23 10:21:17 UTC (rev 434)
@@ -195,6 +195,12 @@
global $table;
if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
$q = 'SELECT '.($mode == 1 ? '*':'id').' from '. $user->dbconn->prefix.$table['team'][name] .' WHERE'. $user->dbconn->Like ("name",$name);
$q .= " order by name ";
@@ -206,11 +212,17 @@
if ($mode == 1) {
$x = new Team($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
@@ -224,7 +236,6 @@
*/
function is_member(&$adr) {
return array_key_exists($adr->id,$this->member);
- return 0;
}
/**
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2011-11-22 19:48:26 UTC (rev 433)
+++ trunk/php/webelements.p3 2011-11-23 10:21:17 UTC (rev 434)
@@ -438,7 +438,7 @@
case 'integer':
case 'double':
$msg .= $a;
- break;
+ break;
case 'boolean':
if (true === $a){
$msg .= 'T';
@@ -2709,10 +2709,7 @@
$x = $_REQUEST[$arg];
$q = ''; // the search part of the query
- if ($not)
- $header = '≠';
- else
- $header = '=';
+ $header = '=';
if (is_array($x)) {
if ($not)
@@ -2760,17 +2757,21 @@
$q .= ')';
$header .= $lang['Departments'].' & ';
} else {
- if ($not)
- $q = ' ≠ ';
- else
+ if ($x < 0) {
+ $q = ' != ';
+ $header = ' ≠ ';
+ $show = true;
+ } else {
$q = ' = ';
- $q .= $x;
+ $header = ' = ';
+ }
+ $q .= abs($x);
}
- $xo = getObject($obj->dbconn,$x);
+ $xo = getObject($obj->dbconn,abs($x));
if (is_object($xo)) {
$header .= $lang[$xo->getType()].' '.$xo->getLink() ;
} else if (method_exists($obj,$resolver)) {
- $header .= $obj->$resolver($x);
+ $header .= $obj->$resolver(abs($x));
} else {
$header .= $x ;
}
@@ -2907,7 +2908,7 @@
}
if ($skip) return false;
// search only in one field
- $obj->q .= $obj->qpre . $prefix.$cnames[0].$q;
+ $obj->q .= $obj->qpre .'('.$prefix.$cnames[0].$q.')';
$obj->head[$cnames[0]] = $show;
$obj->header .= $obj->hpre .$lang[$lgid[0]].$header;
@@ -3072,7 +3073,7 @@
foreach($t2 as $i=>$x) if ($x>'') $r2[$x][]=$i;
$a1=0; $a2=0; # start at beginning of each list
- $actions=array();
+ $actions=array();
// walk this loop until we reach the end of one of the lists
while ($a1<count($t1) && $a2<count($t2)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-22 19:48:32
|
Revision: 433
http://tutos.svn.sourceforge.net/tutos/?rev=433&view=rev
Author: gokohnert
Date: 2011-11-22 19:48:26 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
enable some negated searches
Modified Paths:
--------------
trunk/php/address.pinc
trunk/php/bugtracking/bug_overview.php
trunk/php/db/db.pinc
trunk/php/product_overview.php
trunk/php/webelements.p3
Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc 2011-11-22 13:46:26 UTC (rev 432)
+++ trunk/php/address.pinc 2011-11-22 19:48:26 UTC (rev 433)
@@ -138,6 +138,12 @@
global $table;
if ( trim($name) == "" ) return 0;
+ if (substr($name,0,1) == "!") {
+ $name = substr($name,1);
+ $negate = true;
+ } else {
+ $negate = false;
+ }
// search for a given object ID
$qx = '';
@@ -163,11 +169,17 @@
if ($mode == 1) {
$x = new Tutos_address($user->dbconn);
$x->read_result($r,$a);
- $arr[$x->id] = &$x;
+ if ($negate)
+ $arr[-$x->id] = &$x;
+ else
+ $arr[$x->id] = &$x;
unset($x);
} else {
$id = $r->get($a,'id');
- $arr[$id] = $id;
+ if ($negate)
+ $arr[-$id] = $id;
+ else
+ $arr[$id] = $id;
}
$a++;
}
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2011-11-22 13:46:26 UTC (rev 432)
+++ trunk/php/bugtracking/bug_overview.php 2011-11-22 19:48:26 UTC (rev 433)
@@ -872,11 +872,21 @@
$this->q .= $this->qpre ."(";
$pre = '';
foreach ($s as $sn) {
- $this->q .= $pre. $this->dbconn->Like("c.description",$sn);
- $pre = ' OR ';
- $this->q .= $pre. $this->dbconn->Like("b.short",$sn);
- $this->q .= $pre. $this->dbconn->Like("b.name",$sn);
- $this->q .= $pre. $this->dbconn->Like("b.description",$sn);
+ if (substr($sn,0,1) == "!") {
+ // negate all
+ $sn = substr($sn,1);
+ $this->q .= $pre. $this->dbconn->unLike("c.description",$sn);
+ $pre = ' AND ';
+ $this->q .= $pre. $this->dbconn->unLike("b.short",$sn);
+ $this->q .= $pre. $this->dbconn->unLike("b.name",$sn);
+ $this->q .= $pre. $this->dbconn->unLike("b.description",$sn);
+ } else {
+ $this->q .= $pre. $this->dbconn->Like("c.description",$sn);
+ $pre = ' OR ';
+ $this->q .= $pre. $this->dbconn->Like("b.short",$sn);
+ $this->q .= $pre. $this->dbconn->Like("b.name",$sn);
+ $this->q .= $pre. $this->dbconn->Like("b.description",$sn);
+ }
$this->filter['name'][] = $sn;
}
@@ -892,7 +902,7 @@
$lpre = '';
if (count($arr) > 0) {
$l = '(';
- foreach($arr as $a) {
+ foreach($arr as $idx => $a) {
$l .= $lpre.$a;
$lpre = ',';
}
@@ -1017,7 +1027,7 @@
$xxx = "";
$this->link2 = $this->link1;
order_parse($this->q,$this->link1,$xxx,$hidden,"creation desc");
- // $msg .= $this->q;
+ //$msg .= $this->q;
if ($this->stop) {
return;
}
Modified: trunk/php/db/db.pinc
===================================================================
--- trunk/php/db/db.pinc 2011-11-22 13:46:26 UTC (rev 432)
+++ trunk/php/db/db.pinc 2011-11-22 19:48:26 UTC (rev 433)
@@ -302,10 +302,10 @@
}
function unLike($fld1,$name,$fld2 = "",$fld3 = "") {
- return Like($fld1,$name,$fld2,$fld3,true);
+ return $this->Like($fld1,$name,$fld2,$fld3,true);
}
function unLike2($fld,$name) {
- return Like2($fld,$name,true);
+ return $this->Like2($fld,$name,true);
}
abstract function Like($fld1,$name,$fld2 = "",$fld3 = "",$not=false);
Modified: trunk/php/product_overview.php
===================================================================
--- trunk/php/product_overview.php 2011-11-22 13:46:26 UTC (rev 432)
+++ trunk/php/product_overview.php 2011-11-22 19:48:26 UTC (rev 433)
@@ -835,8 +835,7 @@
$pscnt = 0;
if ( isset($_GET['ps']) ) {
// New Set Default
- @reset($_GET['ps']);
- while ( list ($i1,$f1) = @each ($_GET['ps']) ) {
+ foreach ($_GET['ps'] as $i1 => $f1) {
$this->pshow[$f1] = 1;
$pscnt++;
$this->link1 = addUrlParameter($this->link1,"ps[]=".$f1);
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2011-11-22 13:46:26 UTC (rev 432)
+++ trunk/php/webelements.p3 2011-11-22 19:48:26 UTC (rev 433)
@@ -438,7 +438,7 @@
case 'integer':
case 'double':
$msg .= $a;
- break;
+ break;
case 'boolean':
if (true === $a){
$msg .= 'T';
@@ -1297,6 +1297,7 @@
if ($name == '') return $arr;
$narr = explode('|',$name);
+
if ($types == 'all') {
$ma = array(useaddressbook,useteams,useprojects,usecompany,usedepartment,'D',useinstmanagement,usetaskmanagement,usecalendar);
} else if (!is_array($types)) {
@@ -1342,6 +1343,7 @@
}
// walk over pipe seperated search parts
foreach ($narr as $sn) {
+ $sn = trim($sn);
# error_log('sbn: sn='.$sn."\r\n",3,$tutos[errlog]);
// Search departments by company (i.e. type company name to get all deps)
if ( $c == "D") {
@@ -2627,8 +2629,15 @@
if ($cnt > 1) {
$obj->q .= '(';
}
+
$pre = '';
- foreach($s as $sn) {
+ foreach($s as $idx => $sn) {
+ if ( (substr($s[$idx],0,1) == "!") ) {
+ $sn = substr($s[$idx],1);
+ $not = true;
+ } else {
+ $not = false;
+ }
if (count($cnames) == 1) {
if ($not) {
$obj->q .= $pre.$obj->dbconn->unLike($prefix.$cnames[0],$sn);
@@ -2641,6 +2650,7 @@
$obj->head[$cnames[0]] = true; // wildcard search has to display
} else {
// connect multiple fields by OR
+ $pre = $pre.'(';
foreach($cnames as $c) {
if ($not) {
$obj->q .= $pre.$obj->dbconn->unLike($prefix.$c,$sn);
@@ -2652,11 +2662,16 @@
$obj->filter[$c][] = $sn;
$obj->head[$c] = true; // wildcard search has to display
}
+ $obj->q .= ')';
}
+ $pre = ' OR ';
}
if ($cnt > 1) {
$obj->q .= ')';
}
+ if (count($s) > 1) {
+ $not = false; // multiple search args
+ }
$obj->qpre = ' AND ';
$obj->link1 = addUrlParameter($obj->link1,$arg.'='.UrlEncode($myarg));
@@ -2667,10 +2682,24 @@
$obj->header .= $hpre.$lang[$c];
$hpre = '/';
}
- $obj->header .= ($not ? ' ࣔ ':' = ').htmlentities($myarg).'';
+ $obj->header .= ($not ? ' ≠ ':' = ');
} else {
- $obj->header .= $lang[$lgid] .($not ? ' ࣔ ':' = ').htmlentities($myarg).'';
+ $obj->header .= $lang[$lgid] .($not ? ' ≠ ':' = ');
}
+ // add the args to header
+ $pre = '';
+ foreach($s as $sn) {
+ if (substr($sn,0,1) == "!") {
+ $sn = substr($sn,1);
+ if ($not)
+ $obj->header .= $pre.htmlentities($sn);
+ else
+ $obj->header .= $pre.'<span class="missing"> '.htmlentities($sn).' </span>';
+ } else {
+ $obj->header .= $pre.htmlentities($sn);
+ }
+ $pre = '|';
+ }
$obj->hpre = '<br />';
return true;
}
@@ -2681,7 +2710,7 @@
$q = ''; // the search part of the query
if ($not)
- $header = 'ࣔ';
+ $header = '≠';
else
$header = '=';
@@ -2732,7 +2761,7 @@
$header .= $lang['Departments'].' & ';
} else {
if ($not)
- $q = ' ࣔ ';
+ $q = ' ≠ ';
else
$q = ' = ';
$q .= $x;
@@ -2832,7 +2861,7 @@
if (is_array($x)) {
if ($not) {
$q = ' not in (';
- $header = ' ࣔ ';
+ $header = ' ≠ ';
} else {
$q = ' in (';
$header = ' = ';
@@ -2903,36 +2932,74 @@
} else {
$obj->header .= $hpre .$lang[$lgid];
}
- $obj->header .= ' = '. htmlentities($_REQUEST[$arg]);
+ $s = explode('|',$myarg);
+ if (count($s) == 1) {
+ if ( (substr($myarg,0,1) == "!") ) {
+ $obj->header .= ' ≠ '. htmlentities(substr($myarg,1));
+ $not = true;
+ } else {
+ $obj->header .= ' = '. htmlentities($myarg);
+ }
+ } else {
+ // multisearch
+ $obj->header .= ' = ';
+ $pre = '';
+ foreach ($s as $sn) {
+ if ( (substr($sn,0,1) == "!") ) {
+ $obj->header .= $pre.'<span class="missing">'. htmlentities(substr($sn,1)).'</span>';
+ } else {
+ $obj->header .= $pre.htmlentities($sn);
+ }
+ $pre = ',';
+ }
+ }
$obj->hpre = '<br />';
$obj->addHidden($arg,$_REQUEST[$arg]);
if (count($arr) == 0) {
- $obj->q .= $obj->qpre ." 0 = 1";
- $obj->qpre = " AND ";
+ if (!$not) {
+ $obj->q .= $obj->qpre ." 0 = 1";
+ $obj->qpre = " AND ";
+ }
return false;
}
+
$obj->q .= $obj->qpre;
if (count($cnames) > 1) {
$obj->q .= ' (';
}
$subpre = '';
foreach($cnames as $cn) {
- $obj->q .= $subpre.$prefix.$cn." in(";
+ $l = '';
+ $nl = '';
$sep = '';
+ $nsep = '';
if (count($arr) == 0) {
- $obj->q .= "0";
- } else
- foreach($arr as $a) {
- if (is_object($a))
- $obj->q .= $sep.$a->id;
- else if (is_array($a))
- $obj->q .= $sep.$a[0];
- $sep = ',';
+ $l .= "0";
+ } else {
+ foreach($arr as $idx => $a) {
+ if ($idx > 0) {
+ if (is_object($a))
+ $l .= $sep.$a->id;
+ else if (is_array($a))
+ $l .= $sep.$a[0];
+ $sep = ',';
+ } else {
+ if (is_object($a))
+ $nl .= $nsep.$a->id;
+ else if (is_array($a))
+ $nl .= $nsep.$a[0];
+ $nsep = ',';
+ }
}
- $obj->q .= ")";
+ }
+ if ($l != '') {
+ $obj->q .= $subpre.$prefix.$cn.' in('.$l.')';
+ } else if ($nl != '') {
+ $obj->q .= $subpre.$prefix.$cn.' not in('.$nl.')';
+ }
$subpre = ' OR ';
$obj->filter[$cn] = $myarg;
}
@@ -3005,7 +3072,7 @@
foreach($t2 as $i=>$x) if ($x>'') $r2[$x][]=$i;
$a1=0; $a2=0; # start at beginning of each list
- $actions=array();
+ $actions=array();
// walk this loop until we reach the end of one of the lists
while ($a1<count($t1) && $a2<count($t2)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-22 13:46:37
|
Revision: 432
http://tutos.svn.sourceforge.net/tutos/?rev=432&view=rev
Author: gokohnert
Date: 2011-11-22 13:46:26 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
start to support negated searchs
Modified Paths:
--------------
trunk/php/webelements.p3
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2011-11-22 13:45:28 UTC (rev 431)
+++ trunk/php/webelements.p3 2011-11-22 13:46:26 UTC (rev 432)
@@ -438,7 +438,7 @@
case 'integer':
case 'double':
$msg .= $a;
- break;
+ break;
case 'boolean':
if (true === $a){
$msg .= 'T';
@@ -2592,6 +2592,8 @@
$obj->qpre = " WHERE ";
}
+ $not = false; // negate selection /true == negate)
+
if (!isset($obj->header)) {
$obj->header = '';
}
@@ -2628,15 +2630,25 @@
$pre = '';
foreach($s as $sn) {
if (count($cnames) == 1) {
- $obj->q .= $pre.$obj->dbconn->Like($prefix.$cnames[0],$sn);
- $pre = ' OR ';
+ if ($not) {
+ $obj->q .= $pre.$obj->dbconn->unLike($prefix.$cnames[0],$sn);
+ $pre = ' AND ';
+ } else {
+ $obj->q .= $pre.$obj->dbconn->Like($prefix.$cnames[0],$sn);
+ $pre = ' OR ';
+ }
$obj->filter[$cnames[0]][] = $sn;
$obj->head[$cnames[0]] = true; // wildcard search has to display
} else {
// connect multiple fields by OR
foreach($cnames as $c) {
- $obj->q .= $pre.$obj->dbconn->Like($prefix.$c,$sn);
- $pre = ' OR ';
+ if ($not) {
+ $obj->q .= $pre.$obj->dbconn->unLike($prefix.$c,$sn);
+ $pre = ' AND ';
+ } else {
+ $obj->q .= $pre.$obj->dbconn->Like($prefix.$c,$sn);
+ $pre = ' OR ';
+ }
$obj->filter[$c][] = $sn;
$obj->head[$c] = true; // wildcard search has to display
}
@@ -2655,9 +2667,9 @@
$obj->header .= $hpre.$lang[$c];
$hpre = '/';
}
- $obj->header .= ' = '.htmlentities($myarg).'';
+ $obj->header .= ($not ? ' ࣔ ':' = ').htmlentities($myarg).'';
} else {
- $obj->header .= $lang[$lgid] .' = '.htmlentities($myarg).'';
+ $obj->header .= $lang[$lgid] .($not ? ' ࣔ ':' = ').htmlentities($myarg).'';
}
$obj->hpre = '<br />';
return true;
@@ -2668,9 +2680,17 @@
$x = $_REQUEST[$arg];
$q = ''; // the search part of the query
+ if ($not)
+ $header = 'ࣔ';
+ else
+ $header = '=';
+
if (is_array($x)) {
- $q = ' in (';
- $header = '= (';
+ if ($not)
+ $q = ' not in (';
+ else
+ $q = ' in (';
+ $header .= ' (';
$pre = '';
foreach($x as $i) {
if (!is_numeric($i)) die('overview_arg: non numeric argument -> '.$i);
@@ -2692,11 +2712,14 @@
$show = true;
} else {
$show = false;
- $header = ' = ';
if (!is_numeric($x)) die('overview_arg: non numeric argument -> '.$x);
// if mode includes D (we also accept departments)
if ($mode != null && strstr($mode,'D')) {
- $q = ' in ('.$x;
+ if ($not)
+ $q = ' not in (';
+ else
+ $q = ' in (';
+ $q .= $x;
$xo = getObject($obj->dbconn,$x);
if (is_object($xo) && $xo->getTypeId() == usecompany) {
department::obj_read($xo);
@@ -2708,7 +2731,11 @@
$q .= ')';
$header .= $lang['Departments'].' & ';
} else {
- $q = ' = '.$x;
+ if ($not)
+ $q = ' ࣔ ';
+ else
+ $q = ' = ';
+ $q .= $x;
}
$xo = getObject($obj->dbconn,$x);
if (is_object($xo)) {
@@ -2803,8 +2830,13 @@
$skip = false;
$q = ''; // the search part of the query
if (is_array($x)) {
- $q = ' in (';
- $header = ' = ';
+ if ($not) {
+ $q = ' not in (';
+ $header = ' ࣔ ';
+ } else {
+ $q = ' in (';
+ $header = ' = ';
+ }
if (count($x) > 1) $header .= '(';
$pre = '';
foreach($x as $i) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-22 13:45:34
|
Revision: 431
http://tutos.svn.sourceforge.net/tutos/?rev=431&view=rev
Author: gokohnert
Date: 2011-11-22 13:45:28 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
added a not flag to select
Modified Paths:
--------------
trunk/php/db/db.pinc
trunk/php/db/db_db2.pinc
trunk/php/db/db_firebird.pinc
trunk/php/db/db_interbase.pinc
trunk/php/db/db_mssql.pinc
trunk/php/db/db_mssqlnative.pinc
trunk/php/db/db_mysql.pinc
trunk/php/db/db_mysqli.pinc
trunk/php/db/db_oci.pinc
trunk/php/db/db_ora.pinc
trunk/php/db/db_pg.pinc
trunk/php/db/db_sqlite.pinc
trunk/php/db/db_sqlite3.pinc
Modified: trunk/php/db/db.pinc
===================================================================
--- trunk/php/db/db.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -301,6 +301,16 @@
return '';
}
+ function unLike($fld1,$name,$fld2 = "",$fld3 = "") {
+ return Like($fld1,$name,$fld2,$fld3,true);
+ }
+ function unLike2($fld,$name) {
+ return Like2($fld,$name,true);
+ }
+ abstract function Like($fld1,$name,$fld2 = "",$fld3 = "",$not=false);
+
+ abstract function Like2($fld,$name,$not=false);
+
/**
* lock a table t
*/
Modified: trunk/php/db/db_db2.pinc
===================================================================
--- trunk/php/db/db_db2.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_db2.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2007 by Gero Kohnert
+ * Copyright 2007 - 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
@@ -277,10 +277,11 @@
$x = sprintf ("'%04d-%02d-%02d'",$t->year,$t->month,$t->day);
return $x;
}
+
/**
* case insensitive string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = $fld1;
if ( $fld2 != "" ) {
$fld = "CONCAT(". $fld ." ,' '," .$fld2;
@@ -292,15 +293,16 @@
$name = eregi_replace(" ","%",$name);
$name = eregi_replace("[\]","\\\\",$name);
$name = eregi_replace("'","\'",$name);
- return (" UPPER(". $fld .") like '%". strtoupper($name) ."%' ");
+ return (" UPPER(". $fld .")".($not ? " not":"")." like '%". strtoupper($name) ."%' ");
}
+
/**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
$name = eregi_replace("[\]","\\\\",$name);
$name = eregi_replace("'","\'",$name);
- return (" ". $fld ." = BINARY '". $name ."' ");
+ return (" ". $fld .($not ? " !":" ")."= BINARY '". $name ."' ");
}
/* ---------------------------------------------------------------------------
*/
Modified: trunk/php/db/db_firebird.pinc
===================================================================
--- trunk/php/db/db_firebird.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_firebird.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -251,7 +251,7 @@
/**
* case insensitive string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = $fld1;
if ( $fld2 != "" ) {
$fld .= "|| ' ' ||". $fld2;
@@ -261,15 +261,15 @@
}
$name = eregi_replace(" ","%",$name);
$name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .") like '%". strtoupper($name) ."%' ");
+ return (" UPPER(". $fld .")".($not ? " not":"")." like '%". strtoupper($name) ."%' ");
}
/**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
$name = eregi_replace("'","''",$name);
- return (" ". $fld ." = '". $name ."' ");
+ return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
}
/**
Modified: trunk/php/db/db_interbase.pinc
===================================================================
--- trunk/php/db/db_interbase.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_interbase.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -257,7 +257,7 @@
/**
* case insensitive string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = $fld1;
if ( $fld2 != "" ) {
$fld .= "|| ' ' ||". $fld2;
@@ -267,15 +267,15 @@
}
$name = eregi_replace(" ","%",$name);
$name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .") like '%". strtoupper($name) ."%' ");
+ return (" UPPER(". $fld .")".($not ? " not":"")." like '%". strtoupper($name) ."%' ");
}
/**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
$name = eregi_replace("'","''",$name);
- return (" ". $fld ." = '". $name ."' ");
+ return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
}
/**
Modified: trunk/php/db/db_mssql.pinc
===================================================================
--- trunk/php/db/db_mssql.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_mssql.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -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
@@ -260,10 +260,11 @@
$x = sprintf("'%04d-%02d-%02d'",$t->year,$t->month,$t->day);
return $x;
}
- /* ---------------------------------------------------------------------------
+
+ /**
* case sensitive strict string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = $fld1;
if ( $fld2 != "" ) {
$fld .= "+ ' ' +". $fld2;
@@ -273,16 +274,18 @@
}
$name = eregi_replace(" ","%",$name);
$name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .") like UPPER('%". $name ."%') ");
+ return (" UPPER(". $fld .")".($not ? " not":"")." like UPPER('%". $name ."%') ");
}
- /* ---------------------------------------------------------------------------
+
+ /**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
#$name = eregi_replace(" ","%",$name);
$name = eregi_replace("'","''",$name);
- return (" ". $fld ." = '". $name ."' ");
+ return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
}
+
/* ---------------------------------------------------------------------------
*/
function password($pw) {
Modified: trunk/php/db/db_mssqlnative.pinc
===================================================================
--- trunk/php/db/db_mssqlnative.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_mssqlnative.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -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
@@ -273,10 +273,11 @@
$x = sprintf("'%04d-%02d-%02d'",$t->year,$t->month,$t->day);
return $x;
}
- /* ---------------------------------------------------------------------------
+
+ /**
* case sensitive strict string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = $fld1;
if ( $fld2 != "" ) {
$fld .= " + ' ' + ". $fld2;
@@ -286,16 +287,18 @@
}
$name = eregi_replace(" ","%",$name);
$name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .") LIKE UPPER('%". $name ."%') ");
+ return (" UPPER(". $fld .")".($not ? " NOT":"")." LIKE UPPER('%". $name ."%') ");
}
- /* ---------------------------------------------------------------------------
+
+ /**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
#$name = eregi_replace(" ","%",$name);
$name = eregi_replace("'","''",$name);
- return (" ". $fld ." = '". $name ."' ");
+ return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
}
+
/* ---------------------------------------------------------------------------
*/
function password($pw) {
Modified: trunk/php/db/db_mysql.pinc
===================================================================
--- trunk/php/db/db_mysql.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_mysql.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -337,7 +337,7 @@
/**
* case insensitive string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = ' UPPER('.$fld1.')';
if ( $fld2 != "" ) {
$fld = " CONCAT(UPPER(". $fld .") ,' ',UPPER(".$fld2;
@@ -349,16 +349,16 @@
$name = preg_replace('# #','%',$name);
$name = preg_replace('#\\\#','\\\\\\',$name);
$name = preg_replace("#'#","\'",$name);
- return ($fld ." like '%". strtoupper($name) ."%' ");
+ return ($fld .($not ?" not ":" ")."like '%". strtoupper($name) ."%' ");
}
/**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
$name = preg_replace('#\\\#','\\\\\\',$name);
$name = preg_replace("#'#","\'",$name);
- return (" ". $fld ." = BINARY '". $name ."' ");
+ return (" ". $fld .($not ?" !=":" =")." BINARY '". $name ."' ");
}
/**
Modified: trunk/php/db/db_mysqli.pinc
===================================================================
--- trunk/php/db/db_mysqli.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_mysqli.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -332,7 +332,7 @@
/**
* case insensitive string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = ' UPPER('.$fld1.')';
if ( $fld2 != "" ) {
$fld = " CONCAT(UPPER(". $fld .") ,' ',UPPER(".$fld2;
@@ -344,16 +344,16 @@
$name = preg_replace('# #','%',$name);
$name = preg_replace('#\\\#','\\\\\\',$name);
$name = preg_replace("#'#","\'",$name);
- return ($fld ." like '%". strtoupper($name) ."%' ");
+ return ($fld .($not ? ' not':'')." like '%". strtoupper($name) ."%' ");
}
/**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
$name = preg_replace('#\\\#','\\\\\\',$name);
$name = preg_replace("#'#","\'",$name);
- return (" ". $fld ." = BINARY '". $name ."' ");
+ return (" ". $fld .($not ?" !=":" =")." BINARY '". $name ."' ");
}
/**
Modified: trunk/php/db/db_oci.pinc
===================================================================
--- trunk/php/db/db_oci.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_oci.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -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
@@ -244,10 +244,11 @@
$x = sprintf("to_Date('%04d-%02d-%02d','YYYY-MM-DD')",$t->year,$t->month,$t->day);
return $x;
}
- /* ---------------------------------------------------------------------------
+
+ /**
* case insensitive string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = $fld1;
if ( $fld2 != "" ) {
$fld .= "|| ' ' ||". $fld2;
@@ -257,16 +258,18 @@
}
$name = eregi_replace(" ","%",$name);
$name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .") like UPPER('%". $name ."%') ");
+ return (" UPPER(". $fld .")".($not ? " not":" ")."like '%". strtoupper($name) ."%' ");
}
- /* ---------------------------------------------------------------------------
+
+ /**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
#$name = eregi_replace(" ","%",$name);
$name = eregi_replace("'","''",$name);
- return (" ". $fld ." = '". $name ."' ");
+ return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
}
+
/* ---------------------------------------------------------------------------
*/
function password($pw) {
Modified: trunk/php/db/db_ora.pinc
===================================================================
--- trunk/php/db/db_ora.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_ora.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -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
@@ -261,10 +261,11 @@
$x = sprintf("to_Date('%04d-%02d-%02d','YYYY-MM-DD')",$t->year,$t->month,$t->day);
return $x;
}
- /* ---------------------------------------------------------------------------
+
+ /**
* case sensitive strict string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = $fld1;
if ( $fld2 != "" ) {
$fld .= "|| ' ' ||". $fld2;
@@ -274,16 +275,18 @@
}
$name = eregi_replace(" ","%",$name);
$name = eregi_replace("'","?",$name);
- return (" UPPER(". $fld .") like UPPER('%". $name ."%') ");
+ return (" UPPER(". $fld .")".($not ? " not":" ")."like '%". strtoupper($name) ."%' ");
}
- /* ---------------------------------------------------------------------------
+
+ /**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
#$name = eregi_replace(" ","%",$name);
$name = eregi_replace("'","''",$name);
- return (" ". $fld ." = '". $name ."' ");
+ return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
}
+
/* ---------------------------------------------------------------------------
*/
function password($pw) {
Modified: trunk/php/db/db_pg.pinc
===================================================================
--- trunk/php/db/db_pg.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_pg.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -436,7 +436,7 @@
/**
* case insensitive string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = $fld1;
if ( $fld2 != "" ) {
$fld .= "|| ' ' ||". $fld2;
@@ -447,16 +447,16 @@
$name = preg_replace('# #','%',$name);
$name = preg_replace('#\\\#','\\\\\\',$name);
$name = preg_replace("#'#","''",$name);
- return (" LOWER(". $fld .") like E'%". strtolower($name) ."%' escape ''");
+ return (" LOWER(". $fld .") ". ($not ? "not ":"")." like E'%". strtolower($name) ."%' escape ''");
}
/**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
$name = preg_replace('#\\\#','\\\\\\',$name);
$name = preg_replace("#'#","''",$name);
- return (" ". $fld ." = '". $name ."' ");
+ return (" ". $fld .($not ? " !=":" =")." '". $name ."' ");
}
/**
Modified: trunk/php/db/db_sqlite.pinc
===================================================================
--- trunk/php/db/db_sqlite.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_sqlite.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -228,7 +228,7 @@
/**
* case insensitive string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = $fld1;
if ( $fld2 != "" ) {
$fld = $fld ." || " .$fld2;
@@ -239,16 +239,16 @@
$name = preg_replace("# #","%",$name);
$name = preg_replace("#[\]#","\\\\",$name);
$name = preg_replace("#'#","\'",$name);
- return (" UPPER(". $fld .") like '%". strtoupper($name) ."%' ");
+ return (" UPPER(". $fld .")".($not ? " not":" ")."like '%". strtoupper($name) ."%' ");
}
/**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
$name = preg_replace("#[\]#","\\\\",$name);
$name = preg_replace("#'#","\'",$name);
- return (" ". $fld ." = '". $name ."' ");
+ return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
}
/**
Modified: trunk/php/db/db_sqlite3.pinc
===================================================================
--- trunk/php/db/db_sqlite3.pinc 2011-11-22 13:16:14 UTC (rev 430)
+++ trunk/php/db/db_sqlite3.pinc 2011-11-22 13:45:28 UTC (rev 431)
@@ -299,7 +299,7 @@
/**
* case insensitive string compare
*/
- function like($fld1,$name,$fld2 = "",$fld3 = "") {
+ function like($fld1,$name,$fld2 = "",$fld3 = "",$not=false) {
$fld = $fld1;
if ( $fld2 != "" ) {
$fld = $fld ." || " .$fld2;
@@ -310,16 +310,16 @@
$name = preg_replace("# #","%",$name);
$name = preg_replace('#\\\#','\\\\\\',$name);
$name = preg_replace("#'#","\'",$name);
- return (" UPPER(". $fld .") like '%". strtoupper($name) ."%' ");
+ return (" UPPER(". $fld .")".($not ? " not":" ")."like '%". strtoupper($name) ."%' ");
}
/**
* case sensitive strict string compare
*/
- function like2($fld,$name) {
+ function like2($fld,$name,$not=false) {
$name = eregi_replace("[\]","\\\\",$name);
$name = eregi_replace("'","\'",$name);
- return (" ". $fld ." = '". $name ."' ");
+ return (" ". $fld .($not ? " !":" ")."= '". $name ."' ");
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-22 13:16:24
|
Revision: 430
http://tutos.svn.sourceforge.net/tutos/?rev=430&view=rev
Author: gokohnert
Date: 2011-11-22 13:16:14 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
target selection
Modified Paths:
--------------
trunk/php/bugtracking/bug_overview.php
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2011-11-22 09:33:54 UTC (rev 429)
+++ trunk/php/bugtracking/bug_overview.php 2011-11-22 13:16:14 UTC (rev 430)
@@ -361,6 +361,10 @@
$this->flds++;
}
$r .= $this->orderHeader("",$lang['BugShort'],$this->link2);
+ if ($this->head['target_id']) {
+ $r .= $this->orderHeader("",$lang['BugTarget'],$this->link2);
+ $this->flds++;
+ }
if ($this->head['state']) {
$r .= $this->orderHeader("state",$lang['BugState'],$this->link2);
$this->flds++;
@@ -429,6 +433,16 @@
$x = $this->mark_filter(myentities($b->short),'name');
$r .= ' <td class="over_l">'. $x ."</td>\n";
+ if ($this->head['target_id']) {
+ $r .= ' <td class="over_l">';
+ if ( is_object($b->target) && $b->target->id > 0 ) {
+ $x = $this->mark_filter(myentities($b->parent->getFullName()),'target_id');
+ $r .= $b->target->getLink($x);
+ } else {
+ $r .= '<i>'.$lang['HistoryDeleted'].'</i>';
+ }
+ $r .= "</td>\n";
+ }
if ($this->head['state']) {
$r .= ' <td class="over_l">'.$b->getStateColorBlock().$b->getState() ."</td>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-22 09:34:05
|
Revision: 429
http://tutos.svn.sourceforge.net/tutos/?rev=429&view=rev
Author: gokohnert
Date: 2011-11-22 09:33:54 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
no stateage currently
Modified Paths:
--------------
trunk/php/bugtracking/bug_overview.php
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2011-11-22 09:28:08 UTC (rev 428)
+++ trunk/php/bugtracking/bug_overview.php 2011-11-22 09:33:54 UTC (rev 429)
@@ -793,7 +793,7 @@
$this->filter['name'] = '';
$this->head['state'] = true;
- $this->head['stateage'] = true;
+ # $this->head['stateage'] = true;
$this->head['class'] = true;
$this->head['product_id'] = true;
$this->head['solver'] = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-22 09:28:14
|
Revision: 428
http://tutos.svn.sourceforge.net/tutos/?rev=428&view=rev
Author: gokohnert
Date: 2011-11-22 09:28:08 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
target selection
Modified Paths:
--------------
trunk/php/bugtracking/bug_overview.php
trunk/php/bugtracking/bug_select.php
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2011-11-21 21:30:23 UTC (rev 427)
+++ trunk/php/bugtracking/bug_overview.php 2011-11-22 09:28:08 UTC (rev 428)
@@ -365,6 +365,10 @@
$r .= $this->orderHeader("state",$lang['BugState'],$this->link2);
$this->flds++;
}
+ if ($this->head['stateage']) {
+ $r .= $this->orderHeader("stateage",$lang['BugState'],$this->link2);
+ $this->flds++;
+ }
if ($this->head['class']) {
$r .= $this->orderHeader("class",$lang['BugClass'],$this->link2);
$this->flds++;
@@ -429,6 +433,10 @@
if ($this->head['state']) {
$r .= ' <td class="over_l">'.$b->getStateColorBlock().$b->getState() ."</td>\n";
}
+ if ($this->head['stateage']) {
+ $diff = $b->getStateAge();
+ $r .= ' <td class="over_r">'.TUTOS_Date_Time::duration($diff[0],false) ."</td>\n";
+ }
if ($this->head['class']) {
$r .= ' <td class="over_l">'. $b->getClass() ."</td>\n";
@@ -785,6 +793,7 @@
$this->filter['name'] = '';
$this->head['state'] = true;
+ $this->head['stateage'] = true;
$this->head['class'] = true;
$this->head['product_id'] = true;
$this->head['solver'] = true;
@@ -969,7 +978,10 @@
overview_arg($this,'reporterid',OVERVIEW_ARG_OBJID,bug::getType(),array('reporter'),'BugReportedFrom','b.');
}
// Target to display
- overview_arg($this,'tid',OVERVIEW_ARG_OBJID,bug::getType(),array('target_id'),'BugTarget','b.');
+ if ($this->ext != 0) {
+ overview_arg($this,'tfn',OVERVIEW_ARG_FN,bug::getType(),array('target_id'),'BugTarget','b.',get_parent_classes('bugtracking'));
+ overview_arg($this,'tid',OVERVIEW_ARG_OBJID,bug::getType(),array('target_id'),'BugTarget','b.');
+ }
// custom selectors
// get customized non textual search fields
Modified: trunk/php/bugtracking/bug_select.php
===================================================================
--- trunk/php/bugtracking/bug_select.php 2011-11-21 21:30:23 UTC (rev 427)
+++ trunk/php/bugtracking/bug_select.php 2011-11-22 09:28:08 UTC (rev 428)
@@ -74,6 +74,12 @@
$r .= "</td>\n";
$r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc(sprintf($lang['BugTarget'],''),0,"t");
+ $r .= '<td colspan="2">';
+ $r .= select_from_array_or_input($this->obj,"t",null,1,get_parent_classes('bugtracking'));
+ $r .= "</td>\n";
+
+ $r .= "</tr><tr class=\"ext\">\n";
$r .= $this->showfieldc($lang['BugState'],0,"state");
$r .= ' <td colspan="2">'. BugAskState($this->state,2) ."</td>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-21 21:30:30
|
Revision: 427
http://tutos.svn.sourceforge.net/tutos/?rev=427&view=rev
Author: gokohnert
Date: 2011-11-21 21:30:23 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
better handling of extended searchs. Ignore ext search arguments in non extended searchs
Modified Paths:
--------------
trunk/php/acl.pinc
trunk/php/bugtracking/bug_overview.php
trunk/php/product.pinc
trunk/php/product_overview.php
trunk/php/sales_forecast.php
Modified: trunk/php/acl.pinc
===================================================================
--- trunk/php/acl.pinc 2011-11-21 21:28:53 UTC (rev 426)
+++ trunk/php/acl.pinc 2011-11-21 21:30:23 UTC (rev 427)
@@ -638,7 +638,7 @@
/**
* HTML form to enter feature permissions
*/
-function permission_form(&$layout,&$user,tutos_base &$obj) {
+function permission_form(&$layout,&$user,tutos_base &$obj,$class = 'pf') {
global $lang,$tutos,$permskip;
$r = '';
@@ -698,7 +698,7 @@
$lang['perm'][$x['perm']] .= " (MODULE)";
}
- $r .= "<tr>\n";
+ $r .= '<tr class="'.$class.'">'."\n";
$r .= "<th><script type=\"text/javascript\" language=\"JavaScript\">\n";
$r .= "//<![CDATA[\n";
@@ -738,7 +738,7 @@
if ( $i < -1000 ) {
continue;
}
- $r .= $layout->OverviewRowStart($line);
+ $r .= $layout->OverviewRowStart($line,$f,$class);
if ( $obj->p[$i] == 1 ) {
$obj->p[$i] = 2047;
}
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2011-11-21 21:28:53 UTC (rev 426)
+++ trunk/php/bugtracking/bug_overview.php 2011-11-21 21:30:23 UTC (rev 427)
@@ -816,13 +816,15 @@
return;
}
+ $this->link1 = 'bugtracking/bug_overview.php';
+ $this->link1 = addUrlParameter($this->link1,"format=".UrlEncode($this->format));
+
if (isset($_GET['ext'])) {
$this->ext = $_GET['ext'];
+ $this->link1 = addUrlParameter($this->link1,"ext=".$this->ext);
} else {
- $this->ext = 0;
+ $this->ext = 2; // call from somewhere else
}
- $this->link1 = 'bugtracking/bug_overview.php';
- $this->link1 = addUrlParameter($this->link1,"format=".UrlEncode($this->format));
if ( isset($_GET['pid']) && is_numeric($_GET['pid']) ) {
$pid = $_GET['pid'];
@@ -899,17 +901,18 @@
overview_arg($this,'id',OVERVIEW_ARG_OBJID,'bugtracking',array('id'),'Bug','b.');
// States to display
- $closed = preg_split('#,#',$tutos['bug_closed_states']);
- if (isset($_REQUEST['state']) && is_numeric($_REQUEST['state']) && $_REQUEST['state'] < -1) {
- $_REQUEST['state'] = array();
- foreach ($this->stc->states as $f) {
- if (($f->stc_state > 0) && !in_array($f->stc_state,$closed))
- $_REQUEST['state'][] = $f->stc_state;
+ if ($this->ext != 0) {
+ $closed = preg_split('#,#',$tutos['bug_closed_states']);
+ if (isset($_REQUEST['state']) && is_numeric($_REQUEST['state']) && $_REQUEST['state'] < -1) {
+ $_REQUEST['state'] = array();
+ foreach ($this->stc->states as $f) {
+ if (($f->stc_state > 0) && !in_array($f->stc_state,$closed))
+ $_REQUEST['state'][] = $f->stc_state;
+ }
}
+ overview_arg($this,'state',OVERVIEW_ARG_INT,'bugtracking',array('state'),array('BugState','BugStates'),'b.','','resolver_state');
}
- overview_arg($this,'state',OVERVIEW_ARG_INT,'bugtracking',array('state'),array('BugState','BugStates'),'b.','','resolver_state');
-
// Parent to display
if ( isset($pid) ) {
$ref = getObject($this->dbconn,$pid);
@@ -938,38 +941,51 @@
// projects to display
overview_arg($this,'pfn',OVERVIEW_ARG_FN,bug::getType(),array('product_id'),'BugReference','b.',get_parent_classes('bugtracking'));
// Classes to display
- overview_arg($this,'class',OVERVIEW_ARG_INT,bug::getType(),array('class'),array('BugClass','BugClasses'),'b.');
+ if ($this->ext != 0) {
+ overview_arg($this,'class',OVERVIEW_ARG_INT,bug::getType(),array('class'),array('BugClass','BugClasses'),'b.');
+ }
// Medium to display
- overview_arg($this,'medium',OVERVIEW_ARG_INT,bug::getType(),array('medium'),array('BugMedium','BugMediums'),'b.');
+ if ($this->ext != 0) {
+ overview_arg($this,'medium',OVERVIEW_ARG_INT,bug::getType(),array('medium'),array('BugMedium','BugMediums'),'b.');
+ }
// Followers to display
overview_arg($this,'fid',OVERVIEW_ARG_OBJID,bug::getType(),array('followup_id'),'BugFollowup','b.');
// Start Date for search
- overview_arg($this,'f',OVERVIEW_ARG_D_FROM,bug::getType(),array('creation'),'Date','b.');
+ if ($this->ext != 0) {
+ overview_arg($this,'f',OVERVIEW_ARG_D_FROM,bug::getType(),array('creation'),'Date','b.');
+ }
// End Date for search
- overview_arg($this,'t',OVERVIEW_ARG_D_TO,bug::getType(),array('creation'),'Date','b.');
+ if ($this->ext != 0) {
+ overview_arg($this,'t',OVERVIEW_ARG_D_TO,bug::getType(),array('creation'),'Date','b.');
+ }
// solvers to display
- overview_arg($this,'solverfn',OVERVIEW_ARG_FN,bug::getType(),array('solver'),'BugAssignedTo','b.','atT','resolver');
- overview_arg($this,'solverid',OVERVIEW_ARG_OBJID,bug::getType(),array('solver'),'BugAssignedTo','b.',null,'resolver');
+ if ($this->ext != 0) {
+ overview_arg($this,'solverfn',OVERVIEW_ARG_FN,bug::getType(),array('solver'),'BugAssignedTo','b.','atT','resolver');
+ overview_arg($this,'solverid',OVERVIEW_ARG_OBJID,bug::getType(),array('solver'),'BugAssignedTo','b.',null,'resolver');
+ }
// reporter to display
- overview_arg($this,'reporterfn',OVERVIEW_ARG_FN,bug::getType(),array('reporter'),'BugReportedFrom','b.','at');
- overview_arg($this,'reporterid',OVERVIEW_ARG_OBJID,bug::getType(),array('reporter'),'BugReportedFrom','b.');
+ if ($this->ext != 0) {
+ overview_arg($this,'reporterfn',OVERVIEW_ARG_FN,bug::getType(),array('reporter'),'BugReportedFrom','b.','at');
+ overview_arg($this,'reporterid',OVERVIEW_ARG_OBJID,bug::getType(),array('reporter'),'BugReportedFrom','b.');
+ }
// Target to display
overview_arg($this,'tid',OVERVIEW_ARG_OBJID,bug::getType(),array('target_id'),'BugTarget','b.');
// custom selectors
// get customized non textual search fields
- $custom = get_custom_sql_select($this,bug::getType(),'b',$this->link1);
- foreach ($custom[0] as $s) {
- $this->q .= $this->qpre;
- $this->q .= $s[0];
- $this->qpre = " AND ";
- $this->header .= $this->hpre.$s[1];
- $this->hpre = '<br />';
+ if ($this->ext != 0) {
+ $custom = get_custom_sql_select($this,bug::getType(),'b',$this->link1);
+ foreach ($custom[0] as $s) {
+ $this->q .= $this->qpre;
+ $this->q .= $s[0];
+ $this->qpre = " AND ";
+ $this->header .= $this->hpre.$s[1];
+ $this->hpre = '<br />';
+ }
+ foreach ($custom[1] as $s) {
+ $this->q = preg_replace('# where#i',','.$s.' WHERE',$this->q);
+ }
}
- foreach ($custom[1] as $s) {
- $this->q = preg_replace('# where#i',','.$s.' WHERE',$this->q);
- }
-
// sorting
check_dbacl($this->dbconn, $this->q, $this->user->id);
$xxx = "";
@@ -1099,4 +1115,4 @@
$l = new Bug_overview($current_user);
$l->display();
$dbconn->Close();
-?>
+?>
\ No newline at end of file
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2011-11-21 21:28:53 UTC (rev 426)
+++ trunk/php/product.pinc 2011-11-21 21:30:23 UTC (rev 427)
@@ -54,26 +54,37 @@
$obj->qpre = ' WHERE ';
overview_arg($obj,'name',OVERVIEW_ARG_STRING,'product',array('name','description','desc1','desc2','version'),array('ProdName','ProdDesc','ProdDesc1','ProdDesc2','ProdVersion'));
- // Start Date for search
- overview_arg($obj,'f',OVERVIEW_ARG_D_FROM,'product',array('creation'),'ProdCreationS');
- // End Date for search
- overview_arg($obj,'t',OVERVIEW_ARG_D_TO,'product',array('creation'),'ProdCreationS');
- // Project Start Date for search
- overview_arg($obj,'psf',OVERVIEW_ARG_D_FROM,'product',array('p_start'),'ProdStart');
- // Project Start Date for search
- overview_arg($obj,'pst',OVERVIEW_ARG_D_TO,'product',array('p_start'),'ProdStart');
+ // Creation Start Date for search
+ if ($obj->ext != 0) {
+ overview_arg($obj,'f',OVERVIEW_ARG_D_FROM,'product',array('creation'),'ProdCreationS');
+ }
+ // Creation End Date for search
+ if ($obj->ext != 0) {
+ overview_arg($obj,'t',OVERVIEW_ARG_D_TO,'product',array('creation'),'ProdCreationS');
+ }
+ // Project Start Start Date for search
+ if ($obj->ext != 0) {
+ overview_arg($obj,'psf',OVERVIEW_ARG_D_FROM,'product',array('p_start'),'ProdStart');
+ }
+ // Project End End Date for search
+ if ($obj->ext != 0) {
+ overview_arg($obj,'pst',OVERVIEW_ARG_D_TO,'product',array('p_start'),'ProdStart');
+ }
// Project End Date for search
- overview_arg($obj,'pef',OVERVIEW_ARG_D_FROM,'product',array('p_end'),'ProdEnd');
+ if ($obj->ext != 0) {
+ overview_arg($obj,'pef',OVERVIEW_ARG_D_FROM,'product',array('p_end'),'ProdEnd');
+ }
// Project End Date for search
- overview_arg($obj,'pet',OVERVIEW_ARG_D_TO,'product',array('p_end'),'ProdEnd');
-
+ if ($obj->ext != 0) {
+ overview_arg($obj,'pet',OVERVIEW_ARG_D_TO,'product',array('p_end'),'ProdEnd');
+ }
//
// State to display
//
if ( isset($_GET['state']) && is_numeric($_GET['state'])) {
$_GET['state'] = array($_GET['state']);
}
- if ( isset($_GET['state']) && is_array($_GET['state']) && count($_GET['state']) > 0 ) {
+ if ( ($obj->ext != 0) && isset($_GET['state']) && is_array($_GET['state']) && count($_GET['state']) > 0 ) {
$_SESSION[useprojects.'__state'] = array();
$statarr = array();
$header = '';
@@ -1042,12 +1053,9 @@
if (!is_object($stc)) {
$stc = new stc(null);
$stc->initByArray('ProdStates',$this->c_state);
- if ($s == -1) {
- $this->state = BUG_STATE_OPEN;
- $s = $this->state;
- }
}
- $r .= $stc->states[$s]->color;
+ if (isset($stc->states[$s]))
+ $r .= $stc->states[$s]->color;
return $r;
}
Modified: trunk/php/product_overview.php
===================================================================
--- trunk/php/product_overview.php 2011-11-21 21:28:53 UTC (rev 426)
+++ trunk/php/product_overview.php 2011-11-21 21:30:23 UTC (rev 427)
@@ -825,8 +825,10 @@
if (isset($_GET['ext'])) {
$this->ext = $_GET['ext'];
+ $this->link1 = addUrlParameter($this->link1,"ext=".$this->ext);
+ $this->link3 = addUrlParameter($this->link3,"ext=".$this->ext);
} else {
- $this->ext = 0;
+ $this->ext = 2;
}
/* Fields to show */
@@ -867,18 +869,20 @@
// custom selectors
// get customized non textual search fields
- $custom = get_custom_sql_select($this,'product','',$this->link1);
- foreach ($custom[0] as $s) {
- $this->q .= $this->qpre;
- $this->q .= $s[0];
- $this->qpre = " AND ";
- $this->header .= $this->hpre.$s[1];
- $this->hpre = '<br />';
+ if ($this->ext != 0) {
+ $custom = get_custom_sql_select($this,'product','',$this->link1);
+ foreach ($custom[0] as $s) {
+ $this->q .= $this->qpre;
+ $this->q .= $s[0];
+ $this->qpre = " AND ";
+ $this->header .= $this->hpre.$s[1];
+ $this->hpre = '<br />';
+ }
+ foreach ($custom[1] as $s) {
+ $this->q = preg_replace('# where#i',','.$s.' WHERE',$this->q);
+ }
}
- foreach ($custom[1] as $s) {
- $this->q = preg_replace('# where#i',','.$s.' WHERE',$this->q);
- }
- # $msg .= $this->q;
+ // $msg .= $this->q;
check_dbacl($this->dbconn, $this->q, $this->user->id);
// Order of output
Modified: trunk/php/sales_forecast.php
===================================================================
--- trunk/php/sales_forecast.php 2011-11-21 21:28:53 UTC (rev 426)
+++ trunk/php/sales_forecast.php 2011-11-21 21:30:23 UTC (rev 427)
@@ -57,7 +57,7 @@
$r .= '<td colspan="'. $cols .'">'.$comment.' </td>';
$comment = '';
}
- $r .= '<td align="right"><b><i>';
+ $r .= '<td class="over_r"><b><i>';
foreach($periodtotal[$c] as $i => $f) {
$r .= my_number_format($f,2) .' '. htmlspecialchars($i) ."<br />\n";
}
@@ -68,7 +68,7 @@
$r .= '<td colspan="'. $cols .'">'.$comment.' </td>';
$comment = '';
}
- $r .= '<td align="right"><b><i>';
+ $r .= '<td class="over_r"><b><i>';
$r .= hour_format($periodtotal[$c],2);
$r .= '</i></b></td>';
$cols = 0;
@@ -77,7 +77,7 @@
$r .= '<td colspan="'. $cols .'">'.$comment.' </td>';
$comment = '';
}
- $r .= '<td align="right"><b><i>';
+ $r .= '<td class="over_r"><b><i>';
$r .= hour_format($periodtotal[$c],2);
$r .= '</i></b></td>';
$cols = 0;
@@ -337,21 +337,18 @@
foreach ($tutos[prodfields] as $c) {
// projectname
if ( ($c == "name") && $this->pshow[$c] ) {
- $b = myentities($p->name);
+ $b = $p->name;
if (! $this->pshow['version']) {
- $b .= ' '.myentities($p->version);
+ $b .= ' '.$p->version;
}
- if ( $this->filter['name'] != '' ) {
- $b = preg_replace('#('. $this->filter['name'] .')#i','<span class="found">\\1</span>',$b);
- }
- $r .= ' <td valign="top"> '. makelink($p->getUrl(),$b) ."</td>\n";
+ $r .= ' <td class="over_l">';
+ $r .= makelink($p->getUrl(),$this->mark_filter(myentities($b),'name'));
+ $r .= "</td>\n";
}
if ( ($c == 'version') && $this->pshow[$c] ) {
- $b = myentities($p->version);
- if ( $this->filter['name'] != '' ) {
- $b = preg_replace('#('. $this->filter['name'] .')#i','<span class="found">\\1</span>',$b);
- }
- $r .= ' <td valign="top"> '. $b ."</td>\n";
+ $r .= ' <td class="over_l">';
+ $r .= $this->mark_filter(myentities($p->version),'name');
+ $r .= "</td>\n";
}
// Customer
@@ -372,20 +369,18 @@
// someone forget to say 'description' here :-)
if ( ($c == "desc") && $this->pshow[$c] ) {
- $b = myentities($p->description);
- if ( $this->filter['name'] != '' ) {
- $b = preg_replace('#('. $this->filter['name'] .')#i','<span class="found">\\1</span>',$b);
- }
- $r .= ' <td valign="top"> '. $b ."</td>\n";
+ $r .= ' <td class="over_l">';
+ $r .= $this->mark_filter(myentities($p->description),'name');
+ $r .= "</td>\n";
}
// state
if ( ($c == 'state') && $this->pshow[$c] ) {
- $r .= ' <td valign="top"> '. $p->getState() ."</td>\n";
+ $r .= ' <td class="over_l">'. $p->getStateColorBlock().$p->getState() ."</td>\n";
}
// expected work
if ( ($c == 'ework') && $this->pshow[$c] ) {
- $r .= ' <td align="right"> '. hour_format($p->sum['volume']) ."</td>\n";
+ $r .= ' <td class="over_r">'. hour_format($p->sum['volume']) ."</td>\n";
$sumPeriod[$period][$c] += $p->sum['volume'];
$sumPeriod[$fiscalyear][$c] += $p->sum['volume'];
}
@@ -395,34 +390,34 @@
foreach ($p->tsum as $i => $f) {
$timesum += $p->tsum[$i];
}
- $r .= ' <td align="right"> '. hour_format($timesum) ."</td>\n";
+ $r .= ' <td class="over_r">'. hour_format($timesum) ."</td>\n";
$sumPeriod[$period][$c] += $timesum;
$sumPeriod[$fiscalyear][$c] += $timesum;
}
// probability (mucho importante)
if ( ($c == "probability") && $this->pshow[$c] ) {
- $r .= " <td valign=\"top\"> ". $p->probability ."%</td>\n";
+ $r .= ' <td class="over_r">'. $p->probability ."%</td>\n";
}
// price (also mucho importante)
if ( ($c == "price") && $this->pshow[$c] ) {
- $r .= ' <td valign="top" align="right"> '. my_number_format($p->price,2) .' '. htmlspecialchars($p->currency) ."</td>\n";
+ $r .= ' <td class="over_r">'. my_number_format($p->price,2) .' '. htmlspecialchars($p->currency) ."</td>\n";
}
// price (also mucho importante)
if ( ($c == "cost") && $this->pshow[$c] ) {
- $r .= ' <td valign="top" align="right"> '. my_number_format($p->cost,2) .' '. htmlspecialchars($p->currency) ."</td>\n";
+ $r .= ' <td class="over_r">'. my_number_format($p->cost,2) .' '. htmlspecialchars($p->currency) ."</td>\n";
}
// balanced result
if ( ($c == "balanced") && $this->pshow[$c] ) {
- $r .= ' <td valign="top" align="right"> '. my_number_format($p->getBalanced(),2) .' '. htmlspecialchars($p->currency) ."</td>\n";
+ $r .= ' <td class="over_r">'. my_number_format($p->getBalanced(),2) .' '. htmlspecialchars($p->currency) ."</td>\n";
}
// start date
if ( ($c == "p_start") && $this->pshow[$c] ) {
- $r .= ' <td valign="top"> '. $p->p_start->getLinkDate() ."</td>\n";
+ $r .= ' <td class="over_l">'. $p->p_start->getLinkDate() ."</td>\n";
}
// end date
if ( ($c == "p_end") && $this->pshow[$c] ) {
- $r .= ' <td valign="top"> '. $p->p_end->getLinkDate() ."</td>\n";
+ $r .= ' <td class="over_l">'. $p->p_end->getLinkDate() ."</td>\n";
}
}
$r .= $this->OverviewRowEnd($line++);
@@ -452,7 +447,7 @@
$r .= ' <td colspan="'. $fill ."\"> </td>\n";
$fill = 0;
}
- $r .= " <td nowrap=\"nowrap\" align=\"right\">\n";
+ $r .= " <td class=\"over_r\">\n";
$pre = "";
foreach ( $sum[1] as $i1 => $f1 ) {
if ( $f1 ) {
@@ -467,7 +462,7 @@
$r .= ' <td colspan="'. $fill ."\"> </td>\n";
$fill = 0;
}
- $r .= " <td nowrap=\"nowrap\" align=\"right\">\n";
+ $r .= " <td class=\"over_r\">\n";
$pre = "";
foreach ( $sum[2] as $i1 => $f1 ) {
if ( $f1 ) {
@@ -631,8 +626,16 @@
$this->link1 = 'sales_forecast.php';
$this->link3 = 'product_overview.php';
+ if (isset($_GET['ext'])) {
+ $this->ext = $_GET['ext'];
+ $this->link1 = addUrlParameter($this->link1,"ext=".$this->ext);
+ $this->link3 = addUrlParameter($this->link3,"ext=".$this->ext);
+ } else {
+ $this->ext = 2;
+ }
+
$this->pshow = array();
$tutos[prodfields][] = 'balanced';
$tutos[prodfields][] = 'ework';
@@ -698,5 +701,5 @@
?>
<!--
SVN Info $Id$
- $Author$
- -->
+$Author$
+-->
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-21 21:29:04
|
Revision: 426
http://tutos.svn.sourceforge.net/tutos/?rev=426&view=rev
Author: gokohnert
Date: 2011-11-21 21:28:53 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
updates for next release
Modified Paths:
--------------
trunk/shellfunc.sh
Modified: trunk/shellfunc.sh
===================================================================
--- trunk/shellfunc.sh 2011-11-21 21:28:37 UTC (rev 425)
+++ trunk/shellfunc.sh 2011-11-21 21:28:53 UTC (rev 426)
@@ -2,7 +2,7 @@
#
# Tutos Database selection support
#
-# $Header: /cvsroot/tutos/tutos/shellfunc.sh,v 1.18 2003/04/22 09:35:42 tapoueh Exp $
+# $Id$
#
# A note about passwords:
# -----------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-21 21:28:50
|
Revision: 425
http://tutos.svn.sourceforge.net/tutos/?rev=425&view=rev
Author: gokohnert
Date: 2011-11-21 21:28:37 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
updates for next release
Modified Paths:
--------------
trunk/FAQ.txt
trunk/Makefile
trunk/Tests/WebTest.php
trunk/Tests/tutos_baseTest.php
trunk/createdb.sh
trunk/langdiff.sh
trunk/tutos.spec.in
trunk/upload.sh
Added Paths:
-----------
trunk/Tests/README
Modified: trunk/FAQ.txt
===================================================================
--- trunk/FAQ.txt 2011-11-21 21:27:18 UTC (rev 424)
+++ trunk/FAQ.txt 2011-11-21 21:28:37 UTC (rev 425)
@@ -129,4 +129,3 @@
$Id: FAQ.txt,v 1.17 2003/02/13 09:39:27 markusleist Exp $
$Author: markusleist $
$Date: 2003/02/13 09:39:27 $
-see http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/tutos/tutos/FAQ.txt
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-11-21 21:27:18 UTC (rev 424)
+++ trunk/Makefile 2011-11-21 21:28:37 UTC (rev 425)
@@ -431,6 +431,7 @@
html/js/excanvas.min.js \
html/js/jquery.jqplot.min.js \
html/js/tutos.js \
+ html/js/new2_layout.js \
html/js/plugins/jqplot.barRenderer.min.js \
html/js/plugins/jqplot.canvasAxisTickRenderer.min.js \
html/js/plugins/jqplot.categoryAxisRenderer.min.js \
Added: trunk/Tests/README
===================================================================
--- trunk/Tests/README (rev 0)
+++ trunk/Tests/README 2011-11-21 21:28:37 UTC (rev 425)
@@ -0,0 +1 @@
+you need to start the selenium server in order to run the Web Tests
Modified: trunk/Tests/WebTest.php
===================================================================
--- trunk/Tests/WebTest.php 2011-11-21 21:27:18 UTC (rev 424)
+++ trunk/Tests/WebTest.php 2011-11-21 21:28:37 UTC (rev 425)
@@ -31,7 +31,7 @@
{
global $tutos;
$this->debugPath = $tutos[errlog];
- $this->setBrowser('*opera');
+ $this->setBrowser('*chrome');
$this->setBrowserUrl($tutos[baseurl][0].'/php/');
}
Modified: trunk/Tests/tutos_baseTest.php
===================================================================
--- trunk/Tests/tutos_baseTest.php 2011-11-21 21:27:18 UTC (rev 424)
+++ trunk/Tests/tutos_baseTest.php 2011-11-21 21:28:37 UTC (rev 425)
@@ -28,6 +28,13 @@
*/
class basetest extends tutos_base
{
+ function basetest(&$dbconn) {
+ $this->init($dbconn);
+ $this->xxx_str = '';
+ $this->xxx_int = 0;
+ $this->xxx_float = 0.0;
+ $this->xxx_dt = new TUTOS_Date_Time();
+ }
}
class tutos_baseTest extends PHPUnit_Framework_TestCase
@@ -55,8 +62,8 @@
$this->assertEquals(0,count($x->list));
$this->assertEquals(0,count($x->modified));
$this->assertEquals(0,count($x->history));
- $this->assertEquals(0,count($x->neigbours));
- $this->assertEquals(0,count($x->relation));
+ $this->assertEquals(0,count($x->neighbours));
+ $this->assertEquals(0,count($x->relations));
$this->assertEquals(0,count($x->addrel));
$this->assertEquals(0,count($x->delrel));
$this->assertSame($dbconn,$x->dbconn);
@@ -77,9 +84,9 @@
global $dbconn;
$x = new basetest($dbconn);
- $r = $x->setStrField('xxx','a2711','TEST');
- $this->assertObjectHasAttribute('xxx',$x);
- $this->assertEquals('a2711',$x->xxx);
+ $r = $x->setStrField('xxx_str','a2711','TEST');
+ $this->assertObjectHasAttribute('xxx_str',$x);
+ $this->assertEquals('a2711',$x->xxx_str);
$this->assertEquals(1,count($x->modified));
$this->assertEquals('a2711',$x->modified[0]['new']);
}
@@ -94,9 +101,9 @@
global $dbconn;
$x = new basetest($dbconn);
- $r = $x->setIntField('xxx',-2711,'TEST3');
- $this->assertObjectHasAttribute('xxx',$x);
- $this->assertEquals(-2711,$x->xxx);
+ $r = $x->setIntField('xxx_int',-2711,'TEST3');
+ $this->assertObjectHasAttribute('xxx_int',$x);
+ $this->assertEquals(-2711,$x->xxx_int);
$this->assertEquals(1,count($x->modified));
$this->assertEquals(-2711,$x->modified[0]['new']);
}
@@ -111,9 +118,9 @@
global $dbconn;
$x = new basetest($dbconn);
- $r = $x->setFloatField('xxx',-2711.0815,'TEST4');
- $this->assertObjectHasAttribute('xxx',$x);
- $this->assertEquals(-2711.0815,$x->xxx);
+ $r = $x->setFloatField('xxx_float',-2711.0815,'TEST4');
+ $this->assertObjectHasAttribute('xxx_float',$x);
+ $this->assertEquals(-2711.0815,$x->xxx_float);
$this->assertEquals(1,count($x->modified));
$this->assertEquals(-2711.0815,$x->modified[0]['new']);
}
@@ -128,9 +135,9 @@
global $dbconn;
$x = new basetest($dbconn);
$y = new TUTOS_Date_Time('20111231231501');
- $r = $x->setDateTimeField('xxx',$y,'TEST5');
- $this->assertObjectHasAttribute('xxx',$x);
- $this->assertEquals($y->getYYYYMMDDHHMM(),$x->xxx->getYYYYMMDDHHMM());
+ $r = $x->setDateTimeField('xxx_dt',$y,'TEST5');
+ $this->assertObjectHasAttribute('xxx_dt',$x);
+ $this->assertEquals($y->getYYYYMMDDHHMM(),$x->xxx_dt->getYYYYMMDDHHMM());
$this->assertEquals(1,count($x->modified));
$this->assertEquals($y->getYYYYMMDDHHMM(),$x->modified[0]['new']);
}
Modified: trunk/createdb.sh
===================================================================
--- trunk/createdb.sh 2011-11-21 21:27:18 UTC (rev 424)
+++ trunk/createdb.sh 2011-11-21 21:28:37 UTC (rev 425)
@@ -10,7 +10,7 @@
#
# Author: Gero Kohnert
#
-# $Header: /cvsroot/tutos/tutos/createdb.sh,v 1.12 2003/04/15 08:54:21 tapoueh Exp $
+# $Id$
#
if [ -f /usr/share/tutos/shellfunc.sh ]; then
. /usr/share/tutos/shellfunc.sh
Modified: trunk/langdiff.sh
===================================================================
--- trunk/langdiff.sh 2011-11-21 21:27:18 UTC (rev 424)
+++ trunk/langdiff.sh 2011-11-21 21:28:37 UTC (rev 425)
@@ -4,8 +4,7 @@
#
# Author: Gero Kohnert
#
-# $Header: /cvsroot/tutos/tutos/langdiff.sh,v 1.7 2009/03/08 20:21:37 gokohnert Exp $
-# $Name: $
+# $Id$
#
#
Modified: trunk/tutos.spec.in
===================================================================
--- trunk/tutos.spec.in 2011-11-21 21:27:18 UTC (rev 424)
+++ trunk/tutos.spec.in 2011-11-21 21:28:37 UTC (rev 425)
@@ -1,5 +1,5 @@
#
-# $Header: /cvsroot/tutos/tutos/tutos.spec.in,v 1.5 2003/08/07 16:36:50 gokohnert Exp $
+# $Id$
#
Name: TUTOS
Version: %VERSION%
Modified: trunk/upload.sh
===================================================================
--- trunk/upload.sh 2011-11-21 21:27:18 UTC (rev 424)
+++ trunk/upload.sh 2011-11-21 21:28:37 UTC (rev 425)
@@ -6,7 +6,7 @@
#
# needs an .netrc entry with anonymous password
#
-# $Header: /cvsroot/tutos/tutos/upload.sh,v 1.10 2009/03/08 20:21:37 gokohnert Exp $
+# $Id$
#
export TYPE=$1
export DATE=$2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-21 21:27:25
|
Revision: 424
http://tutos.svn.sourceforge.net/tutos/?rev=424&view=rev
Author: gokohnert
Date: 2011-11-21 21:27:18 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
reworked user_new.php to save some space
Modified Paths:
--------------
trunk/html/js/tutos.js
trunk/php/user_new.php
Property Changed:
----------------
trunk/html/js/new2_layout.js
trunk/html/js/tutos.js
Property changes on: trunk/html/js/new2_layout.js
___________________________________________________________________
Modified: svn:mime-type
- application/javascript
+ text/plain
Modified: trunk/html/js/tutos.js
===================================================================
--- trunk/html/js/tutos.js 2011-11-18 16:00:39 UTC (rev 423)
+++ trunk/html/js/tutos.js 2011-11-21 21:27:18 UTC (rev 424)
@@ -17,6 +17,18 @@
$('.noauto').attr("autocomplete","off");
/**
+ * afunction to switch table tbody elements
+ */
+ function tbodyswitcher(cname) {
+ $(cname).not("td").addClass("tgrpbody").hide();
+ $(cname).not("tbody").addClass("tgrphead").css('font-weight','bold');
+ $("td"+cname).click(function() {
+ $(".tgrpbody").not(cname).hide();
+ $("tbody"+cname).toggle(500);
+ return;
+ });
+ }
+ /**
* handling of the please wait page on "complicated" pages
*/
function scroll(id) {
Property changes on: trunk/html/js/tutos.js
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/php/user_new.php
===================================================================
--- trunk/php/user_new.php 2011-11-18 16:00:39 UTC (rev 423)
+++ trunk/php/user_new.php 2011-11-21 21:27:18 UTC (rev 424)
@@ -123,8 +123,10 @@
$r .= "<form id=\"useradd\" name=\"useradd\" action=\"user_ins.php\" method=\"post\">\n";
- $this->width = 9;
+ $this->width = 10;
+
$r .= $this->DataTableStart();
+ $r .= '<thead>';
$r .= $this->Headline($lang['UserInfo']);
$r .= $this->acl_line(true);
@@ -133,13 +135,12 @@
$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 .= $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="'.($this->width-4).'"><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);
+ $r .= $this->showfieldc($lang['Username'],0);
+ $r .= $this->showdata($this->obj->login,$this->width-1);
$this->addHidden("login", $this->obj->login );
}
- $r .= "<td colspan=\"3\"> </td>\n";
$r .= "</tr>\n";
if ($this->obj->id == -1) {
@@ -159,30 +160,47 @@
} else {
$r .= "<tr>\n";
$r .= $this->showfieldc($lang['User']);
- $r .= $this->showdata($this->obj->getLink(),8);
+ $r .= $this->showdata($this->obj->getLink(),$this->width-1);
$r .= "</tr>\n";
}
$r .= "<tr>\n";
$r .= $this->showfieldc($lang['UserLastSeen']);
$r .= $this->showdata($this->obj->last_seen->getDateTime(),2);
$r .= $this->showfieldc($lang['UserLastHost']);
- $r .= $this->showdata($this->obj->last_host,2);
- $r .= "<td colspan=\"3\"> </td>\n";
+ $r .= $this->showdata($this->obj->last_host,$this->width-4);
$r .= "</tr>\n";
+ $r .= '</thead>';
+
+ $r .= '<tfoot>';
$r .= "<tr>\n";
+ if ($this->obj->uid > 0 ) {
+ $r .= submit_reset(0,1,2,1,2,$this->width-4);
+ } else {
+ $r .= submit_reset(0,-1,2,1,2,$this->width-4);
+ }
+ $r .= "</tr>\n";
+ if ( ($this->obj->uid != -1) && ($this->user->feature_ok(usehistory,PERM_SEE)) ) {
+ $r .= "<tr>\n";
+ $r .= ' <td colspan="'.$this->width.'">'. makelink('history_show.php?id='. $this->obj->uid,$lang['HistoryLink'],sprintf($lang['HistoryLinkI'],$this->obj->getFullname())) ."</td>\n";
+ $r .= "</tr>\n";
+ }
+ $r .= '</tfoot>';
+
+ $r .= '<tbody><tr><td class="tg0" colspan="'.$this->width.'"><a>BASE</a></td></tr></tbody>'."\n";
+ $r .= '<tbody class="tg0">';
+ $r .= "<tr>\n";
$r .= $this->showfieldc($lang['UserAdmin'],1,"admin1");
if ( $this->user->isAdmin()) {
$achecked[0] ="";
$achecked[1] ="";
$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";
+ $r .= ' <td colspan="'.($this->width-2).'" 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);
+ $r .= $this->showdata('<span id="admin1">'. ($this->obj->isAdmin() ? $lang['yes']:$lang['no']).'</span>',$this->width-1);
}
- $r .= "<td colspan=\"3\"> </td>\n";
$r .= "</tr>\n";
if (isset($_SESSION['pwc']) && $_SESSION['pwc'] == false) {
@@ -197,38 +215,54 @@
if ( $this->dbconn->gettype() != "MySQL" ) {
$r .= "<tr>\n";
$r .= $this->showfieldc($lang['Password'] ." (old)",0,"p0");
- $r .= " <td colspan=\"8\"><input id=\"p0\" type=\"password\" size=\"20\" maxlength=\"20\" name=\"p0\" value=\"\" /></td>\n";
+ $r .= ' <td colspan="'.($this->width-1).'"><input id="p0" type="password" size="20" maxlength="20" name="p0" value="" /></td>'."\n";
$r .= "</tr>\n";
}
}
$r .= "<tr>\n";
$r .= $this->showfieldc($lang['Password'] ." (new)",0,"p1");
- $r .= " <td colspan=\"8\"><input id=\"p1\" type=\"password\" size=\"20\" maxlength=\"20\" name=\"p1\" value=\"\" /></td>\n";
+ $r .= ' <td colspan="'.($this->width-1).'"><input id="p1" type="password" size="20" maxlength="20" name="p1" value="" /></td>'."\n";
$r .= "</tr>\n";
$r .= "<tr>\n";
$r .= $this->showfieldc($lang['Password'] ." (repeat)",0,"p2");
- $r .= " <td colspan=\"8\"><input id=\"p2\" type=\"password\" size=\"20\" maxlength=\"20\" name=\"p2\" value=\"\" /></td>\n";
+ $r .= ' <td colspan="'.($this->width-1).'"><input id="p2" type="password" size="20" maxlength="20" name="p2" value="" /></td>'."\n";
$r .= "</tr>\n";
}
}
// Group Memberships
+ team::obj_read($this->obj);
$r .= "<tr>\n";
$r .= $this->showfield($lang['Teams'],0,"teams");
- $r .= " <td colspan=\"8\">\n";
- $r .= ' <select multiple="multiple" size="5" id="teams" name="teams[]">'."\n";
- // present all teams
+ $r .= ' <td colspan="'.($this->width-1)."\">\n";
+ $rx1 = '';
+ $rx2 = '';
foreach ($this->obj->teamlist as $i => $fn) {
- if (!$this->obj->teamlist[$i]->mod_ok()) continue;
- $r .= " <option value=\"". $i ."\" ".($this->obj->teamlist[$i]->is_member($this->obj) ? 'selected="selected"':'')." > ". myentities($this->obj->teamlist[$i]->getFullName()) ." </option>\n";
+ if ($this->obj->teamlist[$i]->mod_ok()) {
+ $rx1 .= ' <option value="'. $i .'" '.($this->obj->teamlist[$i]->is_member($this->obj) ? 'selected="selected"':'').' >'. myentities($this->obj->teamlist[$i]->getFullName()) ."</option>\n";
+ } else if ($this->obj->teamlist[$i]->see_ok()) {
+ if ($this->obj->teamlist[$i]->is_member($this->obj))
+ $rx2 .= $this->obj->teamlist[$i]->getLink().'<br />';
+ }
}
- $r .= " </select>\n";
+ if ($rx1 != '') {
+ $r .= ' <select multiple="multiple" size="5" id="teams" name="teams[]">'."\n";
+ $r .= $rx1;
+ $r .= " </select>\n";
+ }
+ if ($rx2 != '') {
+ $r .= $rx2;
+ }
+ // present all teams
$r .= " </td>\n";
$r .= "</tr>\n";
+ $r .= '</tbody>';
-
// Feature Permissions
+ $r .= '<tbody><tr><td class="tg1" colspan="'.$this->width.'"><a>'.$lang['ACLOverview'].'</a></td></tr></tbody>'."\n";
+ $r .= '<tbody class="tg1">';
$r .= permission_form($this,$this->user,$this->obj);
+ $r .= '</tbody>';
//
// Default-Groups for new objects
@@ -236,14 +270,17 @@
if ( ($tutos[defaultacl] == 2) &&
( ($this->user->isAdmin()) || (count($this->user->teamlist) > 0) )
) {
- $r .= "<tr>\n";
+ $r .= '<tbody><tr><td class="tg2" colspan="'.$this->width.'"><a>'.$lang['UserDefaultGrp'].'</a></td></tr></tbody>'."\n";
+ $r .= '<tbody class="tg2">';
+ $r .= '<tr>'."\n";
$r .= $this->showfieldc($lang['UserDefaultGrp'],0);
$r .= " <th width=\"30%\" colspan=\"2\">". $lang['ACLread'] ."</th>\n";
$r .= " <th width=\"30%\" colspan=\"2\">". $lang['ACLread'] ."<br />". $lang['ACLuse'] ."</th>\n";
$r .= " <th width=\"30%\" colspan=\"2\">". $lang['ACLread'] ."<br />". $lang['ACLuse'] ."<br />". $lang['ACLmodify'] ."</th>\n";
$r .= " <th width=\"30%\" colspan=\"2\">". $lang['ACLread'] ."<br />". $lang['ACLuse'] ."<br />". $lang['ACLmodify'] ."<br />". $lang['ACLdelete'] ."</th>\n";
+ $r .= " <td></td>\n";
$r .= "</tr>\n";
- $r .= "<tr>\n";
+ $r .= '<tr>'."\n";
$r .= " <td> </td>\n";
$r .= " <td colspan=\"2\" align=\"center\">\n";
$r .= $this->acldefault_select(1,$tutos[useok],"r");
@@ -257,12 +294,17 @@
$r .= " <td colspan=\"2\" align=\"center\">\n";
$r .= $this->acldefault_select($tutos[delok], 99, "d");
$r .= " </td>\n";
+ $r .= " <td></td>\n";
$r .= "</tr>\n";
+ $r .= '</tbody>';
}
+
+ $r .= '<tbody><tr><td class="tg3" colspan="'.$this->width.'"><a>Other</a></td></tr></tbody>'."\n";
+ $r .= '<tbody class="tg3">';
// LANGUAGE
- $r .= "<tr>\n";
+ $r .= '<tr>'."\n";
$r .= $this->showfieldc($lang['UserLanguage'],1,"lng");
- $r .= " <td colspan=\"2\">\n";
+ $r .= " <td colspan=\"3\">\n";
$r .= " <select id=\"lng\" name=\"lng\">\n";
foreach($lang['lang'] as $i => $f) {
$r .= " <option value=\"". $i ."\"". ( !strcasecmp($i,$this->obj->lang) ? ' selected="selected"':'') .">". myentities($f) ."</option>\n";
@@ -272,22 +314,19 @@
// TIMEZONE
$r .= $this->showfieldc($lang['UserTimezone'],1,"tz");
- $r .= " <td colspan=\"2\">";
+ $r .= ' <td colspan="'.($this->width-5).'">'."\n";
$r .= " <select id=\"tz\" name=\"tz\">\n";
foreach($tutos[timezones] as $f) {
$r .= " <option value=\"". $f ."\"". ($this->obj->tz == $f ? ' selected="selected"':'') .">". $f ."</option>\n";
}
$r .= " </select>\n";
$r .= " </td>\n";
-
- $r .= "<td colspan=\"3\"> </td>\n";
-
$r .= "</tr>\n";
- $r .= "<tr>\n";
+ $r .= '<tr>'."\n";
// Weekstart
$r .= $this->showfield($lang['UserWeekstart'],1,"ws");
- $r .= " <td colspan=\"2\">\n";
+ $r .= " <td colspan=\"3\">\n";
$r .= " <select id=\"ws\" name=\"ws\">\n";
$r .= " <option value=\"0\"". ($this->obj->weekstart == 0 ? ' selected="selected"':'') .">". $lang['Day0'] ."</option>\n";
$r .= " <option value=\"1\"". ($this->obj->weekstart == 1 ? ' selected="selected"':'') .">". $lang['Day1'] ."</option>\n";
@@ -298,31 +337,25 @@
// Workdays
$xx = 1;
$r .= $this->showfield($lang['UserWorkdays'],1,"wd1");
- $r .= " <td colspan=\"5\">\n";
+ $r .= ' <td colspan="'.($this->width-5).'">'."\n";
for ( $i = 0 ; $i < 7 ; $i++ ) {
$r .= ' <input id="wd'.$xx.'" type="checkbox" name="wd[]" value="'. $i ."\" ". ($this->obj->isworkday($i) ? 'checked="checked"':'') .' /><label for="wd'.$xx.'">'. $lang['Day'.$i] .'</label>';
$xx++;
}
$r .= " </td>\n";
-
$r .= "</tr>\n";
- $r .= "<tr>\n";
+ $r .= '<tr>'."\n";
// HOLIDAYS
$xx = 1;
$r .= $this->showfield($lang['UserHoliday'],0,"holiday1");
-
- $r .= " <td colspan=\"2\">\n";
+ $r .= " <td colspan=\"3\">\n";
foreach ($tutos[holiday] as $i => $f) {
if ( $tutos[holiday][$i] != 1 ) {
continue;
}
$r .= ' <input id="holiday'.$xx.'" type="checkbox" name="h[]" value="'. strtolower($i) ."\" ". ($this->obj->holiday[strtolower($i)] == 1 ? 'checked="checked"':'') .' /><label for="holiday'.$xx.'">'. $i .'</label>';
- if ( 0 == ($xx % 3) ) {
- $r .= "<br />\n";
- } else {
- $r .= " ";
- }
+ $r .= " ";
$xx++;
}
$r .= " </td>\n";
@@ -330,25 +363,19 @@
// Namedays
$xx = 1;
$r .= $this->showfield($lang['UserNamedays'],0,"namedays1");
- $r .= " <td colspan=\"2\">\n";
+ $r .= ' <td colspan="'.($this->width-5).'">'."\n";
foreach ($tutos[nameday] as $i => $f) {
if ( $tutos[nameday][$i] != 1 ) {
continue;
}
$r .= ' <input id="namedays'.$xx.'" type="checkbox" name="nd[]" value="'. strtolower($i) ."\" ". ($this->obj->nameday[strtolower($i)] == 1 ? 'checked="checked"':'') .' /><label for="namedays'.$xx.'">'. $i .'</label>';
- if ( 0 == ($xx % 3) ) {
- $r .= "<br />\n";
- } else {
- $r .= " ";
- }
+ $r .= " ";
$xx++;
}
$r .= " </td>\n";
- $r .= "<td colspan=\"3\"> </td>\n";
$r .= "</tr>\n";
- $r .= "<tr>\n";
-
+ $r .= '<tr>'."\n";
// RowIcons
$xx = 1;
$r .= $this->showfieldc($lang['RowIconsBefore'],0,"rib1");
@@ -366,12 +393,9 @@
$xx++;
}
$r .= " </td>\n";
- $r .= "</tr>\n";
-
- $r .= "<tr>\n";
$xx = 1;
$r .= $this->showfieldc($lang['RowIconsAfter'],0,"ria1");
- $r .= " <td colspan=\"3\">\n";
+ $r .= ' <td colspan="'.($this->width-5).'">'."\n";
foreach($tutos[rowiconsafter] as $f) {
$r .= ' <input id="ria'.$xx.'" type="checkbox" name="ria[]" value="'. $f ."\" ". ($this->obj->rowiconsafter[strtolower($f)] == 1 ? 'checked="checked"':'') .' /><label for="ria'.$xx.'">';
if ( $f == "see" ) {
@@ -387,10 +411,10 @@
$r .= " </td>\n";
$r .= "</tr>\n";
- $r .= "<tr>\n";
+ $r .= '<tr>'."\n";
// THEME
$r .= $this->showfieldc($lang['UserTheme'],1,"theme");
- $r .= " <td colspan=\"2\">\n";
+ $r .= " <td colspan=\"3\">\n";
$r .= " <select id=\"theme\" name=\"theme\">\n";
foreach($tutos[themes] as $f) {
$r .= " <option value=\"". $f ."\" ". ($f == $this->obj->theme ? ' selected="selected"':'') .">". $f ."</option>\n";
@@ -400,35 +424,28 @@
// Layout Engine
$r .= $this->showfieldc($lang['UserLayout'],1,"layout");
- $r .= " <td colspan=\"2\">\n";
+ $r .= ' <td colspan="'.($this->width-5).'">'."\n";
$r .= " <select id=\"layout\" name=\"layout\">\n";
foreach($tutos[layouts] as $f) {
$r .= " <option value=\"". $f ."\" ". ($f == $this->obj->ly ? ' selected="selected"':'') .">". $f ."</option>\n";
}
$r .= " </select>\n";
$r .= " </td>\n";
-
- $r .= "<td colspan=\"3\"> </td>\n";
-
$r .= "</tr>\n";
+ $r .= '</tbody>';
// Edit additional custom fields
- $r .= edit_custom_fields($this,"people",$this->obj,8);
+ $rx = edit_custom_fields($this,"people",$this->obj,$this->width);
+ if ($rx != '') {
+ $r .= '<tbody><tr><td class="tg4" colspan="'.$this->width.'"><a>'.$lang['AdminCustomTable'].'</a></td></tr></tbody>'."\n";
+ $r .= '<tbody class="tg4">'.$rx.'</tbody>';
+ }
// References to modules
- $r .= module_addforms($this->user,$this->obj,8);
-
- $r .= "<tr>\n";
- if ($this->obj->uid > 0 ) {
- $r .= submit_reset(0,1,3,1,3,0);
- } else {
- $r .= submit_reset(0,-1,3,1,3,0);
+ $rx = module_addforms($this->user,$this->obj,$this->width);
+ if ($rx != '') {
+ $r .= '<tbody><tr><td class="tg5" colspan="'.$this->width.'"><a>'.$lang['AdminModules'].'</a></td></tr></tbody>'."\n";
+ $r .= '<tbody class="tg5">'.$rx.'</tbody>';
}
- $r .= "</tr>\n";
- if ( ($this->obj->uid != -1) && ($this->user->feature_ok(usehistory,PERM_SEE)) ) {
- $r .= "<tr>\n";
- $r .= ' <td colspan="8">'. makelink('history_show.php?id='. $this->obj->uid,$lang['HistoryLink'],sprintf($lang['HistoryLinkI'],$this->obj->getFullname())) ."</td>\n";
- $r .= "</tr>\n";
- }
$r .= $this->DataTableEnd();
$r .= $this->getHidden();
$r .= hiddenFormElements();
@@ -436,6 +453,16 @@
$r .= "</form>\n";
$r .= $lang['FldsRequired'] ."\n";
$r .= $this->setfocus("useradd.login");
+
+ $tutos['pagescript'] .= "
+tbodyswitcher('.tg0');
+tbodyswitcher('.tg1');
+tbodyswitcher('.tg2');
+tbodyswitcher('.tg3');
+tbodyswitcher('.tg4');
+tbodyswitcher('.tg5');
+";
+
return $r;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-18 16:00:46
|
Revision: 423
http://tutos.svn.sourceforge.net/tutos/?rev=423&view=rev
Author: gokohnert
Date: 2011-11-18 16:00:39 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
own js for new2, moved jquery to load earlier
Modified Paths:
--------------
trunk/html/js/tutos.js
trunk/php/layout/layout_base.pinc
trunk/php/layout/new2_layout.pinc
trunk/php/webelements.p3
Added Paths:
-----------
trunk/html/js/new2_layout.js
Added: trunk/html/js/new2_layout.js
===================================================================
(Binary files differ)
Property changes on: trunk/html/js/new2_layout.js
___________________________________________________________________
Added: svn:mime-type
+ application/javascript
Modified: trunk/html/js/tutos.js
===================================================================
--- trunk/html/js/tutos.js 2011-11-18 14:50:08 UTC (rev 422)
+++ trunk/html/js/tutos.js 2011-11-18 16:00:39 UTC (rev 423)
@@ -1,5 +1,5 @@
/**
- * Copyright 2005 - 2010 by Gero Kohnert
+ * Copyright 2005 - 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
@@ -7,10 +7,15 @@
*
* Collection of Javascript functions used all over TUTOS
*
- * CVS Info: $Id$
+ * SVN Info: $Id$
* $Author$
*/
+/**
+ * NOTE: this script will be loaded after jquery right at the beginning of a page
+ */
+$('.noauto').attr("autocomplete","off");
+
/**
* handling of the please wait page on "complicated" pages
*/
Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc 2011-11-18 14:50:08 UTC (rev 422)
+++ trunk/php/layout/layout_base.pinc 2011-11-18 16:00:39 UTC (rev 423)
@@ -169,6 +169,7 @@
$r = '';
// TUTOS javascript
+ $r .= ' <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/jquery.min.js"></script>'."\n";
$r .= ' <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/tutos.js"></script>'."\n";
return $r;
@@ -185,7 +186,6 @@
$r .= ' <!--[if lt IE 9]>';
$r .= ' <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/excanvas.min.js"></script>';
$r .= '<![endif]-->'."\n";
- $r .= ' <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/jquery.min.js"></script>'."\n";
$r .= ' <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/jquery.hoverIntent.minified.js"></script>'."\n";
$r .= ' <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/jquery.bgiframe.min.js"></script>'."\n";
$r .= ' <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/jquery-ui.custom.min.js"></script>'."\n";
@@ -207,25 +207,26 @@
$x = 'en-GB';
}
$tutos['pagescript'] = "
-jQuery.bt.defaults.width = 200;
-jQuery.bt.defaults.positions = ['most'];
-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',color: 'white'};
-jQuery.bt.defaults.windowMargin = '0px';
-jQuery.bt.defaults.padding = '0px';
-jQuery.bt.defaults.noShadowOpts = {strokeStyle: '#999', strokeWidth: 2};
+ jQuery.bt.defaults.width = 200;
+ jQuery.bt.defaults.positions = ['most'];
+ 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',color: 'white'};
+ jQuery.bt.defaults.windowMargin = '0px';
+ jQuery.bt.defaults.padding = '0px';
+ jQuery.bt.defaults.noShadowOpts = {strokeStyle: '#999', strokeWidth: 2};
+
$(function() {
$.datepicker.setDefaults( $.datepicker.regional[ \"".$x."\" ] );
$.datepicker.setDefaults({autoSize:true,changeYear:true,changeMonth:true,showOtherMonths:true,showWeek:true,dateFormat:\"".TUTOS_Date_Time::getDateFormat()."\"});
Modified: trunk/php/layout/new2_layout.pinc
===================================================================
--- trunk/php/layout/new2_layout.pinc 2011-11-18 14:50:08 UTC (rev 422)
+++ trunk/php/layout/new2_layout.pinc 2011-11-18 16:00:39 UTC (rev 423)
@@ -609,8 +609,9 @@
$c = " />\n";
if (true) {
- $r .= "<?xml version=\"1.0\"?>\n";
+ $r .= '<?xml version="1.0"?>'."\n";
$r .= "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
+ #$r .= "<!DOCTYPE html>\n";
$xml = true;
}
$r .= '<html';
@@ -672,29 +673,6 @@
$r .= " <body>\n";
$r .= '<div style="z-index:10;position:absolute;left:10%;top:10%;text-align:center;opacity:0.3;-moz-opacity:0.5;-khtml-opacity:0.5;filter: alpha(opacity=50);width:80%;height:80%;background-color:#000;border:0px solid black;display:none;color:white;font-size:30pt;font-weight:bold" id="loading"><br /><br /><div id="scrollme">...Loading...</div><br /><img src="'.$tutos['base'].'/html/loading.gif'.'" alt="loading" /></div>';
$r .= '<script type="text/javascript" language="JavaScript">loader = window.setTimeout("loading(1);",1500);</script>'."\n";
- $tutos['pagescript'] .= "
-$(document).ready(function(){
- $(\"ul.sf-menu\").
- superfish({
- delay:200,
- speed:'fast',
- animation: {opacity:'show',height:'show'},
- dropShadows: true
- }).find('ul').bgIframe({
- opacity:false
- });
-});
-
-$(\".line1,.line2\").mouseenter(function(){
- $(this).addClass(\"line_active\");
-}).mouseleave(function(){
- $(this).removeClass(\"line_active\");
-});
-
-$(\".m_field\").change(function(){
- $(this).closest('tr').toggleClass(\"line_selected\");
-});
-\n";
$tutos['pagescript'] .= "loading(0);\n";
return $r;
}
@@ -710,6 +688,7 @@
$r .= $this->add_js_links_end();
$r .= ' <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/supersubs.js"></script>'."\n";
$r .= ' <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/superfish.js"></script>'."\n";
+ $r .= ' <script type="text/javascript" language="JavaScript" src="'.$tutos['base'].'/html/js/new2_layout.js"></script>'."\n";
$r .= ' <script type="text/javascript" language="JavaScript">'."\n";
$r .= "//<![CDATA[\n";
$r .= $tutos['pagescript'];
@@ -1101,6 +1080,7 @@
if ( $this->nomenu == false ) {
# $before = '<tr class="nl_menu_row" %ONCLICK% ><td class="nl_menu_item">'."\n";
$r .= " <td width=\"10%\" class=\"navigate\" id=\"nl_navigate\">\n";
+ #$r .= " <td class=\"navigate\" id=\"nl_navigate\">\n";
$r .= "<table id=\"nl_menu\">\n";
$r .= "<!-- outside navigation -->\n";
$r .= $this->navigate();
@@ -1213,7 +1193,6 @@
$cols -= 1;
$colsproz -= 5;
}
- # $r .= ' <td width="'.$colsproz.'%" colspan="'.$cols.'" class="'. $this->css_class .'" align='. ($this->center ? '"center"':'"left"') ." id=\"datafield\">\n";
$r .= ' <td width="'.$colsproz.'%" colspan="'.$cols.'" class="'. $this->css_class .'" id="datafield">'."\n";
if ($this->center) $r .= '<center>';
// the remaining parts are put into an table field
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2011-11-18 14:50:08 UTC (rev 422)
+++ trunk/php/webelements.p3 2011-11-18 16:00:39 UTC (rev 423)
@@ -1965,20 +1965,20 @@
$js .= " "EnableInputField('".$name."')\"";
if ( is_object($sobj) && isset($sobj->id) && $sobj->id > 0 ) {
// a field that represents a TUTOS object
- $r .= '<input autocomplete="off" class="infoonly" readonly="readonly" id="'. $name .'" size="'.$size.'" maxlength="'.max(40,$size).'" name="_XX_'. $name .'fn" value="'. myentities($sobj->getFullname()) .'" '.$js.' />';
- $r .= '<input autocomplete="off" type="hidden" id="'.$name.'id" name="'.$name.'id" value="'.$sobj->id.'"/>';
+ $r .= '<input class="infoonly noauto" readonly="readonly" id="'. $name .'" size="'.$size.'" maxlength="'.max(40,$size).'" name="_XX_'. $name .'fn" value="'. myentities($sobj->getFullname()) .'" '.$js.' />';
+ $r .= '<input class="noauto" type="hidden" id="'.$name.'id" name="'.$name.'id" value="'.$sobj->id.'"/>';
} else if ( is_array($sobj) ) {
// a field that represents a something
- $r .= '<input autocomplete="off" class="infoonly" readonly="readonly" id="'. $name .'" size="'.$size.'" maxlength="'.max(40,$size).'" name="_XX_'. $name .'fn" value="'. myentities($sobj[1]) .'" '.$js.' />';
- $r .= '<input autocomplete="off" type="hidden" id="'.$name.'id" name="'.$name.'id" value="'.$sobj[0].'"/>';
+ $r .= '<input class="infoonly noauto" readonly="readonly" id="'. $name .'" size="'.$size.'" maxlength="'.max(40,$size).'" name="_XX_'. $name .'fn" value="'. myentities($sobj[1]) .'" '.$js.' />';
+ $r .= '<input class="noauto" type="hidden" id="'.$name.'id" name="'.$name.'id" value="'.$sobj[0].'"/>';
} else {
// a field just filled with a string or nothing
// no id is given or available
if ( ! isset($obj->xfn[$name]) ) {
$obj->xfn[$name] = '';
}
- $r .= '<input autocomplete="off" id="'. $name .'" size="'.$size.'" maxlength="'.max(40,$size).'" name="'. $name .'fn" value="'. myentities($obj->xfn[$name]) .'" '. $js .' />';
- $r .= '<input autocomplete="off" type="hidden" id="'.$name.'id" name="_XX_'.$name.'id" value="-1"/>';
+ $r .= '<input class="noauto" id="'. $name .'" size="'.$size.'" maxlength="'.max(40,$size).'" name="'. $name .'fn" value="'. myentities($obj->xfn[$name]) .'" '. $js .' />';
+ $r .= '<input class="noauto" type="hidden" id="'.$name.'id" name="_XX_'.$name.'id" value="-1"/>';
}
$r .= '<div id="'. $name .'-popup" class="autocomplete"></div>';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-18 14:50:15
|
Revision: 422
http://tutos.svn.sourceforge.net/tutos/?rev=422&view=rev
Author: gokohnert
Date: 2011-11-18 14:50:08 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
more js based extended search
Modified Paths:
--------------
trunk/php/app_select.php
trunk/php/custom.pinc
trunk/php/expense/expense_select.php
trunk/php/file/file_select.php
trunk/php/file/mconfig.pinc
trunk/php/installation/installation_select.php
trunk/php/note/note_select.php
trunk/php/product.pinc
trunk/php/product_select.php
trunk/php/resource/resource_select.php
trunk/php/timetrack/timetrack_select.php
trunk/php/webelements.p3
Modified: trunk/php/app_select.php
===================================================================
--- trunk/php/app_select.php 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/app_select.php 2011-11-18 14:50:08 UTC (rev 422)
@@ -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,54 +33,71 @@
$r .= "<form id=\"appsearch\" name=\"appsearch\" action=\"app_overview.php\" method=\"get\">\n";
$r .= DoubleTableStart();
+ $this->addHidden("ext",0);
+
$r .= "<tr>\n";
- if ( $this->ext == false ) {
- $this->addHidden("ext",0);
- $r .= "<th colspan=\"3\">". $lang['SearchForApp'] ."</th>\n";
+ $r .= ' <th colspan="3">'. $lang['SearchForApp'] ."</th>\n";
+ $r .= "</tr><tr>\n";
- $r .= "</tr><tr>\n";
+ $r .= $this->showfieldc($lang['AdrName'],0,'name');
+ $r .= " <td><input id=\"name\" type=\"text\" value=\"\" name=\"name\" /></td>\n";
+ $r .= ' <td><input type="submit" value="'. $lang['Search'] .'" title="'.$lang['SearchForApp']."\" /></td>\n";
- $r .= $this->showfieldc($lang['AdrName']);
- $r .= " <td align=\"center\"> <input type=\"text\" value=\"\" name=\"name\" /></td>\n";
- $r .= " <td align=\"center\">\n";
- $r .= " <input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
- $r .= "</tr><tr>\n";
- $r .= ' <td align="center" colspan="2"><span class="small">'. $lang['AppSelInfo'] ."</span></td>\n";
- $r .= ' <td align="center">'. makelink('app_select.php?ext=1',$lang['extended']) ."</td></tr>\n";
- } else {
- $this->addHidden("ext",1);
- $r .= "<th colspan=\"3\">". $lang['SearchForAppExt'] ."</th>\n";
+ $r .= "</tr><tr>\n";
+ $r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
+ $tutos['pagescript'] .= "
+$( \"#toggler\" ).click(function() {
+ $(\".ext\").toggle();
+ if ( $(\"#h_ext\").val() == 0 ) {
+ $(\"#h_ext\").val(1);
+ } else {
+ $(\"#h_ext\").val(0);
+ }
+ return;
+ });
+\n";
+ if ( $this->ext == 0 ) {
+ $tutos['pagescript'] .= "
+ $(\".ext\").hide();
+\n";
+ }
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['AdrName'],0,"name");
- $r .= " <td> <input type=\"text\" value=\"\" id=\"name\" name=\"name\" />";
- $r .= " </td>\n";
- $r .= ' <td align="center"><input type="submit" value="'. $lang['Search'] ."\" /></td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= ' <td rowspan="2" class="desc">'. $lang['TaskBetween'] ."</td>\n";
+ $r .= ' <td colspan="2">';
+ $r .= $this->asfd->EnterDate("f",1);
+ $r .= "</td>\n";
- $r .= "</tr><tr>\n";
- $r .= ' <td rowspan="2" class="desc">'. $lang['TimetrackBetween'] ."</td>\n";
- $r .= ' <td colspan="2"> ';
- $r .= $this->asfd->EnterDate("f",1);
- $r .= " </td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= ' <td colspan="2">';
+ $r .= $this->astd->EnterDate("t",1);
+ $r .= "</td>\n";
- $r .= "</tr><tr>\n";
- $r .= ' <td colspan="2"> ';
- $r .= $this->astd->EnterDate("t",1);
- $r .= " </td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($lang['Location2'],0,"loc");
+ $r .= " <td colspan=\"2\"><select id=\"loc\" name=\"loc\">\n";
+ $r .= " <option value=\"-1\">". $lang['all'] ."</option>\n";
+ foreach ($lang['AppLoc'] as $i => $f ) {
+ $r .= " <option value=\"". $i ."\">". $lang['AppLoc'][$i] ."</option>\n";
+ }
+ $r .= " </select></td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['Location2'],0,"loc");
- $r .= " <td colspan=\"2\"> <select id=\"loc\" name=\"loc\">\n";
- $r .= " <option value=\"-1\">". $lang['all'] ."</option>\n";
- foreach ($lang['AppLoc'] as $i => $f ) {
- $r .= " <option value=\"". $i ."\">". $lang['AppLoc'][$i] ."</option>\n";
- }
- $r .= " </select></td>\n";
- $r .= "</tr><tr>\n";
- $r .= "<td><input id=\"myapps\" type=\"checkbox\" name=\"myapps\" value=\"1\" /></td>";
- $r .= $this->showfieldc($lang['AppUserSearch'],0,"myapps")."</td></tr>";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($lang['AppUserSearch'],0,"myapps")."\n";
+ $r .= "<td colspan=\"2\"><input id=\"myapps\" type=\"checkbox\" name=\"myapps\" value=\"1\" /></td>";
+
+ // add custom selectors
+ $x = get_custom_selectors('appointment1');
+ foreach ($x as $s) {
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($s[0]);
+ $r .= " <td colspan=\"2\">\n";
+ $r .= $s[1];
+ $r .= " </td>\n";
}
+ $r .= "</tr>\n";
+
$r .= DoubleTableEnd();
$r .= hiddenFormElements();
$r .= $this->getHidden();
@@ -137,5 +154,5 @@
?>
<!--
SVN Info $Id$
- $Author$
- -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file
Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/custom.pinc 2011-11-18 14:50:08 UTC (rev 422)
@@ -190,7 +190,7 @@
$x[1] = ''; // Select/Search field
if ($tx['ftype'] == 'SelectOne') {
- $x[1] .= SelectLangArray($parsename.'[]',$tx['lang'].'_',-1,true,0,true);
+ $x[1] .= SelectLangArray($parsename,$tx['lang'].'_',-1,true,0,true);
} else if ($tx['ftype'] == 'Boolean') {
$x[1] .= '<input id="'.$parsename.'_yes" name="'. $parsename .'" value="1" type="radio">'.$lang['yes'].' </input>';
$x[1] .= '<input id="'.$parsename.'_no" name="'. $parsename .'" value="0" type="radio">'.$lang['no'].' </input>';
Modified: trunk/php/expense/expense_select.php
===================================================================
--- trunk/php/expense/expense_select.php 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/expense/expense_select.php 2011-11-18 14:50:08 UTC (rev 422)
@@ -39,70 +39,74 @@
$r .= DoubleTableStart();
$r .= "<tr>\n";
- if ( $this->ext == false ) {
- $r .= "<th colspan=\"3\">". $lang['SearchForExpense'] ."</th>\n";
+ $r .= '<th colspan="3">'. $lang['SearchForExpense'] ."</th>\n";
+ $r .= "</tr><tr>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['ExpenseName']);
- $r .= " <td align=\"center\"> <input type=\"text\" value=\"\" name=\"name\"></td>\n";
- $r .= " <td align=\"center\">\n";
- $r .= " <input type=\"submit\" value=\"". $lang['Search'] ."\"></td>\n";
- $r .= "</tr><tr>\n";
- $r .= ' <td colspan="2" align="center"><span class="small">'. $lang['ExpenseSelInfo'] ."</span></td>\n";
- $r .= " <td align=\"center\">". makelink("expense/expense_select.php?ext=1",$lang['extended']) ."</td>\n";
- } else {
- $r .= "<th colspan=\"3\">". $lang['SearchForExpenseExt'] ."</th>\n";
+ $r .= $this->showfieldc($lang['ExpenseName'],0,'name');
+ $r .= " <td><input id=\"name\" type=\"text\" value=\"\" name=\"name\" /></td>\n";
+ $r .= ' <td><input type="submit" value="'. $lang['Search'] .'" title="'.$lang['SearchForExpense']."\" /></td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['ExpenseName']);
- $r .= " <td> <input type=\"text\" value=\"\" name=\"name\">";
- $r .= " </td>\n";
- $r .= " <td align=\"center\"><input type=\"submit\" value=\"". $lang['Search'] ."\"></td>\n";
+ $r .= "</tr><tr>\n";
+ $r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
+ $tutos['pagescript'] .= "
+$( \"#toggler\" ).click(function() {
+ $(\".ext\").toggle();
+ if ( $(\"#h_ext\").val() == 0 ) {
+ $(\"#h_ext\").val(1);
+ } else {
+ $(\"#h_ext\").val(0);
+ }
+ return;
+ });
+\n";
+ if ( $this->ext == 0 ) {
+ $tutos['pagescript'] .= "
+ $(\".ext\").hide();
+\n";
+ }
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['ExpenseRefType']);
- $r .= " <td colspan=\"2\"> <b>". $this->ExpenseAskRefType($this->nsrt,1) ."</b> </td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($lang['ExpenseRefType']);
+ $r .= " <td colspan=\"2\"><b>". $this->ExpenseAskRefType($this->nsrt,1) ."</b></td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['ExpenseRefName']);
- $r .= " <td colspan=\"2\"> <input type=\"text\" value=\"\" name=\"nsrn\"> </td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($lang['ExpenseRefName']);
+ $r .= " <td colspan=\"2\"><input type=\"text\" value=\"\" name=\"nsrn\" /></td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['ExpenseSupplier']);
- $r .= ' <td colspan=\"2\"> ';
- $r .= select_from_array_or_input($this->obj,"sup",null,1,'cd');
- $r .= "</td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($lang['ExpenseSupplier']);
+ $r .= ' <td colspan="2">';
+ $r .= select_from_array_or_input($this->obj,"sup",null,1,'cd');
+ $r .= "</td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['ExpenseCategory']);
- $r .= ' <td colspan="2"> <b>'. SelectLangArray('cat','ExpenseCategories',-1,true) ."</b> </td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($lang['ExpenseCategory']);
+ $r .= ' <td colspan="2"><b>'. SelectLangArray('cat','ExpenseCategories',-1,true) ."</b></td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['ExpenseCreator']);
- $r .= " <td colspan=\"2\"> <input type=\"text\" value=\"\" name=\"nscr\"> </td>\n";
- $r .= "</tr><tr>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($lang['ExpenseCreator']);
+ $r .= " <td colspan=\"2\"><input type=\"text\" value=\"\" name=\"nscr\" /></td>\n";
- $r .= " <td rowspan=\"2\" class=\"desc\">". $lang['ExpenseBetween'] ."</td>\n";
- $r .= " <td colspan=\"2\"> ";
- $r .= $this->nsfd->EnterDate("f",1);
- $r .= " </td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= ' <td rowspan="2" class="desc">'. $lang['ExpenseBetween'] ."</td>\n";
+ $r .= " <td colspan=\"2\">";
+ $r .= $this->nsfd->EnterDate("f",1);
+ $r .= "</td>\n";
- $r .= "</tr><tr>\n";
- $r .= " <td colspan=\"2\"> ";
- $r .= $this->nstd->EnterDate("t",1);
- $r .= " </td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= ' <td colspan="2">';
+ $r .= $this->nstd->EnterDate("t",1);
+ $r .= "</td>\n";
- // add custom selectors
- $x = get_custom_selectors('expense');
- foreach ($x as $s) {
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($s[0]);
- $r .= " <td colspan=\"2\">\n";
- $r .= $s[1];
- $r .= " </td>\n";
- }
+ // add custom selectors
+ $x = get_custom_selectors('expense');
+ foreach ($x as $s) {
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($s[0]);
+ $r .= " <td colspan=\"2\">\n";
+ $r .= $s[1];
+ $r .= " </td>\n";
}
-
$r .= "</tr>\n";
$r .= DoubleTableEnd();
@@ -124,7 +128,7 @@
function ExpenseAskRefType ($default,$any) {
global $lang;
- $r = "<select name=\"reftype\">";
+ $r = '<select name="reftype">';
foreach ($lang['ExpenseReferences'] as $i => $f ) {
$r .= "<option value=\"". $i ."\" ";
if ( $i == $default ) {
@@ -135,7 +139,7 @@
if ( $any > 0 ) {
$r .= "<option value=\"-1\"";
if ( -1 == $default ) {
- $r .= " selected ";
+ $r .= ' selected="selected" ';
}
$r .= ">". $lang['any'] ."</option>";
}
Modified: trunk/php/file/file_select.php
===================================================================
--- trunk/php/file/file_select.php 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/file/file_select.php 2011-11-18 14:50:08 UTC (rev 422)
@@ -41,12 +41,11 @@
$r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['AdrName']);
- $r .= " <td align=\"center\"><input type=\"text\" value=\"\" name=\"name\"></td>\n";
- $r .= " <td align=\"center\">\n";
- $r .= " <input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForFile'] ."\"></td>\n";
+ $r .= $this->showfieldc($lang['AdrName'],0,'name');
+ $r .= " <td><input id=\"name\" type=\"text\" value=\"\" name=\"name\" /></td>\n";
+ $r .= ' <td><input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForFile'] ."\" /></td>\n";
+
$r .= "</tr><tr>\n";
- $r .= " <td colspan=\"2\" align=\"center\"></td>\n";
$r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
$tutos['pagescript'] .= "
$( \"#toggler\" ).click(function() {
Modified: trunk/php/file/mconfig.pinc
===================================================================
--- trunk/php/file/mconfig.pinc 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/file/mconfig.pinc 2011-11-18 14:50:08 UTC (rev 422)
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright 2002 - 2008 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
@@ -21,7 +21,7 @@
name => 'tutos_file',
Desc => 'document management',
file => 'php/file/file.pinc',
- 'overview' => 'file/file_overview.php',
+ 'overview' => 'file/file_select.php',
'configurl' => 'file/file_config.php',
'perm' => usedocmanagement
);
@@ -34,17 +34,17 @@
# List of objects/modules where we do something with this module
# and need to include this module
#
-$tutos[modulesinc]['file'][] = "address";
-$tutos[modulesinc]['file'][] = "appointment";
-$tutos[modulesinc]['file'][] = "company";
-$tutos[modulesinc]['file'][] = "department";
-$tutos[modulesinc]['file'][] = "product";
-$tutos[modulesinc]['file'][] = "task";
-$tutos[modulesinc]['file'][] = "mytutos";
-$tutos[modulesinc]['file'][] = "scheme";
+$tutos[modulesinc]['file'][] = 'address';
+$tutos[modulesinc]['file'][] = 'appointment';
+$tutos[modulesinc]['file'][] = 'company';
+$tutos[modulesinc]['file'][] = 'department';
+$tutos[modulesinc]['file'][] = 'product';
+$tutos[modulesinc]['file'][] = 'task';
+$tutos[modulesinc]['file'][] = 'mytutos';
+$tutos[modulesinc]['file'][] = 'scheme';
#
-# List of modules/packages that canact as parent for documents
+# List of modules/packages that can act as parent for documents
#
$tutos['docowners'] = array('product','team','company','department','tutos_address','task');
Modified: trunk/php/installation/installation_select.php
===================================================================
--- trunk/php/installation/installation_select.php 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/installation/installation_select.php 2011-11-18 14:50:08 UTC (rev 422)
@@ -40,34 +40,59 @@
$r .= "<tr>\n";
$r .= "<th colspan=\"3\">". $lang['SearchForInst'] ."</th>\n";
+ $r .= "</tr><tr>\n";
+ $r .= $this->showfieldc($lang['SearchString'],0,'name');
+ $r .= " <td><input id=\"name\" type=\"text\" value=\"\" name=\"name\" /></td>\n";
+ $r .= " <td><input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForInst'] ."\" /></td>\n";
+
$r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['SearchString'],0,"name");
- $r .= " <td align=\"center\"><input id=\"name\" type=\"text\" value=\"\" name=\"name\" /></td>\n";
- $r .= " <td align=\"center\">\n";
- $r .= " <input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForInst'] ."\" /></td>\n";
- $r .= "</tr><tr>\n";
+ $r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
+ $tutos['pagescript'] .= "
+$( \"#toggler\" ).click(function() {
+ $(\".ext\").toggle();
+ if ( $(\"#h_ext\").val() == 0 ) {
+ $(\"#h_ext\").val(1);
+ } else {
+ $(\"#h_ext\").val(0);
+ }
+ return;
+ });
+\n";
if ( $this->ext == 0 ) {
- $r .= ' <td colspan="2" align="center"><span class="small">'. $lang['InstSelInfo'] ."</span></td>\n";
- $r .= " <td align=\"center\">". makelink('installation/installation_select.php?ext=1',$lang['extended']) ."</td>\n";
- } else {
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc(sprintf($lang['Customer'],''),0,"cid");
- $r .= '<td colspan="2">';
- $r .= select_from_array_or_input($this->obj,"c",null,1,'cdat');
- $r .= "</td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc(sprintf($lang['SoldBy'],''),0,"sid");
- $r .= '<td colspan="2">';
- $r .= select_from_array_or_input($this->obj,"s",null,1,'at');
- $r .= "</td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc(sprintf($lang['InstalledBy'],''),0,"iid");
- $r .= '<td colspan="2">';
- $r .= select_from_array_or_input($this->obj,"i",null,1,'at');
- $r .= "</td>\n";
+ $tutos['pagescript'] .= "
+ $(\".ext\").hide();
+\n";
}
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc(sprintf($lang['Customer'],''),0,"cid");
+ $r .= '<td colspan="2">';
+ $r .= select_from_array_or_input($this->obj,"c",null,1,'cdat');
+ $r .= "</td>\n";
+
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc(sprintf($lang['SoldBy'],''),0,"sid");
+ $r .= '<td colspan="2">';
+ $r .= select_from_array_or_input($this->obj,"s",null,1,'at');
+ $r .= "</td>\n";
+
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc(sprintf($lang['InstalledBy'],''),0,"iid");
+ $r .= '<td colspan="2">';
+ $r .= select_from_array_or_input($this->obj,"i",null,1,'at');
+ $r .= "</td>\n";
+
+ // add custom selectors
+ $x = get_custom_selectors('installation');
+ foreach ($x as $s) {
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($s[0]);
+ $r .= " <td colspan=\"2\">\n";
+ $r .= $s[1];
+ $r .= " </td>\n";
+ }
+
$r .= "</tr>\n";
$r .= DoubleTableEnd();
$r .= hiddenFormElements();
Modified: trunk/php/note/note_select.php
===================================================================
--- trunk/php/note/note_select.php 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/note/note_select.php 2011-11-18 14:50:08 UTC (rev 422)
@@ -37,53 +37,66 @@
$r .= DoubleTableStart();
$r .= "<tr>\n";
- if ( $this->ext == false ) {
- $this->addHidden("ext",0);
- $r .= "<th colspan=\"3\">". $lang['SearchForNote'] ."</th>\n";
+ $r .= "<th colspan=\"3\">". $lang['SearchForNote'] ."</th>\n";
+ $r .= "</tr><tr>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['NoteName']);
- $r .= " <td align=\"center\"><input type=\"text\" value=\"\" name=\"name\" /></td>\n";
- $r .= " <td align=\"center\">\n";
- $r .= " <input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
- $r .= "</tr><tr>\n";
- $r .= " <td colspan=\"2\" align=\"center\"><span class=\"small\">". $lang['NoteSelInfo'] ."</small></td>\n";
- $r .= " <td align=\"center\">". makelink("note/note_select.php?ext=1",$lang['extended']) ."</td>\n";
- } else {
- $this->addHidden("ext",1);
- $r .= "<th colspan=\"3\">". $lang['SearchForNoteExt'] ."</th>\n";
+ $r .= $this->showfieldc($lang['NoteName'],0,'name');
+ $r .= " <td><input id=\"name\" type=\"text\" value=\"\" name=\"name\" /></td>\n";
+ $r .= " <td><input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['NoteName']);
- $r .= " <td><input type=\"text\" value=\"\" name=\"name\" />";
- $r .= " </td>\n";
- $r .= " <td align=\"center\"><input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
+ $r .= "</tr><tr>\n";
+ $tutos['pagescript'] .= "
+$( \"#toggler\" ).click(function() {
+ $(\".ext\").toggle();
+ if ( $(\"#h_ext\").val() == 0 ) {
+ $(\"#h_ext\").val(1);
+ } else {
+ $(\"#h_ext\").val(0);
+ }
+ return;
+ });
+\n";
+ if ( $this->ext == 0 ) {
+ $tutos['pagescript'] .= "
+ $(\".ext\").hide();
+\n";
+ }
+ $r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['NoteRefType']);
- $r .= ' <td colspan="2">'. $this->NoteAskRefType($this->nsrt,0) ."</td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($lang['NoteRefType']);
+ $r .= ' <td colspan="2">'. $this->NoteAskRefType($this->nsrt,0) ."</td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['NoteRefName']);
- $r .= " <td colspan=\"2\"><input type=\"text\" value=\"\" name=\"nsrn\" /></td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($lang['NoteRefName']);
+ $r .= " <td colspan=\"2\"><input type=\"text\" value=\"\" name=\"nsrn\" /></td>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['NoteCreator']);
- $r .= " <td colspan=\"2\">";
- $r .= select_from_array_or_input($this,'nc',null,0,'a');
- $r .= "</td></tr><tr>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($lang['NoteCreator']);
+ $r .= " <td colspan=\"2\">";
+ $r .= select_from_array_or_input($this,'nc',null,0,'a');
+ $r .= "</td>";
- $r .= " <td rowspan=\"2\" class=\"desc\">". $lang['NoteBetween'] ."</td>\n";
- $r .= ' <td colspan="2">';
- $r .= $this->nsfd->EnterDate("f",1);
- $r .= "</td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= " <td rowspan=\"2\" class=\"desc\">". $lang['NoteBetween'] ."</td>\n";
+ $r .= ' <td colspan="2">';
+ $r .= $this->nsfd->EnterDate("f",1);
+ $r .= "</td>\n";
- $r .= "</tr><tr>\n";
- $r .= ' <td colspan="2">';
- $r .= $this->nstd->EnterDate("t",1);
- $r .= "</td>\n";
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= ' <td colspan="2">';
+ $r .= $this->nstd->EnterDate("t",1);
+ $r .= "</td>\n";
+
+ // add custom selectors
+ $x = get_custom_selectors('note');
+ foreach ($x as $s) {
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($s[0]);
+ $r .= " <td colspan=\"2\">\n";
+ $r .= $s[1];
+ $r .= " </td>\n";
}
-
$r .= "</tr>\n";
$r .= DoubleTableEnd();
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/product.pinc 2011-11-18 14:50:08 UTC (rev 422)
@@ -297,14 +297,14 @@
while ( list ($i,$f) = @each ($lang['ProdClasses'.$c]) ) {
$r .= " <option value=\"". $i ."\"";
if ( $i == $default ) {
- $r .= " selected";
+ $r .= ' selected="selected"';
}
$r .= ">". myentities($f) ."</option>\n";
}
if ( $any == 1 ) {
$r .= " <option value=\"-1\"";
if ( -1 == $default ) {
- $r .= " selected";
+ $r .= ' selected="selected"';
}
$r .= ">". $lang['any'] ."</option>\n";
}
Modified: trunk/php/product_select.php
===================================================================
--- trunk/php/product_select.php 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/product_select.php 2011-11-18 14:50:08 UTC (rev 422)
@@ -41,8 +41,7 @@
$r .= $this->showfieldc($lang['AdrName'],0,"name");
$r .= " <td align=\"center\"><input id=\"name\" type=\"text\" value=\"\" name=\"name\" /></td>\n";
- $r .= " <td align=\"xxcenter\">\n";
- $r .= ' <input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForProd'] ."\" /></td>\n";
+ $r .= ' <td><input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForProd'] ."\" /></td>\n";
$r .= "</tr><tr>\n";
$r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
$this->help_popup('name',$lang['SearchForProdHelp'],$lang['ProdName'],$lang['ProdVersion'],$lang['ProdDesc'],$lang['ProdDesc1'],$lang['ProdDesc2']);
@@ -62,9 +61,7 @@
$(\".ext\").hide();
\n";
}
- $r .= "</tr>\n";
-
- $r .= "<tr class=\"ext\">\n";
+ $r .= "</tr><tr class=\"ext\">\n";
$r .= $this->showfieldc($lang['ProdState'],0,"state");
$r .= ' <td colspan="2">'. ProdAskState($this->state,1) ."</td>\n";
@@ -113,12 +110,11 @@
// Roles
$r .= "</tr><tr class=\"ext\">\n";
- $r .= $this->showfieldc($lang['ProdRoles'],0,"rfn");
+ $r .= $this->showfieldc($lang['ProdRoles'],0,"r");
$r .= ' <td colspan="2">';
$r .= select_from_array_or_input($this->obj,"r",null,1,array(useaddressbook,useteams));
$r .= "</td>\n";
-
// add custom selectors
$x = get_custom_selectors('product');
foreach ($x as $s) {
Modified: trunk/php/resource/resource_select.php
===================================================================
--- trunk/php/resource/resource_select.php 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/resource/resource_select.php 2011-11-18 14:50:08 UTC (rev 422)
@@ -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
@@ -35,38 +35,46 @@
$r .= "<form id=\"ressearch\" name=\"ressearch\" method=\"get\" action=\"resource_overview.php\">\n";
$r .= DoubleTableStart();
+ $this->addHidden('ext',$this->ext);
$r .= "<tr>\n";
+ $r .= "<th colspan=\"3\">". $lang['SearchForRes'] ."</th>\n";
+ $r .= "</tr><tr>\n";
+
+ $r .= $this->showfieldc($lang['AdrName'],0,'name');
+ $r .= " <td><input id=\"name\" type=\"text\" value=\"\" name=\"name\" /></td>\n";
+ $r .= ' <td><input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForRes'] ."\" /></td>\n";
+
+ $r .= "</tr><tr>\n";
+ $r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
+
+ $tutos['pagescript'] .= "
+$( \"#toggler\" ).click(function() {
+ $(\".ext\").toggle();
+ if ( $(\"#h_ext\").val() == 0 ) {
+ $(\"#h_ext\").val(1);
+ } else {
+ $(\"#h_ext\").val(0);
+ }
+ return;
+ });
+\n";
if ( $this->ext == 0 ) {
- $r .= "<th colspan=\"3\">". $lang['SearchForRes'] ."</th>\n";
+ $tutos['pagescript'] .= "
+ $(\".ext\").hide();
+\n";
+ }
- $r .= "</tr><tr>\n";
-
- $r .= $this->showfieldc($lang['AdrName']);
- $r .= " <td align=\"center\"><input type=\"text\" value=\"\" name=\"name\" /></td>\n";
- $r .= " <td align=\"center\">\n";
- $r .= ' <input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForRes'] ."\" /></td>\n";
- $r .= "</tr><tr>\n";
- $r .= " <td colspan=\"2\" align=\"center\"> </td>\n";
- # $r .= " <td align=\"center\">". makelink("file/file_select.php?ext=1",$lang['extended']) ."</td>\n";
- } else {
- $r .= "<th colspan=\"3\">". $lang['SearchForFileExt'] ."</th>\n";
- $r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['AdrName']);
- $r .= " <td> <input type=\"text\" value=\"\" name=\"name\" />";
+ // add custom selectors
+ $x = get_custom_selectors('product');
+ foreach ($x as $s) {
+ $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->showfieldc($s[0]);
+ $r .= " <td colspan=\"2\">\n";
+ $r .= $s[1];
$r .= " </td>\n";
- $r .= ' <td align="center"><input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForFileExt'] ."\" /></td>\n";
+ }
- $r .= "</tr><tr>\n";
- $r .= " <td rowspan=\"2\" class=\"desc\">". $lang['TimetrackBetween'] ."</td>\n";
- $r .= " <td colspan=\"2\"> ";
- $r .= $this->fd->EnterDate("f",1);
- $r .= " </td>\n";
- $r .= "</tr><tr>\n";
- $r .= " <td colspan=\"2\"> ";
- $r .= $this->td->EnterDate("t",1);
- $r .= " </td>\n";
- }
$r .= "</tr>\n";
$r .= DoubleTableEnd();
$r .= hiddenFormElements();
@@ -115,5 +123,5 @@
?>
<!--
SVN Info $Id$
- $Author$
- -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file
Modified: trunk/php/timetrack/timetrack_select.php
===================================================================
--- trunk/php/timetrack/timetrack_select.php 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/timetrack/timetrack_select.php 2011-11-18 14:50:08 UTC (rev 422)
@@ -38,13 +38,14 @@
$this->addHidden('ext',$this->ext);
$r .= "<tr>\n";
- $r .= "<th colspan=\"3\">". $lang['SearchForTT'] ."</th>\n";
+ $r .= '<th colspan="3">'. $lang['SearchForTT'] ."</th>\n";
$r .= "</tr><tr>\n";
- $r .= $this->showfieldc($lang['AdrName']);
- $r .= " <td align=\"center\"><input type=\"text\" value=\"\" name=\"name\" /></td>\n";
- $r .= ' <td align="center"><input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForTTExt'] ."\" /></td>\n";
+
+ $r .= $this->showfieldc($lang['AdrName'],0,'name');
+ $r .= " <td><input id=\"name\" type=\"text\" value=\"\" name=\"name\" /></td>\n";
+ $r .= ' <td><input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForTTExt'] ."\" /></td>\n";
+
$r .= "</tr><tr>\n";
- $r .= " <td colspan=\"2\" align=\"center\"></td>\n";
$r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
$tutos['pagescript'] .= "
$( \"#toggler\" ).click(function() {
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2011-11-16 16:53:28 UTC (rev 421)
+++ trunk/php/webelements.p3 2011-11-18 14:50:08 UTC (rev 422)
@@ -97,10 +97,11 @@
global $lang,$tutos;
$r = '';
+ $orgfld = $fldname;
if ( ($multi != false) and (substr($fldname,-2) != '[]') ) {
$fldname .= '[]';
}
- $r .= '<select id="'. $fldname .'" name="'.$fldname.'"';
+ $r .= '<select id="'. $orgfld .'" name="'.$fldname.'"';
if ($multi != false) {
$r .= ' multiple="multiple"';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-11-16 16:53:39
|
Revision: 421
http://tutos.svn.sourceforge.net/tutos/?rev=421&view=rev
Author: gokohnert
Date: 2011-11-16 16:53:28 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
some more svn keyword and mimetype setting
Modified Paths:
--------------
trunk/Makefile
trunk/php/auth/auth_remoteuser.pinc
trunk/php/graphs.pinc
trunk/php/pdf2.pinc
trunk/php/testmanager/tw.p3
trunk/php/testmanager/zh.p3
trunk/test.sh
Property Changed:
----------------
trunk/php/acl_ins.php
trunk/php/acl_new.php
trunk/php/acl_overview.php
trunk/php/acl_show.php
trunk/php/address_del.php
trunk/php/address_ins.php
trunk/php/address_new.php
trunk/php/address_overview.php
trunk/php/address_show.php
trunk/php/admin_show.php
trunk/php/admin_sync.php
trunk/php/adodb-time.inc.php
trunk/php/ajax.php
trunk/php/app_do_vote.php
trunk/php/app_new.php
trunk/php/app_new_r.php
trunk/php/app_overview.php
trunk/php/app_select.php
trunk/php/app_show.php
trunk/php/app_vote.php
trunk/php/auth/auth.pinc
trunk/php/auth/auth_cmdline.pinc
trunk/php/auth/auth_db.pinc
trunk/php/auth/auth_external.pinc
trunk/php/auth/auth_http.pinc
trunk/php/auth/auth_ldap.pinc
trunk/php/auth/auth_pam.pinc
trunk/php/auth/auth_pwauth_db.pinc
trunk/php/auth/auth_remoteuser.pinc
trunk/php/auth/auth_typo3.pinc
trunk/php/auth/auth_x509.pinc
trunk/php/barcode.php
trunk/php/cal_ajax.php
trunk/php/calendar_day.php
trunk/php/calendar_week.php
trunk/php/check.php
trunk/php/company_ins.php
trunk/php/company_new.php
trunk/php/company_overview.php
trunk/php/company_show.php
trunk/php/database_del.php
trunk/php/database_ins.php
trunk/php/database_new.php
trunk/php/database_overview.php
trunk/php/database_show.php
trunk/php/delobject.php
trunk/php/department_ins.php
trunk/php/department_new.php
trunk/php/department_show.php
trunk/php/gantt_png.php
trunk/php/gettext.php
trunk/php/graph_bars.php
trunk/php/graphs.pinc
trunk/php/help.php
trunk/php/history_show.php
trunk/php/i18n.php
trunk/php/ical_parse.php
trunk/php/location_del.php
trunk/php/logout.php
trunk/php/mail_ins.php
trunk/php/mail_new.php
trunk/php/message_del.php
trunk/php/message_overview.php
trunk/php/minical.php
trunk/php/minitimer.php
trunk/php/module_overview.php
trunk/php/mytutos.php
trunk/php/notfound.php
trunk/php/pdf2.pinc
trunk/php/product_contacts.php
trunk/php/product_new.php
trunk/php/product_overview.php
trunk/php/product_role_ins.php
trunk/php/product_role_new.php
trunk/php/product_show.php
trunk/php/res_cal.php
trunk/php/res_cal_select.php
trunk/php/sales_forecast.php
trunk/php/scrum/de.p3
trunk/php/scrum/demodata.p3
trunk/php/scrum/en.p3
trunk/php/scrum/log_ajax.php
trunk/php/scrum/log_ins.php
trunk/php/scrum/log_new.php
trunk/php/scrum/log_overview.php
trunk/php/scrum/log_show.php
trunk/php/scrum/mconfig.pinc
trunk/php/scrum/mtable.pinc
trunk/php/scrum/scrum.pinc
trunk/php/scrum/scrum_config.php
trunk/php/scrum/sprint_ins.php
trunk/php/scrum/sprint_new.php
trunk/php/scrum/sprint_overview.php
trunk/php/scrum/sprint_show.php
trunk/php/showobject.php
trunk/php/task_copy_ins.php
trunk/php/task_gantt.php
trunk/php/task_import_csv.php
trunk/php/task_import_xml.php
trunk/php/task_ins.php
trunk/php/task_new.php
trunk/php/task_show.php
trunk/php/team_ins.php
trunk/php/team_new.php
trunk/php/team_overview.php
trunk/php/team_select.php
trunk/php/team_show.php
trunk/php/testmanager/de.p3
trunk/php/testmanager/demodata.p3
trunk/php/testmanager/en.p3
trunk/php/testmanager/mconfig.pinc
trunk/php/testmanager/mtable.pinc
trunk/php/testmanager/testcase_ins.php
trunk/php/testmanager/testcase_new.php
trunk/php/testmanager/testcase_overview.php
trunk/php/testmanager/testcase_select.php
trunk/php/testmanager/testcase_show.php
trunk/php/testmanager/testmanager.pinc
trunk/php/testmanager/testrun_ins.php
trunk/php/testmanager/testrun_new.php
trunk/php/testmanager/testrun_overview.php
trunk/php/testmanager/testrun_select.php
trunk/php/testmanager/testrun_show.php
trunk/php/testmanager/testsuite_ins.php
trunk/php/testmanager/testsuite_new.php
trunk/php/testmanager/testsuite_overview.php
trunk/php/testmanager/testsuite_select.php
trunk/php/testmanager/testsuite_show.php
trunk/php/testmanager/tw.p3
trunk/php/testmanager/zh.p3
trunk/php/user_del.php
trunk/php/user_ins.php
trunk/php/user_new.php
trunk/php/user_overview.php
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-11-16 16:30:55 UTC (rev 420)
+++ trunk/Makefile 2011-11-16 16:53:28 UTC (rev 421)
@@ -316,8 +316,8 @@
$(wildcard libs/tcpdf/font/*.z) \
$(wildcard libs/tcpdf/config/*.php) \
libs/tcpdf/TUTOS-README \
- libs/tcpdf/README.txt \
- libs/tcpdf/LICENSE.txt
+ libs/tcpdf/README.TXT \
+ libs/tcpdf/LICENSE.TXT
LIBS_EXCEL = $(wildcard libs/excel/*.php) \
@@ -366,8 +366,11 @@
$(wildcard html/help/*.html)
CSSFILES = \
- html/css/smoothness/jquery-ui-1.8.9.custom.css \
- html/css/ui-lightness/jquery-ui-1.8.9.custom.css \
+ html/css/smoothness/jquery-ui.custom.css \
+ html/css/ui-lightness/jquery-ui.custom.css \
+ html/css/jquery.jqplot.min.css \
+ html/css/superfish-vertical.css \
+ html/css/superfish.css \
html/default.css \
html/new_layout.css \
html/new2_layout.css \
@@ -419,15 +422,24 @@
OTHER_HTML = html/.htaccess \
html/copyright.html \
html/motd_default.html \
- html/js/jquery-1.4.4.min.js \
+ html/js/jquery.min.js \
html/js/jquery.bgiframe.min.js \
html/js/jquery.hoverIntent.minified.js \
- html/js/jquery-ui-1.8.9.custom.min.js \
+ html/js/jquery-ui.custom.min.js \
html/js/superfish.js \
html/js/supersubs.js \
- html/css/superfish-vertical.css \
- html/css/superfish.css \
- html/js/tutos.js
+ html/js/excanvas.min.js \
+ html/js/jquery.jqplot.min.js \
+ html/js/tutos.js \
+ html/js/plugins/jqplot.barRenderer.min.js \
+ html/js/plugins/jqplot.canvasAxisTickRenderer.min.js \
+ html/js/plugins/jqplot.categoryAxisRenderer.min.js \
+ html/js/plugins/jqplot.highlighter.min.js \
+ html/js/plugins/jqplot.pointLabels.min.js \
+ html/js/plugins/jqplot.canvasAxisLabelRenderer.min.js \
+ html/js/plugins/jqplot.canvasTextRenderer.min.js \
+ html/js/plugins/jqplot.enhancedLegendRenderer.min.js \
+ html/js/plugins/jqplot.pieRenderer.min.js \
OTHERH= $(TEMPLATES) \
$(THEMEBLUE) \
@@ -694,260 +706,6 @@
)
@${ECHO} "DONE"
-
-# WARNING: I (Dimitri Fontaine <dfo...@cv...>) added this target
-# in order to be able to build a debian package !
-install: clean apache.conf tutos.spec
-# find php -type d -exec mkdir -p $(TARGETDIR)/{} \;
-# find html -type d -exec mkdir -p $(TARGETDIR)/{} \;
-# find homepage -type d -exec mkdir -p $(TARGETDIR)/{} \;
-
- # PHP files
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)
- $(INSTALL) $(INSTALLARGS) -m 644 index.html $(TARGETDIR)
- $(INSTALL) $(INSTALLARGS) -m 644 favicon.ico $(TARGETDIR)
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_TOP) $(TARGETDIR)/php
- $(RM) $(TARGETDIR)/php/config.php
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/db
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_DB) $(TARGETDIR)/php/db
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/admin
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_ADMIN) $(TARGETDIR)/php/admin
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/auth
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_AUTH) $(TARGETDIR)/php/auth
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/localization
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_LOCAL) $(TARGETDIR)/php/localization
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/group
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_GRP) $(TARGETDIR)/php/group
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/group/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_GRP) $(TARGETDIR)/php/group/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/invoice
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_INV) $(TARGETDIR)/php/invoice
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/invoice/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_INV_HLP) $(TARGETDIR)/php/invoice/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/note
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_NOTE) $(TARGETDIR)/php/note
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/note/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_NOTE_HLP) $(TARGETDIR)/php/note/help
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/note/templates
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_NOTE_TPL) $(TARGETDIR)/php/note/templates
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/bugtracking
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_BUG) $(TARGETDIR)/php/bugtracking
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/bugtracking/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_BUG_HLP) $(TARGETDIR)/php/bugtracking/help
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/bugtracking/templates
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_BUG_TPL) $(TARGETDIR)/php/bugtracking/templates
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/xml
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_XML) $(TARGETDIR)/php/xml
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/ldap
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_LDAP) $(TARGETDIR)/php/ldap
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/mailbox
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_MBOX) $(TARGETDIR)/php/mailbox
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/mailbox/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_MBOX_HLP) $(TARGETDIR)/php/mailbox/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/rate
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_RATE) $(TARGETDIR)/php/rate
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/rate/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_RATE_HLP) $(TARGETDIR)/php/rate/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/url
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_URL) $(TARGETDIR)/php/url
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/url/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_URL_HLP) $(TARGETDIR)/php/url/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/resource
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_RES) $(TARGETDIR)/php/resource
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/resource/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_RES_HLP) $(TARGETDIR)/php/resource/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/timetrack
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_TT) $(TARGETDIR)/php/timetrack
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/timetrack/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_TT_HLP) $(TARGETDIR)/php/timetrack/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/file
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_FILE) $(TARGETDIR)/php/file
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/file/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_FILE_HLP) $(TARGETDIR)/php/file/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/watchlist
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_WATCH) $(TARGETDIR)/php/watchlist
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/watchlist/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_WATCH_HLP) $(TARGETDIR)/php/watchlist/help
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/watchlist/templates
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_WATCH_TPL) $(TARGETDIR)/php/watchlist/templates
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/reminder
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REMINDER) $(TARGETDIR)/php/reminder
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/reminder/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REMINDER_HLP) $(TARGETDIR)/php/reminder/help
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/reminder/templates
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REMINDER_TPL) $(TARGETDIR)/php/reminder/templates
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/installation
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_INST) $(TARGETDIR)/php/installation
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/installation/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_INST_HLP) $(TARGETDIR)/php/installation/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/module_template
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_MODTEMPLATE) $(TARGETDIR)/php/module_template
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/module_template/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_MODTEMPLATE_HLP) $(TARGETDIR)/php/module_template/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/ticker
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_TICKER) $(TARGETDIR)/php/ticker
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/ticker/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_TICKER_HLP) $(TARGETDIR)/php/ticker/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/palm
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_PALM) $(TARGETDIR)/php/palm
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/palm/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_PALM_HLP) $(TARGETDIR)/php/palm/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/checklist
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_CHECKLIST) $(TARGETDIR)/php/checklist
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/checklist/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_CHECKLIST_HLP) $(TARGETDIR)/php/checklist/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/stuff
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_STUFF) $(TARGETDIR)/php/stuff
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/stuff/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_STUFF_HLP) $(TARGETDIR)/php/stuff/help
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/report-engine
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REPORT) $(TARGETDIR)/php/report-engine
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/report-engine/rep_spine
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REPORT_SPINE) $(TARGETDIR)/php/report-engine/rep_spine
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/report-engine/rep_envelope
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REPORT_ENVELOPE) $(TARGETDIR)/php/report-engine/rep_envelope
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/report-engine/rep_directory
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REPORT_DIR) $(TARGETDIR)/php/report-engine/rep_directory
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/report-engine/rep_index
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REPORT_INDEX) $(TARGETDIR)/php/report-engine/rep_index
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/report-engine/rep_prod_excel
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REPORT_EXCEL) $(TARGETDIR)/php/report-engine/rep_prod_excel
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/report-engine/rep_prodstat
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REPORT_PRODSTAT) $(TARGETDIR)/php/report-engine/rep_prodstat
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/report-engine/rep_freemind
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REPORT_FREEMIND) $(TARGETDIR)/php/report-engine/rep_freemind
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/report-engine/rep_bug_state_duration
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_REPORT_BUGSTATE) $(TARGETDIR)/php/report-engine/rep_bug_state_duration
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/counter
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_COUNTER) $(TARGETDIR)/php/counter
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/counter/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_COUNTER_HLP) $(TARGETDIR)/php/counter/help
- # STC
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/stc
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_COUNTER) $(TARGETDIR)/php/stc
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/stc/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_COUNTER_HLP) $(TARGETDIR)/php/stc/help
- # RSS
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/rss
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_COUNTER) $(TARGETDIR)/php/rss
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/rss/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_COUNTER_HLP) $(TARGETDIR)/php/rss
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/layout
- $(INSTALL) $(INSTALLARGS) -m 644 $(PHP_LAYOUT) $(TARGETDIR)/php/layout
-
- $(INSTALL) $(INSTALLARGS) -m 644 php/.htaccess $(TARGETDIR)/php
-
- # HANDLER
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/sipgate
- $(INSTALL) $(INSTALLARGS) -m 644 $(HDL_SIPGATE) $(TARGETDIR)/php/sipgate
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/oanda
- $(INSTALL) $(INSTALLARGS) -m 644 $(HDL_OANDA) $(TARGETDIR)/php/oanda
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/yahoo
- $(INSTALL) $(INSTALLARGS) -m 644 $(HDL_YAHOO) $(TARGETDIR)/php/yahoo
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/map24
- $(INSTALL) $(INSTALLARGS) -m 644 $(HDL_MAP24) $(TARGETDIR)/php/map24
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/mapquest
- $(INSTALL) $(INSTALLARGS) -m 644 $(HDL_MAPQUEST) $(TARGETDIR)/php/mapquest
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/cia
- $(INSTALL) $(INSTALLARGS) -m 644 $(HDL_CIA) $(TARGETDIR)/php/cia
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/phpweather
- $(INSTALL) $(INSTALLARGS) -m 644 $(HDL_WEATHER) $(TARGETDIR)/php/phpweather
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/sms
- $(INSTALL) $(INSTALLARGS) -m 644 $(HDL_SMS) $(TARGETDIR)/php/sms
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/fax
- $(INSTALL) $(INSTALLARGS) -m 644 $(HDL_FAX) $(TARGETDIR)/php/fax
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/isbn
- $(INSTALL) $(INSTALLARGS) -m 644 $(HDL_SIPGATE) $(TARGETDIR)/php/isbn
-
-
- # LIBS
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/libs
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/libs/drawboard
-# $(INSTALL) $(INSTALLARGS) -m 644 libs/drawboard/TUTOS-README $(TARGETDIR)/libs/drawboard
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/libs/excel
- $(INSTALL) $(INSTALLARGS) -m 644 libs/excel/TUTOS-README $(TARGETDIR)/libs/excel
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/libs/fckeditor
- $(INSTALL) $(INSTALLARGS) -m 644 libs/fckeditor/TUTOS-README $(TARGETDIR)/libs/fckeditor
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/libs/fpdf
- $(INSTALL) $(INSTALLARGS) -m 644 libs/fpdf/TUTOS-README $(TARGETDIR)/libs/fpdf
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/libs/freemind
- $(INSTALL) $(INSTALLARGS) -m 644 libs/freemind/TUTOS-README $(TARGETDIR)/libs/freemind
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/libs/jpgraph
- $(INSTALL) $(INSTALLARGS) -m 644 libs/jpgraph/TUTOS-README $(TARGETDIR)/libs/jpgraph
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/libs/php-barcode
- $(INSTALL) $(INSTALLARGS) -m 644 libs/php-barcode/TUTOS-README $(TARGETDIR)/libs/php-barcode
-
- # HTML files
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/html
- $(INSTALL) $(INSTALLARGS) -m 644 $(TEMPLATES) $(TARGETDIR)/html
- $(INSTALL) $(INSTALLARGS) -m 644 $(HTMLPICS) $(TARGETDIR)/html
- $(INSTALL) $(INSTALLARGS) -m 644 $(CSSFILES) $(TARGETDIR)/html
- $(INSTALL) $(INSTALLARGS) -m 644 $(OTHER_HTML) $(TARGETDIR)/html
-
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/html/nuke
- $(INSTALL) $(INSTALLARGS) -m 644 $(THEMENUKE) $(TARGETDIR)/html/nuke
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/html/blue
- $(INSTALL) $(INSTALLARGS) -m 644 $(THEMEBLUE) $(TARGETDIR)/html/blue
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/html/red
- $(INSTALL) $(INSTALLARGS) -m 644 $(THEMERED) $(TARGETDIR)/html/red
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/html/visual
- $(INSTALL) $(INSTALLARGS) -m 644 $(THEMEVISUAL) $(TARGETDIR)/html/visual
- $(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/html/help
- $(INSTALL) $(INSTALLARGS) -m 644 $(HELP) $(TARGETDIR)/html/help
-
- # HOMEDIR files
-# install -o www-data -m 664 $(HOMEP) $(TARGETDIR)/homepage
-# install -o www-data -m 664 $(OTHERHP) $(TARGETDIR)/homepage
-
- # Top files
- $(INSTALL) $(INSTALLARGS) -m 644 $(TOPFILES) $(TARGETDIR)
- (cd $(TARGETDIR) && ${CHMOD} a+rx $(SCRIPTS))
-
- # care about config files
- mkdir -p $(DESTDIR)/etc/tutos
- cp $(TARGETDIR)/php/modules.pinc $(DESTDIR)/etc/tutos
- cp $(TARGETDIR)/apache.conf $(DESTDIR)/etc/tutos
-
- # Make a config.pinc in the tarball
- # it will be configured in the postinst process
- touch $(DESTDIR)/etc/tutos/config.pinc
-
- # The upload dir
- mkdir -p $(UPLOADDIR)
-
- # care about documentation
- mkdir -p $(DESTDIR)/usr/share/doc/tutos
- install -m 664 README $(DESTDIR)/usr/share/doc/tutos
- install -m 664 INSTALL $(DESTDIR)/usr/share/doc/tutos/README.Install
-
#
# Packages & Handler that will not be part of the standard releases
#
Property changes on: trunk/php/acl_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/acl_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/acl_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/acl_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/address_del.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/address_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/address_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/address_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/address_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/admin_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/admin_sync.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/adodb-time.inc.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/ajax.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/app_do_vote.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/app_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/app_new_r.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/app_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/app_select.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/app_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/app_vote.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/auth/auth.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/auth/auth_cmdline.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/auth/auth_db.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/auth/auth_external.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/auth/auth_http.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/auth/auth_ldap.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/auth/auth_pam.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/auth/auth_pwauth_db.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Modified: trunk/php/auth/auth_remoteuser.pinc
===================================================================
--- trunk/php/auth/auth_remoteuser.pinc 2011-11-16 16:30:55 UTC (rev 420)
+++ trunk/php/auth/auth_remoteuser.pinc 2011-11-16 16:53:28 UTC (rev 421)
@@ -2,8 +2,8 @@
/*
* Copyright 1999 - 2011 by Gero Kohnert
*
- * SVN Info: $Id: auth_remoteuser.pinc,v 1.4 2010/02/24 20:15:30 gokohnert Exp $
- * $Author: gokohnert $
+ * SVN Info: $Id$
+ * $Author$
* contributed by Sebastian Brab\xE4nder
*/
Property changes on: trunk/php/auth/auth_remoteuser.pinc
___________________________________________________________________
Added: svn:keywords
+ Id Author Rev
Property changes on: trunk/php/auth/auth_typo3.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/auth/auth_x509.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/barcode.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/cal_ajax.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/calendar_day.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/calendar_week.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/check.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/company_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/company_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/company_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/company_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/database_del.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/database_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/database_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/database_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/database_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/delobject.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/department_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/department_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/department_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/gantt_png.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/gettext.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/graph_bars.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Modified: trunk/php/graphs.pinc
===================================================================
--- trunk/php/graphs.pinc 2011-11-16 16:30:55 UTC (rev 420)
+++ trunk/php/graphs.pinc 2011-11-16 16:53:28 UTC (rev 421)
@@ -6,8 +6,8 @@
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; version 2 of the License.
*
- * SVN Info $Id: product.pinc 397 2011-11-09 13:02:17Z gokohnert $
- * $Author: gokohnert $
+ * SVN Info $Id$
+ * $Author$
*/
/**
Property changes on: trunk/php/graphs.pinc
___________________________________________________________________
Added: svn:keywords
+ Id Author Rev
Property changes on: trunk/php/help.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/history_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/i18n.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/ical_parse.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/location_del.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/logout.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/mail_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/mail_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/message_del.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/message_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/minical.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/minitimer.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/module_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/mytutos.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/notfound.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Modified: trunk/php/pdf2.pinc
===================================================================
--- trunk/php/pdf2.pinc 2011-11-16 16:30:55 UTC (rev 420)
+++ trunk/php/pdf2.pinc 2011-11-16 16:53:28 UTC (rev 421)
@@ -8,8 +8,8 @@
*
* base format for TUTOS pdf output (using tcpdf engine)
*
- * SVN Info $Id: pdf.pinc 18 2011-02-15 14:56:42Z gokohnert $
- * $Author: gokohnert $
+ * SVN Info $Id$
+ * $Author$
*/
if ($tutos[tcpdfpath] != '') {
Property changes on: trunk/php/pdf2.pinc
___________________________________________________________________
Added: svn:keywords
+ Id Author Rev
Property changes on: trunk/php/product_contacts.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/product_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/product_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/product_role_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/product_role_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/product_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/res_cal.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/res_cal_select.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/sales_forecast.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/de.p3
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/demodata.p3
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/en.p3
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/log_ajax.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/log_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/log_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/log_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/log_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/mconfig.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/mtable.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/scrum.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/scrum_config.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/sprint_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/sprint_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/sprint_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/scrum/sprint_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/showobject.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/task_copy_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/task_gantt.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/task_import_csv.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/task_import_xml.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/task_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/task_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/task_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/team_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/team_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/team_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/team_select.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/team_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/de.p3
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/demodata.p3
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/en.p3
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/mconfig.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/mtable.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testcase_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testcase_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testcase_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testcase_select.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testcase_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testmanager.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testrun_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testrun_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testrun_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testrun_select.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testrun_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testsuite_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testsuite_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testsuite_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testsuite_select.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/testmanager/testsuite_show.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Modified: trunk/php/testmanager/tw.p3
===================================================================
--- trunk/php/testmanager/tw.p3 2011-11-16 16:30:55 UTC (rev 420)
+++ trunk/php/testmanager/tw.p3 2011-11-16 16:53:28 UTC (rev 421)
@@ -1,5 +1,5 @@
<?php
-# $Id: tw.p3,v 1.23 2010/08/16 09:15:13 gokohnert Exp $
+# $Id$
#
# ========================= NOTE ========================
# Please put site specific extensions and changes
Property changes on: trunk/php/testmanager/tw.p3
___________________________________________________________________
Added: svn:keywords
+ Id Author Rev
Modified: trunk/php/testmanager/zh.p3
===================================================================
--- trunk/php/testmanager/zh.p3 2011-11-16 16:30:55 UTC (rev 420)
+++ trunk/php/testmanager/zh.p3 2011-11-16 16:53:28 UTC (rev 421)
@@ -1,5 +1,5 @@
<?php
-# $Id: zh.p3,v 1.23 2010/08/16 09:15:13 gokohnert Exp $
+# $Id$
#
# ========================= NOTE ========================
# Please put site specific extensions and changes
Property changes on: trunk/php/testmanager/zh.p3
___________________________________________________________________
Added: svn:keywords
+ Id Author Rev
Property changes on: trunk/php/user_del.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/user_ins.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/user_new.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Property changes on: trunk/php/user_overview.php
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Modified: trunk/test.sh
===================================================================
--- trunk/test.sh 2011-11-16 16:30:55 UTC (rev 420)
+++ trunk/test.sh 2011-11-16 16:53:28 UTC (rev 421)
@@ -37,7 +37,7 @@
USER=superuser
PW=tutos
-DBNR=0
+DBNR=1
CHECKURI=http://validator.w3.org/check?uri=
CHECKURI2=http://schneegans.de/sv/?url=
@@ -65,7 +65,7 @@
FAIL=1
fi
- C=`grep -o -E "CVS" $2`
+ C=`grep -o -E "SVN" $2`
R=$?
if [ "$R" = "1" ]; then
F2="CVS not found\r\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|