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
(5) |
2
|
3
|
4
|
5
(2) |
6
|
|
7
(2) |
8
|
9
(4) |
10
|
11
|
12
|
13
|
|
14
|
15
|
16
(3) |
17
(2) |
18
(1) |
19
(2) |
20
|
|
21
|
22
(2) |
23
(1) |
24
|
25
|
26
(2) |
27
|
|
28
|
29
(2) |
30
|
31
|
|
|
|
|
From: <gok...@us...> - 2012-10-29 15:08:02
|
Revision: 833
http://tutos.svn.sourceforge.net/tutos/?rev=833&view=rev
Author: gokohnert
Date: 2012-10-29 15:07:51 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
set focus
Modified Paths:
--------------
trunk/php/group/group2_new.php
Modified: trunk/php/group/group2_new.php
===================================================================
--- trunk/php/group/group2_new.php 2012-10-29 14:53:07 UTC (rev 832)
+++ trunk/php/group/group2_new.php 2012-10-29 15:07:51 UTC (rev 833)
@@ -70,7 +70,7 @@
$r .= $this->getHidden();
$r .= $this->markBadFields();
$r .= "</form>\n";
- $r .= $this->setfocus('group2add.name');
+ $r .= $this->setfocus('group2add.comment');
$r .= $lang['FldsRequired'] ."\n";
return $r;
}
@@ -115,4 +115,4 @@
<!--
SVN Info $Id$
$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...> - 2012-10-29 14:53:16
|
Revision: 832
http://tutos.svn.sourceforge.net/tutos/?rev=832&view=rev
Author: gokohnert
Date: 2012-10-29 14:53:07 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
removed print_r
Modified Paths:
--------------
trunk/php/group/group.pinc
Modified: trunk/php/group/group.pinc
===================================================================
--- trunk/php/group/group.pinc 2012-10-26 10:24:19 UTC (rev 831)
+++ trunk/php/group/group.pinc 2012-10-29 14:53:07 UTC (rev 832)
@@ -459,7 +459,7 @@
$crm = array();
}
- print_r($crm);
+ //print_r($crm);
group::obj_read($obj);
@@ -641,4 +641,4 @@
return $r;
}
}
-?>
\ 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...> - 2012-10-26 10:24:28
|
Revision: 831
http://tutos.svn.sourceforge.net/tutos/?rev=831&view=rev
Author: gokohnert
Date: 2012-10-26 10:24:19 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
fix text file popup
Modified Paths:
--------------
trunk/html/default.css
trunk/php/file/file.pinc
Modified: trunk/html/default.css
===================================================================
--- trunk/html/default.css 2012-10-26 10:23:27 UTC (rev 830)
+++ trunk/html/default.css 2012-10-26 10:24:19 UTC (rev 831)
@@ -48,12 +48,25 @@
.file_preview {
width: 250px;
- margin: 5px;
+}
+
+.img_preview {
text-align: left;
- padding: 1px;
+ margin: 8px;
+ padding: 0px;
border: 1px solid black;
- font-size: 6pt;
}
+
+.txt_preview {
+ overflow: auto;
+ min-width: 40em;
+ max-width: 50em;
+ margin: 8px;
+ text-align: left;
+ padding: 2px;
+ border: 1px solid black;
+ font-size: 7pt;
+}
.left {
float: left;
}
Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc 2012-10-26 10:23:27 UTC (rev 830)
+++ trunk/php/file/file.pinc 2012-10-26 10:24:19 UTC (rev 831)
@@ -695,7 +695,7 @@
return '';
}
$url = $tutos['base'].'/php/'.addUrlParameter($this->getUrl(),'format=preview',true);
- $info = "{ajaxPath: '".$url." div#file_content',
+ $info = "{shrinkToFit:true,ajaxPath: '".$url." div#file_content',
trigger : ['hoverIntent mouseover','none']}";
return array($info,'');
}
@@ -784,16 +784,18 @@
$info = '';
$url = dirname(getBaseUrl()) .'/'. addSessionKey($this->getUrl().'&format=show');
+ $info .= '<div id="file_content">';
if ( preg_match('#image#',$this->filetype) ) {
- $info .= '<div id="file_content"><a href="'.$url.'"><img class="file_preview" src="'.$url.'"></a><br />'.$this->getFullName().'</div>';
+ $info .= '<div class="img_preview"><a href="'.$url.'"><img class="file_preview" src="'.$url.'"></a></div><br />';
} else {
- $info .= '<div id="file_content"><pre class="file_preview">';
- $info .= file_get_contents($fname,false,null,-1,100);
+ $info .= '<div class="txt_preview pre">';
+ $info .= myentities(file_get_contents($fname,false,null,-1,100));
if ($this->filesize > 100) {
$info .= '<br />......';
}
- $info .= '</pre>'.$this->getFullName().'</div>';
+ $info .= '</div>';
}
+ $info.= makelink($url,$this->getFullName()).'</div>';
return $info;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-26 10:23:34
|
Revision: 830
http://tutos.svn.sourceforge.net/tutos/?rev=830&view=rev
Author: gokohnert
Date: 2012-10-26 10:23:27 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
fix edit of quoted text
Modified Paths:
--------------
trunk/php/testmanager/testmanager.pinc
Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc 2012-10-23 12:51:09 UTC (rev 829)
+++ trunk/php/testmanager/testmanager.pinc 2012-10-26 10:23:27 UTC (rev 830)
@@ -803,8 +803,8 @@
$r .= ' <td rowspan="2" class="inputrow" width="110" valign="top"> ';
if ($this->mod_ok() && ($this->activ != 1) && !isset($this->test) ) {
- $r .= "<input size=\"8\" id=\"N".$this->id."t\" value=\"".myentities($this->name)."\" style=\"display:none;\" "enableTextEdit('N".$this->id."')\" "disableTextEdit('N".$this->id."');\" />";
- $r .= "<span id=\"N".$this->id."p\" "enableTextEdit('N".$this->id."');\">".myentities($this->getFullName())."</span>";
+ $r .= '<input size="8" id="N'.$this->id.'t" value="'.myentities($this->name)."\" style=\"display:none;\" "enableTextEdit('N".$this->id."')\" "disableTextEdit('N".$this->id."');\" />";
+ $r .= '<span id="N'.$this->id."p\" "enableTextEdit('N".$this->id."');\">".myentities($this->getFullName())."</span>";
} else {
$r .= myentities($this->getFullName());
}
@@ -2687,7 +2687,7 @@
$url = addUrlParameter($url,'prefix='.$prefix);
if ($obj->mod_ok() && ($obj->activ != 1) && !isset($obj->test) && ($obj->state != TS_RELEASED) ) {
- $r .= '<input id="N'.$obj->id."t\" style=\"display:none;\" "enableTextEdit('N".$obj->id."');\" "disableTextEdit('N".$obj->id."');\" value=\"" . $obj->name. '" />';
+ $r .= '<input id="N'.$obj->id."t\" style=\"display:none;\" "enableTextEdit('N".$obj->id."');\" "disableTextEdit('N".$obj->id."');\" value=\"" . myentities($obj->name). '" />';
$r .= '<div id="N'.$obj->id."p\" "enableTextEdit('N".$obj->id."');\">".$obj->name."</div>";
} else {
$r .= makelink($url,myentities($obj->name));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-23 12:51:20
|
Revision: 829
http://tutos.svn.sourceforge.net/tutos/?rev=829&view=rev
Author: gokohnert
Date: 2012-10-23 12:51:09 +0000 (Tue, 23 Oct 2012)
Log Message:
-----------
extended lang files
Modified Paths:
--------------
trunk/php/admin/de.p3
trunk/php/admin/en.p3
trunk/php/admin/hu.p3
Modified: trunk/php/admin/de.p3
===================================================================
--- trunk/php/admin/de.p3 2012-10-22 07:44:19 UTC (rev 828)
+++ trunk/php/admin/de.p3 2012-10-23 12:51:09 UTC (rev 829)
@@ -81,6 +81,7 @@
$lang['ConfigHelpPassMaxAge'] = 'maximal age (in days) of an password before user is required to choose a new one. ( -1 = never )';
$lang['ConfigHelpPassMinLength'] = 'minimal number of characters for an password';
$lang['ConfigHelpPassNeedSpecial'] = 'minimal number of special characters in an password (i.e. characters other than a-z)';
+$lang['ConfigHelpPrefMail'] = 'bevorzugtes Format für eingehende Emails';
$lang['ConfigMailModes'][0] = '0: No outgoing mails';
$lang['ConfigMailModes'][1] = '1: use sendmail program';
@@ -92,4 +93,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
Modified: trunk/php/admin/en.p3
===================================================================
--- trunk/php/admin/en.p3 2012-10-22 07:44:19 UTC (rev 828)
+++ trunk/php/admin/en.p3 2012-10-23 12:51:09 UTC (rev 829)
@@ -83,6 +83,7 @@
$lang['ConfigHelpPassMaxAge'] = 'maximal age (in days) of an password before user is required to choose a new one. ( -1 = never )';
$lang['ConfigHelpPassMinLength'] = 'minimal number of characters for an password';
$lang['ConfigHelpPassNeedSpecial'] = 'minimal number of special characters in an password (i.e. characters other than a-z)';
+$lang['ConfigHelpPrefMail'] = 'preffered format for receiving mails';
$lang['ConfigMailModes'][0] = '0: No outgoing mails';
$lang['ConfigMailModes'][1] = '1: use sendmail program';
@@ -93,4 +94,4 @@
### Local Variables: ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
Modified: trunk/php/admin/hu.p3
===================================================================
--- trunk/php/admin/hu.p3 2012-10-22 07:44:19 UTC (rev 828)
+++ trunk/php/admin/hu.p3 2012-10-23 12:51:09 UTC (rev 829)
@@ -81,6 +81,7 @@
$lang['ConfigHelpPassMaxAge'] = 'maximal age (in days) of an password before user is required to choose a new one. ( -1 = never )';
$lang['ConfigHelpPassMinLength'] = 'minimal number of characters for an password';
$lang['ConfigHelpPassNeedSpecial'] = 'minimal number of special characters in an password (i.e. characters other than a-z)';
+$lang['ConfigHelpPrefMail'] = 'preffered format for receiving mails';
$lang['ConfigMailModes'][0] = '0: No outgoing mails';
$lang['ConfigMailModes'][1] = '1: use sendmail program';
@@ -92,4 +93,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ 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...> - 2012-10-22 07:44:26
|
Revision: 828
http://tutos.svn.sourceforge.net/tutos/?rev=828&view=rev
Author: gokohnert
Date: 2012-10-22 07:44:19 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
made search_by_name static
Modified Paths:
--------------
trunk/php/address.pinc
trunk/php/appointment.pinc
trunk/php/base.pinc
trunk/php/bugtracking/bug.pinc
trunk/php/company.pinc
trunk/php/department.pinc
trunk/php/expense/expense.pinc
trunk/php/file/file.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/testmanager/testmanager.pinc
Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/address.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -130,7 +130,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/appointment.pinc
===================================================================
--- trunk/php/appointment.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/appointment.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -518,7 +518,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/base.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -1290,7 +1290,7 @@
} else {
$q->addFV($i,$this->$fld,'');
}
- # echo $x[type] ." ". $fld ." ". $this->$fld ."<br />";
+ // echo $x[type] ." ". $fld ." ". $this->$fld ."<br />";
}
}
@@ -1772,7 +1772,7 @@
/**
* search objects of this class by name
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
return 0;
}
@@ -1806,4 +1806,4 @@
return array($r,$o);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/bugtracking/bug.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -662,7 +662,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table,$tutos;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/company.pinc
===================================================================
--- trunk/php/company.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/company.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -153,7 +153,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
@@ -498,4 +498,4 @@
}
}
$tutos['classes'][usecompany] = 'company';
-?>
+?>
\ No newline at end of file
Modified: trunk/php/department.pinc
===================================================================
--- trunk/php/department.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/department.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -128,7 +128,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
@@ -527,6 +527,6 @@
$r .= "</ul>\n";
return $r;
}
-}
+ }
$tutos['classes'][usedepartment] = 'department';
?>
\ No newline at end of file
Modified: trunk/php/expense/expense.pinc
===================================================================
--- trunk/php/expense/expense.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/expense/expense.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -253,7 +253,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/file/file.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -295,7 +295,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/installation/installation.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -272,7 +272,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/module_template/AAA.pinc
===================================================================
--- trunk/php/module_template/AAA.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/module_template/AAA.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -83,7 +83,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table,$tutos;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/product.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -708,7 +708,7 @@
*
* the result will first show active projects and than inactive ones
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table,$tutos;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/scrum/scrum.pinc
===================================================================
--- trunk/php/scrum/scrum.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/scrum/scrum.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -924,7 +924,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/stuff/stuff.pinc
===================================================================
--- trunk/php/stuff/stuff.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/stuff/stuff.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -97,7 +97,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table,$tutos;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/task.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -794,7 +794,7 @@
*
* result is sorted (fisr not finished then finished tasks)
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table,$tutos;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/team.pinc
===================================================================
--- trunk/php/team.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/team.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -192,7 +192,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc 2012-10-22 07:36:36 UTC (rev 827)
+++ trunk/php/testmanager/testmanager.pinc 2012-10-22 07:44:19 UTC (rev 828)
@@ -177,7 +177,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
@@ -1303,7 +1303,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
@@ -2233,7 +2233,7 @@
* mode 1 fill objects
* mode 0 do not fill objects
*/
- function search_by_name(&$arr,&$user,$name,$mode = 1) {
+ static function search_by_name(array &$arr,tutos_user $user,$name,$mode = 1) {
global $table;
if ( trim($name) == "" ) return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-22 07:36:47
|
Revision: 827
http://tutos.svn.sourceforge.net/tutos/?rev=827&view=rev
Author: gokohnert
Date: 2012-10-22 07:36:36 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/localization/ca.p3
trunk/php/localization/cs.p3
trunk/php/localization/el.p3
trunk/php/localization/en.p3
trunk/php/localization/es-mx.p3
trunk/php/localization/es-ni.p3
trunk/php/localization/es-ve.p3
trunk/php/localization/es.p3
trunk/php/localization/fr.p3
trunk/php/localization/hu.p3
trunk/php/localization/it.p3
trunk/php/localization/ja.p3
trunk/php/localization/ko.p3
trunk/php/localization/nl.p3
trunk/php/localization/pl.p3
trunk/php/localization/pt-br.p3
trunk/php/localization/pt.p3
trunk/php/localization/ru.p3
trunk/php/localization/sv.p3
trunk/php/localization/tw.p3
trunk/php/localization/vi.p3
trunk/php/localization/zh.p3
Modified: trunk/php/localization/ca.p3
===================================================================
--- trunk/php/localization/ca.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/ca.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -63,7 +63,7 @@
$lang['seeapp'] = "veure els detalls de la cita (%s - %s)";
$lang['AllEntries'] = "veure totes les %s entrades";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/cs.p3
===================================================================
--- trunk/php/localization/cs.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/cs.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
$lang['seeapp'] = "Prohlížet detaily (%s - %s)";
$lang['AllEntries'] = "Prohlížet všechny %s položky";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/el.p3
===================================================================
--- trunk/php/localization/el.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/el.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -59,7 +59,7 @@
$lang['seeapp'] = "δες λεπτομέρειες συνάντησης (%s - %s)";
$lang['AllEntries'] = "δες %s καταχωρίσεις";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/en.p3
===================================================================
--- trunk/php/localization/en.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/en.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
$lang['seeapp'] = 'see this appointment details (%s - %s)';
$lang['AllEntries'] = 'see all %s entries';
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/es-mx.p3
===================================================================
--- trunk/php/localization/es-mx.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/es-mx.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver las entradas %s";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/es-ni.p3
===================================================================
--- trunk/php/localization/es-ni.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/es-ni.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver las entradas %s";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/es-ve.p3
===================================================================
--- trunk/php/localization/es-ve.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/es-ve.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver las entradas %s";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/es.p3
===================================================================
--- trunk/php/localization/es.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/es.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver todas las %s entradas";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/fr.p3
===================================================================
--- trunk/php/localization/fr.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/fr.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
$lang['seeapp'] = 'Voir les détails de ce rendez-vous (%s - %s)';
$lang['AllEntries'] = 'Voir toutes les %s entrées';
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/hu.p3
===================================================================
--- trunk/php/localization/hu.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/hu.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -62,7 +62,7 @@
$lang['seeapp'] = "ezen időpont részleteinek vizsgálata (%s - %s)";
$lang['AllEntries'] = "az összes %s bejegyzés vizsgálata";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/it.p3
===================================================================
--- trunk/php/localization/it.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/it.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -55,7 +55,7 @@
$lang['seeapp'] = "visualizza questa dettaglio di appuntamento (%s - %s)";
$lang['AllEntries'] = "visualizza tutti gli elementi di %s";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/ja.p3
===================================================================
--- trunk/php/localization/ja.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/ja.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
$lang['seeapp'] = "この予約の詳細を見る (%s - %s)";
$lang['AllEntries'] = "%s のすべてのエントリを見る";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/ko.p3
===================================================================
--- trunk/php/localization/ko.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/ko.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -63,7 +63,7 @@
$lang['seeapp'] = "일정의 자세한 내용을 본다 (%s - %s)";
$lang['AllEntries'] = "%s의 모든 등록사항을 봅니다.";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/nl.p3
===================================================================
--- trunk/php/localization/nl.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/nl.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -66,7 +66,7 @@
$lang['seeapp'] = "deze afspraakinfo zien (%s - %s)";
$lang['AllEntries'] = "Toon alle %s ingevoerde gegevens";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/pl.p3
===================================================================
--- trunk/php/localization/pl.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/pl.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -62,7 +62,7 @@
$lang['seeapp'] = "sprawdź szczegóły spotkania (%s - %s)";
$lang['AllEntries'] = "przejrzyj wszystkie %s wpisów";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/pt-br.p3
===================================================================
--- trunk/php/localization/pt-br.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/pt-br.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
$lang['seeapp'] = "visualiza os detalhes desse compromisso (%s - %s)";
$lang['AllEntries'] = "visualizar todas %s entradas";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/pt.p3
===================================================================
--- trunk/php/localization/pt.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/pt.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -62,7 +62,7 @@
$lang['seeapp'] = "consulta detalhes do compromisso (%s - %s)";
$lang['AllEntries'] = "consulta todas %s entradas";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/ru.p3
===================================================================
--- trunk/php/localization/ru.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/ru.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -57,7 +57,7 @@
$lang['seeapp'] = "Просмотр подробностей(%s - %s)";
$lang['AllEntries'] = "Смотреть все %s записи";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/sv.p3
===================================================================
--- trunk/php/localization/sv.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/sv.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -58,7 +58,7 @@
$lang['seeapp'] = "Visa bokningsdetaljer (%s - %s)";
$lang['AllEntries'] = "Visa alla %s inmatningar";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/tw.p3
===================================================================
--- trunk/php/localization/tw.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/tw.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
$lang['seeapp'] = "查看會議細節(%s - %s)";
$lang['AllEntries'] = "查看所有 %s 輸入";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/vi.p3
===================================================================
--- trunk/php/localization/vi.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/vi.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
$lang['seeapp'] = "Xem chi tiết các cuộc hẹn (%s - %s)";
$lang['AllEntries'] = "Xem tất cả %s nội dung";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
Modified: trunk/php/localization/zh.p3
===================================================================
--- trunk/php/localization/zh.p3 2012-10-19 16:14:19 UTC (rev 826)
+++ trunk/php/localization/zh.p3 2012-10-22 07:36:36 UTC (rev 827)
@@ -60,7 +60,7 @@
$lang['seeapp'] = "查看会议细节(%s - %s)";
$lang['AllEntries'] = "查看所有 %s 输入";
$lang['Comment'] = 'comment';
-$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp1'] = 'seperate alternates by |.';
$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
$lang['SearchHelp3'] = 'A empty input will show everything.';
$lang['SearchHelp4'] = 'A # will select empty data.';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-19 16:14:26
|
Revision: 826
http://tutos.svn.sourceforge.net/tutos/?rev=826&view=rev
Author: gokohnert
Date: 2012-10-19 16:14:19 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
introduce help popups on smart search fields
Modified Paths:
--------------
trunk/php/bugtracking/bug.pinc
trunk/php/bugtracking/bug_select.php
trunk/php/custom.pinc
trunk/php/layout/layout_base.pinc
trunk/php/localization/ca.p3
trunk/php/localization/cs.p3
trunk/php/localization/de.p3
trunk/php/localization/el.p3
trunk/php/localization/en.p3
trunk/php/localization/es-mx.p3
trunk/php/localization/es-ni.p3
trunk/php/localization/es-ve.p3
trunk/php/localization/es.p3
trunk/php/localization/fr.p3
trunk/php/localization/hu.p3
trunk/php/localization/it.p3
trunk/php/localization/ja.p3
trunk/php/localization/ko.p3
trunk/php/localization/nl.p3
trunk/php/localization/pl.p3
trunk/php/localization/pt-br.p3
trunk/php/localization/pt.p3
trunk/php/localization/ru.p3
trunk/php/localization/sv.p3
trunk/php/localization/tw.p3
trunk/php/localization/vi.p3
trunk/php/localization/zh.p3
trunk/php/stuff/de.p3
trunk/php/stuff/stuff_select.php
trunk/php/testmanager/testmanager.pinc
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/bugtracking/bug.pinc 2012-10-19 16:14:19 UTC (rev 826)
@@ -702,7 +702,6 @@
$arr[-$id] = $id;
else
$arr[$id] = $id;
-
}
$a++;
}
Modified: trunk/php/bugtracking/bug_select.php
===================================================================
--- trunk/php/bugtracking/bug_select.php 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/bugtracking/bug_select.php 2012-10-19 16:14:19 UTC (rev 826)
@@ -54,7 +54,7 @@
$tutos['pagescript'] .= "
$( \"#toggler\" ).click(function() {
- $(\".ext\").toggle();
+ $(\".ext\").slideToggle();
if ( $(\"#h_ext\").val() == 0 ) {
$(\"#h_ext\").val(1);
} else {
@@ -73,11 +73,13 @@
$r .= $this->showfieldc(sprintf($lang['BugReference'],''),0,"p");
$r .= $this->showdata(select_from_array_or_input($this,"p",null,1,get_parent_classes('bugtracking')),2);
$r .= $this->ContentRowEnd();
+ $this->help_popup('p',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
$r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc(sprintf($lang['BugTarget'],''),0,"t");
$r .= $this->showdata(select_from_array_or_input($this,"t",null,1,get_parent_classes('bugtracking')),2);
$r .= $this->ContentRowEnd();
+ $this->help_popup('t',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
$r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['BugState'],0,"state");
@@ -108,6 +110,7 @@
$r .= $this->showfieldc(sprintf($lang['BugReportedFrom'],''),0,"reporterid");
$r .= $this->showdata(select_from_array_or_input($this,"reporter",null,1,'at'),2);
$r .= $this->ContentRowEnd();
+ $this->help_popup('reporter',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
// add custom selectors
$x = get_custom_selectors('bugtracking');
Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/custom.pinc 2012-10-19 16:14:19 UTC (rev 826)
@@ -1326,6 +1326,7 @@
if ($_REQUEST[$parsename.'fn'] == '*') {
// ANY NOT NULL
$x .= ' '.$pre.$ti .' > 0';
+ $l .= ' = '. $_REQUEST[$parsename.'fn'];
} else {
if ($tx['otype'] == 'H') {
$arr = search_by_name($_GET[$parsename.'fn'],$tx['olist']);
@@ -1333,26 +1334,73 @@
$arr = search_by_name($_GET[$parsename.'fn'],$tx['otype']);
}
if (0 == count($arr)) continue;
- $x .= ' '.$pre.$ti .' in (';
+ $ll = '';
+ $nl = '';
$sep = '';
- foreach($arr as $a) {
- if (isset($tx['expand_id']) && function_exists($tx['expand_id'])) {
- $x .= $sep.$a->id;
- $sep = ',';
- // expand id if neccessary
- $idl = $tx['expand_id']($a);
- if (count($idl))
- foreach($idl as $id) {
- $x .= $sep.$id;
+ $nsep = '';
+ foreach($arr as $idx => $a) {
+ if (is_numeric($idx)) {
+ if ($idx > 0) {
+ if (is_object($a))
+ $ll .= $sep.$a->id;
+ else if (is_array($a))
+ $ll .= $sep.$a[0];
+ $sep = ',';
+ if (isset($tx['expand_id']) && function_exists($tx['expand_id'])) {
+ // expand id if neccessary
+ $idl = $tx['expand_id']($a);
+ if (count($idl))
+ foreach($idl as $id) {
+ $ll .= $sep.$id;
+ }
}
- } else {
- $x .= $sep.$a->id;
- $sep = ',';
+ } else {
+ if (is_object($a))
+ $nl .= $nsep.$a->id;
+ else if (is_array($a))
+ $nl .= $nsep.$a[0];
+ $nsep = ',';
+ if (isset($tx['expand_id']) && function_exists($tx['expand_id'])) {
+ // expand id if neccessary
+ $idl = $tx['expand_id']($a);
+ if (count($idl))
+ foreach($idl as $id) {
+ $nl .= $nsep.$id;
+ }
+ }
+ }
+ } else
+ if (preg_match('/[A-Z]/',$idx)) {
+ $ll .= $sep.$a[0];
+ $sep = ',';
+ } else {
+ $nl .= $nsep.$a[0];
+ $nsep = ',';
+ }
+ }
+ if ($ll != '') {
+ $x .= ' '.$pre.$ti .' in ('.$ll.')';
+ $l .= ' = ';
+ }
+ if ($nl != '') {
+ $x .= ' '.$pre.$ti .' not in ('.$nl.')';
+ $l .= ' ≠ ';
+ }
+ $s = explode('|',$_REQUEST[$parsename.'fn']);
+ if (count($s)) {
+ $lpre = '';
+ foreach ($s as $sn) {
+ if (constant('EMPTY') == $sn) {
+ $sn = '<i>'.$lang['empty'].'</i>';
+ }
+ $l .= $lpre.$sn;
+ $lpre = ',';
}
+ } else {
+ $l .= $_REQUEST[$parsename.'fn'];
}
- $x .= ')';
}
- $r[] = array($x,$l .' = '. $_REQUEST[$parsename.'fn']);
+ $r[] = array($x,$l );
$layout->filter['_fld_'.$ti] = $_REQUEST[$parsename.'fn'];
$link = addUrlParameter($link,$parsename.'fn='.$_REQUEST[$parsename.'fn']);
}
Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/layout/layout_base.pinc 2012-10-19 16:14:19 UTC (rev 826)
@@ -1228,8 +1228,8 @@
trigger: ['hoverIntent keypress', 'blur'],
positions: ['right'],
padding: 10,
- width: 300,
- fill: 'rgba(200,200,200,0.8)',
+ width: 350,
+ fill: 'rgba(200,200,200,0.7)',
killTitle: false,
hoverIntentOpts: { interval: 1000, timeout: 2000 }
});\n";
Modified: trunk/php/localization/ca.p3
===================================================================
--- trunk/php/localization/ca.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/ca.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -63,6 +63,12 @@
$lang['seeapp'] = "veure els detalls de la cita (%s - %s)";
$lang['AllEntries'] = "veure totes les %s entrades";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d.m.Y H:i T";
$lang['DateTimeStr'] = "%d.%m.%Y %H:%M %Z";
Modified: trunk/php/localization/cs.p3
===================================================================
--- trunk/php/localization/cs.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/cs.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
$lang['seeapp'] = "Prohlížet detaily (%s - %s)";
$lang['AllEntries'] = "Prohlížet všechny %s položky";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d/m/Y H:i T";
$lang['DateTimeStr'] = "%d/%m/%Y %H:%M %Z";
Modified: trunk/php/localization/de.p3
===================================================================
--- trunk/php/localization/de.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/de.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
$lang['seeapp'] = 'Diesen Termin ansehen (%s - %s)';
$lang['AllEntries'] = 'Alle %s Einträge ansehen';
$lang['Comment'] = 'Kommentar';
+$lang['SearchHelp1'] = 'Alternative Suchbegriffe können mit | separiert werden.';
+$lang['SearchHelp2'] = 'Ein ! an erster Stelle kehrt die Selektion um.';
+$lang['SearchHelp3'] = 'Eine leere Eingabe selektiert alle Daten.';
+$lang['SearchHelp4'] = 'Ein # selektiert leere Daten.';
+$lang['SearchHelp5'] = 'Gesucht wird in:';
+$lang['SearchHelp6'] = 'Die nicht erweiterte Suche sucht in:';
#
$lang['DateTimePHP'] = 'd.m.Y H:i T';
$lang['DateTimeStr'] = '%d.%m.%Y %H:%M %Z';
Modified: trunk/php/localization/el.p3
===================================================================
--- trunk/php/localization/el.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/el.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -59,6 +59,12 @@
$lang['seeapp'] = "δες λεπτομέρειες συνάντησης (%s - %s)";
$lang['AllEntries'] = "δες %s καταχωρίσεις";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d/m/Y H:i T";
$lang['DateTimeStr'] = "%d/%m/%Y %H:%M %Z";
Modified: trunk/php/localization/en.p3
===================================================================
--- trunk/php/localization/en.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/en.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -54,12 +54,18 @@
$lang['plus4weeks'] = '4 weeks plus';
$lang['minus4weeks'] = '4 weeks back';
$lang['only'] = 'only';
-$lang['reload'] = 'RRR';
+$lang['reload'] = 'reload';
$lang['empty'] = 'empty';
$lang['changeapp'] = 'see or change this appointment (%s - %s)';
$lang['seeapp'] = 'see this appointment details (%s - %s)';
$lang['AllEntries'] = 'see all %s entries';
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = 'd/m/Y H:i T';
$lang['DateTimeStr'] = '%d/%m/%Y %H:%M %Z';
Modified: trunk/php/localization/es-mx.p3
===================================================================
--- trunk/php/localization/es-mx.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/es-mx.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver las entradas %s";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d.m.Y H:i T";
$lang['DateTimeStr'] = "%d.%m.%Y %H:%M %Z";
Modified: trunk/php/localization/es-ni.p3
===================================================================
--- trunk/php/localization/es-ni.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/es-ni.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver las entradas %s";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d.m.Y H:i T";
$lang['DateTimeStr'] = "%d.%m.%Y %H:%M %Z";
Modified: trunk/php/localization/es-ve.p3
===================================================================
--- trunk/php/localization/es-ve.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/es-ve.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver las entradas %s";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d.m.Y H:i T";
$lang['DateTimeStr'] = "%d.%m.%Y %H:%M %Z";
Modified: trunk/php/localization/es.p3
===================================================================
--- trunk/php/localization/es.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/es.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver todas las %s entradas";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d.m.Y H:i T";
$lang['DateTimeStr'] = "%d.%m.%Y %H:%M %Z";
Modified: trunk/php/localization/fr.p3
===================================================================
--- trunk/php/localization/fr.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/fr.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
$lang['seeapp'] = 'Voir les détails de ce rendez-vous (%s - %s)';
$lang['AllEntries'] = 'Voir toutes les %s entrées';
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = 'd.m.Y H:i T';
$lang['DateTimeStr'] = '%d.%m.%Y %H:%M %Z';
Modified: trunk/php/localization/hu.p3
===================================================================
--- trunk/php/localization/hu.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/hu.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -62,6 +62,12 @@
$lang['seeapp'] = "ezen időpont részleteinek vizsgálata (%s - %s)";
$lang['AllEntries'] = "az összes %s bejegyzés vizsgálata";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "Y.m.d. H:i T";
$lang['DateTimeStr'] = "%Y.%m.%d. %H:%M %Z";
Modified: trunk/php/localization/it.p3
===================================================================
--- trunk/php/localization/it.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/it.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -55,6 +55,12 @@
$lang['seeapp'] = "visualizza questa dettaglio di appuntamento (%s - %s)";
$lang['AllEntries'] = "visualizza tutti gli elementi di %s";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d.m.Y H:i T";
$lang['DateTimeStr'] = "%d.%m.%Y %H:%M %Z";
Modified: trunk/php/localization/ja.p3
===================================================================
--- trunk/php/localization/ja.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/ja.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
$lang['seeapp'] = "この予約の詳細を見る (%s - %s)";
$lang['AllEntries'] = "%s のすべてのエントリを見る";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "Y/m/d H:i T";
$lang['DateTimeStr'] = "%Y/%m/%d %H:%M %Z";
Modified: trunk/php/localization/ko.p3
===================================================================
--- trunk/php/localization/ko.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/ko.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -63,6 +63,12 @@
$lang['seeapp'] = "일정의 자세한 내용을 본다 (%s - %s)";
$lang['AllEntries'] = "%s의 모든 등록사항을 봅니다.";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "Y-m-d H:i T";
$lang['DateTimeStr'] = "%Y-%m-%d %H:%M %Z";
Modified: trunk/php/localization/nl.p3
===================================================================
--- trunk/php/localization/nl.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/nl.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -66,6 +66,12 @@
$lang['seeapp'] = "deze afspraakinfo zien (%s - %s)";
$lang['AllEntries'] = "Toon alle %s ingevoerde gegevens";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d/m/Y H:i T";
$lang['DateTimeStr'] = "%d/%m/%Y %H:%M %Z";
Modified: trunk/php/localization/pl.p3
===================================================================
--- trunk/php/localization/pl.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/pl.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -62,6 +62,12 @@
$lang['seeapp'] = "sprawdź szczegóły spotkania (%s - %s)";
$lang['AllEntries'] = "przejrzyj wszystkie %s wpisów";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d/m/Y H:i T";
Modified: trunk/php/localization/pt-br.p3
===================================================================
--- trunk/php/localization/pt-br.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/pt-br.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
$lang['seeapp'] = "visualiza os detalhes desse compromisso (%s - %s)";
$lang['AllEntries'] = "visualizar todas %s entradas";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d/m/Y H:i T";
$lang['DateTimeStr'] = "%d/%m/%Y %H:%M %Z";
Modified: trunk/php/localization/pt.p3
===================================================================
--- trunk/php/localization/pt.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/pt.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -62,6 +62,12 @@
$lang['seeapp'] = "consulta detalhes do compromisso (%s - %s)";
$lang['AllEntries'] = "consulta todas %s entradas";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d/m/Y H:i T";
$lang['DateTimeStr'] = "%d/%m/%Y %H:%M %Z";
Modified: trunk/php/localization/ru.p3
===================================================================
--- trunk/php/localization/ru.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/ru.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -57,6 +57,12 @@
$lang['seeapp'] = "Просмотр подробностей(%s - %s)";
$lang['AllEntries'] = "Смотреть все %s записи";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d/m/Y H:i T";
$lang['DateTimeStr'] = "%d/%m/%Y %H:%M %Z";
Modified: trunk/php/localization/sv.p3
===================================================================
--- trunk/php/localization/sv.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/sv.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -58,6 +58,13 @@
$lang['seeapp'] = "Visa bokningsdetaljer (%s - %s)";
$lang['AllEntries'] = "Visa alla %s inmatningar";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
+#
$lang['DateTimePHP'] = "Y/m/d H:i T";
$lang['DateTimeStr'] = "%Y/%m/%d %H:%M %Z";
$lang['DateTimeFormat'] = "%s/%s/%s %02s:%02s %s";
Modified: trunk/php/localization/tw.p3
===================================================================
--- trunk/php/localization/tw.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/tw.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
$lang['seeapp'] = "查看會議細節(%s - %s)";
$lang['AllEntries'] = "查看所有 %s 輸入";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "Y年m月d日 H:i T";
$lang['DateTimeStr'] = "%Y/%m/%d %H:%M %Z";
Modified: trunk/php/localization/vi.p3
===================================================================
--- trunk/php/localization/vi.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/vi.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
$lang['seeapp'] = "Xem chi tiết các cuộc hẹn (%s - %s)";
$lang['AllEntries'] = "Xem tất cả %s nội dung";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "d/m/Y H:i T";
$lang['DateTimeStr'] = "%d/%m/%Y %H:%M %Z";
Modified: trunk/php/localization/zh.p3
===================================================================
--- trunk/php/localization/zh.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/localization/zh.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -60,6 +60,12 @@
$lang['seeapp'] = "查看会议细节(%s - %s)";
$lang['AllEntries'] = "查看所有 %s 输入";
$lang['Comment'] = 'comment';
+$lang['SearchHelp1'] = 'seperate alternates by |.;
+$lang['SearchHelp2'] = 'A ! before the input will negate the selection.';
+$lang['SearchHelp3'] = 'A empty input will show everything.';
+$lang['SearchHelp4'] = 'A # will select empty data.';
+$lang['SearchHelp5'] = 'Search will look into:';
+$lang['SearchHelp6'] = 'unextended search will look into:';
#
$lang['DateTimePHP'] = "Y年m月d日 H:i T";
$lang['DateTimeStr'] = "%Y/%m/%d %H:%M %Z";
Modified: trunk/php/stuff/de.p3
===================================================================
--- trunk/php/stuff/de.p3 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/stuff/de.p3 2012-10-19 16:14:19 UTC (rev 826)
@@ -63,4 +63,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
Modified: trunk/php/stuff/stuff_select.php
===================================================================
--- trunk/php/stuff/stuff_select.php 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/stuff/stuff_select.php 2012-10-19 16:14:19 UTC (rev 826)
@@ -43,6 +43,8 @@
$r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" />');
$r .= $this->ContentRowEnd();
+ $this->help_popup('name',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp6'],$lang['StuffName'],$lang['StuffDesc'],$lang['StuffSerial'],$lang['StuffId']);
+
$r .= $this->ContentRowStart();
$r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
$r .= $this->ContentRowEnd();
@@ -88,16 +90,19 @@
$r .= $this->showfieldc($lang['StuffSource'],0,"source");
$r .= $this->showdata(select_from_array_or_input($this->obj,"source",null,1,'cdat'),2);
$r .= $this->ContentRowEnd();
+ $this->help_popup('source',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
$r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['StuffOwner'],0,"owner");
$r .= $this->showdata(select_from_array_or_input($this->obj,"owner",null,1,'cdat'),2);
$r .= $this->ContentRowEnd();
+ $this->help_popup('owner',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
$r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['StuffUser'],0,"user");
$r .= $this->showdata(select_from_array_or_input($this->obj,"user",null,1,'cdat'),2);
$r .= $this->ContentRowEnd();
+ $this->help_popup('user',$lang['SearchHelp1'],$lang['SearchHelp2'],$lang['SearchHelp3'],$lang['SearchHelp4']);
// add custom selectors
$x = get_custom_selectors('stuff');
Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc 2012-10-19 13:36:42 UTC (rev 825)
+++ trunk/php/testmanager/testmanager.pinc 2012-10-19 16:14:19 UTC (rev 826)
@@ -181,6 +181,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 = '';
@@ -202,11 +208,17 @@
if ($mode == 1) {
$x = new Testcase($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++;
}
@@ -1295,6 +1307,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 = '';
@@ -1316,11 +1334,17 @@
if ($mode == 1) {
$x = new Testsuite($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++;
}
@@ -2213,6 +2237,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 = '';
@@ -2234,11 +2264,17 @@
if ($mode == 1) {
$x = new Testrun($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++;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-19 13:36:54
|
Revision: 825
http://tutos.svn.sourceforge.net/tutos/?rev=825&view=rev
Author: gokohnert
Date: 2012-10-19 13:36:42 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
better support for "empty" refernece searches using \#
Modified Paths:
--------------
trunk/php/address.pinc
trunk/php/bugtracking/bug_overview.php
trunk/php/expense/expense_overview.php
trunk/php/expense/expense_select.php
trunk/php/installation/installation.pinc
trunk/php/installation/installation_overview.php
trunk/php/installation/installation_select.php
trunk/php/invoice/invoice_overview.php
trunk/php/invoice/invoice_select.php
trunk/php/layout/layout_base.pinc
trunk/php/reminder/reminder_overview.php
trunk/php/resource/resource_select.php
trunk/php/scrum/sprint_overview.php
trunk/php/testmanager/testcase_overview.php
trunk/php/testmanager/testrun_overview.php
trunk/php/testmanager/testsuite_overview.php
trunk/php/timetrack/timetrack_overview.php
trunk/php/url/url_overview.php
trunk/php/url/url_select.php
trunk/php/webelements.p3
Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/address.pinc 2012-10-19 13:36:42 UTC (rev 825)
@@ -287,10 +287,10 @@
$cpre = '';
$dpre = '';
foreach($this->location as $i => $f) {
- if (is_object($f->department)) {
+ if (is_object($f->department) && $f->department->id >0) {
$dep .= $dpre.$f->department->getFullName();
$dpre = "<br />";
- } else if (is_object($f->company)) {
+ } else if (is_object($f->company) && $f->company->id > 0) {
$cmp .= $cpre.$f->company->getFullName();
$dpre = "<br />";
}
@@ -765,4 +765,4 @@
}
$tutos['classes'][useaddressbook] = 'tutos_address';
-?>
+?>
\ No newline at end of file
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/bugtracking/bug_overview.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -426,7 +426,6 @@
$this->flds++;
}
$r .= show_custom_overview_headers($this,bug::getType(),$this->link2);
-
$r .= $this->MassUpdateHeader();
$r .= $this->OverviewHeadLineEnd();
$r .= $this->OverviewHeadEnd();
Modified: trunk/php/expense/expense_overview.php
===================================================================
--- trunk/php/expense/expense_overview.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/expense/expense_overview.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -130,8 +130,8 @@
$r .= $this->actionformStart("expense_overview.php");
$r .= $this->header;
$r .= $this->OverviewTableStart();
- $r .= "<thead>\n";
- $r .= "<tr>\n";
+ $r .= $this->OverviewHeadStart();
+ $r .= $this->OverviewHeadLineStart();
$r .= $this->orderHeader('name',$lang['ExpenseName'],$this->link2);
if ($this->head['link_id']) {
$r .= $this->orderHeader('',$lang['ExpenseReference'],$this->link2);
@@ -167,8 +167,8 @@
$r .= get_module_overview_header($this,'expense');
}
$r .= $this->MassUpdateHeader();
- $r .= "</tr>\n";
- $r .= "</thead>\n";
+ $r .= $this->OverviewHeadLineEnd();
+ $r .= $this->OverviewHeadEnd();
if ( $this->start == -1 ) {
// Show the last pasrt
@@ -193,7 +193,7 @@
if ($this->head['link_id']) {
$x = '';
if ( is_object($b->ref) ) {
- $x = $this->mark_filter(myentities($b->ref->getFullName()),'nsrn');
+ $x = $this->mark_filter(myentities($b->ref->getFullName()),'link_id');
}
$r .= ' <td class="over_l">'. $b->getRefLink($x) ."</td>\n";
}
@@ -375,29 +375,10 @@
$reftype = '';
$name = '';
- $nsrn = '';
- $nscr = '';
if ( isset($_GET['name']) ) {
$name = $_GET['name'];
}
- if ($this->ext != 0) {
- if ( isset($_GET['reftype']) ) {
- $reftype = $_GET['reftype'];
- $this->link1 = addUrlParameter($this->link1,"reftype=". $reftype);
- $this->filter['reftype'] = $reftype;
- }
- if ( isset($_GET['nsrn']) ) {
- $nsrn = $_GET['nsrn'];
- $this->link1 = addUrlParameter($this->link1,"nsrn=". $nsrn);
- $this->filter['nsrn'] = $nsrn;
- }
- if ( isset($_GET['nscr']) ) {
- $nscr = $_GET['nscr'];
- $this->link1 = addUrlParameter($this->link1,"nscr=".UrlEncode($nscr));
- $this->filter['nscr'] = $nscr;
- }
- }
$j = "SELECT DISTINCT e.* FROM ". $this->dbconn->prefix .$table['expense'][name].' e '; // select + join
$q = "";
@@ -430,80 +411,6 @@
}
// References to display
- if ( ($reftype > 0) || ($reftype > 0 && ($nsrn != "*") && ($nsrn != "")) ) {
- if ( ! isset($nsrn) || ($nsrn == "*") ) {
- $nsrn = "";
- }
- if ( ($reftype == 1) || ($reftype == -1) ) {
- $j .= ", ". $this->dbconn->prefix .$table['company'][name].' c ';
- $q .= " ". $pre . "(e.link_id=c.id ";
- if ( $nsrn != "" ) {
- $q .= " AND ". $this->dbconn->Like("c.name",$nsrn);
- }
- $q .= ")";
- $pre = " OR ";
- }
- if ( ($reftype == 2) || ($reftype == -1) ) {
- $j .= ",". $this->dbconn->prefix .$table['department'][name].' d ';
- $q .= " ". $pre . "(e.link_id=d.id ";
- if ( $nsrn != "" ) {
- $q .= " AND ". $this->dbconn->Like("d.name",$nsrn);
- }
- $q .= ")";
- $pre = " OR ";
- }
- if ( ($reftype == 3) || ($reftype == -1) ) {
- $j .= ",". $this->dbconn->prefix .$table['address'][name].' a ';
- $q .= $pre ."( (";
- $q .= $this->dbconn->Like("a.f_name",$nsrn) ." OR ";
- $q .= $this->dbconn->Like("a.m_name",$nsrn) ." OR ";
- $q .= $this->dbconn->Like("a.l_name",$nsrn) .")";
- $q .= " AND e.link_id=a.id )";
- $pre = " OR ";
- }
- if ( ($reftype == 4) || ($reftype == -1) ) {
- $j .= ",". $this->dbconn->prefix .$table['bugtracking'][name].' b';
- $q .= " ". $pre . "(e.link_id=b.id ";
- if ( $nsrn != "" ) {
- $q .= " AND ". $this->dbconn->Like("b.short",$nsrn);
- }
- $q .= ")";
- $pre = " OR ";
- }
- if ( ($reftype == 5) || ($reftype == -1) ) {
- $j .= ",". $this->dbconn->prefix .$table['product'][name].' p';
- $q .= $pre ."( e.link_id=p.id ";
- if ( $nsrn != "" ) {
- $q .= " AND (";
- $q .= $this->dbconn->Like("p.name",$nsrn) ." OR ";
- $q .= $this->dbconn->Like("p.version",$nsrn) .")";
- }
- $q .= ")";
- $pre = " OR ";
- }
- if ( ($reftype == 6) || ($reftype == -1) ) {
- $j .= ",". $this->dbconn->prefix .$table['team'][name].' t';
- $q .= $pre . "(e.link_id=t.id AND ". $this->dbconn->Like("t.name",$nsrn) .")";
- $pre = " OR ";
- }
- if ( ($reftype == 7) || ($reftype == -1) ) {
- $j .= ",". $this->dbconn->prefix .$table['task'][name].' k';
- $q .= $pre . "(e.link_id=k.id AND ". $this->dbconn->Like("k.name",$nsrn) .")";
- $pre = " OR ";
- }
- if ( ($reftype == 8) || ($reftype == -1) ) {
- $j .= ",". $this->dbconn->prefix.$table['installation'][name].' i';
- if ( ! stristr($j, $table['product'][name]) ) {
- $j .= ",".$this->dbconn->prefix.$table['product'][name].' p';
- }
- $q .= $pre ."( e.link_id=i.id AND i.product_id=p.id AND (";
- $q .= $this->dbconn->Like("p.name",$nsrn) ." OR ";
- $q .= $this->dbconn->Like("p.version",$nsrn) .") )";
- $pre = " OR ";
- }
- $pre = "AND ";
-
- }
// remember this
$_SESSION['expensesearchreftype'] = $reftype;
@@ -516,6 +423,7 @@
overview_arg($this,'t',OVERVIEW_ARG_D_TO,'expense',array('creation','t_start'),'created','e.');
// reference
+ overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'expense',array('link_id'),'ExpenseReference','e.',get_parent_classes('expense'));
overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'expense',array('link_id'),'ExpenseReference','e.');
// supplier
Modified: trunk/php/expense/expense_select.php
===================================================================
--- trunk/php/expense/expense_select.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/expense/expense_select.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -68,16 +68,11 @@
}
$r .= $this->ContentRowStart('ext');
- $r .= $this->showfieldc($lang['ExpenseRefType'],0,'reftype');
- $r .= $this->showdata($this->ExpenseAskRefType($this->nsrt,1),2);
+ $r .= $this->showfieldc($lang['ExpenseRefName'],0,'link_');
+ $r .= $this->showdata(select_from_array_or_input($this,"link_",null,1,get_parent_classes('expense')),2);
$r .= $this->ContentRowEnd();
$r .= $this->ContentRowStart('ext');
- $r .= $this->showfieldc($lang['ExpenseRefName'],0,'nsrn');
- $r .= $this->showdata('<input type="text" value="" id="nsrn" name="nsrn" />',2);
- $r .= $this->ContentRowEnd();
-
- $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['ExpenseSupplier'],0,'sup');
$r .= $this->showdata(select_from_array_or_input($this->obj,"sup",null,1,'cd'),2);
$r .= $this->ContentRowEnd();
Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/installation/installation.pinc 2012-10-19 13:36:42 UTC (rev 825)
@@ -80,7 +80,7 @@
$n++;
}
return $r;
-}
+ }
/**
* a installation of a product/project
* @package installation
@@ -440,16 +440,8 @@
} else {
$q->addFV("money","null","");
}
- if ( is_object($this->installer) && $this->installer->id > 0 ) {
- $q->addFV("installer_id",$this->installer,"OBJ");
- } else {
- $q->addFV("installer_id","null","");
- }
- if ( is_object($this->seller) && $this->seller->id > 0 ) {
- $q->addFV("seller_id",$this->seller,"OBJ");
- } else {
- $q->addFV("seller_id","null","");
- }
+ $q->addFV("installer_id",$this->installer,"OBJ");
+ $q->addFV("seller_id",$this->seller,"OBJ");
$q->addFV("creator",$this->creator,"OBJ");
Modified: trunk/php/installation/installation_overview.php
===================================================================
--- trunk/php/installation/installation_overview.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/installation/installation_overview.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -68,8 +68,8 @@
$r .= $this->actionformStart('installation_overview.php');
$r .= $this->header;
$r .= $this->OverviewTableStart();
- $r .= "<thead>\n";
- $r .= "<tr>\n";
+ $r .= $this->OverviewHeadStart();
+ $r .= $this->OverviewHeadLineStart();
$r .= $this->orderHeader('',"#",$this->link1);
if ($this->head['product_id']) {
$r .= $this->orderHeader('',$lang['Product'],$this->link1);
@@ -104,10 +104,9 @@
$r .= get_module_overview_header($this,'installation');
$r .= show_custom_overview_headers($this,'installation',$this->link1);
$r .= $this->MassUpdateHeader();
+ $r .= $this->OverviewHeadLineEnd();
+ $r .= $this->OverviewHeadEnd();
- $r .= "</tr>\n";
- $r .= "</thead>\n";
-
if ( $this->start == -1 ) {
$a = $n - $tutos['maxshow'];
$end = $n;
@@ -139,7 +138,7 @@
if ( is_object($i->customer) && $i->customer->id == -1 ) {
$r .= '<i>'. $lang['HistoryDeleted'] .'</i>';
} else if (is_object($i->customer) && $i->customer->id != -1 ) {
- $x = $this->mark_filter(myentities($i->customer->getFullName()),'cfn');
+ $x = $this->mark_filter(myentities($i->customer->getFullName()),'customer_id');
$r .= $i->customer->getLink($x);
} else {
$r .= ' ';
@@ -148,17 +147,17 @@
}
if ($this->head['version']) {
$x = $this->mark_filter(myentities($i->version),'name');
- $r .= ' <td class="over_l">'. $x ." </td>\n";
+ $r .= $this->OverviewRowBlock($x,'over_l');
}
$x = $this->mark_filter(myentities($i->description),'name');
- $r .= ' <td class="over_ml">'. $x ." </td>\n";
+ $r .= $this->OverviewRowBlock($x,'over_ml');
if ($this->head['installer_id']) {
$r .= ' <td class="over_r">';
if ( is_object($i->installer) && $i->installer->id == -1 ) {
$r .= '<i>'. $lang['HistoryDeleted'] .'</i>';
} else if ( is_object($i->installer) && $i->installer->id != -1 ) {
- $x = $this->mark_filter(myentities($i->installer->getFullName()),'ifn');
+ $x = $this->mark_filter(myentities($i->installer->getFullName()),'installer_id');
$r .= $i->installer->getLink($x);
} else {
$r .= ' ';
@@ -166,14 +165,14 @@
$r .= '</td>'."\n";
}
if ($this->head['instdate']) {
- $r .= ' <td class="over_l">'. $i->instdate->getLinkDate() ."</td>\n";
+ $r .= $this->OverviewRowBlock($i->instdate->getLinkDate(),'over_l');
}
if ($this->head['seller_id']) {
$r .= ' <td class="over_r">';
if ( is_object($i->seller) && $i->seller->id == -1 ) {
$r .= '<i>'. $lang['HistoryDeleted'] .'</i>';
} else if ( is_object($i->seller) && $i->seller->id != -1 ) {
- $x = $this->mark_filter(myentities($i->seller->getFullName()),'sfn');
+ $x = $this->mark_filter(myentities($i->seller->getFullName()),'seller_id');
$r .= $i->seller->getLink($x);
} else {
$r .= ' ';
@@ -181,7 +180,7 @@
$r .= '</td>'."\n";
}
if ($this->head['salesdate']) {
- $r .= ' <td class="over_l">'. $i->salesdate->getLinkDate() ."</td>\n";
+ $r .= $this->OverviewRowBlock($i->salesdate->getLinkDate(),'over_l');
}
$r .= get_module_overview_data($this,$i);
@@ -390,4 +389,4 @@
<!--
SVN Info $Id$
$Author$
--->
+-->
\ No newline at end of file
Modified: trunk/php/installation/installation_select.php
===================================================================
--- trunk/php/installation/installation_select.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/installation/installation_select.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -70,6 +70,11 @@
}
$r .= $this->ContentRowStart('ext');
+ $r .= $this->showfieldc(sprintf($lang['Product'],''),0,"p");
+ $r .= $this->showdata(select_from_array_or_input($this,"p",null,1,get_parent_classes('installation')),2);
+ $r .= $this->ContentRowEnd();
+
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc(sprintf($lang['Customer'],''),0,"c");
$r .= $this->showdata(select_from_array_or_input($this->obj,"c",null,1,'cdat'),2);
$r .= $this->ContentRowEnd();
Modified: trunk/php/invoice/invoice_overview.php
===================================================================
--- trunk/php/invoice/invoice_overview.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/invoice/invoice_overview.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -123,23 +123,25 @@
$r .= ' <td class="over_l">'. $c->getLink('','ss='.$ss) ."</td>";
if ($this->head['customer']) {
- $r .= ' <td class="over_l">';
+ $xx = '';
if ( is_object($c->customer) ) {
- $r .= $c->customer->getLink();
+ $x = $this->mark_filter(myentities($c->customer->getFullName()),'customer');
+ $xx .= $c->customer->getLink($x);
} else {
- $r .= '<i>'.$lang['HistoryDeleted'].'</i>';
+ $xx .= '<i>'.$lang['HistoryDeleted'].'</i>';
}
- $r .= "</td>\n";
+ $r .= $this->OverviewRowBlock($xx,'over_l');
}
if ($this->head['link_id']) {
- $r .= ' <td class="over_l">';
+ $xx = '';
if ( is_object($c->ref) ) {
- $r .= $c->ref->getLink();
+ $x = $this->mark_filter(myentities($c->ref->getFullName()),'link_id');
+ $xx .= $c->ref->getLink($x);
} else {
- $r .= '<i>'. $lang['HistoryDeleted'] .'</i>';
+ $xx .= '<i>'. $lang['HistoryDeleted'] .'</i>';
}
- $r .= "</td>\n";
+ $r .= $this->OverviewRowBlock($xx,'over_l');
}
if ($this->head['state']) {
@@ -309,7 +311,8 @@
if ($this->ext != 0) {
- overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('customer','link_id'),array('InvoiceCustomer','InvoiceReference'));
+ overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice'));
+ overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference');
}
// Start Date for search
@@ -369,4 +372,4 @@
<!--
SVN Info $Id$
$Author$
--->
+-->
\ No newline at end of file
Modified: trunk/php/invoice/invoice_select.php
===================================================================
--- trunk/php/invoice/invoice_select.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/invoice/invoice_select.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -69,6 +69,11 @@
}
$r .= $this->ContentRowStart('ext');
+ $r .= $this->showfieldc($lang['InvoiceReference'],0,'link_');
+ $r .= $this->showdata(select_from_array_or_input($this,"link_",null,1,get_parent_classes('invoice')),2);
+ $r .= $this->ContentRowEnd();
+
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['InvoiceState'],0,'state');
$r .= $this->showdata(InvoiceAskState($this->isst,2),2);
$r .= $this->ContentRowEnd();
Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/layout/layout_base.pinc 2012-10-19 13:36:42 UTC (rev 825)
@@ -642,11 +642,10 @@
$rx = '';
$rxpre = '';
foreach ($xx as $x) {
- $rx .= $rxpre. preg_quote(htmlentities($x),'/');
+ $rx .= $rxpre. preg_quote(htmlspecialchars(trim($x)),'/');
$rxpre = '|';
}
$str = preg_replace('/('.$rx.')/i','<span class="found">$1</span>',$str);
-
return $str;
}
Modified: trunk/php/reminder/reminder_overview.php
===================================================================
--- trunk/php/reminder/reminder_overview.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/reminder/reminder_overview.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -104,8 +104,8 @@
}
if ($this->head['link_id']) {
- $x = $this->mark_filter(myentities($c->ref->getFullName()),'reffn');
- $xx = $lang[$c->ref->getType()] ." ". $c->ref->getLink($x);
+ $x = $this->mark_filter(myentities($c->ref->getFullName()),'link_id');
+ $xx = $lang[$c->ref->getType()] .' '. $c->ref->getLink($x);
if ($c->type != REMINDER_SIMPLE) {
$xx .= "<br />\n". $c->getEventName();
}
Modified: trunk/php/resource/resource_select.php
===================================================================
--- trunk/php/resource/resource_select.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/resource/resource_select.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -33,6 +33,8 @@
Function info() {
global $lang,$tutos;
+ $cs = get_custom_selectors('resource');
+
$this->width = 3;
$r = '';
$r .= "<form id=\"ressearch\" name=\"ressearch\" method=\"get\" action=\"resource_overview.php\">\n";
@@ -40,15 +42,18 @@
$this->addHidden('ext',$this->ext);
$r .= $this->headline($lang['SearchForRes']);
- $r .= "<tr>\n";
+ $r .= $this->ContentRowStart();
$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 .= $this->ContentRowEnd();
- $r .= "</tr><tr>\n";
- $r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
+ if (count($cs)) {
+ $r .= $this->ContentRowStart();
+ $r .= ' <td colspan="3" align="right"><span style="text-align:right;" id="toggler">'. $lang['extended'] ."</span></td>\n";
+ $r .= $this->ContentRowEnd();
- $tutos['pagescript'] .= "
+ $tutos['pagescript'] .= "
$( \"#toggler\" ).click(function() {
$(\".ext\").toggle();
if ( $(\"#h_ext\").val() == 0 ) {
@@ -59,24 +64,20 @@
return;
});
\n";
- if ( $this->ext == 0 ) {
- $tutos['pagescript'] .= "
+ if ( $this->ext == 0 ) {
+ $tutos['pagescript'] .= "
$(\".ext\").hide();
\n";
- }
+ }
- // 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";
+ // add custom selectors
+ foreach ($cs as $s) {
+ $r .= $this->ContentRowStart('ext');
+ $r .= $this->showfieldc($s[0]);
+ $r .= $this->showdata($s[1],2);
+ $r .= $this->ContentRowEnd();
+ }
}
-
-
- $r .= "</tr>\n";
$r .= $this->SelectTableEnd();
$r .= hiddenFormElements();
$r .= $this->getHidden();
Modified: trunk/php/scrum/sprint_overview.php
===================================================================
--- trunk/php/scrum/sprint_overview.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/scrum/sprint_overview.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -94,7 +94,7 @@
// Project Ref
if ($this->head['p_id']) {
if (is_object($obj->pref))
- $x = $this->mark_filter(myentities($obj->pref->getFullName()),'p_fn');
+ $x = $this->mark_filter(myentities($obj->pref->getFullName()),'p_id');
$r .= $this->OverviewRowBlock((is_object($obj->pref) ? $obj->pref->getLink($x):' '),'over_l');
}
Modified: trunk/php/testmanager/testcase_overview.php
===================================================================
--- trunk/php/testmanager/testcase_overview.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/testmanager/testcase_overview.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -56,8 +56,8 @@
$r .= $this->header;
$r .= $this->actionformStart('testcase_overview.php');
$r .= $this->OverviewTableStart();
- $r .= "<thead>\n";
- $r .= "<tr>\n";
+ $r .= $this->OverviewHeadStart();
+ $r .= $this->OverviewHeadLineStart();
if ($this->head['pos']) {
$r .= $this->orderHeader('pos',$lang['TestcasePosition'],$this->link2);
$this->flds++;
@@ -73,8 +73,8 @@
$r .= $this->orderHeader('t_result',$lang['TestcaseResult'],$this->link2);
$r .= show_custom_overview_headers($this,'testcase',$this->link2);
$r .= $this->MassUpdateHeader();
- $r .= "</tr>\n";
- $r .= "</thead>\n";
+ $r .= $this->OverviewHeadLineEnd();
+ $r .= $this->OverviewHeadEnd();
$line = 1;
while ( ($a < $n) && ($a < $end) ) {
@@ -96,19 +96,20 @@
$r .= '</td>'."\n";
}
$x = $this->mark_filter(myentities($b->getFullName()),'name');
- $r .= ' <td class="over_l"> '.($b->activ == 1 ? '':'<i>').$b->getLink($x,'ss='.$ss).($b->activ == 1 ? '':'</i>').'</td>'."\n";
- $r .= ' <td class="over_l"> '.($b->activ == 1 ? '':'<i>').$b->getLink($b->version,'ss='.$ss).($b->activ == 1 ? '':'</i>').'</td>'."\n";
+ $r .= $this->OverviewRowBlock(($b->activ == 1 ? '':'<i>').$b->getLink($x,'ss='.$ss).($b->activ == 1 ? '':'</i>'),'over_l');
+ $r .= $this->OverviewRowBlock(($b->activ == 1 ? '':'<i>').$b->getLink($b->version,'ss='.$ss).($b->activ == 1 ? '':'</i>'),'over_l');
+
if ($this->head['ref_id']) {
- $r .= ' <td class="over_l">';
+ $xx = '';
if (is_object($b->ref)) {
- $x = $this->mark_filter(myentities($b->ref->getFullName()),'reffn');
- $r .= $b->ref->getLink($x);
+ $x = $this->mark_filter(myentities($b->ref->getFullName()),'ref_id');
+ $xx .= $b->ref->getLink($x);
} else {
- $r .= '-';
+ $xx .= '-';
}
- $r .= '</td>'."\n";
+ $r .= $this->OverviewRowBlock($xx,'over_l');
}
- $r .= ' <td class="over_l"> '.($b->activ != 1 ? '':$b->getResult()) .'</td>'."\n";
+ $r .= $this->OverviewRowBlock(($b->activ != 1 ? '':$b->getResult()),'over_l');
$r .= show_custom_overview_data($this,'testcase',$b);
$r .= $this->MassUpdateField($b);
$r .= $this->OverviewRowEnd($line++);
@@ -247,7 +248,6 @@
order_parse($this->q,$this->link1,$xxx,$this,$defsort);
$this->result = $this->dbconn->Exec($this->q);
-
$this->link2 = $this->link1;
// menu
Modified: trunk/php/testmanager/testrun_overview.php
===================================================================
--- trunk/php/testmanager/testrun_overview.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/testmanager/testrun_overview.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -85,8 +85,8 @@
$r .= $this->header;
$r .= $this->actionformStart('testrun_overview.php');
$r .= $this->OverviewTableStart();
- $r .= "<thead>\n";
- $r .= "<tr>\n";
+ $r .= $this->OverviewHeadStart();
+ $r .= $this->OverviewHeadLineStart();
$this->flds = 1;
$r .= $this->orderHeader('name',$lang['TestrunName'],$this->link2);
if ($this->head['ref_id']) {
@@ -110,8 +110,8 @@
}
$r .= show_custom_overview_headers($this,'testrun',$this->link2);
$r .= $this->MassUpdateHeader();
- $r .= "</tr>\n";
- $r .= "</thead>\n";
+ $r .= $this->OverviewHeadLineEnd();
+ $r .= $this->OverviewHeadEnd();
$poststat = $this->flds -1 -$tutos[massupdate] -$prestat;
@@ -131,7 +131,7 @@
$r .= ' <td class="over_l">'.$b->getLink($x,'ss='.$ss).'</td>'."\n";
if ($this->head['ref_id']) {
- $x = $this->mark_filter(myentities($b->ref->getFullName()),'refidfn');
+ $x = $this->mark_filter(myentities($b->ref->getFullName()),'ref_id');
$r .= ' <td class="over_l">'. $b->ref->getLink($x) .'</td>'."\n";
}
if ($this->head['test_id']) {
@@ -285,6 +285,7 @@
if ( isset($_GET['name']) && $_GET['name'] != '' ) {
+ $hpre = '';
$name = $_GET['name'];
$this->addHidden("name",$name);
$this->q .= $this->qpre .'(';
@@ -294,7 +295,10 @@
// on non extended search look also for references
if ($this->ext == 0 && $name != '') {
- $arr = search_by_name($name,"p",0);
+ $this->header .= $hpre.$lang['TestrunRef'];
+ $this->filter['ref_id'] = $name;
+ $hpre = ' / ';
+ $arr = search_by_name($name,'p',0);
$l = '';
$lpre = '';
if (count($arr) > 0) {
@@ -310,6 +314,8 @@
}
$this->q .= get_custom_wild_search($this,'testrun',$arr,$name,'or','or');
}
+ $this->header .= $hpre.$lang['TestrunName'];
+ $this->header .= ' = '.myentities($name);
$this->q .= ')';
$this->qpre = ' AND ';
@@ -374,4 +380,4 @@
<!--
SVN Info $Id$
$Author$
--->
+-->
\ No newline at end of file
Modified: trunk/php/testmanager/testsuite_overview.php
===================================================================
--- trunk/php/testmanager/testsuite_overview.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/testmanager/testsuite_overview.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -58,8 +58,8 @@
$r .= $this->header;
$r .= $this->actionformStart('testsuite_overview.php');
$r .= $this->OverviewTableStart();
- $r .= "<thead>\n";
- $r .= "<tr>\n";
+ $r .= $this->OverviewHeadStart();
+ $r .= $this->OverviewHeadLineStart();
$this->flds = 3;
if ($this->head['pos']) {
$r .= $this->orderHeader('pos',$lang['TestsuitePosition'],$this->link2);
@@ -84,8 +84,8 @@
}
$r .= show_custom_overview_headers($this,'testsuite',$this->link2);
$r .= $this->MassUpdateHeader();
- $r .= "</tr>\n";
- $r .= "</thead>\n";
+ $r .= $this->OverviewHeadLineEnd();
+ $r .= $this->OverviewHeadEnd();
$line = 1;
while ( ($a < $n) && ($a < $end) ) {
@@ -94,42 +94,42 @@
$b->read_reference();
$r .= $this->OverviewRowStart($line);
if ($this->head['pos']) {
+ $xx = '';
$linkup = addUrlParameter($this->link2,'up='.$b->id);
$linkdown = addUrlParameter($this->link2,'down='.$b->id);
- $r .= ' <td class="over_l">';
if($b->mod_ok() && $_GET['xf'] == 'pos') {
- $r .= makelink($linkup,$this->theme->getImage(up,'list'));
+ $xx .= makelink($linkup,$this->theme->getImage(up,'list'));
}
- $r .= $b->pos;
+ $xx .= $b->pos;
if($b->mod_ok() && $_GET['xf'] == 'pos') {
- $r .= makelink($linkdown,$this->theme->getImage(down,'list'));
+ $xx .= makelink($linkdown,$this->theme->getImage(down,'list'));
}
- $r .= '</td>'."\n";
+ $r .= $this->OverviewRowBlock($xx,'over_l');
}
$x = $this->mark_filter(myentities($b->getFullName()),'name');
- $r .= ' <td class="over_l">'.$b->getLink($x,'ss='.$ss).'</td>'."\n";
- $r .= ' <td class="over_l">'.makeLink($b->getUrl(),$b->version).'</td>'."\n";
+ $r .= $this->OverviewRowBlock($b->getLink($x,'ss='.$ss),'over_l');
+ $r .= $this->OverviewRowBlock(makeLink($b->getUrl(),$b->version),'over_l');
if ($this->head['ref_id']) {
- $r .= ' <td class="over_l">';
+ $xx = '';
if (is_object($b->ref)) {
if ($b->ref->getTypeId() != usetestsuite ) {
- $r .= $lang[$b->ref->getType()].' ';
+ $xx .= $lang[$b->ref->getType()].' ';
}
- $x = $this->mark_filter(myentities($b->ref->getFullName()),'reffn');
- $r .= $b->ref->getLink($x);
+ $x = $this->mark_filter(myentities($b->ref->getFullName()),'ref_id');
+ $xx .= $b->ref->getLink($x);
} else {
- $r .= myentities($lang['HistoryDeleted']);
+ $xx .= myentities($lang['HistoryDeleted']);
}
- $r .= '</td>'."\n";
+ $r .= $this->OverviewRowBlock($xx,'over_l');
}
if ($this->head['t_state']) {
- $r .= ' <td class="over_l">'. $lang['TestsuiteStates'][$b->state] .'</td>'."\n";
+ $r .= $this->OverviewRowBlock($lang['TestsuiteStates'][$b->state],'over_l');
}
if ($this->head['count']) {
- $r .= ' <td class="over_r">'. $b->countTestCases() .'</td>'."\n";
+ $r .= $this->OverviewRowBlock($b->countTestCases(),'over_r');
}
$r .= show_custom_overview_data($this,'testsuite',$b);
@@ -231,6 +231,7 @@
if (isset($this->filter['ref_id']) && is_object($this->filter['ref_id']) && $this->filter['ref_id']->getType() == 'testsuite') {
$this->head['pos'] = true;
if (!isset($_GET['xf'])) {
+ $_GET['xf'] = 'pos';
$defsort = array('pos',1);
}
}
@@ -320,4 +321,4 @@
<!--
SVN Info $Id$
$Author$
--->
+-->
\ No newline at end of file
Modified: trunk/php/timetrack/timetrack_overview.php
===================================================================
--- trunk/php/timetrack/timetrack_overview.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/timetrack/timetrack_overview.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -255,7 +255,7 @@
$xx = '<i>'. makelink('history_show.php?id='. $tt->link_id ,$lang['HistoryDeleted']) .'</i>';
} else {
// Marks
- $x = $this->mark_filter(myentities($tt->ref->getFullName()),'reffn');
+ $x = $this->mark_filter(myentities($tt->ref->getFullName()),'link_id');
$xx = $tt->ref->getLink($x);
}
$r .= $this->OverviewRowBlock($xx,'over_l');
Modified: trunk/php/url/url_overview.php
===================================================================
--- trunk/php/url/url_overview.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/url/url_overview.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -107,7 +107,8 @@
$c->ref = getObject($this->dbconn,$c->link_id);
$x = '';
if (is_object($c->ref)) {
- $x .= $c->ref->getLink();
+ $xx = $this->mark_filter(myentities($c->ref->getFullName()),'link_id');
+ $x .= $c->ref->getLink($xx);
} else if ($c->link_id < 0 ) {
$x .= 'TUTOS '.$lang[$c->link_id];
} else {
@@ -205,16 +206,16 @@
return;
}
- $this->link1 = "url/url_overview.php";
+ $this->link1 = 'url/url_overview.php';
$this->filter = array();
- $this->q = "SELECT * FROM ". $this->dbconn->prefix .$table['url'][name];
- $this->qpre = " WHERE ";
+ $this->q = 'SELECT * FROM '. $this->dbconn->prefix .$table['url'][name];
+ $this->qpre = ' WHERE ';
if ( isset($_GET['name']) && ($_GET['name'] != "*") && ($_GET['name'] != "") ) {
$this->q .= $this->qpre ."(". $this->dbconn->Like("name",$_GET['name']);
- $this->q .= " or ". $this->dbconn->Like("url",$_GET['name']) .")";
- $this->qpre = " AND ";
+ $this->q .= ' or '. $this->dbconn->Like("url",$_GET['name']) .")";
+ $this->qpre = ' AND ';
$this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
$this->filter['name'] = $_GET['name'];
$this->addHidden("name",$_GET['name']);
@@ -223,6 +224,7 @@
}
overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,url::getType(),array('link_id'),'Reference');
+ overview_arg($this,'link_fn',OVERVIEW_ARG_FN,url::getType(),array('link_id'),'Reference','','all');
overview_arg($this,'category',OVERVIEW_ARG_OBJID,url::getType(),array('category'),'URLCat');
if ( isset($_GET['short_id']) && is_numeric($_GET['short_id']) ) {
Modified: trunk/php/url/url_select.php
===================================================================
--- trunk/php/url/url_select.php 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/url/url_select.php 2012-10-19 13:36:42 UTC (rev 825)
@@ -47,6 +47,41 @@
$r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" title="'.$lang['Search'].'"/>',1);
$r .= $this->ContentRowEnd();
+ $r .= $this->ContentRowStart();
+ $r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
+ $r .= $this->ContentRowEnd();
+
+ $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 .= $this->ContentRowStart('ext');
+ $r .= $this->showfieldc($lang['Reference'],0,"link");
+ $r .= $this->showdata(select_from_array_or_input($this->obj,"link_",null,1,'all'),2);
+ $r .= $this->ContentRowEnd();
+
+ // add custom selectors
+ $x = get_custom_selectors('url');
+ foreach ($x as $s) {
+ $r .= $this->ContentRowStart('ext');
+ $r .= $this->showfieldc($s[0]);
+ $r .= $this->showdata($s[1],2);
+ $r .= $this->ContentRowEnd();
+ }
+
$r .= $this->SelectTableEnd();
$r .= hiddenFormElements();
$r .= $this->getHidden();
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2012-10-18 15:04:05 UTC (rev 824)
+++ trunk/php/webelements.p3 2012-10-19 13:36:42 UTC (rev 825)
@@ -821,8 +821,8 @@
/**
* format a value for use with csv files from
* "http://de2.php.net/manual/en/function.fputcsv.php#87120"
- * output is always converted to target_enc encoding
- */
+* output is always converted to target_enc encoding
+*/
function txt2csv ($val,$delimiter = '',$enclosure = '') {
global $tutos;
@@ -922,7 +922,7 @@
$text = preg_replace('#</([BIU])>#im' ,'</$1>',$text);
// $text = preg_replace('#"#m' ,'"',$text);
if ($ureplace)
- $text = urlReplace($text,0);
+ $text = urlReplace($text,0);
if ($ireplace)
$text = ImgReplace($text,$obj);
@@ -2896,7 +2896,7 @@
* cname = array column names in $table
* lgid = id in lang (array if multiple cnames)
* prefix= columnprefix (defaults to no prefix)
- * mode = array of name sarch modes
+ * mode = array of name search modes
* resolver = a method in obj that resolves unknown keys
*
* this function populates $obj->head $obj->filter $obj->header $obj->link1
@@ -3018,13 +3018,13 @@
if (substr($sn,0,1) == "!") {
$sn = substr($sn,1);
if ($not)
- $obj->header .= $pre.htmlentities($sn);
+ $obj->header .= $pre.htmlspecialchars($sn);
else {
if ($pre != '') $pre = ' , ';
- $obj->header .= $pre.'<span class="missing"> '.htmlentities($sn).' </span>';
+ $obj->header .= $pre.'<span class="missing"> '.htmlspecialchars($sn).' </span>';
}
} else {
- $obj->header .= $pre.htmlentities($sn);
+ $obj->header .= $pre.htmlspecialchars($sn);
}
$pre = ' | ';
}
@@ -3305,16 +3305,16 @@
$myarg = substr($myarg,1);
if (constant('EMPTY') == $myarg) {
$myarg = $lang['empty'];
- $obj->header .= ' ≠ <i>'. htmlentities($myarg).'</i>';
+ $obj->header .= ' ≠ <i>'. htmlspecialchars($myarg).'</i>';
} else
- $obj->header .= ' ≠ '. htmlentities($myarg);
+ $obj->header .= ' ≠ '. htmlspecialchars($myarg);
$not = true;
} else {
if (constant('EMPTY') == $myarg) {
$myarg = $lang['empty'];
- $obj->header .= ' = <i>'. htmlentities($myarg).'</i>';
+ $obj->header .= ' = <i>'. htmlspecialchars($myarg).'</i>';
} else
- $obj->header .= ' = '. htmlentities($myarg);
+ $obj->header .= ' = '. htmlspecialchars($myarg);
}
} else {
// multisearch
@@ -3344,12 +3344,12 @@
if (is_object($snobj)) {
$sn = $snobj->getLink();
} else {
- $sn = htmlentities($sn);
+ $sn = htmlspecialchars($sn);
}
} else {
- $sn = htmlentities($sn);
+ $sn = htmlspecialchars($sn);
if ($empty)
- $sn = '<i>'.htmlentities($sn).'</i>';
+ $sn = '<i>'.htmlspecialchars($sn).'</i>';
}
if ( $negate ) {
$obj->header .= $pre.'<span class="missing">'. $sn.'</span>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-18 15:04:18
|
Revision: 824
http://tutos.svn.sourceforge.net/tutos/?rev=824&view=rev
Author: gokohnert
Date: 2012-10-18 15:04:05 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
support search for empty references by using a \#
Modified Paths:
--------------
trunk/php/bugtracking/bug.pinc
trunk/php/installation/installation.pinc
trunk/php/localization/ca.p3
trunk/php/localization/cs.p3
trunk/php/localization/de.p3
trunk/php/localization/el.p3
trunk/php/localization/en.p3
trunk/php/localization/es-mx.p3
trunk/php/localization/es-ni.p3
trunk/php/localization/es-ve.p3
trunk/php/localization/es.p3
trunk/php/localization/fr.p3
trunk/php/localization/hu.p3
trunk/php/localization/it.p3
trunk/php/localization/ja.p3
trunk/php/localization/ko.p3
trunk/php/localization/nl.p3
trunk/php/localization/pl.p3
trunk/php/localization/pt-br.p3
trunk/php/localization/pt.p3
trunk/php/localization/ru.p3
trunk/php/localization/sv.p3
trunk/php/localization/tw.p3
trunk/php/localization/vi.p3
trunk/php/localization/zh.p3
trunk/php/product.pinc
trunk/php/webelements.p3
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/bugtracking/bug.pinc 2012-10-18 15:04:05 UTC (rev 824)
@@ -674,9 +674,8 @@
}
// search for a given object ID
- $qx = '';
if (preg_match('/#([0-9]*)/',trim($name),$regs) && is_numeric($regs[1])) {
- $qx = ' id = '.$regs[1];
+ $qx = 'id = '.$regs[1];
} else {
$qx = '('.$user->dbconn->Like('name',$name).' or '.$user->dbconn->Like('short',$name).')';
}
Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/installation/installation.pinc 2012-10-18 15:04:05 UTC (rev 824)
@@ -80,7 +80,7 @@
$n++;
}
return $r;
- }
+}
/**
* a installation of a product/project
* @package installation
@@ -275,7 +275,6 @@
function search_by_name(&$arr,&$user,$name,$mode = 1) {
global $table;
- $qid = '';
if ( trim($name) == "" ) return 0;
if (substr($name,0,1) == "!") {
$name = substr($name,1);
@@ -285,11 +284,14 @@
}
if (preg_match('/#([0-9]*)/',trim($name),$regs) && is_numeric($regs[1])) {
- $qid = ' or id = '.$regs[1];
+ $qx = 'id = '.$regs[1];
+ } else {
+ $qx = $user->dbconn->Like('description',$name);
}
- $q = 'SELECT '.($mode == 1 ? '*':'id').' from '. $user->dbconn->prefix .$table['installation'][name].' WHERE'. $user->dbconn->Like('description',$name);
- $q .= $qid;
+ $q = 'SELECT '.($mode == 1 ? '*':'id').' from '. $user->dbconn->prefix .$table['installation'][name].' WHERE ';
+ $q .= $qx;
+ $q .= ' order by creation';
check_dbacl($user->dbconn, $q, $user->id);
$r = $user->dbconn->Exec($q);
Modified: trunk/php/localization/ca.p3
===================================================================
--- trunk/php/localization/ca.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/ca.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -58,6 +58,7 @@
$lang['minus4weeks'] = "4 setmanes anteriors";
$lang['only'] = "només";
$lang['reload'] = "recarregar";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "veure o modificar aquesta cita (%s - %s)";
$lang['seeapp'] = "veure els detalls de la cita (%s - %s)";
$lang['AllEntries'] = "veure totes les %s entrades";
Modified: trunk/php/localization/cs.p3
===================================================================
--- trunk/php/localization/cs.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/cs.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
$lang['minus4weeks'] = "4 týdny nazpět";
$lang['only'] = "Pouze";
$lang['reload'] = "Obnovit";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "Prohlížet a měnit (%s - %s)";
$lang['seeapp'] = "Prohlížet detaily (%s - %s)";
$lang['AllEntries'] = "Prohlížet všechny %s položky";
Modified: trunk/php/localization/de.p3
===================================================================
--- trunk/php/localization/de.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/de.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
$lang['minus4weeks'] = '4 Wochen zurück';
$lang['only'] = 'Nur';
$lang['reload'] = 'Neu laden';
+$lang['empty'] = 'leer';
$lang['changeapp'] = 'Diesen Termin ansehen oder ändern (%s - %s)';
$lang['seeapp'] = 'Diesen Termin ansehen (%s - %s)';
$lang['AllEntries'] = 'Alle %s Einträge ansehen';
Modified: trunk/php/localization/el.p3
===================================================================
--- trunk/php/localization/el.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/el.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -54,6 +54,7 @@
$lang['minus4weeks'] = "4 εβοδομάδες πριν";
$lang['only'] = "μόνο";
$lang['reload'] = "Επαναφόρτωση";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "δες ή άλλαξε αυτή τη συνάντηση (%s - %s)";
$lang['seeapp'] = "δες λεπτομέρειες συνάντησης (%s - %s)";
$lang['AllEntries'] = "δες %s καταχωρίσεις";
Modified: trunk/php/localization/en.p3
===================================================================
--- trunk/php/localization/en.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/en.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -54,7 +54,8 @@
$lang['plus4weeks'] = '4 weeks plus';
$lang['minus4weeks'] = '4 weeks back';
$lang['only'] = 'only';
-$lang['reload'] = 'reload';
+$lang['reload'] = 'RRR';
+$lang['empty'] = 'empty';
$lang['changeapp'] = 'see or change this appointment (%s - %s)';
$lang['seeapp'] = 'see this appointment details (%s - %s)';
$lang['AllEntries'] = 'see all %s entries';
Modified: trunk/php/localization/es-mx.p3
===================================================================
--- trunk/php/localization/es-mx.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/es-mx.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
$lang['minus4weeks'] = "4 semanas anteriores";
$lang['only'] = "solamente";
$lang['reload'] = "recargar";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "ver o modificar esta cita (%s - %s)";
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver las entradas %s";
Modified: trunk/php/localization/es-ni.p3
===================================================================
--- trunk/php/localization/es-ni.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/es-ni.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
$lang['minus4weeks'] = "4 semanas anteriores";
$lang['only'] = "solamente";
$lang['reload'] = "recargar";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "ver o modificar esta cita (%s - %s)";
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver las entradas %s";
Modified: trunk/php/localization/es-ve.p3
===================================================================
--- trunk/php/localization/es-ve.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/es-ve.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
$lang['minus4weeks'] = "4 semanas anteriores";
$lang['only'] = "solamente";
$lang['reload'] = "recargar";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "ver o modificar esta cita (%s - %s)";
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver las entradas %s";
Modified: trunk/php/localization/es.p3
===================================================================
--- trunk/php/localization/es.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/es.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
$lang['minus4weeks'] = "4 semanas anteriores";
$lang['only'] = "solamente";
$lang['reload'] = "recargar";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "ver o modificar esta cita (%s - %s)";
$lang['seeapp'] = "ver los detalles de la cita (%s - %s)";
$lang['AllEntries'] = "ver todas las %s entradas";
Modified: trunk/php/localization/fr.p3
===================================================================
--- trunk/php/localization/fr.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/fr.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
$lang['minus4weeks'] = '4 semaines précedentes';
$lang['only'] = 'Seulement';
$lang['reload'] = 'Rafraîchir';
+$lang['empty'] = 'empty';
$lang['changeapp'] = 'Voir ou changer ce rendez-vous (%s - %s)';
$lang['seeapp'] = 'Voir les détails de ce rendez-vous (%s - %s)';
$lang['AllEntries'] = 'Voir toutes les %s entrées';
Modified: trunk/php/localization/hu.p3
===================================================================
--- trunk/php/localization/hu.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/hu.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -57,6 +57,7 @@
$lang['minus4weeks'] = "4 héttel vissza";
$lang['only'] = "csak";
$lang['reload'] = "újratöltés";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "időpont vizsgálata vagy változtatása (%s - %s)";
$lang['seeapp'] = "ezen időpont részleteinek vizsgálata (%s - %s)";
$lang['AllEntries'] = "az összes %s bejegyzés vizsgálata";
Modified: trunk/php/localization/it.p3
===================================================================
--- trunk/php/localization/it.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/it.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -50,6 +50,7 @@
$lang['minus4weeks'] = "4 settimane prima";
$lang['only'] = "solo";
$lang['reload'] = "reload";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "visualizza o modifica questa appuntamento (%s - %s)";
$lang['seeapp'] = "visualizza questa dettaglio di appuntamento (%s - %s)";
$lang['AllEntries'] = "visualizza tutti gli elementi di %s";
Modified: trunk/php/localization/ja.p3
===================================================================
--- trunk/php/localization/ja.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/ja.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
$lang['minus4weeks'] = "4週戻る";
$lang['only'] = "特定者のみ";
$lang['reload'] = "再ロード";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "この予約を見るか変更 (%s - %s)";
$lang['seeapp'] = "この予約の詳細を見る (%s - %s)";
$lang['AllEntries'] = "%s のすべてのエントリを見る";
Modified: trunk/php/localization/ko.p3
===================================================================
--- trunk/php/localization/ko.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/ko.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -58,6 +58,7 @@
$lang['minus4weeks'] = "4주전";
$lang['only'] = "only";
$lang['reload'] = "다시로드";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "일정을 보거나 바꾼다. (%s - %s)";
$lang['seeapp'] = "일정의 자세한 내용을 본다 (%s - %s)";
$lang['AllEntries'] = "%s의 모든 등록사항을 봅니다.";
Modified: trunk/php/localization/nl.p3
===================================================================
--- trunk/php/localization/nl.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/nl.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -61,6 +61,7 @@
$lang['minus4weeks'] = "4 weken terug";
$lang['only'] = "alleen";
$lang['reload'] = "herladen";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "deze afspraak zien of wijzigen (%s - %s)";
$lang['seeapp'] = "deze afspraakinfo zien (%s - %s)";
$lang['AllEntries'] = "Toon alle %s ingevoerde gegevens";
Modified: trunk/php/localization/pl.p3
===================================================================
--- trunk/php/localization/pl.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/pl.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -57,6 +57,7 @@
$lang['minus4weeks'] = "cztery tygodnie w tył";
$lang['only'] = "tylko";
$lang['reload'] = "odśwież";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "sprawdź lub zmień niniejsze spotkanie (%s - %s)";
$lang['seeapp'] = "sprawdź szczegóły spotkania (%s - %s)";
$lang['AllEntries'] = "przejrzyj wszystkie %s wpisów";
Modified: trunk/php/localization/pt-br.p3
===================================================================
--- trunk/php/localization/pt-br.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/pt-br.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
$lang['minus4weeks'] = "4 semanas atrás";
$lang['only'] = "somente";
$lang['reload'] = "recarregar";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "visualiza ou muda esse compromisso (%s - %s)";
$lang['seeapp'] = "visualiza os detalhes desse compromisso (%s - %s)";
$lang['AllEntries'] = "visualizar todas %s entradas";
Modified: trunk/php/localization/pt.p3
===================================================================
--- trunk/php/localization/pt.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/pt.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -57,6 +57,7 @@
$lang['minus4weeks'] = "4 Semanas Anteriores";
$lang['only'] = "somente";
$lang['reload'] = "REFRESCAR";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "consulta ou modifica compromisso (%s - %s)";
$lang['seeapp'] = "consulta detalhes do compromisso (%s - %s)";
$lang['AllEntries'] = "consulta todas %s entradas";
Modified: trunk/php/localization/ru.p3
===================================================================
--- trunk/php/localization/ru.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/ru.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -52,6 +52,7 @@
$lang['minus4weeks'] = "- 4 недели";
$lang['only'] = "только";
$lang['reload'] = "перегрузить";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "Просмотр или изменение этой встречи(%s - %s)";
$lang['seeapp'] = "Просмотр подробностей(%s - %s)";
$lang['AllEntries'] = "Смотреть все %s записи";
Modified: trunk/php/localization/sv.p3
===================================================================
--- trunk/php/localization/sv.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/sv.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -53,6 +53,7 @@
$lang['minus4weeks'] = " 4 veckor";
$lang['only'] = "endast";
$lang['reload'] = "Ladda om";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "Visa/Ändra denna \"bokning\" (%s - %s)";
$lang['seeapp'] = "Visa bokningsdetaljer (%s - %s)";
$lang['AllEntries'] = "Visa alla %s inmatningar";
Modified: trunk/php/localization/tw.p3
===================================================================
--- trunk/php/localization/tw.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/tw.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
$lang['minus4weeks'] = "四週前";
$lang['only'] = "僅";
$lang['reload'] = "更新";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "查看或更改會議(%s - %s)";
$lang['seeapp'] = "查看會議細節(%s - %s)";
$lang['AllEntries'] = "查看所有 %s 輸入";
Modified: trunk/php/localization/vi.p3
===================================================================
--- trunk/php/localization/vi.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/vi.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
$lang['minus4weeks'] = "Lui 4 tuần";
$lang['only'] = "chỉ";
$lang['reload'] = "nạp lại";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "Xem hoặc thay đổi cuộc hẹn n\xC3 y (%s - %s)";
$lang['seeapp'] = "Xem chi tiết các cuộc hẹn (%s - %s)";
$lang['AllEntries'] = "Xem tất cả %s nội dung";
Modified: trunk/php/localization/zh.p3
===================================================================
--- trunk/php/localization/zh.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/localization/zh.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -55,6 +55,7 @@
$lang['minus4weeks'] = "之前四星期";
$lang['only'] = "只";
$lang['reload'] = "更新";
+$lang['empty'] = 'empty';
$lang['changeapp'] = "查看或更改会议(%s - %s)";
$lang['seeapp'] = "查看会议细节(%s - %s)";
$lang['AllEntries'] = "查看所有 %s 输入";
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/product.pinc 2012-10-18 15:04:05 UTC (rev 824)
@@ -187,7 +187,7 @@
if ( isset($_GET['role']) ) {
$role = $_GET['role'];
} else {
- $role = "";
+ $role = '';
}
$rid = array();
if ( isset($_GET['rid']) ) {
@@ -199,7 +199,16 @@
// run a search by name and fill rid
$r = search_by_name($_GET['rfn'],array(useaddressbook,useteams));
foreach ($r as $i => $o) {
- $rid[] = $i;
+ if (is_numeric($i)) {
+ if (is_object($o))
+ $rid[$o->id] = $o->id;
+ else if (is_array($o))
+ $rid[$o[0]] = $o[0];
+ else
+ $rid[$o] = $o;
+ } else {
+ $rid[$i] = $o[0];
+ }
}
}
@@ -224,22 +233,25 @@
if ( is_object($x) ) {
$h .= $hpre.$x->getLink();
$hpre = ',';
+ } else {
+ $h .= $hpre.$f1;
+ $hpre = ',';
}
}
if (count($rid) > 1) {
$h = '('.$h.')';
}
+ $q1 = 'SELECT distinct pro_id FROM '. $obj->dbconn->prefix .$table['product2'][name].' WHERE ';
if ( !empty($role) ) {
- $q1 = "SELECT pro_id FROM ". $obj->dbconn->prefix ."projectroles WHERE role_id in (". $role .") AND adr_id in (". $ml .")";
+ $q1 .= 'role_id in ('. $role .') AND adr_id in ('. $ml .')';
$obj->link1 = addUrlParameter($obj->link1,"role=".$role);
$obj->addHidden("role",$role);
$obj->header .= $obj->hpre.$lang['ProdRole'][$role].' = '.$h;
- $obj->hpre = '<br />';
} else {
- $q1 = "SELECT pro_id FROM ". $obj->dbconn->prefix ."projectroles WHERE adr_id in (". $ml .")";
+ $q1 .= 'adr_id in ('. $ml .')';
$obj->header .= $obj->hpre.$lang['ProdRoles'].' = '.$h;
- $obj->hpre = '<br />';
}
+ $obj->hpre = '<br />';
$r = $obj->dbconn->Exec($q1);
$n = $r->numrows();
$a = 0;
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2012-10-17 09:17:50 UTC (rev 823)
+++ trunk/php/webelements.p3 2012-10-18 15:04:05 UTC (rev 824)
@@ -27,6 +27,8 @@
@require_once 'webelements_special.p3';
@require_once 'custom.pinc';
+define('EMPTY','#');
+
/**
* get a paramater from commandline
*/
@@ -819,8 +821,8 @@
/**
* format a value for use with csv files from
* "http://de2.php.net/manual/en/function.fputcsv.php#87120"
-* output is always converted to target_enc encoding
-*/
+ * output is always converted to target_enc encoding
+ */
function txt2csv ($val,$delimiter = '',$enclosure = '') {
global $tutos;
@@ -920,7 +922,7 @@
$text = preg_replace('#</([BIU])>#im' ,'</$1>',$text);
// $text = preg_replace('#"#m' ,'"',$text);
if ($ureplace)
- $text = urlReplace($text,0);
+ $text = urlReplace($text,0);
if ($ireplace)
$text = ImgReplace($text,$obj);
@@ -1381,6 +1383,20 @@
// walk over pipe seperated search parts
foreach ($narr as $sn) {
$sn = trim($sn);
+ if ( constant('EMPTY') == $sn) {
+ // empty
+ $arr['A'] = array(-1);
+ $arr['B'] = array('null');
+ $arr['C'] = array(0);
+ continue;
+ }
+ if ( '!'.constant('EMPTY') == $sn) {
+ // not empty
+ $arr['a'] = array(-1);
+ //$arr['b'] = array('null');
+ $arr['c'] = array(0);
+ continue;
+ }
// Search departments by company (i.e. type company name to get all deps)
if ( $c == "D") {
$pos = strpos($sn," / ");
@@ -3286,21 +3302,40 @@
$s = explode('|',$myarg);
if (count($s) == 1) {
if ( (substr($myarg,0,1) == "!") ) {
- $obj->header .= ' ≠ '. htmlentities(substr($myarg,1));
+ $myarg = substr($myarg,1);
+ if (constant('EMPTY') == $myarg) {
+ $myarg = $lang['empty'];
+ $obj->header .= ' ≠ <i>'. htmlentities($myarg).'</i>';
+ } else
+ $obj->header .= ' ≠ '. htmlentities($myarg);
$not = true;
} else {
- $obj->header .= ' = '. htmlentities($myarg);
+ if (constant('EMPTY') == $myarg) {
+ $myarg = $lang['empty'];
+ $obj->header .= ' = <i>'. htmlentities($myarg).'</i>';
+ } else
+ $obj->header .= ' = '. htmlentities($myarg);
}
} else {
// multisearch
$obj->header .= ' = ';
$pre = '';
foreach ($s as $sn) {
+ $empty = false;
$sn = trim($sn);
if ( (substr($sn,0,1) == "!") ) {
$negate = true;
+ $sn = substr($sn,1);
+ if ('!'.constant('EMPTY') == $sn) {
+ $sn = $lang['empty'];
+ $empty = true;
+ }
} else {
$negate = false;
+ if (constant('EMPTY') == $sn) {
+ $sn = $lang['empty'];
+ $empty = true;
+ }
}
// check ID search
$snid = array();
@@ -3313,6 +3348,8 @@
}
} else {
$sn = htmlentities($sn);
+ if ($empty)
+ $sn = '<i>'.htmlentities($sn).'</i>';
}
if ( $negate ) {
$obj->header .= $pre.'<span class="missing">'. $sn.'</span>';
@@ -3349,18 +3386,28 @@
$l .= "0";
} else {
foreach($arr as $idx => $a) {
- if ($idx > 0) {
- if (is_object($a))
- $l .= $sep.$a->id;
- else if (is_array($a))
+ if (is_numeric($idx)) {
+ 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 = ',';
+ }
+ } else {
+ if (preg_match('/[A-Z]/',$idx)) {
$l .= $sep.$a[0];
- $sep = ',';
- } else {
- if (is_object($a))
- $nl .= $nsep.$a->id;
- else if (is_array($a))
+ $sep = ',';
+ } else {
$nl .= $nsep.$a[0];
- $nsep = ',';
+ $nsep = ',';
+ }
}
}
}
@@ -3376,7 +3423,6 @@
$obj->q .= ') ';
}
-
$obj->qpre = " AND ";
$obj->head[$cnames[0]] = true;
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-17 09:18:00
|
Revision: 823
http://tutos.svn.sourceforge.net/tutos/?rev=823&view=rev
Author: gokohnert
Date: 2012-10-17 09:17:50 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/config_default.pinc
Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc 2012-10-17 08:07:53 UTC (rev 822)
+++ trunk/php/config_default.pinc 2012-10-17 09:17:50 UTC (rev 823)
@@ -517,6 +517,8 @@
$tutos[timezones][] = 'Asia/Hong_Kong';
$tutos[timezones][] = 'Asia/Tehran';
$tutos[timezones][] = 'Asia/Tokyo';
+ $tutos[timezones][] = 'Asia/Calcutta';
+ $tutos[timezones][] = 'Asia/Kolkata';
$tutos[timezones][] = 'Australia/Sydney';
$tutos[timezones][] = 'Australia/Perth';
} else {
@@ -749,10 +751,10 @@
#
# The TUTOS Version number
#
-$tutos[version] = '1.8.20120718';
+$tutos[version] = '1.8.20121017';
#
### Local Variables: ***
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ 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...> - 2012-10-17 08:08:05
|
Revision: 822
http://tutos.svn.sourceforge.net/tutos/?rev=822&view=rev
Author: gokohnert
Date: 2012-10-17 08:07:53 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/subversion/en.p3
trunk/php/subversion/svn.pinc
Modified: trunk/php/subversion/en.p3
===================================================================
--- trunk/php/subversion/en.p3 2012-10-16 15:25:13 UTC (rev 821)
+++ trunk/php/subversion/en.p3 2012-10-17 08:07:53 UTC (rev 822)
@@ -1,14 +1,15 @@
<?php
-# $Id$
-#
-# ========================= NOTE ========================
-# Please put site specific extensions and changes
-# to TUTOS language files in a file called "en_custom.p3"
-# or "lang_custom.p3" (for all languages)
-# using the same format like here
-# =======================================================
-
-# Subversion
+/**
+ * $Id$
+ *
+ * ========================= NOTE ========================
+ * Please put site specific extensions and changes
+ * to TUTOS language files in a file called "en_custom.p3"
+ * or "lang_custom.p3" (for all languages)
+ * using the same format like here
+ * =======================================================
+ * Subversion
+ */
$lang['SVN'] = 'Subversion Path';
$lang['SVNName'] = 'Short Name';
$lang['SVNDesc'] = 'Description';
@@ -37,8 +38,8 @@
$lang['SVNConfig'] = 'Configure Subversion';
$lang['SvnConfigHelpLongPop'] = 'Relations between uri and an localpath
-each line has a svnuri like https://server/svn and a local path like /home/svn/repos
-multiple lines are seperated by ,';
+ each line has a svnuri like https://server/svn and a local path like /home/svn/repos
+ multiple lines are seperated by ,';
$lang['perm'][usesvn] = "use subversion";
$lang['svn'] = &$lang['SVN'];
Modified: trunk/php/subversion/svn.pinc
===================================================================
--- trunk/php/subversion/svn.pinc 2012-10-16 15:25:13 UTC (rev 821)
+++ trunk/php/subversion/svn.pinc 2012-10-17 08:07:53 UTC (rev 822)
@@ -27,7 +27,6 @@
$d->sec = (integer)$regs[6];
$OFF = $regs[7];
$d->format = 17;
- # echo '|'.$str.'|'.$OFF.'|'.$current_user->offset;
return;
}
}
@@ -92,6 +91,7 @@
$this->uri = '';
$this->repo = ''; // name of repository
$this->rev = null; // currently handeld revision
+ $this->maxrev = null; // latest handeld revision
$this->rpath = ''; // path in repo
$this->lpath = ''; // local path to repo
$this->log = ''; // log to rev
@@ -274,6 +274,7 @@
function retrieve_file($path) {
if ($this->rev == null) {
$this->retrieve_rev();
+ $this->rev = $this->maxrev;
}
$r = '';
@@ -294,6 +295,7 @@
function retrieve_diff($path) {
if ($this->rev == null) {
$this->retrieve_rev();
+ $this->rev = $this->maxrev;
}
$r = '';
@@ -316,6 +318,7 @@
function retrieve_dir($path) {
if ($this->rev == null) {
$this->retrieve_rev();
+ $this->rev = $this->maxrev;
}
$r = '';
@@ -386,8 +389,7 @@
pclose($p);
if (count($this->history) == 0) {
- $cmd = 'svnlook history "'. $rpath .'" '.$this->rpath.' -l 10 -r'.$this->rev;
- $cmd = 'svnlook history "'. $rpath .'" '.$this->rpath.' -l 10';
+ $cmd = 'svnlook history "'. $rpath .'" '.$this->rpath.' -l 20 -r '.(min ($this->rev +10,$this->maxrev));
$p = popen ($cmd,'r');
if (!is_resource($p)) die ('Problems with: svnlook');
while(!feof($p)) {
@@ -405,18 +407,17 @@
$rpath = $this->lpath.'/'.$this->repo;
- $this->rev = null;
- $this->history = array();
+ $this->maxrev = null;
- $cmd = 'svnlook history "'. $rpath .'" '.$this->rpath.' -l 10';
+ $cmd = 'svnlook history "'. $rpath .'" '.$this->rpath.' -l 1';
$p = popen ($cmd,'r');
- if (!is_resource($p)) die ('Problems with: svnlook history');
+ if (!is_resource($p)) die ('Problems with: svnlook history (search maxrev)');
while(!feof($p)) {
$t = fgets($p,1024);
- $this->history[] = trim($t);
$x = explode(' ',trim($t));
- if (is_numeric($x[0]) && $this->rev == null) {
- $this->rev = trim($x[0]);
+ if (is_numeric($x[0]) && $this->maxrev == null) {
+ $this->maxrev = trim($x[0]);
+ break;
}
}
pclose($p);
@@ -458,55 +459,57 @@
}
}
+ $this->retrieve_rev();
if ($this->rev == null) {
- $this->retrieve_rev();
+ $this->rev = $this->maxrev;
}
$this->retrieve_data();
if ($cols > 1) {
- $r .= "<tr>\n";
+ $r .= $ly->ContentRowStart();
$r .= $ly->showfield($lang['SVNRepository']);
$r .= $ly->showdata($this->repo,$cols-1);
- $r .= "</tr>\n";
- $r .= "<tr>\n";
+ $r .= $ly->ContentRowEnd();
+
+ $r .= $ly->ContentRowStart();
$r .= $ly->showfield($lang['SVNPath']);
$r .= $ly->showdata($this->rpath,$cols-1);
- $r .= "</tr>\n";
+ $r .= $ly->ContentRowEnd();
- $r .= "<tr>\n";
+ $r .= $ly->ContentRowStart();
$r .= $ly->showfield($lang['SVNRevision']);
$url = $this->getUrl();
$url = addUrlParameter($url,'format=diff');
$url = addUrlParameter($url,'rev='.$this->rev);
$r .= $ly->showdata($this->rev.' ('.makelink($url,'diff').')',$cols-1);
- $r .= "</tr>\n";
+ $r .= $ly->ContentRowEnd();
- $r .= "<tr>\n";
+ $r .= $ly->ContentRowStart();
$r .= $ly->showfield($lang['SVNLog']);
$r .= '<td class="pre" style="white-space: pre;" colspan="'.($cols-1).'">'.$this->urlreplace(urlreplace($this->log)).'</td>';
- $r .= "</tr>\n";
+ $r .= $ly->ContentRowEnd();
- $r .= "<tr>\n";
+ $r .= $ly->ContentRowStart();
$r .= $ly->showfield($lang['SVNDate']);
if (is_object($this->revdate_obj)) {
$r .= $ly->showdata($this->revdate_obj->getDateTime(),$cols-1);
} else {
$r .= $ly->showdata($this->revdate,$cols-1);
}
- $r .= "</tr>\n";
+ $r .= $ly->ContentRowEnd();
- $r .= "<tr>\n";
+ $r .= $ly->ContentRowStart();
$r .= $ly->showfield($lang['SVNAuthor']);
if (is_object($this->author_obj)) {
$r .= $ly->showdata($this->author_obj->getLink(),$cols-1);
} else {
$r .= $ly->showdata($this->author,$cols-1);
}
- $r .= "</tr>\n";
+ $r .= $ly->ContentRowEnd();
- $r .= "<tr>\n";
+ $r .= $ly->ContentRowStart();
$r .= $ly->showfield($lang['SVNChanged']);
- $r .= '<td colspan="'.($cols-1).'">';
+ $x = '';
foreach ($this->changed as $c) {
$pos = strpos($c,' ');
$path = ltrim(substr($c,$pos));
@@ -515,27 +518,34 @@
$url = addUrlParameter($url,'format=show');
$url = addUrlParameter($url,'path='.Base64_Encode($path));
$url = addUrlParameter($url,'rev='.$this->rev);
- $r .= substr($c,0,$pos).' '.$icon.' '.makelink($url,$path)."<br />";
+ $x .= substr($c,0,$pos).' '.$icon.' '.makelink($url,$path)."<br />";
}
- $r .= "</td>\n";
- $r .= "</tr>\n";
+ $r .= $ly->showdata($x,$cols-1);
+ $r .= $ly->ContentRowEnd();
- $r .= "<tr>\n";
+ $r .= $ly->ContentRowStart();
$r .= $ly->showfield($lang['SVNHistory']);
- $r .= '<td colspan="'.($cols-1).'">';
+ $x = '';
+ $cnt = 1;
foreach ($this->history as $c) {
$rev = trim(substr($c,0,strpos($c,' ')));
if (is_numeric($rev)) {
$url = $this->getUrl();
$url= addUrlParameter($url,'rev='.$rev);
- $r .= makelink($url,$rev).'<br />';
- } else {
- # $r .= $rev.'<br />';
+ if ($rev == $this->rev)
+ $x .= '<b>'.makelink($url,$rev).'</b>';
+ else
+ $x .= makelink($url,$rev);
+ if ($cnt % 3 == 0)
+ $x .='<br />';
+ else
+ $x .='    ';
+ $x .= "\n";
+ $cnt++;
}
}
- $r .= "</td>\n";
- $r .= "</tr>\n";
-
+ $r .= $ly->showdata($x,$cols-1);
+ $r .= $ly->ContentRowEnd();
} else {
$r .= $lang['SVNRepository'].":\t\t".$this->repo."\n";
$r .= $lang['SVNPath'].":\t/".$this->rpath."\n";
@@ -777,4 +787,4 @@
}
}
-?>
+?>
\ 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...> - 2012-10-16 15:25:22
|
Revision: 821
http://tutos.svn.sourceforge.net/tutos/?rev=821&view=rev
Author: gokohnert
Date: 2012-10-16 15:25:13 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
more mobile layout support
Modified Paths:
--------------
trunk/html/mobile_layout.css
trunk/php/bugtracking/bug_overview.php
trunk/php/bugtracking/bug_select.php
trunk/php/db/table.pinc
trunk/php/product_select.php
trunk/php/reminder/reminder_overview.php
trunk/php/testmanager/testmanager.pinc
trunk/php/webelements.p3
Modified: trunk/html/mobile_layout.css
===================================================================
--- trunk/html/mobile_layout.css 2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/html/mobile_layout.css 2012-10-16 15:25:13 UTC (rev 821)
@@ -25,19 +25,59 @@
color: red;
text-align: center;
border: 1px solid black;
- margin-top: 2px;
+ margin-top: -5px;
+ margin-bottom: 5px;
margin-left: 3%;
margin-right: 3%;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
+ padding-top: 0.2em;
+ padding-bottom: 0.2em;
}
.info {
color: blue;
text-align: center;
border: 1px solid #888;
- margin-top: 2px;
+ margin-top: -5px;
+ margin-bottom: 5px;
margin-left: 3%;
margin-right: 3%;
- padding-top: 0.5em;
- padding-bottom: 0.5em;
+ padding-top: 0.2em;
+ padding-bottom: 0.2em;
}
+
+.over_c {
+ text-align: center;
+ vertical-align: top;
+ white-space: nowrap;
+ padding-right: 0.2em;
+ padding-left: 0.2em;
+ padding-bottom: 0.2em;
+}
+.over_r {
+ text-align: right;
+ vertical-align: top;
+ white-space: nowrap;
+ padding-right: 0em;
+ padding-left: 0.2em;
+ padding-bottom: 0.2em;
+}
+.over_l {
+ text-align: left;
+ vertical-align: top;
+ white-space: nowrap;
+ padding-left: 0em;
+ padding-right: 0.2em;
+ padding-bottom: 0.2em;
+}
+/* multiline */
+.over_ml {
+ text-align: left;
+ vertical-align: top;
+ white-space: normal;
+ padding-left: 0.5em;
+ padding-right: 0.2em;
+ padding-bottom: 0.2em;
+}
+
+UL.ui-listview LI {
+ border-bottom: 1px solid silver;
+}
\ No newline at end of file
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/bugtracking/bug_overview.php 2012-10-16 15:25:13 UTC (rev 821)
@@ -23,6 +23,7 @@
// Check if user is allowed to use it
check_user();
+$tutos['mobileok'] = 1;
require_once 'product.pinc';
require_once 'graphs.pinc';
Modified: trunk/php/bugtracking/bug_select.php
===================================================================
--- trunk/php/bugtracking/bug_select.php 2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/bugtracking/bug_select.php 2012-10-16 15:25:13 UTC (rev 821)
@@ -71,12 +71,12 @@
$r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc(sprintf($lang['BugReference'],''),0,"p");
- $r .= $this->showdata(select_from_array_or_input($this->obj,"p",null,1,get_parent_classes('bugtracking')),2);
+ $r .= $this->showdata(select_from_array_or_input($this,"p",null,1,get_parent_classes('bugtracking')),2);
$r .= $this->ContentRowEnd();
$r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc(sprintf($lang['BugTarget'],''),0,"t");
- $r .= $this->showdata(select_from_array_or_input($this->obj,"t",null,1,get_parent_classes('bugtracking')),2);
+ $r .= $this->showdata(select_from_array_or_input($this,"t",null,1,get_parent_classes('bugtracking')),2);
$r .= $this->ContentRowEnd();
$r .= $this->ContentRowStart('ext');
@@ -101,12 +101,12 @@
$r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc(sprintf($lang['UserBugSearch'],''),0,"solverid");
- $r .= $this->showdata(select_from_array_or_input($this->obj,"solver",null,1,'atT'),2);
+ $r .= $this->showdata(select_from_array_or_input($this,"solver",null,1,'atT'),2);
$r .= $this->ContentRowEnd();
$r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc(sprintf($lang['BugReportedFrom'],''),0,"reporterid");
- $r .= $this->showdata(select_from_array_or_input($this->obj,"reporter",null,1,'at'),2);
+ $r .= $this->showdata(select_from_array_or_input($this,"reporter",null,1,'at'),2);
$r .= $this->ContentRowEnd();
// add custom selectors
Modified: trunk/php/db/table.pinc
===================================================================
--- trunk/php/db/table.pinc 2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/db/table.pinc 2012-10-16 15:25:13 UTC (rev 821)
@@ -688,6 +688,12 @@
'ts' => array(type => 'TS_TYPE', constraints => '', Desc => 'date'),
'message' => array(type => 'VARCHAR', size => 200, constraints => '', Desc => 'Info'),
);
+$tableidx['messages1'] = array(
+ name => 'messages_idx1',
+ table => 'messages',
+ column => array('ts'),
+ Desc => 'messages by time',
+ );
$table['database'] = array(
name => 'tutos_dbs',
Modified: trunk/php/product_select.php
===================================================================
--- trunk/php/product_select.php 2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/product_select.php 2012-10-16 15:25:13 UTC (rev 821)
@@ -101,7 +101,7 @@
// Roles
$r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['ProdRoles'],0,"r");
- $r .= $this->showdata(select_from_array_or_input($this->obj,"r",null,1,array(useaddressbook,useteams)),2);
+ $r .= $this->showdata(select_from_array_or_input($this,"r",null,1,array(useaddressbook,useteams)),2);
$r .= $this->ContentRowEnd();
// add custom selectors
Modified: trunk/php/reminder/reminder_overview.php
===================================================================
--- trunk/php/reminder/reminder_overview.php 2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/reminder/reminder_overview.php 2012-10-16 15:25:13 UTC (rev 821)
@@ -20,6 +20,8 @@
// Check if user is allowed to use it
check_user();
+
+$tutos['mobileok'] = 1;
loadmodules('reminder','overview');
loadmodule('reminder');
loadlayout();
@@ -44,6 +46,7 @@
$n = $this->result->numrows();
$r .= $this->header;
+
$r .= $this->actionformStart("reminder_overview.php");
$r .= $this->OverviewTableStart();
$r .= $this->OverviewHeadStart();
Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc 2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/testmanager/testmanager.pinc 2012-10-16 15:25:13 UTC (rev 821)
@@ -625,7 +625,7 @@
// Prepare the history
if (!isset($this->quite) || $this->quite != true) {
$this->modified[] = array ( "field" => "TestcaseCreate" ,
- "old" => "-1" ,
+ "old" => '' ,
"new" => $this->id,
"obj_id" => $this->ref_id
);
@@ -1549,7 +1549,7 @@
// Prepare the history
if (!isset($this->quite) || $this->quite != true) {
$this->modified[] = array ( "field" => "TestsuiteCreate" ,
- "old" => "-1" ,
+ "old" => '' ,
"new" => $this->id,
"obj_id" => $this->ref_id
);
@@ -2465,7 +2465,7 @@
}
// Prepare the history
$this->modified[] = array ( "field" => "TestrunCreate" ,
- "old" => "-1" ,
+ "old" => '' ,
"new" => $this->id,
"obj_id" => $this->ref_id
);
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2012-10-16 15:24:09 UTC (rev 820)
+++ trunk/php/webelements.p3 2012-10-16 15:25:13 UTC (rev 821)
@@ -819,8 +819,8 @@
/**
* format a value for use with csv files from
* "http://de2.php.net/manual/en/function.fputcsv.php#87120"
- * output is always converted to target_enc encoding
- */
+* output is always converted to target_enc encoding
+*/
function txt2csv ($val,$delimiter = '',$enclosure = '') {
global $tutos;
@@ -920,7 +920,7 @@
$text = preg_replace('#</([BIU])>#im' ,'</$1>',$text);
// $text = preg_replace('#"#m' ,'"',$text);
if ($ureplace)
- $text = urlReplace($text,0);
+ $text = urlReplace($text,0);
if ($ireplace)
$text = ImgReplace($text,$obj);
@@ -1247,7 +1247,7 @@
} else {
$id = '';
}
- return sprintf ('<a class="smallinfo'.$id.'" href="%s"'.$target." title=\"%s\">%s</a>",$href,myentities($info),$text);
+ return sprintf ('<a class="smallinfo'.$id.'" href="%s"'.$target.' title="%s">%s</a>',$href,myentities($info),$text);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-16 15:24:20
|
Revision: 820
http://tutos.svn.sourceforge.net/tutos/?rev=820&view=rev
Author: gokohnert
Date: 2012-10-16 15:24:09 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
mobile layout support
Modified Paths:
--------------
trunk/php/layout/layout_base.pinc
trunk/php/layout/mobile_layout.pinc
trunk/php/scrum/log_select.php
trunk/php/scrum/sprint_overview.php
trunk/php/scrum/sprint_select.php
trunk/php/url/url_overview.php
trunk/php/url/url_select.php
Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc 2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/layout/layout_base.pinc 2012-10-16 15:24:09 UTC (rev 820)
@@ -170,6 +170,7 @@
$this->width = 4; // width of infotable
$this->obj = $this; // some useful default
+ $this->obj = null; // some useful default
if ( !isset($tutos['pagescript']) ) {
$tutos['pagescript'] = ''; // collect scripts in the page
}
Modified: trunk/php/layout/mobile_layout.pinc
===================================================================
--- trunk/php/layout/mobile_layout.pinc 2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/layout/mobile_layout.pinc 2012-10-16 15:24:09 UTC (rev 820)
@@ -117,7 +117,7 @@
* start a overview table
*/
function OverviewHeadStart() {
- return '';
+ return '<p />';
}
/**
@@ -131,14 +131,14 @@
* start a overview headline
*/
function OverviewHeadLineStart() {
- return '';
+ return '<li>';
}
/**
* end a overview headline
*/
function OverviewHeadLineEnd() {
- return '';
+ return '</li>';
}
/**
@@ -146,7 +146,8 @@
*/
function OverviewRowStart($line,$title = '',$class = '') {
$this->blk_cnt = 0;
- return '<li>'."\n";
+ return '<li class="tlv">'."\n";
+ // return '<li><div data-role="controlgroup" data-type="horizontal">'."\n";
}
/**
@@ -162,10 +163,11 @@
function OverviewRowBlock($content,$class = '',$rows=1) {
$this->blk_cnt++;
+ $class .= " tlve";
if ($this->blk_cnt > 3) {
$class .= " ui-li-aside";
}
- $r = ' <span'.($class!='' ? ' class="'.$class.'"':'').'>'.$content.'</span> '."\n";
+ $r = ' <span'.($class!='' ? ' class="'.$class.'"':'').'>'.$content.'</span>'."\n";
if ($this->blk_cnt >3) {
$this->blk_cnt = 0;
$r .= ' <p>'."\n";
@@ -764,6 +766,11 @@
$x = htmlentities(delUrlParameter($x,"lg"));
$r .= ' <script type="text/javascript" src="'.$tutos['base'].'/html/js/jquery.min.js"></script>'."\n";
$r .= ' <script type="text/javascript" src="'.$tutos['base'].'/html/js/tutos.js"></script>'."\n";
+ $r .= "<script type=\"text/javascript\" >
+$(document).bind('mobileinit',function(){
+ $.mobile.selectmenu.prototype.options.nativeMenu = false;
+});
+</script>";
$r .= ' <script type="text/javascript" src="'.$tutos['base']. '/html/js/jquery.mobile.min.js"></script>'."\n";
// $r .= ' <script type="text/javascript" src="'.$tutos['base']. '/html/js/jquery.mobile.subpage.js"></script>'."\n";
@@ -782,6 +789,7 @@
$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/mobile_layout.js"></script>'."\n";
$r .= ' <script type="text/javascript">'."\n";
$r .= "//<![CDATA[\n";
$r .= $tutos['pagescript'];
@@ -835,7 +843,7 @@
/**
* take the menu entries and put into subpages
*/
- function makemenu($section) {
+ function makemenu($section,$headline = '') {
global $tutos;
$r = '';
@@ -873,7 +881,10 @@
unset($this->menu[$i]);
}
if ( $first == null ) {
- $first = $section;
+ if ($headline != '')
+ $first = $headline;
+ else
+ $first = $section;
}
if ($c == '') return '';
@@ -931,10 +942,10 @@
$r .= $this->makemenu('main4');
// Edit/Context Menu
- $r .= $this->makemenu('view');
+ $r .= $this->makemenu('obj',( ($this->obj != null) ? $this->obj->getFullName():$this->name));
// VIEW Menu
- $r .= $this->makemenu('obj');
+ $r .= $this->makemenu('view');
// Search Menu
$r .= $this->makemenu('search');
Modified: trunk/php/scrum/log_select.php
===================================================================
--- trunk/php/scrum/log_select.php 2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/scrum/log_select.php 2012-10-16 15:24:09 UTC (rev 820)
@@ -17,6 +17,8 @@
// Check if user is allowed to use it
check_user();
+
+$tutos['mobileok'] = 1;
loadmodules('scrumlog','select');
loadmodule('scrumlog');
loadmodule('scrumsprint');
@@ -39,15 +41,16 @@
$this->addHidden('ext',$this->ext);
$r .= $this->headline($lang['SearchForLog']);
- $r .= "<tr>\n";
+ $r .= $this->ContentRowStart();
$r .= $this->showfieldc($lang['LogSearchField']);
$r .= " <td ><input type=\"text\" value=\"\" name=\"name\" /></td>\n";
$r .= " <td align=\"center\">\n";
$r .= " <input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
- $r .= "</tr>\n";
+ $r .= $this->ContentRowEnd();
- $r .= "<tr>\n";
+ $r .= $this->ContentRowStart();
$r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
+ $r .= $this->ContentRowEnd();
$tutos['pagescript'] .= "
$( \"#toggler\" ).click(function() {
$(\".ext\").toggle();
@@ -65,56 +68,51 @@
\n";
}
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['ScrumLogSprint'],0,"s_id");
- $r .= ' <td>';
- $r .= select_from_array_or_input($this->obj,"s_",null,1,array(USESCRUMSPRINT));
- $r .= '</td><td>';
- $r .= '<input type="checkbox" name="nos" id="nos" value="1"><strike>'.$lang['Sprint'].'</strike></input>';
- $r .= "</td>\n";
+ $x = select_from_array_or_input($this->obj,"s_",null,1,array(USESCRUMSPRINT));
+ $x .= '<input type="checkbox" name="nos" id="nos" value="1"><strike>'.$lang['Sprint'].'</strike></input>';
+ $r .= $this->showdata($x,2);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['ScrumLogPref'],0,"p_id");
- $r .= ' <td colspan="2">';
- $r .= select_from_array_or_input($this->obj,"p_",null,1,array(useprojects));
- $r .= "</td>\n";
+ $r .= $this->showdata(select_from_array_or_input($this->obj,"p_",null,1,array(useprojects)),2);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['ScrumLogWorker'],0,"w_id");
- $r .= ' <td colspan="2">';
- $r .= select_from_array_or_input($this->obj,"w_",null,1,array(useaddressbook));
- $r .= "</td>\n";
+ $r .= $this->showdata(select_from_array_or_input($this->obj,"w_",null,1,array(useaddressbook)),2);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['ScrumLogState'],0,"state");
- $r .= ' <td colspan="2">';
- $r .= '<select size="4" id="state" name="state[]" multiple="multiple">'."\n";
+ $x = '<select size="4" id="state" name="state[]" multiple="multiple">'."\n";
foreach($lang['ScrumLogStates'] as $i => $j) {
- $r .= '<option value="'.$i.'">'.$lang['ScrumLogStates'][$i]."</option>\n";
+ $x .= '<option value="'.$i.'">'.$lang['ScrumLogStates'][$i]."</option>\n";
}
- $r .= "</select></td>\n";
+ $x .= "</select>\n";
+ $r .= $this->showdata($x,2);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['ScrumLogPrio'],0,"prio");
- $r .= ' <td colspan="2">';
- $r .= '<select size="6" id="prio" name="prio[]" multiple="multiple">'."\n";
+ $x = '<select size="6" id="prio" name="prio[]" multiple="multiple">'."\n";
for ($i = 0; $i<SCRUMLOG_MAXPRIO; $i++) {
- $r .= ' <option value="'.$i.'" style="'.ScrumLog::getPrioColor($i).'">';
- $r .= $i;
- $r .= '</option>'."\n";
+ $x .= ' <option value="'.$i.'" style="'.ScrumLog::getPrioColor($i).'">' .$i.'</option>'."\n";
}
- $r .= "</select></td>\n";
+ $x .= "</select>\n";
+ $r .= $this->showdata($x,2);
+ $r .= $this->ContentRowEnd();
// add custom selectors
$x = get_custom_selectors(ScrumLog::getType());
foreach ($x as $s) {
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($s[0]);
- $r .= " <td colspan=\"2\">\n";
- $r .= $s[1];
- $r .= " </td>\n";
+ $r .= $this->showdata($s[1],2);
+ $r .= $this->ContentRowEnd();
}
- $r .= "</tr>\n";
$r .= $this->SelectTableEnd();
$r .= hiddenFormElements();
Modified: trunk/php/scrum/sprint_overview.php
===================================================================
--- trunk/php/scrum/sprint_overview.php 2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/scrum/sprint_overview.php 2012-10-16 15:24:09 UTC (rev 820)
@@ -17,6 +17,8 @@
/* Check if user is allowed to use it */
check_user();
+
+$tutos['mobileok'] = 1;
loadmodules('scrumsprint','overview');
loadmodule('scrumsprint');
loadlayout();
@@ -49,8 +51,8 @@
$r .= $this->header;
$r .= $this->actionformStart('sprint_overview.php');
$r .= $this->OverviewTableStart();
- $r .= "<thead>\n";
- $r .= "<tr>\n";
+ $r .= $this->OverviewHeadStart();
+ $r .= $this->OverviewHeadLineStart();
if ($this->head['name']) {
$r .= $this->orderHeader('',$lang['SprintName'],$this->link2);
@@ -71,8 +73,8 @@
$r .= show_custom_overview_headers($this,'scrumsprint',$this->link2);
$r .= $this->MassUpdateHeader();
- $r .= "</tr>\n";
- $r .= "</thead>\n";
+ $r .= $this->OverviewHeadLineEnd();
+ $r .= $this->OverviewHeadEnd();
$line = 1;
while ( ($a < $n) && ($a < $end) ) {
@@ -86,22 +88,22 @@
// NAME
if ($this->head['name']) {
$x = $this->mark_filter(myentities($obj->name),'name');
- $r .= ' <td class="over_l">'. $obj->getLink($x) .'</td>'."\n";
+ $r .= $this->OverviewRowBlock($obj->getLink($x),'over_l');
}
// Project Ref
if ($this->head['p_id']) {
if (is_object($obj->pref))
$x = $this->mark_filter(myentities($obj->pref->getFullName()),'p_fn');
- $r .= ' <td class="over_l">'. (is_object($obj->pref) ? $obj->pref->getLink($x):' ') .'</td>'."\n";
+ $r .= $this->OverviewRowBlock((is_object($obj->pref) ? $obj->pref->getLink($x):' '),'over_l');
}
if ($this->head['state']) {
- $r .= ' <td class="over_l">'. $lang['SprintStates'][$obj->state] .'</td>'."\n";
+ $r .= $this->OverviewRowBlock($lang['SprintStates'][$obj->state],'over_l');
}
if ($this->head['start']) {
- $r .= ' <td class="over_l">'. $obj->start_dt .'</td>'."\n";
+ $r .= $this->OverviewRowBlock($obj->start_dt,'over_l');
}
$r .= show_custom_overview_data($this,'scrumsprint',$obj);
Modified: trunk/php/scrum/sprint_select.php
===================================================================
--- trunk/php/scrum/sprint_select.php 2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/scrum/sprint_select.php 2012-10-16 15:24:09 UTC (rev 820)
@@ -17,6 +17,8 @@
// Check if user is allowed to use it
check_user();
+
+$tutos['mobileok'] = 1;
loadmodules('scrumsprint','select');
loadmodule('scrumsprint');
loadlayout();
@@ -39,15 +41,16 @@
$this->addHidden('ext',$this->ext);
$r .= $this->headline($lang['SearchForSprint']);
- $r .= "<tr>\n";
+ $r .= $this->ContentRowStart();
$r .= $this->showfieldc($lang['SprintSearchField']);
- $r .= " <td ><input type=\"text\" value=\"\" name=\"name\" /></td>\n";
- $r .= " <td align=\"center\">\n";
- $r .= " <input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
+ $r .= $this->showdata('<input id="name" type="text" value="" name="name" />',1);
+ $r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" title="'.$lang['SearchForSprint'].'" />',1);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr>\n";
+ $r .= $this->ContentRowStart();
+ $r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
+ $r .= $this->ContentRowEnd();
- $r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
$tutos['pagescript'] .= "
$( \"#toggler\" ).click(function() {
$(\".ext\").toggle();
@@ -65,32 +68,31 @@
\n";
}
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['SprintRef'],0,"p_id");
- $r .= ' <td colspan="2">';
- $r .= select_from_array_or_input($this->obj,"p_",null,1,array(useprojects));
- $r .= "</td>\n";
+ $r .= $this->showdata(select_from_array_or_input($this->obj,"p_",null,1,array(useprojects)),2);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['SprintState'],0,"state");
- $r .= ' <td colspan="2">';
- $r .= '<select size="4" id="state" name="state[]" multiple="multiple">'."\n";
+ $x = '<select size="4" id="state" name="state[]" multiple="multiple">'."\n";
foreach($lang['SprintStates'] as $i => $j) {
- $r .= '<option value="'.$i.'">'.$lang['SprintStates'][$i]."</option>\n";
+ $x .= '<option value="'.$i.'">'.$lang['SprintStates'][$i]."</option>\n";
}
- $r .= "</select></td></tr>\n";
+ $x .= "</select>\n";
+ $r .= $this->showdata($x,2);
+ $r .= $this->ContentRowEnd();
// add custom selectors
$x = get_custom_selectors(ScrumSprint::getType());
foreach ($x as $s) {
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($s[0]);
- $r .= " <td colspan=\"2\">\n";
- $r .= $s[1];
- $r .= " </td>\n";
+ $r .= $this->showdata($s[1],2);
+ $r .= $this->ContentRowEnd();
}
- $r .= "</tr>\n";
+
$r .= $this->SelectTableEnd();
$r .= hiddenFormElements();
$r .= $this->getHidden();
Modified: trunk/php/url/url_overview.php
===================================================================
--- trunk/php/url/url_overview.php 2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/url/url_overview.php 2012-10-16 15:24:09 UTC (rev 820)
@@ -19,6 +19,8 @@
// Check if user is allowed to use it
check_user();
+
+$tutos['mobileok'] = 1;
loadmodules('url','overview');
loadmodule('url');
loadlayout();
@@ -68,7 +70,8 @@
$r .= $this->actionformStart("url_overview.php");
$r .= $this->OverviewTableStart();
- $r .= "<tr>\n";
+ $r .= $this->OverviewHeadStart();
+ $r .= $this->OverviewHeadLineStart();
$this->flds = 2;
if ($this->head['link_id']) {
$r .= $this->orderHeader("",$lang['Reference'],$this->link2);
@@ -82,7 +85,8 @@
$r .= $this->orderHeader("url",$lang['URL'],$this->link2);
$r .= show_custom_overview_headers($this,'url',$this->link2);
$r .= $this->MassUpdateHeader();
- $r .= "</tr>\n";
+ $r .= $this->OverviewHeadLineEnd();
+ $r .= $this->OverviewHeadEnd();
if ( $this->start == -1 ) {
$a = $n - $tutos['maxshow'];
@@ -101,21 +105,22 @@
if ($this->head['link_id']) {
$c->ref = getObject($this->dbconn,$c->link_id);
- $r .= ' <td class="over_l">';
+ $x = '';
if (is_object($c->ref)) {
- $r .= $c->ref->getLink();
+ $x .= $c->ref->getLink();
} else if ($c->link_id < 0 ) {
- $r .= 'TUTOS '.$lang[$c->link_id];
+ $x .= 'TUTOS '.$lang[$c->link_id];
} else {
- $r .= " ";
+ $x .= " ";
}
- $r .= "</td>\n";
+ $r .= $this->OverviewRowBlock($x,'over_l');
}
+
$x = $this->mark_filter(myentities($c->name),'name');
- $r .= ' <td class="over_l">'. $c->getLink($x) .'</td>';
+ $r .= $this->OverviewRowBlock($c->getLink($x),'over_l');
if ($this->head['category']) {
- $r .= ' <td class="over_l">'. $c->getCategory() .'</td>';
+ $r .= $this->OverviewRowBlock($c->getCategory(),'over_l');
}
$x = $c->url;
if (mb_strlen($x) > 50) {
@@ -123,11 +128,10 @@
}
$x = $this->mark_filter(myentities($x),'name');
$x = preg_replace('#\.\.\.\.\.#','<span class="warn">.....</span>',$x);
- $r .= ' <td class="over_l">'.$x ;
if ( $c->mod_ok() ) {
- $r .= '  ('. makelink('url/url_new.php?id='. $c->id.'&ss='.$ss,$lang['Modify'],$lang['Modify']) .')';
+ $x .= '  ('. makelink('url/url_new.php?id='. $c->id.'&ss='.$ss,$lang['Modify'],$lang['Modify']) .')';
}
- $r .= "</td>";
+ $r .= $this->OverviewRowBlock($x,'over_l');
$r .= show_custom_overview_data($this,'url',$c);
$r .= $this->MassUpdateField($c);
Modified: trunk/php/url/url_select.php
===================================================================
--- trunk/php/url/url_select.php 2012-10-16 15:22:40 UTC (rev 819)
+++ trunk/php/url/url_select.php 2012-10-16 15:24:09 UTC (rev 820)
@@ -19,6 +19,8 @@
// Check if user is allowed to use it
check_user();
+
+$tutos['mobileok'] = 1;
loadmodules('url','select');
loadmodule('url');
loadlayout();
@@ -39,12 +41,11 @@
$r .= $this->SelectTableStart();
$r .= $this->headline($lang['SearchForURL']);
- $r .= "<tr>\n";
- $r .= $this->showfieldc($lang['URLName']);
- $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>\n";
+ $r .= $this->ContentRowStart();
+ $r .= $this->showfieldc($lang['URLName'],0,'name');
+ $r .= $this->showdata('<input type="text" value="" name="name" />',1);
+ $r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" title="'.$lang['Search'].'"/>',1);
+ $r .= $this->ContentRowEnd();
$r .= $this->SelectTableEnd();
$r .= hiddenFormElements();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-16 15:22:51
|
Revision: 819
http://tutos.svn.sourceforge.net/tutos/?rev=819&view=rev
Author: gokohnert
Date: 2012-10-16 15:22:40 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
fix formatting
Modified Paths:
--------------
trunk/php/appointment.pinc
trunk/php/calendar.php
Modified: trunk/php/appointment.pinc
===================================================================
--- trunk/php/appointment.pinc 2012-10-09 14:50:44 UTC (rev 818)
+++ trunk/php/appointment.pinc 2012-10-16 15:22:40 UTC (rev 819)
@@ -348,16 +348,16 @@
}
$r .= $pre.$icon.' '.$f->getLink();
if ( ($ext == 1) && is_object($f->product) ) {
- $r .= " → ". $f->product->getLink();
+ $r .= " → ". $f->product->getLink();
}
if ( ($ext == 2) && is_object($f->visitor) ) {
- $r .= " ";
+ $r .= ' ';
if ( $f->outside ) {
- $r .= $lang['VisitAt'] .": ";
+ $r .= $lang['VisitAt'];
} else {
- $r .= $lang['VisitFrom'] .": ";
+ $r .= $lang['VisitFrom'];
}
- $r .= $f->visitor->getLink();
+ $r .= ': '.$f->visitor->getLink();
}
$pre = "<br />\n";
if ( $cols > 0 ) {
@@ -1074,9 +1074,9 @@
}
if ( $this->see_ok() ) {
if ( $this->repeat == APP_NOREP ) {
- return makelink($url , $this->start->GetDate() ,$info) . " " .myentities($this->descr);
+ return makelink($url , $this->start->GetDate() ,$info) . ' ' .myentities($this->descr);
} else {
- return makelink($url , "®". $this->start->GetDate() ,$info) . " " . myentities($this->descr);
+ return makelink($url , "®". $this->start->GetDate() ,$info) . ' ' . myentities($this->descr);
}
} else {
if ( $this->repeat == APP_NOREP ) {
@@ -1423,7 +1423,7 @@
# $g = '≫';
# $l = '≪';
- $r .= '<li class="'.$class2.'"><div class="formatted '.$class.'" xid="'.$this->id.'">';
+ $r .= ' <li class="'.$class2.'"><div class="formatted '.$class.'" xid="'.$this->id.'">';
$start = $this->start->getTime();
$end = $this->end->getTime();
@@ -1456,7 +1456,7 @@
$r .= '<span class="left"><b>'. $this->getLink($duration) .'</b></span>';
$r .= '<span class="right"><b>'. $this->getLocation() .'</b></span>';
- $r .= '<div style="clear: both;" />';
+ $r .= '<div style="clear: both;"></div>';
$myself = false;
foreach ( $this->participant as $i => $fp) {
@@ -1496,7 +1496,7 @@
) {
$descr = preg_replace('#\n#m','<br />',$this->descr);
if ($descr != '' ) {
- $r .= '<span class="left">'.urlReplace($descr).'</span>';
+ $r .= '<span class="left">'.urlReplace($descr,0).'</span>';
}
if ( !(is_numeric($this->visitor) && $this->visitor == -1) ) {
$r .= '<br /><span class="left">';
@@ -1516,7 +1516,7 @@
$r .= $x->small_infolist($current_user,$this);
}
}
- $r .= '</div></li>';
+ $r .= '</div></li>'."\n";
return $r;
}
@@ -2115,4 +2115,4 @@
}
}
$tutos['classes'][usecalendar] = 'Appointment';
-?>
+?>
\ No newline at end of file
Modified: trunk/php/calendar.php
===================================================================
--- trunk/php/calendar.php 2012-10-09 14:50:44 UTC (rev 818)
+++ trunk/php/calendar.php 2012-10-16 15:22:40 UTC (rev 819)
@@ -93,7 +93,7 @@
$r .= '<td class="'. $dinfo[color] .'" width="10%"'.">\n";
$r .= ' <ul class="dropable">'."\n";
- $r .= '<li date="'.$dd->getYYYY_MM_DD().'">';
+ $r .= ' <li date="'.$dd->getYYYY_MM_DD().'">';
if ( isset($dinfo[Desc]) ) {
if ( $this->user->feature_ok(usecalendar,PERM_NEW) ) {
$r .= makelink('app_new.php?t='. $tref,$d,$lang['NewAppointInfo'],$dinfo[popinfo]) ."\n";
@@ -108,7 +108,7 @@
$r .= $d."\n";
}
}
- $r .= '</li>';
+ $r .= ' </li>'."\n";
$a = 0;
foreach ($this->user->callist as $idx => $x) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-09 14:50:50
|
Revision: 818
http://tutos.svn.sourceforge.net/tutos/?rev=818&view=rev
Author: gokohnert
Date: 2012-10-09 14:50:44 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
fix empty department
Modified Paths:
--------------
trunk/php/address_tools.p3
trunk/php/base.pinc
trunk/php/department.pinc
trunk/php/watchlist/watchlist_overview.php
Modified: trunk/php/address_tools.p3
===================================================================
--- trunk/php/address_tools.p3 2012-10-09 14:37:56 UTC (rev 817)
+++ trunk/php/address_tools.p3 2012-10-09 14:50:44 UTC (rev 818)
@@ -48,10 +48,10 @@
} elseif ( $name == "fax_1" ) {
$r .= handle('fax',$l->$name,myentities($l->$name));
} elseif ( $name == "c_id" ) {
- if (is_object($l->company))
+ if (is_object($l->company) && $l->company->id > 0)
$r .= $l->company->getLink();
} elseif ( $name == "d_id" ) {
- if (is_object($l->department))
+ if (is_object($l->department) && $l->department->id > 0)
$r .= $l->department->getLink($l->department->name);
} elseif ( $name == "country" ) {
if ( isset($lang['countrycde'][$l->$name]) ) {
@@ -124,7 +124,7 @@
}
$r .= "</tr>\n";
return $r;
- }
+}
/**
* initialize for adress search and overview pages
*/
@@ -322,7 +322,7 @@
$r .= $layout->OverviewRowStart($line);
if ( $layout->head['icon_before'] ) {
-# myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank.
+ // myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank.
$r .= $layout->showGuiIcons(' <td rowspan="'. $c .'" class="over_l">',"</td>\n",$address,$address,$current_user->get_preficons(1),false);
}
if ( $layout->head['f_name'] ) {
@@ -515,4 +515,4 @@
}
return $r;
}
-?>
+?>
\ No newline at end of file
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2012-10-09 14:37:56 UTC (rev 817)
+++ trunk/php/base.pinc 2012-10-09 14:50:44 UTC (rev 818)
@@ -996,6 +996,9 @@
if ( $text == '' ) {
$text = myentities($this->getFullName());
}
+ if ( $text == '' ) {
+ return '';
+ }
if ( !$this->see_ok() ) {
return $text;
}
Modified: trunk/php/department.pinc
===================================================================
--- trunk/php/department.pinc 2012-10-09 14:37:56 UTC (rev 817)
+++ trunk/php/department.pinc 2012-10-09 14:50:44 UTC (rev 818)
@@ -390,6 +390,8 @@
* get the Full Name
*/
function getFullName () {
+ if ($this->company->id < 0)
+ return $this->name;
return $this->company->getFullname() .' / '. $this->name ;
}
@@ -525,6 +527,6 @@
$r .= "</ul>\n";
return $r;
}
- }
+}
$tutos['classes'][usedepartment] = 'department';
-?>
+?>
\ No newline at end of file
Modified: trunk/php/watchlist/watchlist_overview.php
===================================================================
--- trunk/php/watchlist/watchlist_overview.php 2012-10-09 14:37:56 UTC (rev 817)
+++ trunk/php/watchlist/watchlist_overview.php 2012-10-09 14:50:44 UTC (rev 818)
@@ -238,6 +238,10 @@
if (isset($_REQUEST['id'])) {
$o = getObject($this->dbconn,$_REQUEST['id']);
+ if (!is_object($o)) {
+ $this->stop = true;
+ return;
+ }
$this->addMenu(watchlist::getAddLink($this->user,$o));
$this->name .= ': '. $o->getFullName();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-09 14:38:05
|
Revision: 817
http://tutos.svn.sourceforge.net/tutos/?rev=817&view=rev
Author: gokohnert
Date: 2012-10-09 14:37:56 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
popups with compny/dep info
Modified Paths:
--------------
trunk/php/address.pinc
trunk/php/address_tools.p3
trunk/php/company.pinc
Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc 2012-10-09 12:02:22 UTC (rev 816)
+++ trunk/php/address.pinc 2012-10-09 14:37:56 UTC (rev 817)
@@ -278,22 +278,39 @@
$info = '';
$info .= '<table class="popupinfo">';
$info .= '<tr><th colspan="2">'. $fn ."</th></tr>";
- $info .= '<tr><td valign="top">'. $lang['Phone'] .':</td><td nowrap="nowrap">';
- if ( isset($this->location) ) {
+ if ( isset($this->location) && count($this->location) ) {
+ $phone = '';
+ $cmp = '';
+ $dep = '';
$pre = '';
+ $cpre = '';
+ $dpre = '';
foreach($this->location as $i => $f) {
+ if (is_object($f->department)) {
+ $dep .= $dpre.$f->department->getFullName();
+ $dpre = "<br />";
+ } else if (is_object($f->company)) {
+ $cmp .= $cpre.$f->company->getFullName();
+ $dpre = "<br />";
+ }
if ( $f->phone_1 != "" ) {
- $info .= $pre . myentities($f->phone_1);
+ $phone .= $pre . myentities($f->phone_1);
$pre = "<br />";
}
if ( $f->phone_2 != "" ) {
- $info .= $pre . myentities($f->phone_2);
+ $phone .= $pre . myentities($f->phone_2);
$pre = "<br />";
}
}
+ if ($cmp != '')
+ $info .= '<tr><td colspan="2" valign="top">'. $cmp .'</td></tr>';
+ if ($dep != '')
+ $info .= '<tr><td nowrap="nowrap" colspan="2" valign="top">'. $dep .'</td></tr>';
+ $info .= '<tr><td valign="top">'. $lang['Phone'] .':</td><td nowrap="nowrap">';
+ $info .= $phone;
+ $info .= ' </td></tr>';
}
- $info .= ' </td></tr>';
$info .= $this->custom_popup_content();
$info .= '</table>';
return $info;
@@ -748,4 +765,4 @@
}
$tutos['classes'][useaddressbook] = 'tutos_address';
-?>
\ No newline at end of file
+?>
Modified: trunk/php/address_tools.p3
===================================================================
--- trunk/php/address_tools.p3 2012-10-09 12:02:22 UTC (rev 816)
+++ trunk/php/address_tools.p3 2012-10-09 14:37:56 UTC (rev 817)
@@ -223,8 +223,8 @@
if (isset($layout->header))
$r .= $layout->header;
$r .= $layout->OverviewTableStart();
- $r .= "<thead>\n";
- $r .= "<tr>\n";
+ $r .= $layout->OverviewHeadStart();
+ $r .= $layout->OverviewHeadLineStart();
$needloc = 0;
$layout->flds = 0;
@@ -305,8 +305,8 @@
$r .= " <th nowrap=\"nowrap\"><input id=\"checkit\" type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";
$layout->flds++;
}
- $r .= "</tr>\n";
- $r .= "</thead>\n";
+ $r .= $layout->OverviewHeadLineEnd();
+ $r .= $layout->OverviewHeadEnd();
$line = 0;
while ( ($a < $n) && ($a < $end) ) {
@@ -350,51 +350,51 @@
# $location = new location($dbconn);
# $location = $location->read($i,$location);
if ( $layout->head['location'] ) {
- $r .= ' <td class="over_l">'. makelink($location->getUrl(),myentities($address->loc[$i])) ."</td>\n";
+ $r .= $layout->OverviewRowBlock(makelink($location->getUrl(),myentities($address->loc[$i])),'over_l');
}
if ( $layout->head['desc1'] ) {
$b = $layout->mark_filter(myentities($location->desc1),'desc1');
- $r .= ' <td class="over_l">'. $b ."</td>\n";
+ $r .= $layout->OverviewRowBlock($b,'over_l');
}
if ( $layout->head['email'] ) {
- $r .= ' <td class="over_l">';
+ $xx = '';
if ( $location->email_1 == $location->email_2 ) {
if ( $location->email_2 != "" ) {
$b = $layout->mark_filter(myentities($location->email_1),'email');
- $r .= handle('email',$b,myentities($location->email_1));
+ $xx .= handle('email',$b,myentities($location->email_1));
}
} else {
$pre = "";
if ( $location->email_1 != "" ) {
$b = $layout->mark_filter(myentities($location->email_1),'email');
- $r .= handle('email',$b,myentities($location->email_1));
+ $xx .= handle('email',$b,myentities($location->email_1));
$pre = "<br />";
}
if ( $location->email_2 != "" ) {
$b = $layout->mark_filter(myentities($location->email_2),'email');
- $r .= $pre . handle('email',$b,myentities($location->email_2));
+ $xx .= $pre . handle('email',$b,myentities($location->email_2));
}
}
- $r .= ' </td>';
+ $r .= $layout->OverviewRowBlock($xx,'over_l');
}
if ( $layout->head['phone'] ) {
- $r .= ' <td class="over_l">';
+ $xx = '';
if ( $location->phone_1 == $location->phone_2 ) {
$b = $layout->mark_filter(myentities($location->phone_1),'phone');
- $r .= handle('phone',$location->phone_1,$b) ."\n";
+ $xx .= handle('phone',$location->phone_1,$b) ."\n";
} else {
$pre = "";
if ( $location->phone_1 != "" ) {
$b = $layout->mark_filter(myentities($location->phone_1),'phone');
- $r .= handle('phone',$location->phone_1,$b) ."\n";
+ $xx .= handle('phone',$location->phone_1,$b) ."\n";
$pre = "<br />";
}
if ( $location->phone_2 != "" ) {
$b = myentities($location->phone_2);
- $r .= $pre . handle('phone',$location->phone_2,$b) ."\n";
+ $xx .= $pre . handle('phone',$location->phone_2,$b) ."\n";
}
}
- $r .= " </td>";
+ $r .= $layout->OverviewRowBlock($xx,'over_l');
}
if ( $layout->head['fax'] ) {
$b = $layout->mark_filter(myentities($location->fax_1),'fax');
@@ -412,16 +412,20 @@
}
if ( $layout->head['city'] ) {
$b = $layout->mark_filter(myentities($location->city),'city');
- $r .= ' <td class="over_l">'. $b ."</td>\n";
+ $r .= $layout->OverviewRowBlock($b,'over_l');
}
if ( $layout->head['c_id'] ) {
- $r .= ' <td class="over_l">'.(is_object($location->company) ? $location->company->getLink():' ') ."</td>\n";
+ $r .= $layout->OverviewRowBlock((is_object($location->company) ? $location->company->getLink():' '),'over_l');
}
if ( $layout->head['d_id'] ) {
- $r .= ' <td class="over_l">'.(is_object($location->department) ? $location->department->getLink():' ') ."</td>\n";
+ if ( $layout->head['c_id'] ) {
+ $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink($location->department->name):' '),'over_l');
+ } else {
+ $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink():' '),'over_l');
+ }
}
if ( ($row == 0) && ($layout->head['icon_after']) ) {
-# myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank.
+ // myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank.
$r .= $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">"," </td>\n",$address,$address,$current_user->get_preficons(2),false);
}
$r .= show_custom_overview_data($layout,'address',$address);
@@ -511,4 +515,4 @@
}
return $r;
}
-?>
\ No newline at end of file
+?>
Modified: trunk/php/company.pinc
===================================================================
--- trunk/php/company.pinc 2012-10-09 12:02:22 UTC (rev 816)
+++ trunk/php/company.pinc 2012-10-09 14:37:56 UTC (rev 817)
@@ -265,9 +265,9 @@
$info = '';
$info .= '<table class="popupinfo">';
$info .= '<tr><th colspan="2">'. $fn ."</th></tr>";
- $info .= '<tr><td valign="top">'. $lang['Phone'] .':</td><td>';
- if ( isset($this->location) ) {
+ if ( isset($this->location) && count($this->location) ) {
+ $info .= '<tr><td valign="top">'. $lang['Phone'] .':</td><td>';
$pre = '';
foreach($this->location as $i => $f) {
if ( $f->phone_1 != "" ) {
@@ -279,8 +279,8 @@
$pre = "<br />";
}
}
+ $info .= ' </td></tr>';
}
- $info .= ' </td></tr>';
$info .= $this->custom_popup_content();
$info .= '</table>';
return $info;
@@ -498,4 +498,4 @@
}
}
$tutos['classes'][usecompany] = 'company';
-?>
\ 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...> - 2012-10-09 12:02:29
|
Revision: 816
http://tutos.svn.sourceforge.net/tutos/?rev=816&view=rev
Author: gokohnert
Date: 2012-10-09 12:02:22 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/url/url_overview.php
Modified: trunk/php/url/url_overview.php
===================================================================
--- trunk/php/url/url_overview.php 2012-10-09 11:43:30 UTC (rev 815)
+++ trunk/php/url/url_overview.php 2012-10-09 12:02:22 UTC (rev 816)
@@ -39,6 +39,7 @@
$blist = array();
// Make a big array of all visible urls
$np = array();
+ $x = 0;
while ( $x < $n ) {
$b = new url($this->dbconn);
$b->read_result($this->result,$x);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-09 11:43:36
|
Revision: 815
http://tutos.svn.sourceforge.net/tutos/?rev=815&view=rev
Author: gokohnert
Date: 2012-10-09 11:43:30 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
fix ldap import
Modified Paths:
--------------
trunk/php/department.pinc
trunk/php/ldap/ldap.pinc
trunk/php/location.pinc
Modified: trunk/php/department.pinc
===================================================================
--- trunk/php/department.pinc 2012-10-07 17:50:15 UTC (rev 814)
+++ trunk/php/department.pinc 2012-10-09 11:43:30 UTC (rev 815)
@@ -254,10 +254,10 @@
$this->read_locs_data();
$info = '';
$info .= '<table class="popupinfo">';
- $info .= '<tr><th colspan="2">'. $fn .'</th></tr>';
- $info .= '<tr><td valign="top">'. $lang['Phone'] .':</font></td><td>';
+ $info .= '<tr><th colspan="2">'. myentities($this->company->getFullName()) .'<br />'. myentities($this->name) .'</th></tr>';
- if ( isset($this->location) ) {
+ if ( isset($this->location) && count($this->location) ) {
+ $info .= '<tr><td valign="top">'. $lang['Phone'] .':</font></td><td>';
$pre = '';
foreach($this->location as $i => $f) {
if ( $f->phone_1 != "" ) {
@@ -269,8 +269,8 @@
$pre = "<br />";
}
}
+ $info .= ' </td></tr>';
}
- $info .= ' </td></tr>';
$info .= $this->custom_popup_content();
$info .= '</table>';
return $info;
@@ -434,7 +434,9 @@
$r .= " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
$pre = "";
foreach($obj->list[usedepartment] as $i => $f) {
- $r .= $pre . $obj->list[usedepartment][$i]->getLink($obj->list[usedepartment][$i]->name) ."\n";
+ $obj->list[usedepartment][$i]->read_members();
+ $r .= $pre . $obj->list[usedepartment][$i]->getLink($obj->list[usedepartment][$i]->name);
+ $r .= ' ('.count($obj->list[usedepartment][$i]->member).')'."\n";
$pre = "<br />\n";
}
$r .= " </td>\n";
@@ -525,4 +527,4 @@
}
}
$tutos['classes'][usedepartment] = 'department';
-?>
\ No newline at end of file
+?>
Modified: trunk/php/ldap/ldap.pinc
===================================================================
--- trunk/php/ldap/ldap.pinc 2012-10-07 17:50:15 UTC (rev 814)
+++ trunk/php/ldap/ldap.pinc 2012-10-09 11:43:30 UTC (rev 815)
@@ -159,7 +159,7 @@
* Import/Update the given key to/in TUTOS
*/
function import($key) {
- global $lang,$tutos,$msg;
+ global $lang,$tutos,$msg,$info,$table;
if (isset($tutos['ldap:'. $this->host .":". $this->port]['uniquekey']) ) {
$ukey = $tutos['ldap:'. $this->host .":". $this->port]['uniquekey'];
@@ -364,33 +364,59 @@
if (isset($tutos['ldap:'. $this->host .":". $this->port]['company']) ) {
$v = strtolower($tutos['ldap:'. $this->host .":". $this->port]['company']);
if (isset($import[$c][$v][0]) ) {
- $loc[$c]->company = check_field($import[$c][$v][0],"company","cl","c");
- // Create Company on demand
- if ( !is_object($loc[$c]->company) ) {
+ $q = 'SELECT * from '. $this->dbconn->prefix.$table['company'][name].' where name ='.$this->dbconn->String(trim($import[$c][$v][0]));
+ $r = $this->dbconn->Exec($q);
+ $n = $r->numrows();
+ if ($n == 1) {
$comp = new company($this->dbconn);
- $comp->setName($import[$c][$v][0]);
+ $comp->read_result($r,0);
+ $loc[$c]->company = &$comp;
+ unset($comp);
+ } else if ($n == 0) {
+ $info = addLine($info,$lang['CompanyCreateInfo'] .':'. $import[$c][$v][0]);
+ $comp = new company($this->dbconn);
+ $comp->setName(trim($import[$c][$v][0]));
$comp->save();
$loc[$c]->company = &$comp;
+ unset($comp);
}
+ $r->free();
}
}
if (isset($tutos['ldap:'. $this->host .":". $this->port]['department']) ) {
$v = strtolower($tutos['ldap:'. $this->host .":". $this->port]['department']);
if (isset($import[$c][$v][0]) ) {
- $loc[$c]->department = check_field($import[$c][$v][0],"department","dl","d");
+ if (is_object($loc[$c]->company)) {
+ $q = 'SELECT * from '. $this->dbconn->prefix.$table['department'][name].' where name ='.$this->dbconn->String(trim($import[$c][$v][0]));
+ $q .= ' AND c_id = '.$loc[$c]->company->id;
+ $r = $this->dbconn->Exec($q);
+ $n = $r->numrows();
+ if ($n == 1) {
+ $dep = new department($this->dbconn);
+ $dep->read_result($r,0);
+ $loc[$c]->department = &$dep;
+ unset($dep);
+ } else if ($n == 0) {
+ $info = addLine($info,$lang['DepCreateInfo'] .':'. $import[$c][$v][0]);
+ $dep = new department($this->dbconn);
+ $dep->setName(trim($import[$c][$v][0]));
+ $dep->setCompany($loc[$c]->company->id);
+ $dep->save();
+ $loc[$c]->department = &$dep;
+ unset($dep);
+ }
+ $r->free();
+ }
}
}
-
}
-# if (isset($tutos['ldap:'. $this->host .":". $this->port]['uniquekey']) ) {
- # $ukey = $tutos['ldap:'. $this->host .":". $this->port]['uniquekey'];
- # }
+ // if (isset($tutos['ldap:'. $this->host .":". $this->port]['uniquekey']) ) {
+ // $ukey = $tutos['ldap:'. $this->host .":". $this->port]['uniquekey'];
+ // }
if (isset($import[0][$ukey])) {
$key = $ukey.'='.$import[0][$ukey][0];
}
-# echo $key.' '.$ukey.' '.$import[0][$ukey][0];
-# die();
$msg .= $adr->save();
if ($savefile) {
$adr->pic_file->link_id = $adr->id;
Modified: trunk/php/location.pinc
===================================================================
--- trunk/php/location.pinc 2012-10-07 17:50:15 UTC (rev 814)
+++ trunk/php/location.pinc 2012-10-09 11:43:30 UTC (rev 815)
@@ -566,6 +566,7 @@
$c[0] = $_POST['d_id'];
$c[1] = -1;
}
+ $this->department = new Department($this->dbconn);
$this->SetDepartment($this->department->read($c[0],$this->department));
$gotourl= addUrlParameter($gotourl,"dl[]=". $this->department->id,true);
$locid = $c[1];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-07 17:50:22
|
Revision: 814
http://tutos.svn.sourceforge.net/tutos/?rev=814&view=rev
Author: gokohnert
Date: 2012-10-07 17:50:15 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
mobile layout updates
Modified Paths:
--------------
trunk/php/layout/mobile_layout.pinc
trunk/php/login.pinc
trunk/php/scrum/log_overview.php
Modified: trunk/php/layout/mobile_layout.pinc
===================================================================
--- trunk/php/layout/mobile_layout.pinc 2012-10-07 08:43:22 UTC (rev 813)
+++ trunk/php/layout/mobile_layout.pinc 2012-10-07 17:50:15 UTC (rev 814)
@@ -801,18 +801,18 @@
$r = '';
$r .= '<div id="main" data-role="page">'."\n";
- $r .= " <div data-theme=\"a\" data-role=\"header\">\n";
- $r .= " <h3>". myentities($this->name) ."</h3>\n";
+ $r .= ' <div data-theme="a" data-role="header">'."\n";
+ $r .= ' <h4>'. myentities($this->name) ."</h4>\n";
$r .= ' <a href="index.html" data-icon="gear" class="ui-btn-right">Options</a>'."\n";
if ( isset($this->user->id) && ($this->user->id != -1) ) {
$r .= " <div data-theme=\"a\" data-role=\"navbar\">\n";
$r .= " <ul>\n";
- $r .= ' <li><a href="#main0" data-rel="dialog" data-transition="pop">'.$this->user->getShortName().'</a></li>'."\n";
- $r .= ' <li><a href="#main1" data-rel="dialog" data-transition="pop">'.$lang['Calendar'].'</a></li>'."\n";
- $r .= ' <li><a href="#main2" data-rel="dialog" data-transition="pop">'.$lang['Addresses'].'</a></li>'."\n";
- $r .= ' <li><a href="#main3" data-rel="dialog" data-transition="pop">'.$lang['BugTrack'].'</a></li>'."\n";
- $r .= ' <li><a href="#main4" data-rel="dialog" data-transition="pop">'.$lang['ProductMenu'].'</a></li>'."\n";
+ $r .= ' <li><a href="#main0" data-rel="popup" data-transition="pop">'.$this->user->getShortName().'</a></li>'."\n";
+ $r .= ' <li><a href="#main1" data-rel="popup" data-transition="pop">'.$lang['Calendar'].'</a></li>'."\n";
+ $r .= ' <li><a href="#main2" data-rel="popup" data-transition="pop">'.$lang['Addresses'].'</a></li>'."\n";
+ $r .= ' <li><a href="#main3" data-rel="popup" data-transition="pop">'.$lang['BugTrack'].'</a></li>'."\n";
+ $r .= ' <li><a href="#main4" data-rel="popup" data-transition="pop">'.$lang['ProductMenu'].'</a></li>'."\n";
$r .= " </ul>\n";
$r .= " </div>\n";
}
@@ -877,7 +877,7 @@
}
if ($c == '') return '';
- $r .= ' <div id="'.$section.'" data-role="page" data-theme="a">'."\n"; // page
+ $r .= ' <div id="'.$section.'" data-role="popup" data-theme="a">'."\n"; // page
$r .= ' <div data-theme="a" data-role="header">'."\n";
$r .= ' <h3>'.$first.'</h3>'."\n";
$r .= ' </div>'."\n"; // header
@@ -889,7 +889,7 @@
$r .= ' <div data-role="footer">'."\n";
$r .= ' <a href="#main" data-rel="back" data-role="button" data-inline="true" data-icon="back">BACK</a>';
$r .= ' </div>'."\n"; // footer
- $r .= ' </div><!-- subpage -->'."\n"; // page
+ $r .= ' </div><!-- subpage -->'."\n\n"; // page
return $r;
}
@@ -900,21 +900,20 @@
global $tutos,$lang,$g_hash;
$r = '';
+ $r .= " </div><!-- content -->\n"; // data-role content
$r .= " <!-- layout_stop -->\n";
- $r .= " </div><!-- content -->\n"; // data-role content
if ( isset($this->user->id) && ($this->user->id != -1) ) {
- $r .= " <div data-theme=\"a\" data-role=\"footer\">\n";
- $r .= " <div data-theme=\"a\" data-role=\"navbar\">\n";
- $r .= " <ul>\n";
- $r .= ' <li><a href="#obj" data-rel="dialog" data-transition="pop">EDIT</a></li>'."\n";
- $r .= ' <li><a href="#view" data-rel="dialog" data-transition="pop">VIEW</a></li>'."\n";
- $r .= ' <li><a href="#search" data-rel="dialog" data-transition="pop">SEARCH</a></li>'."\n";
- $r .= ' <li><a href="#module" data-rel="dialog" data-transition="pop">MODULE</a></li>'."\n";
+ $r .= ' <div data-theme="a" data-role="footer">'."\n";
+ $r .= ' <div data-theme="a" data-role="navbar">'."\n";
+ $r .= ' <ul>'."\n";
+ $r .= ' <li><a href="#obj" data-rel="popup" data-transition="pop">EDIT</a></li>'."\n";
+ $r .= ' <li><a href="#view" data-rel="popup" data-transition="pop">VIEW</a></li>'."\n";
+ $r .= ' <li><a href="#search" data-rel="popup" data-transition="pop">SEARCH</a></li>'."\n";
+ $r .= ' <li><a href="#module" data-rel="popup">MODULE</a></li>'."\n";
$r .= " </ul>\n";
$r .= " </div>\n"; // data-role navbar
$r .= " </div>\n"; // data-role footer
}
- $r .= " </div><!-- page -->\n"; // data-role page
// personal Menu
$r .= $this->makemenu('main0');
@@ -943,6 +942,7 @@
// Module Menu
$r .= $this->makemenu('module');
+ $r .= " </div><!-- page -->\n"; // data-role page
//$r .= "<!-- end of layout_stop -->\n";
return $r;
}
Modified: trunk/php/login.pinc
===================================================================
--- trunk/php/login.pinc 2012-10-07 08:43:22 UTC (rev 813)
+++ trunk/php/login.pinc 2012-10-07 17:50:15 UTC (rev 814)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2011 by Gero Kohnert
+ * Copyright 2001 - 2012 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
@@ -66,8 +66,7 @@
$r .= $this->SelectTableStart();
-
- $r .= "<tr>\n";
+ $r .= $this->ContentRowStart();
$r .= " <th colspan=\"2\">".$lang['PleaseLogin'];
if ( $tutos[authtype] == "x509" ) {
$r .= ' ('.$lang['Certificate'].')';
@@ -77,38 +76,38 @@
$r.="";
}
$r .="</th>\n";
+ $r .= $this->ContentRowEnd();
- $r .= "</tr>\n";
$r .= $this->ContentRowStart();
$r .= $this->showfieldc($lang['Username'],0,"uname");
-
- $r .= ' <td><input class="required_fld" id="uname" type="text" size="'. min($table['people']['login'][size],20) .'" maxlength="'. $table['people']['login'][size] .'" name="uname"';
+ $xx = ' <input class="required_fld" id="uname" type="text" size="'. min($table['people']['login'][size],20) .'" maxlength="'. $table['people']['login'][size] .'" name="uname"';
if ( $tutos[authtype] == "x509") {
- $r .= ' value="'.$_SERVER["SSL_CLIENT_S_DN_CN"].'" readonly="readonly"';
+ $xx .= ' value="'.$_SERVER["SSL_CLIENT_S_DN_CN"].'" readonly="readonly"';
} else if ( $tutos[authtype] == "remoteuser") {
- $r .= ' value="'.$auth[0]->getuname().'" readonly="readonly"';
+ $xx .= ' value="'.$auth[0]->getuname().'" readonly="readonly"';
} else {
- $r .= ' value=""';
+ $xx .= ' value=""';
}
if ( ($tutos[debug] == 0) && ($tutos['autocomplete'] == 0) ) {
- $r .= ' autocomplete="off"';
+ $xx .= ' autocomplete="off"';
}
- $r .= ' /></td>';
+ $xx .= ' />';
+ $r .= $this->showdata($xx);
$r .= $this->ContentRowEnd();
$r .= $this->ContentRowStart();
$r .= $this->showfieldc($lang['Password'],0,"pw");
-
- $r .= ' <td><input class="required_fld" id="pw" type="password" size="'. min($table['people']['pw'][size],20) .'" maxlength="'. $table['people']['pw'][size] .'" name="pw"';
+ $xx = ' <input class="required_fld" id="pw" type="password" size="'. min($table['people']['pw'][size],20) .'" maxlength="'. $table['people']['pw'][size] .'" name="pw"';
if ( $tutos[authtype] == "x509") {
- $r .= ' value="x509" readonly="readonly"';
+ $xx .= ' value="x509" readonly="readonly"';
} else if ( $tutos[authtype] == "remoteuser") {
- $r .= ' value="" readonly="readonly"';
+ $xx .= ' value="" readonly="readonly"';
} else {
- $r .= '';
+ $xx .= '';
}
- $r .= ' /></td>';
+ $xx .= ' />';
+ $r .= $this->showdata($xx);
$r .= $this->ContentRowEnd();
if ( $this->db > -1 ) {
@@ -119,7 +118,7 @@
if ( count($tutos[dbname]) > 1 ) {
$r .= $this->ContentRowStart();
$r .= $this->showfieldc($lang['DB'],0,"dbnr");
- $r .= " <td><select id=\"dbnr\" name=\"dbnr\">\n";
+ $xx = ' <select id="dbnr" name="dbnr">'."\n";
foreach ($tutos[dbname] as $i => $f) {
// check if db server is visible on webserver
if (isset($tutos[servernames][$i]) && is_array($tutos[servernames][$i]) && count($tutos[servernames][$i]) > 0) {
@@ -132,15 +131,16 @@
}
if ($stop) continue;
}
- $r .= ' <option value="'. $i .'"'. ($db == $i ? ' selected="selected"':'') .">";
+ $xx .= ' <option value="'. $i .'"'. ($db == $i ? ' selected="selected"':'') .">";
if ( isset($tutos[dbalias][$i]) ) {
- $r .= $tutos[dbalias][$i];
+ $xx .= $tutos[dbalias][$i];
} else {
- $r .= $tutos[dbname][$i] .'@'. $tutos[dbhost][$i];
+ $xx .= $tutos[dbname][$i] .'@'. $tutos[dbhost][$i];
}
- $r .= "</option>\n";
+ $xx .= "</option>\n";
}
- $r .= "</select></td>\n";
+ $xx .= "</select>\n";
+ $r .= $this->showdata($xx);
$r .= $this->ContentRowEnd();
} else {
$this->addHidden("dbnr","0");
@@ -148,19 +148,20 @@
}
}
- $r .= "<tr>\n";
- $r .= ' <td><input id="login" name="login" type="submit" value="'. $lang['Login'] ."\" /></td>\n";
- $r .= ' <td align="right">';
+ $r .= $this->ContentRowStart();
+ $r .= $this->showdata('<input id="login" name="login" type="submit" value="'. $lang['Login'] ."\" />");
+ $xx = '';
if($tutos[help_need_login] == 0) {
$m = make_helplink('login');
- $r .= sprintf ("<a href=\"%s\" %s "self.status='%s' ;return true;\" "self.status='';return true;\" title=\"%s\">%s</a>",$m,"",myentities($lang['HelpInfo'],1),myentities($lang['HelpInfo']),$lang['Help']);
+ $xx .= sprintf ("<a href=\"%s\" %s "self.status='%s' ;return true;\" "self.status='';return true;\" title=\"%s\">%s</a>",$m,"",myentities($lang['HelpInfo'],1),myentities($lang['HelpInfo']),$lang['Help']);
}
- $r .= " </td>\n";
- $r .= "</tr>\n";
+ $r .= $this->showdata($xx);
+ $r .= $this->ContentRowEnd();
+
if ( $tutos[pwlostsupport] > 0 ) {
- $r .= "<tr>\n";
+ $r .= $this->ContentRowStart();
$r .= ' <td colspan="2"><input id="pwlost" name="login" type="submit" value="'. $lang['LostPassword'] ."\" /></td>\n";
- $r .= "</tr>\n";
+ $r .= $this->ContentRowEnd();
}
$r .= $this->SelectTableEnd();
Modified: trunk/php/scrum/log_overview.php
===================================================================
--- trunk/php/scrum/log_overview.php 2012-10-07 08:43:22 UTC (rev 813)
+++ trunk/php/scrum/log_overview.php 2012-10-07 17:50:15 UTC (rev 814)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2009 - 2011 by Gero Kohnert
+ * Copyright 2009 - 2012 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
@@ -110,8 +110,8 @@
$r .= $this->header;
$r .= $this->actionformStart('log_overview.php');
$r .= $this->OverviewTableStart();
- $r .= "<thead>\n";
- $r .= "<tr>\n";
+ $r .= $this->OverviewHeadStart();
+ $r .= $this->OverviewHeadLineStart();
if ($this->head['name']) {
$r .= $this->orderHeader('name',$lang['ScrumLogName'],$this->link2);
@@ -156,8 +156,8 @@
$r .= show_custom_overview_headers($this,'scrumlog',$this->link2);
$r .= $this->MassUpdateHeader();
- $r .= "</tr>\n";
- $r .= "</thead>\n";
+ $r .= $this->OverviewHeadLineEnd();
+ $r .= $this->OverviewHeadEnd();
$line = 1;
while ( ($a < $n) && ($a < $end) ) {
@@ -171,63 +171,66 @@
// NAME
if ($this->head['name']) {
$x = $this->mark_filter(myentities($obj->name),'name');
- $r .= ' <td class="over_l">'. $obj->getLink($x,'ss='.$ss) .'</td>'."\n";
+ $r .= $this->OverviewRowBlock($obj->getLink($x,'ss='.$ss),'over_l');
}
// Project Ref
if ($this->head['p_id']) {
+ $x = '';
if (is_object($obj->p_ref))
$x = $this->mark_filter(myentities($obj->p_ref->getFullName()),'p_fn');
- $r .= ' <td class="over_l">'. (is_object($obj->p_ref) ? $obj->p_ref->getLink($x):' ') .'</td>'."\n";
+ $r .= $this->OverviewRowBlock((is_object($obj->p_ref) ? $obj->p_ref->getLink($x):' '),'over_l');
}
// Sprint Ref
if ($this->head['sprint_id']) {
+ $x = '';
if (is_object($obj->sprint))
$x = $this->mark_filter(myentities($obj->sprint->getFullName()),'s_fn');
- $r .= ' <td class="over_l">'. (is_object($obj->sprint) ? $obj->sprint->getLink($x):' ') .'</td>'."\n";
+ $r .= $this->OverviewRowBlock((is_object($obj->sprint) ? $obj->sprint->getLink($x):' '),'over_l');
}
// Prio
if ($this->head['prio']) {
- $r .= ' <td class="over_l"><div class="logprio" style="'.$obj->getPrioColor($obj->prio).'">';
+ $x = '<div class="logprio" style="'.$obj->getPrioColor($obj->prio).'">';
if ($obj->mod_ok() && !is_object($obj->sprint)) {
$u = addUrlParameter($this->link1,'action=PP');
$u = addUrlParameter($u,'mark[]='.$obj->id);
- $r .= makelink($u,'+');
- $r .= ' '.$obj->prio.' ';
+ $x .= makelink($u,'+');
+ $x .= ' '.$obj->prio.' ';
$u = addUrlParameter($this->link1,'action=PM');
$u = addUrlParameter($u,'mark[]='.$obj->id);
- $r .= makelink($u,'-');
+ $x .= makelink($u,'-');
} else {
- $r .= $obj->prio;
+ $x .= $obj->prio;
}
- $r .= '</div></td>'."\n";
+ $x .= '</div>'."\n";
+ $r .= $this->OverviewRowBlock($x,'over_l');
}
// State
if ($this->head['state']) {
- $r .= ' <td class="over_l">';
+ $x = '';
if ($obj->state == SCRUMLOGSTATE_DONE) {
- $r .= $this->theme->getImage(tick,'list');
+ $x .= $this->theme->getImage(tick,'list');
}
- $r .= $lang['ScrumLogStates'][$obj->state];
- $r .= '</td>'."\n";
+ $x .= $lang['ScrumLogStates'][$obj->state];
+ $r .= $this->OverviewRowBlock($x,'over_l');
}
// Object Ref
if ($this->head['ref_id']) {
- $r .= ' <td class="over_l">'. (is_object($obj->ref) ? $obj->ref->getLink():'-') .'</td>'."\n";
+ $r .= $this->OverviewRowBlock((is_object($obj->ref) ? $obj->ref->getLink():'-'),'over_l');
}
// Capacity
if ($this->head['capacity']) {
- $r .= '<td class="over_r">';
if ($obj->capacity > $tutos['scrum_max_hours'] || $obj->capacity <= 0) {
- $r .= ' <div class="scrum_too_long">';
+ $x = ' <div class="scrum_too_long">';
} else {
- $r .= ' <div>';
+ $x = ' <div>';
}
- $r .= hour_format($obj->capacity).'</div></td>'."\n";
+ $x .= hour_format($obj->capacity).'</div>';
+ $r .= $this->OverviewRowBlock($x,'over_r');
}
if ($this->head['booked']) {
$obj->readTimetrackSum();
- $r .= '<td class="over_r">';
+ $x = '';
if ( ($this->user->id == $obj->w_id) &&
($obj->state != SCRUMLOGSTATE_DONE) &&
($obj->sprint->state != SCRUMSPRINT_STATE_CLOSED) &&
@@ -244,30 +247,31 @@
if ($obj->obj_feature_ok($this->user,usetimetrack,PERM_NEW)) {
$url = addUrlParameter($url,'wd='.$obj->start_dt->getYYYYMMDD());
$url = addUrlParameter($url,'ss='.$ss);
- $r .= makelink($url,'<b>+</b>',sprintf($lang['TimetrackCreateI'], $obj->getFullName())).' ';
+ $x .= makelink($url,'<b>+</b>',sprintf($lang['TimetrackCreateI'], $obj->getFullName())).' ';
}
}
if ($obj->timetracksum > 0) {
if ($obj->obj_feature_ok($this->user,usetimetrack,PERM_SEE)) {
$url = 'timetrack/timetrack_overview.php?link_id='.$obj->id;
$url = addUrlParameter($url,'hide[]=distance');
- $r .= makelink($url,hour_format($obj->timetracksum));
+ $x .= makelink($url,hour_format($obj->timetracksum));
} else {
- $r .= hour_format($obj->timetracksum);
+ $x .= hour_format($obj->timetracksum);
}
}
- $r .= '</td>'."\n";
+ $r .= $this->OverviewRowBlock($x,'over_r');
}
// Worker
if ($this->head['w_id']) {
+ $x = '';
if (is_object($obj->worker))
$x = $this->mark_filter(myentities($obj->worker->getFullName()),'w_fn');
- $r .= ' <td class="over_l">'. (is_object($obj->worker) ? $obj->worker->getLink($x):' ') .'</td>'."\n";
+ $r .= $this->OverviewRowBlock((is_object($obj->worker) ? $obj->worker->getLink($x):' '),'over_l');
}
// Start
if ($this->head['start']) {
- $r .= ' <td class="over_l">'. $obj->start_dt->getDate() .'</td>'."\n";
+ $r .= $this->OverviewRowBlock($obj->start_dt->getDate(),'over_l');
}
$r .= show_custom_overview_data($this,'scrumlog',$obj);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-07 08:43:30
|
Revision: 813
http://tutos.svn.sourceforge.net/tutos/?rev=813&view=rev
Author: gokohnert
Date: 2012-10-07 08:43:22 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
mobile layout updates
Modified Paths:
--------------
trunk/html/css/jquery.mobile.min.css
trunk/html/js/jquery.mobile.min.js
trunk/php/admin_show.php
trunk/php/bugtracking/bug_overview.php
trunk/php/custom.pinc
trunk/php/file/file_overview.php
trunk/php/layout/classic_base.pinc
trunk/php/layout/layout_base.pinc
trunk/php/layout/mobile_layout.pinc
trunk/php/layout/new_base.pinc
trunk/php/ldap/ldap_overview.php
trunk/php/note/note_overview.php
trunk/php/product_overview.php
trunk/php/reminder/reminder_overview.php
trunk/php/team_overview.php
trunk/php/timetrack/timetrack_overview.php
trunk/php/url/urlcat_show.php
Modified: trunk/html/css/jquery.mobile.min.css
===================================================================
--- trunk/html/css/jquery.mobile.min.css 2012-10-05 07:30:48 UTC (rev 812)
+++ trunk/html/css/jquery.mobile.min.css 2012-10-07 08:43:22 UTC (rev 813)
@@ -1,2 +1,2 @@
-/*! jQuery Mobile v1.1.0-rc.1 jquerymobile.com | jquery.org/license */
-.ui-bar-a{border:1px solid #333;background:#111;color:#fff;font-weight:bold;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#111));background-image:-webkit-linear-gradient(#3c3c3c,#111);background-image:-moz-linear-gradient(#3c3c3c,#111);background-image:-ms-linear-gradient(#3c3c3c,#111);background-image:-o-linear-gradient(#3c3c3c,#111);background-image:linear-gradient(#3c3c3c,#111)}.ui-bar-a,.ui-bar-a input,.ui-bar-a select,.ui-bar-a textarea,.ui-bar-a button{font-family:Helvetica,Arial,sans-serif}.ui-bar-a .ui-link-inherit{color:#fff}.ui-bar-a .ui-link{color:#7cc4e7;font-weight:bold}.ui-bar-a .ui-link:hover{color:#2489ce}.ui-bar-a .ui-link:active{color:#2489ce}.ui-bar-a .ui-link:visited{color:#2489ce}.ui-body-a,.ui-overlay-a{border:1px solid #444;background:#111;color:#fff;text-shadow:0 1px 1px #000;font-weight:normal;background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#222));background-image:-webkit-linear-gradient(#444,#222);background-image:-moz-linear-gradient(#444,#222);background-image:-ms-linear-gradient(#444,#222);background-image:-o-linear-gradient(#444,#222);background-image:linear-gradient(#444,#222)}.ui-overlay-a{background-image:none;border-width:0}.ui-body-a,.ui-body-a input,.ui-body-a select,.ui-body-a textarea,.ui-body-a button{font-family:Helvetica,Arial,sans-serif}.ui-body-a .ui-link-inherit{color:#fff}.ui-body-a .ui-link{color:#2489ce;font-weight:bold}.ui-body-a .ui-link:hover{color:#2489ce}.ui-body-a .ui-link:active{color:#2489ce}.ui-body-a .ui-link:visited{color:#2489ce}.ui-btn-up-a{border:1px solid #111;background:#333;font-weight:bold;color:#fff;text-shadow:0 1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#4f4f4f),to(#2d2d2d));background-image:-webkit-linear-gradient(#4f4f4f,#2d2d2d);background-image:-moz-linear-gradient(#4f4f4f,#2d2d2d);background-image:-ms-linear-gradient(#4f4f4f,#2d2d2d);background-image:-o-linear-gradient(#4f4f4f,#2d2d2d);background-image:linear-gradient(#4f4f4f,#2d2d2d)}.ui-btn-up-a a.ui-link-inherit{color:#fff}.ui-btn-hover-a{border:1px solid #000;background:#444;font-weight:bold;color:#fff;text-shadow:0 1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#555),to(#383838));background-image:-webkit-linear-gradient(#555,#383838);background-image:-moz-linear-gradient(#555,#383838);background-image:-ms-linear-gradient(#555,#383838);background-image:-o-linear-gradient(#555,#383838);background-image:linear-gradient(#555,#383838)}.ui-btn-hover-a a.ui-link-inherit{color:#fff}.ui-btn-down-a{border:1px solid #000;background:#222;font-weight:bold;color:#fff;text-shadow:0 1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#202020),to(#2c2c2c));background-image:-webkit-linear-gradient(#202020,#2c2c2c);background-image:-moz-linear-gradient(#202020,#2c2c2c);background-image:-ms-linear-gradient(#202020,#2c2c2c);background-image:-o-linear-gradient(#202020,#2c2c2c);background-image:linear-gradient(#202020,#2c2c2c)}.ui-btn-down-a a.ui-link-inherit{color:#fff}.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-b{border:1px solid #456f9a;background:#5e87b0;color:#fff;font-weight:bold;text-shadow:0 1px 1px #254f7a;background-image:-webkit-gradient(linear,left top,left bottom,from(#81a8ce),to(#5e87b0));background-image:-webkit-linear-gradient(#6facd5,#497bae);background-image:-moz-linear-gradient(#81a8ce,#5e87b0);background-image:-ms-linear-gradient(#81a8ce,#5e87b0);background-image:-o-linear-gradient(#81a8ce,#5e87b0);background-image:linear-gradient(#81a8ce,#5e87b0)}.ui-bar-b,.ui-bar-b input,.ui-bar-b select,.ui-bar-b textarea,.ui-bar-b button{font-family:Helvetica,Arial,sans-serif}.ui-bar-b .ui-link-inherit{color:#fff}.ui-bar-b .ui-link{color:#ddf0f8;font-weight:bold}.ui-bar-b .ui-link:hover{color:#ddf0f8}.ui-bar-b .ui-link:active{color:#ddf0f8}.ui-bar-b .ui-link:visited{color:#ddf0f8}.ui-body-b,.ui-overlay-b{border:1px solid #999;background:#f3f3f3;color:#222;text-shadow:0 1px 0 #fff;font-weight:normal;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddd),to(#ccc));background-image:-webkit-linear-gradient(#ddd,#ccc);background-image:-moz-linear-gradient(#ddd,#ccc);background-image:-ms-linear-gradient(#ddd,#ccc);background-image:-o-linear-gradient(#ddd,#ccc);background-image:linear-gradient(#ddd,#ccc)}.ui-overlay-b{background-image:none;border-width:0}.ui-body-b,.ui-body-b input,.ui-body-b select,.ui-body-b textarea,.ui-body-b button{font-family:Helvetica,Arial,sans-serif}.ui-body-b .ui-link-inherit{color:#333}.ui-body-b .ui-link{color:#2489ce;font-weight:bold}.ui-body-b .ui-link:hover{color:#2489ce}.ui-body-b .ui-link:active{color:#2489ce}.ui-body-b .ui-link:visited{color:#2489ce}.ui-btn-up-b{border:1px solid #044062;background:#396b9e;font-weight:bold;color:#fff;text-shadow:0 1px 1px #044062;background-image:-webkit-gradient(linear,left top,left bottom,from(#5f9cc5),to(#396b9e));background-image:-webkit-linear-gradient(#5f9cc5,#396b9e);background-image:-moz-linear-gradient(#5f9cc5,#396b9e);background-image:-ms-linear-gradient(#5f9cc5,#396b9e);background-image:-o-linear-gradient(#5f9cc5,#396b9e);background-image:linear-gradient(#5f9cc5,#396b9e)}.ui-btn-up-b a.ui-link-inherit{color:#fff}.ui-btn-hover-b{border:1px solid #00415e;background:#4b88b6;font-weight:bold;color:#fff;text-shadow:0 1px 1px #014d68;background-image:-webkit-gradient(linear,left top,left bottom,from(#72b0d4),to(#4272a4));background-image:-webkit-linear-gradient(#6facd5,#4272a4);background-image:-moz-linear-gradient(#6facd5,#4272a4);background-image:-ms-linear-gradient(#6facd5,#4272a4);background-image:-o-linear-gradient(#6facd5,#4272a4);background-image:linear-gradient(#6facd5,#4272a4)}.ui-btn-hover-b a.ui-link-inherit{color:#fff}.ui-btn-down-b{border:1px solid #225377;background:#4e89c5;font-weight:bold;color:#fff;text-shadow:0 1px 1px #225377;background-image:-webkit-gradient(linear,left top,left bottom,from(#396b9e),to(#295b8e));background-image:-webkit-linear-gradient(#295b8e,#3e79b5);background-image:-moz-linear-gradient(#295b8e,#3e79b5);background-image:-ms-linear-gradient(#295b8e,#3e79b5);background-image:-o-linear-gradient(#295b8e,#3e79b5);background-image:linear-gradient(#295b8e,#3e79b5)}.ui-btn-down-b a.ui-link-inherit{color:#fff}.ui-btn-up-b,.ui-btn-hover-b,.ui-btn-down-b{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-c{border:1px solid #b3b3b3;background:#eee;color:#3e3e3e;font-weight:bold;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#f0f0f0),to(#ddd));background-image:-webkit-linear-gradient(#f0f0f0,#ddd);background-image:-moz-linear-gradient(#f0f0f0,#ddd);background-image:-ms-linear-gradient(#f0f0f0,#ddd);background-image:-o-linear-gradient(#f0f0f0,#ddd);background-image:linear-gradient(#f0f0f0,#ddd)}.ui-bar-c .ui-link-inherit{color:#3e3e3e}.ui-bar-c .ui-link{color:#7cc4e7;font-weight:bold}.ui-bar-c .ui-link:hover{color:#2489ce}.ui-bar-c .ui-link:active{color:#2489ce}.ui-bar-c .ui-link:visited{color:#2489ce}.ui-bar-c,.ui-bar-c input,.ui-bar-c select,.ui-bar-c textarea,.ui-bar-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c,.ui-overlay-c{border:1px solid #aaa;color:#333;text-shadow:0 1px 0 #fff;background:#f9f9f9;background-image:-webkit-gradient(linear,left top,left bottom,from(#f9f9f9),to(#eee));background-image:-webkit-linear-gradient(#f9f9f9,#eee);background-image:-moz-linear-gradient(#f9f9f9,#eee);background-image:-ms-linear-gradient(#f9f9f9,#eee);background-image:-o-linear-gradient(#f9f9f9,#eee);background-image:linear-gradient(#f9f9f9,#eee)}.ui-overlay-c{background-image:none;border-width:0}.ui-body-c,.ui-body-c input,.ui-body-c select,.ui-body-c textarea,.ui-body-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c .ui-link-inherit{color:#333}.ui-body-c .ui-link{color:#2489ce;font-weight:bold}.ui-body-c .ui-link:hover{color:#2489ce}.ui-body-c .ui-link:active{color:#2489ce}.ui-body-c .ui-link:visited{color:#2489ce}.ui-btn-up-c{border:1px solid #ccc;background:#eee;font-weight:bold;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1)}.ui-btn-up-c a.ui-link-inherit{color:#2f3e46}.ui-btn-hover-c{border:1px solid #bbb;background:#dfdfdf;font-weight:bold;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#f6f6f6),to(#e0e0e0));background-image:-webkit-linear-gradient(#f9f9f9,#e0e0e0);background-image:-moz-linear-gradient(#f6f6f6,#e0e0e0);background-image:-ms-linear-gradient(#f6f6f6,#e0e0e0);background-image:-o-linear-gradient(#f6f6f6,#e0e0e0);background-image:linear-gradient(#f6f6f6,#e0e0e0)}.ui-btn-hover-c a.ui-link-inherit{color:#2f3e46}.ui-btn-down-c{border:1px solid #bbb;background:#d6d6d6;font-weight:bold;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#d0d0d0),to(#dfdfdf));background-image:-webkit-linear-gradient(#d0d0d0,#dfdfdf);background-image:-moz-linear-gradient(#d0d0d0,#dfdfdf);background-image:-ms-linear-gradient(#d0d0d0,#dfdfdf);background-image:-o-linear-gradient(#d0d0d0,#dfdfdf);background-image:linear-gradient(#d0d0d0,#dfdfdf)}.ui-btn-down-c a.ui-link-inherit{color:#2f3e46}.ui-btn-up-c,.ui-btn-hover-c,.ui-btn-down-c{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-d{border:1px solid #bbb;background:#bbb;color:#333;text-shadow:0 1px 0 #eee;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddd),to(#bbb));background-image:-webkit-linear-gradient(#ddd,#bbb);background-image:-moz-linear-gradient(#ddd,#bbb);background-image:-ms-linear-gradient(#ddd,#bbb);background-image:-o-linear-gradient(#ddd,#bbb);background-image:linear-gradient(#ddd,#bbb)}.ui-bar-d,.ui-bar-d input,.ui-bar-d select,.ui-bar-d textarea,.ui-bar-d button{font-family:Helvetica,Arial,sans-serif}.ui-bar-d .ui-link-inherit{color:#333}.ui-bar-d .ui-link{color:#2489ce;font-weight:bold}.ui-bar-d .ui-link:hover{color:#2489ce}.ui-bar-d .ui-link:active{color:#2489ce}.ui-bar-d .ui-link:visited{color:#2489ce}.ui-body-d,.ui-overlay-d{border:1px solid #bbb;color:#333;text-shadow:0 1px 0 #fff;background:#fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#fff));background-image:-webkit-linear-gradient(#fff,#fff);background-image:-moz-linear-gradient(#fff,#fff);background-image:-ms-linear-gradient(#fff,#fff);background-image:-o-linear-gradient(#fff,#fff);background-image:linear-gradient(#fff,#fff)}.ui-overlay-d{background-image:none;border-width:0}.ui-body-d,.ui-body-d input,.ui-body-d select,.ui-body-d textarea,.ui-body-d button{font-family:Helvetica,Arial,sans-serif}.ui-body-d .ui-link-inherit{color:#333}.ui-body-d .ui-link{color:#2489ce;font-weight:bold}.ui-body-d .ui-link:hover{color:#2489ce}.ui-body-d .ui-link:active{color:#2489ce}.ui-body-d .ui-link:visited{color:#2489ce}.ui-btn-up-d{border:1px solid #bbb;background:#fff;font-weight:bold;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#f6f6f6));background-image:-webkit-linear-gradient(#fafafa,#fff);background-image:-moz-linear-gradient(#fafafa,#f6f6f6);background-image:-ms-linear-gradient(#fafafa,#f6f6f6);background-image:-o-linear-gradient(#fafafa,#f6f6f6);background-image:linear-gradient(#fafafa,#f6f6f6)}.ui-btn-up-d a.ui-link-inherit{color:#333}.ui-btn-hover-d{border:1px solid #aaa;background:#eee;font-weight:bold;color:#333;cursor:pointer;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#fff));background-image:-webkit-linear-gradient(#eee,#fff);background-image:-moz-linear-gradient(#eee,#fff);background-image:-ms-linear-gradient(#eee,#fff);background-image:-o-linear-gradient(#eee,#fff);background-image:linear-gradient(#eee,#fff)}.ui-btn-hover-d a.ui-link-inherit{color:#333}.ui-btn-down-d{border:1px solid #aaa;background:#eee;font-weight:bold;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#e5e5e5),to(#f2f2f2));background-image:-webkit-linear-gradient(#e5e5e5,#f2f2f2);background-image:-moz-linear-gradient(#e5e5e5,#f2f2f2);background-image:-ms-linear-gradient(#e5e5e5,#f2f2f2);background-image:-o-linear-gradient(#e5e5e5,#f2f2f2);background-image:linear-gradient(#e5e5e5,#f2f2f2)}.ui-btn-down-d a.ui-link-inherit{color:#333}.ui-btn-up-d,.ui-btn-hover-d,.ui-btn-down-d{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-e{border:1px solid #f7c942;background:#fadb4e;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fceda7),to(#fbef7e));background-image:-webkit-linear-gradient(#fceda7,#fbef7e);background-image:-moz-linear-gradient(#fceda7,#fbef7e);background-image:-ms-linear-gradient(#fceda7,#fbef7e);background-image:-o-linear-gradient(#fceda7,#fbef7e);background-image:linear-gradient(#fceda7,#fbef7e)}.ui-bar-e,.ui-bar-e input,.ui-bar-e select,.ui-bar-e textarea,.ui-bar-e button{font-family:Helvetica,Arial,sans-serif}.ui-bar-e .ui-link-inherit{color:#333}.ui-bar-e .ui-link{color:#2489ce;font-weight:bold}.ui-bar-e .ui-link:hover{color:#2489ce}.ui-bar-e .ui-link:active{color:#2489ce}.ui-bar-e .ui-link:visited{color:#2489ce}.ui-body-e,.ui-overlay-e{border:1px solid #f7c942;color:#222;text-shadow:0 1px 0 #fff;background:#fff9df;background-image:-webkit-gradient(linear,left top,left bottom,from(#fffadf),to(#fff3a5));background-image:-webkit-linear-gradient(#fffadf,#fff3a5);background-image:-moz-linear-gradient(#fffadf,#fff3a5);background-image:-ms-linear-gradient(#fffadf,#fff3a5);background-image:-o-linear-gradient(#fffadf,#fff3a5);background-image:linear-gradient(#fffadf,#fff3a5)}.ui-overlay-e{background-image:none;border-width:0}.ui-body-e,.ui-body-e input,.ui-body-e select,.ui-body-e textarea,.ui-body-e button{font-family:Helvetica,Arial,sans-serif}.ui-body-e .ui-link-inherit{color:#333}.ui-body-e .ui-link{color:#2489ce;font-weight:bold}.ui-body-e .ui-link:hover{color:#2489ce}.ui-body-e .ui-link:active{color:#2489ce}.ui-body-e .ui-link:visited{color:#2489ce}.ui-btn-up-e{border:1px solid #f4c63f;background:#fadb4e;font-weight:bold;color:#222;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#ffefaa),to(#ffe155));background-image:-webkit-linear-gradient(#ffefaa,#ffe155);background-image:-moz-linear-gradient(#ffefaa,#ffe155);background-image:-ms-linear-gradient(#ffefaa,#ffe155);background-image:-o-linear-gradient(#ffefaa,#ffe155);background-image:linear-gradient(#ffefaa,#ffe155)}.ui-btn-up-e a.ui-link-inherit{color:#222}.ui-btn-hover-e{border:1px solid #f2c43d;background:#fbe26f;font-weight:bold;color:#111;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff5ba),to(#fbdd52));background-image:-webkit-linear-gradient(#fff5ba,#fbdd52);background-image:-moz-linear-gradient(#fff5ba,#fbdd52);background-image:-ms-linear-gradient(#fff5ba,#fbdd52);background-image:-o-linear-gradient(#fff5ba,#fbdd52);background-image:linear-gradient(#fff5ba,#fbdd52)}.ui-btn-hover-e a.ui-link-inherit{color:#333}.ui-btn-down-e{border:1px solid #f2c43d;background:#fceda7;font-weight:bold;color:#111;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#f8d94c),to(#fadb4e));background-image:-webkit-linear-gradient(#f8d94c,#fadb4e);background-image:-moz-linear-gradient(#f8d94c,#fadb4e);background-image:-ms-linear-gradient(#f8d94c,#fadb4e);background-image:-o-linear-gradient(#f8d94c,#fadb4e);background-image:linear-gradient(#f8d94c,#fadb4e)}.ui-btn-down-e a.ui-link-inherit{color:#333}.ui-btn-up-e,.ui-btn-hover-e,.ui-btn-down-e{font-family:Helvetica,Arial,sans-serif;text-decoration:none}a.ui-link-inherit{text-decoration:none!important}.ui-btn-active{border:1px solid #2373a5;background:#5393c5;font-weight:bold;color:#fff;cursor:pointer;text-shadow:0 1px 1px #145072;text-decoration:none;background-image:-webkit-gradient(linear,left top,left bottom,from(#5393c5),to(#6facd5));background-image:-webkit-linear-gradient(#5393c5,#6facd5);background-image:-moz-linear-gradient(#5393c5,#6facd5);background-image:-ms-linear-gradient(#5393c5,#6facd5);background-image:-o-linear-gradient(#5393c5,#6facd5);background-image:linear-gradient(#5393c5,#6facd5);font-family:Helvetica,Arial,sans-serif}.ui-btn-active a.ui-link-inherit{color:#fff}.ui-btn-inner{border-top:1px solid #fff;border-color:rgba(255,255,255,.3)}.ui-corner-tl{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em}.ui-corner-tr{-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em}.ui-corner-bl{-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em}.ui-corner-br{-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-top{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em;-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em}.ui-corner-bottom{-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em;-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-right{-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em;-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-left{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em;-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em}.ui-corner-all{-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em}.ui-corner-none{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0}.ui-br{border-bottom:#828282;border-bottom:rgba(130,130,130,.3);border-bottom-width:1px;border-bottom-style:solid}.ui-disabled{opacity:.3}.ui-disabled,.ui-disabled a{cursor:default!important;pointer-events:none}.ui-disabled .ui-btn-text{-ms-filter:"alpha(opacity=30)";filter:alpha(opacity=30);zoom:1}.ui-icon,.ui-icon-searchfield:after{background:#666;background:rgba(0,0,0,.4);background-image:url(images/icons-18-white.png);background-repeat:no-repeat;-moz-border-radius:9px;-webkit-border-radius:9px;border-radius:9px}.ui-icon-alt{background:#fff;background:rgba(255,255,255,.3);background-image:url(images/icons-18-black.png);background-repeat:no-repeat}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min--moz-device-pixel-ratio:1.5),only screen and (min-resolution:240dpi){.ui-icon-plus,.ui-icon-minus,.ui-icon-delete,.ui-icon-arrow-r,.ui-icon-arrow-l,.ui-icon-arrow-u,.ui-icon-arrow-d,.ui-icon-check,.ui-icon-gear,.ui-icon-refresh,.ui-icon-forward,.ui-icon-back,.ui-icon-grid,.ui-icon-star,.ui-icon-alert,.ui-icon-info,.ui-icon-home,.ui-icon-search,.ui-icon-searchfield:after,.ui-icon-checkbox-off,.ui-icon-checkbox-on,.ui-icon-radio-off,.ui-icon-radio-on{background-image:url(images/icons-36-white.png);-moz-background-size:776px 18px;-o-background-size:776px 18px;-webkit-background-size:776px 18px;background-size:776px 18px}.ui-icon-alt{background-image:url(images/icons-36-black.png)}}.ui-icon-plus{background-position:-0 50%}.ui-icon-minus{background-position:-36px 50%}.ui-icon-delete{background-position:-72px 50%}.ui-icon-arrow-r{background-position:-108px 50%}.ui-icon-arrow-l{background-position:-144px 50%}.ui-icon-arrow-u{background-position:-180px 50%}.ui-icon-arrow-d{background-position:-216px 50%}.ui-icon-check{background-position:-252px 50%}.ui-icon-gear{background-position:-288px 50%}.ui-icon-refresh{background-position:-324px 50%}.ui-icon-forward{background-position:-360px 50%}.ui-icon-back{background-position:-396px 50%}.ui-icon-grid{background-position:-432px 50%}.ui-icon-star{background-position:-468px 50%}.ui-icon-alert{background-position:-504px 50%}.ui-icon-info{background-position:-540px 50%}.ui-icon-home{background-position:-576px 50%}.ui-icon-search,.ui-icon-searchfield:after{background-position:-612px 50%}.ui-icon-checkbox-off{background-position:-684px 50%}.ui-icon-checkbox-on{background-position:-648px 50%}.ui-icon-radio-off{background-position:-756px 50%}.ui-icon-radio-on{background-position:-720px 50%}.ui-checkbox .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.ui-icon-checkbox-off,.ui-icon-radio-off{background-color:transparent}.ui-checkbox-on .ui-icon,.ui-radio-on .ui-icon{background-color:#4596ce}.ui-icon-loading{background:url(images/ajax-loader.gif);background-size:46px 46px}.ui-btn-corner-tl{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em}.ui-btn-corner-tr{-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em}.ui-btn-corner-bl{-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em}.ui-btn-corner-br{-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-top{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em;-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em}.ui-btn-corner-bottom{-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em;-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-right{-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em;-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-left{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em;-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em}.ui-btn-corner-all{-moz-border-radius:1em;-webkit-border-radius:1em;border-radius:1em}.ui-corner-tl,.ui-corner-tr,.ui-corner-bl,.ui-corner-br,.ui-corner-top,.ui-corner-bottom,.ui-corner-right,.ui-corner-left,.ui-corner-all,.ui-btn-corner-tl,.ui-btn-corner-tr,.ui-btn-corner-bl,.ui-btn-corner-br,.ui-btn-corner-top,.ui-btn-corner-bottom,.ui-btn-corner-right,.ui-btn-corner-left,.ui-btn-corner-all{-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.ui-overlay{background:#666;opacity:.5;filter:Alpha(Opacity=50);position:absolute;width:100%;height:100%}.ui-overlay-shadow{-moz-box-shadow:0 0 12px rgba(0,0,0,.6);-webkit-box-shadow:0 0 12px rgba(0,0,0,.6);box-shadow:0 0 12px rgba(0,0,0,.6)}.ui-shadow{-moz-box-shadow:0 1px 4px rgba(0,0,0,.3);-webkit-box-shadow:0 1px 4px rgba(0,0,0,.3);box-shadow:0 1px 4px rgba(0,0,0,.3)}.ui-bar-a .ui-shadow,.ui-bar-b .ui-shadow,.ui-bar-c .ui-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.ui-shadow-inset{-moz-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);box-shadow:inset 0 1px 4px rgba(0,0,0,.2)}.ui-icon-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.4);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.4);box-shadow:0 1px 0 rgba(255,255,255,.4)}.ui-btn:focus{outline:0}.ui-focus,.ui-btn:focus{-moz-box-shadow:0 0 12px #387bbe;-webkit-box-shadow:0 0 12px #387bbe;box-shadow:0 0 12px #387bbe}.ui-mobile-nosupport-boxshadow *{-moz-box-shadow:none!important;-webkit-box-shadow:none!important;box-shadow:none!important}.ui-mobile-nosupport-boxshadow .ui-focus,.ui-mobile-nosupport-boxshadow .ui-btn:focus{outline-width:1px;outline-style:dotted}.ui-mobile,.ui-mobile body{height:99.9%}.ui-mobile fieldset,.ui-page{padding:0;margin:0}.ui-mobile a img,.ui-mobile fieldset{border-width:0}.ui-mobile-viewport{margin:0;overflow-x:visible;-webkit-text-size-adjust:none;-ms-text-size-adjust:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}body.ui-mobile-viewport,div.ui-mobile-viewport{overflow-x:hidden}.ui-mobile [data-role=page],.ui-mobile [data-role=dialog],.ui-page{top:0;left:0;width:100%;min-height:100%;position:absolute;display:none;border:0}.ui-mobile .ui-page-active{display:block;overflow:visible}.ui-page{outline:0}@media screen and (orientation:portrait){.ui-mobile,.ui-mobile .ui-page{min-height:420px}}@media screen and (orientation:landscape){.ui-mobile,.ui-mobile .ui-page{min-height:300px}}.ui-loading .ui-loader{display:block}.ui-loader{display:none;z-index:9999999;position:fixed;top:50%;box-shadow:0 1px 1px -1px #fff;left:50%;border:0}.ui-loader-default{background:0;opacity:.18;width:46px;height:46px;margin-left:-23px;margin-top:-23px}.ui-loader-verbose{width:200px;opacity:.88;height:auto;margin-left:-110px;margin-top:-43px;padding:10px}.ui-loader-default h1{font-size:0;width:0;height:0;overflow:hidden}.ui-loader-verbose h1{font-size:16px;margin:0;text-align:center}.ui-loader .ui-icon{background-color:#000;display:block;margin:0;width:44px;height:44px;padding:1px;-webkit-border-radius:36px;-moz-border-radius:36px;border-radius:36px}.ui-loader-verbose .ui-icon{margin:0 auto 10px;opacity:.75}.ui-loader-textonly{padding:15px;margin-left:-115px}.ui-loader-textonly .ui-icon{display:none}.ui-loader-fakefix{position:absolute}.ui-mobile-rendering>*{visibility:hidden}.ui-bar,.ui-body{position:relative;padding:.4em 15px;overflow:hidden;display:block;clear:both}.ui-bar{font-size:16px;margin:0}.ui-bar h1,.ui-bar h2,.ui-bar h3,.ui-bar h4,.ui-bar h5,.ui-bar h6{margin:0;padding:0;font-size:16px;display:inline-block}.ui-header,.ui-footer{position:relative;overflow:hidden;border-left-width:0;border-right-width:0}.ui-header .ui-btn-left,.ui-header .ui-btn-right{position:absolute;top:-5px}.ui-header .ui-btn-left,.ui-footer .ui-btn-left{left:5px}.ui-header .ui-btn-right,.ui-footer .ui-btn-right{right:5px}.ui-footer .ui-btn-icon-notext,.ui-header .ui-btn-icon-notext{top:-1px}.ui-header .ui-title,.ui-footer .ui-title{min-height:1.1em;text-align:center;font-size:16px;display:block;margin:.6em 30% .8em;padding:0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;outline:0!important}.ui-footer .ui-title{margin:.6em 15px .8em}.ui-content{border-width:0;overflow:visible;overflow-x:hidden;padding:15px}.ui-icon{width:18px;height:18px}.ui-mobile img{max-width:100%}.ui-nojs{position:absolute;left:-9999px}.ui-hide-label label,.ui-hidden-accessible{position:absolute!important;left:-9999px;clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px)}.ui-mobile-viewport-transitioning,.ui-mobile-viewport-transitioning .ui-page{width:100%;height:100%;overflow:hidden}.in{-webkit-animation-timing-function:ease-out;-webkit-animation-duration:350ms;-moz-animation-timing-function:ease-out;-moz-animation-duration:350ms}.out{-webkit-animation-timing-function:ease-in;-webkit-animation-duration:225ms;-moz-animation-timing-function:ease-in;-moz-animation-duration:225}@-webkit-keyframes fadein{from{opacity:0}to{opacity:1}}@-moz-keyframes fadein{from{opacity:0}to{opacity:1}}@-webkit-keyframes fadeout{from{opacity:1}to{opacity:0}}@-moz-keyframes fadeout{from{opacity:1}to{opacity:0}}.fade.out{opacity:0;-webkit-animation-duration:125ms;-webkit-animation-name:fadeout;-moz-animation-duration:125ms;-moz-animation-name:fadeout}.fade.in{opacity:1;-webkit-animation-duration:225ms;-webkit-animation-name:fadein;-moz-animation-duration:225ms;-moz-animation-name:fadein}.pop{-webkit-transform-origin:50% 50%;-moz-transform-origin:50% 50%}.pop.in{-webkit-transform:scale(1);-moz-transform:scale(1);opacity:1;-webkit-animation-name:popin;-moz-animation-name:popin;-webkit-animation-duration:350ms;-moz-animation-duration:350ms}.pop.out{-webkit-animation-name:fadeout;-moz-animation-name:fadeout;opacity:0;-webkit-animation-duration:100ms;-moz-animation-duration:100ms}.pop.in.reverse{-webkit-animation-name:fadein;-moz-animation-name:fadein}.pop.out.reverse{-webkit-transform:scale(.8);-moz-transform:scale(.8);-webkit-animation-name:popout;-moz-animation-name:popout}@-webkit-keyframes popin{from{-webkit-transform:scale(.8);opacity:0}to{-webkit-transform:scale(1);opacity:1}}@-moz-keyframes popin{from{-moz-transform:scale(.8);opacity:0}to{-moz-transform:scale(1);opacity:1}}@-webkit-keyframes popout{from{-webkit-transform:scale(1);opacity:1}to{-webkit-transform:scale(.8);opacity:0}}@-moz-keyframes popout{from{-moz-transform:scale(1);opacity:1}to{-moz-transform:scale(.8);opacity:0}}.slide.out{-webkit-transform:translateX(-100%);-webkit-animation-name:slideouttoleft;-moz-transform:translateX(-100%);-moz-animation-name:slideouttoleft;-webkit-animation-duration:225ms;-moz-animation-duration:225ms}.slide.in{-webkit-transform:translateX(0);-webkit-animation-name:fadein;-moz-transform:translateX(0);-moz-animation-name:fadein;-webkit-animation-duration:200ms;-moz-animation-duration:200ms}.slide.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:slideouttoright;-moz-transform:translateX(100%);-moz-animation-name:slideouttoright;-webkit-animation-duration:200ms;-moz-animation-duration:200ms}.slide.in.reverse{-webkit-transform:translateX(0);-webkit-animation-name:fadein;-moz-transform:translateX(0);-moz-animation-name:fadein;-webkit-animation-duration:200ms;-moz-animation-duration:200ms}@-webkit-keyframes slideouttoleft{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(-100%)}}@-moz-keyframes slideouttoleft{from{-moz-transform:translateX(0)}to{-moz-transform:translateX(-100%)}}@-webkit-keyframes slideouttoright{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(100%)}}@-moz-keyframes slideouttoright{from{-moz-transform:translateX(0)}to{-moz-transform:translateX(100%)}}.slidedown.out{-webkit-animation-name:fadeout;-moz-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-duration:100ms}.slidedown.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfromtop;-moz-transform:translateY(0);-moz-animation-name:slideinfromtop;-webkit-animation-duration:250ms;-moz-animation-duration:250ms}.slidedown.in.reverse{-webkit-animation-name:fadein;-moz-animation-name:fadein;-webkit-animation-duration:150ms;-moz-animation-duration:150ms}.slidedown.out.reverse{-webkit-transform:translateY(-100%);-moz-transform:translateY(-100%);-webkit-animation-name:slideouttotop;-moz-animation-name:slideouttotop;-webkit-animation-duration:200ms;-moz-animation-duration:200ms}@-webkit-keyframes slideinfromtop{from{-webkit-transform:translateY(-100%)}to{-webkit-transform:translateY(0)}}@-moz-keyframes slideinfromtop{from{-moz-transform:translateY(-100%)}to{-moz-transform:translateY(0)}}@-webkit-keyframes slideouttotop{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(-100%)}}@-moz-keyframes slideouttotop{from{-moz-transform:translateY(0)}to{-moz-transform:translateY(-100%)}}.slideup.out{-webkit-animation-name:fadeout;-moz-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-duration:100ms}.slideup.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfrombottom;-moz-transform:translateY(0);-moz-animation-name:slideinfrombottom;-webkit-animation-duration:250ms;-moz-animation-duration:250ms}.slideup.in.reverse{-webkit-animation-name:fadein;-moz-animation-name:fadein;-webkit-animation-duration:150ms;-moz-animation-duration:150ms}.slideup.out.reverse{-webkit-transform:translateY(100%);-moz-transform:translateY(100%);-webkit-animation-name:slideouttobottom;-moz-animation-name:slideouttobottom;-webkit-animation-duration:200ms;-moz-animation-duration:200ms}@-webkit-keyframes slideinfrombottom{from{-webkit-transform:translateY(100%)}to{-webkit-transform:translateY(0)}}@-moz-keyframes slideinfrombottom{from{-moz-transform:translateY(100%)}to{-moz-transform:translateY(0)}}@-webkit-keyframes slideouttobottom{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(100%)}}@-moz-keyframes slideouttobottom{from{-moz-transform:translateY(0)}to{-moz-transform:translateY(100%)}}.viewport-flip{-webkit-perspective:1000;-moz-perspective:1000;position:absolute}.flip{-webkit-backface-visibility:hidden;-webkit-transform:translateX(0);-moz-backface-visibility:hidden;-moz-transform:translateX(0)}.flip.out{-webkit-transform:rotateY(-90deg) scale(.9);-webkit-animation-name:flipouttoleft;-webkit-animation-duration:175ms;-moz-transform:rotateY(-90deg) scale(.9);-moz-animation-name:flipouttoleft;-moz-animation-duration:175ms}.flip.in{-webkit-animation-name:flipintoright;-webkit-animation-duration:225ms;-moz-animation-name:flipintoright;-moz-animation-duration:225ms}.flip.out.reverse{-webkit-transform:rotateY(90deg) scale(.9);-webkit-animation-name:flipouttoright;-moz-transform:rotateY(90deg) scale(.9);-moz-animation-name:flipouttoright}.flip.in.reverse{-webkit-animation-name:flipintoleft;-moz-animation-name:flipintoleft}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(-90deg) scale(.9)}}@-moz-keyframes flipouttoleft{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(-90deg) scale(.9)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(90deg) scale(.9)}}@-moz-keyframes flipouttoright{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(90deg) scale(.9)}}@-webkit-keyframes flipintoleft{from{-webkit-transform:rotateY(-90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoleft{from{-moz-transform:rotateY(-90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@-webkit-keyframes flipintoright{from{-webkit-transform:rotateY(90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoright{from{-moz-transform:rotateY(90deg) scale(.9)}to{-moz-transform:rotateY(0)}}.viewport-turn{-webkit-perspective:1000;-moz-perspective:1000;position:absolute}.turn{-webkit-backface-visibility:hidden;-webkit-transform:translateX(0);-webkit-transform-origin:0 0;-moz-backface-visibility:hidden;-moz-transform:translateX(0);-moz-transform-origin:0 0}.turn.out{-webkit-transform:rotateY(-90deg) scale(.9);-webkit-animation-name:flipouttoleft;-moz-transform:rotateY(-90deg) scale(.9);-moz-animation-name:flipouttoleft;-webkit-animation-duration:125ms;-moz-animation-duration:125ms}.turn.in{-webkit-animation-name:flipintoright;-moz-animation-name:flipintoright;-webkit-animation-duration:250ms;-moz-animation-duration:250ms}.turn.out.reverse{-webkit-transform:rotateY(90deg) scale(.9);-webkit-animation-name:flipouttoright;-moz-transform:rotateY(90deg) scale(.9);-moz-animation-name:flipouttoright}.turn.in.reverse{-webkit-animation-name:flipintoleft;-moz-animation-name:flipintoleft}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(-90deg) scale(.9)}}@-moz-keyframes flipouttoleft{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(-90deg) scale(.9)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(90deg) scale(.9)}}@-moz-keyframes flipouttoright{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(90deg) scale(.9)}}@-webkit-keyframes flipintoleft{from{-webkit-transform:rotateY(-90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoleft{from{-moz-transform:rotateY(-90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@-webkit-keyframes flipintoright{from{-webkit-transform:rotateY(90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoright{from{-moz-transform:rotateY(90deg) scale(.9)}to{-moz-transform:rotateY(0)}}.flow{-webkit-transform-origin:50% 30%;-moz-transform-origin:50% 30%;-webkit-box-shadow:0 0 20px rgba(0,0,0,.4);-moz-box-shadow:0 0 20px rgba(0,0,0,.4)}.ui-dialog.flow{-webkit-transform-origin:none;-moz-transform-origin:none;-webkit-box-shadow:none;-moz-box-shadow:none}.flow.out{-webkit-transform:translateX(-100%) scale(.7);-webkit-animation-name:flowouttoleft;-webkit-animation-timing-function:ease;-webkit-animation-duration:350ms;-moz-transform:translateX(-100%) scale(.7);-moz-animation-name:flowouttoleft;-moz-animation-timing-function:ease;-moz-animation-duration:350ms}.flow.in{-webkit-transform:translateX(0) scale(1);-webkit-animation-name:flowinfromright;-webkit-animation-timing-function:ease;-webkit-animation-duration:350ms;-moz-transform:translateX(0) scale(1);-moz-animation-name:flowinfromright;-moz-animation-timing-function:ease;-moz-animation-duration:350ms}.flow.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:flowouttoright;-moz-transform:translateX(100%);-moz-animation-name:flowouttoright}.flow.in.reverse{-webkit-animation-name:flowinfromleft;-moz-animation-name:flowinfromleft}@-webkit-keyframes flowouttoleft{0%{-webkit-transform:translateX(0) scale(1)}60%,70%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(-100%) scale(.7)}}@-moz-keyframes flowouttoleft{0%{-moz-transform:translateX(0) scale(1)}60%,70%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(-100%) scale(.7)}}@-webkit-keyframes flowouttoright{0%{-webkit-transform:translateX(0) scale(1)}60%,70%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(100%) scale(.7)}}@-moz-keyframes flowouttoright{0%{-moz-transform:translateX(0) scale(1)}60%,70%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(100%) scale(.7)}}@-webkit-keyframes flowinfromleft{0%{-webkit-transform:translateX(-100%) scale(.7)}30%,40%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(0) scale(1)}}@-moz-keyframes flowinfromleft{0%{-moz-transform:translateX(-100%) scale(.7)}30%,40%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(0) scale(1)}}@-webkit-keyframes flowinfromright{0%{-webkit-transform:translateX(100%) scale(.7)}30%,40%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(0) scale(1)}}@-moz-keyframes flowinfromright{0%{-moz-transform:translateX(100%) scale(.7)}30%,40%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(0) scale(1)}}.ui-grid-a,.ui-grid-b,.ui-grid-c,.ui-grid-d{overflow:hidden}.ui-block-a,.ui-block-b,.ui-block-c,.ui-block-d,.ui-block-e{margin:0;padding:0;border:0;float:left;min-height:1px}.ui-grid-solo .ui-block-a{width:100%;float:none}.ui-grid-a .ui-block-a,.ui-grid-a .ui-block-b{width:50%}.ui-grid-a .ui-block-a{clear:left}.ui-grid-b .ui-block-a,.ui-grid-b .ui-block-b,.ui-grid-b .ui-block-c{width:33.333%}.ui-grid-b .ui-block-a{clear:left}.ui-grid-c .ui-block-a,.ui-grid-c .ui-block-b,.ui-grid-c .ui-block-c,.ui-grid-c .ui-block-d{width:25%}.ui-grid-c .ui-block-a{clear:left}.ui-grid-d .ui-block-a,.ui-grid-d .ui-block-b,.ui-grid-d .ui-block-c,.ui-grid-d .ui-block-d,.ui-grid-d .ui-block-e{width:20%}.ui-grid-d .ui-block-a{clear:left}.ui-header-fixed,.ui-footer-fixed{left:0;right:0;position:fixed;z-index:1000}.ui-header-fixed{top:0}.ui-footer-fixed{bottom:-1px;padding-bottom:1px}.ui-header-fullscreen,.ui-footer-fullscreen{opacity:.9}.ui-page-header-fixed{padding-top:2.5em}.ui-page-footer-fixed{padding-bottom:3em}.ui-page-header-fullscreen .ui-content,.ui-page-footer-fullscreen .ui-content{padding:0}.ui-fixed-hidden{position:absolute}.ui-page-header-fullscreen .ui-fixed-hidden,.ui-page-footer-fullscreen .ui-fixed-hidden{left:-99999em}.ui-header-fixed .ui-btn,.ui-footer-fixed .ui-btn{z-index:10}.ui-navbar{overflow:hidden}.ui-navbar ul,.ui-navbar-expanded ul{list-style:none;padding:0;margin:0;position:relative;display:block;border:0}.ui-navbar-collapsed ul{float:left;width:75%;margin-right:-2px}.ui-navbar-collapsed .ui-navbar-toggle{float:left;width:25%}.ui-navbar li.ui-navbar-truncate{position:absolute;left:-9999px;top:-9999px}.ui-navbar li .ui-btn,.ui-navbar .ui-navbar-toggle .ui-btn{display:block;font-size:12px;text-align:center;margin:0;border-right-width:0;max-width:100%}.ui-navbar li .ui-btn{margin-right:-1px}.ui-navbar li .ui-btn:last-child{margin-right:0}.ui-header .ui-navbar li .ui-btn,.ui-header .ui-navbar .ui-navbar-toggle .ui-btn,.ui-footer .ui-navbar li .ui-btn,.ui-footer .ui-navbar .ui-navbar-toggle .ui-btn{border-top-width:0;border-bottom-width:0}.ui-navbar .ui-btn-inner{padding-left:2px;padding-right:2px}.ui-navbar-noicons li .ui-btn .ui-btn-inner,.ui-navbar-noicons .ui-navbar-toggle .ui-btn-inner{padding-top:.8em;padding-bottom:.9em}.ui-navbar-expanded .ui-btn{margin:0;font-size:14px}.ui-navbar-expanded .ui-btn-inner{padding-left:5px;padding-right:5px}.ui-navbar-expanded .ui-btn-icon-top .ui-btn-inner{padding:45px 5px 15px;text-align:center}.ui-navbar-expanded .ui-btn-icon-top .ui-icon{top:15px}.ui-navbar-expanded .ui-btn-icon-bottom .ui-btn-inner{padding:15px 5px 45px;text-align:center}.ui-navbar-expanded .ui-btn-icon-bottom .ui-icon{bottom:15px}.ui-navbar-expanded li .ui-btn .ui-btn-inner{min-height:2.5em}.ui-navbar-expanded .ui-navbar-noicons .ui-btn .ui-btn-inner{padding-top:1.8em;padding-bottom:1.9em}.ui-btn{display:block;text-align:center;cursor:pointer;position:relative;margin:.5em 5px;padding:0}.ui-mini{margin:.25em 5px}.ui-btn-inner{padding:.6em 25px;display:block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;position:relative;zoom:1}.ui-btn input,.ui-btn button{z-index:2}.ui-btn-left,.ui-btn-right,.ui-btn-inline{display:inline-block}.ui-header .ui-btn-inner,.ui-footer .ui-btn-inner,.ui-mini .ui-btn-inner{font-size:13px;padding:.55em 1.5em .5em}.ui-header .ui-fullsize .ui-btn-inner,.ui-footer .ui-fullsize .ui-btn-inner{font-size:16px;padding:.6em 25px}.ui-btn-icon-notext{width:24px;height:24px}.ui-btn-icon-notext .ui-btn-inner{padding:2px 1px 2px 3px}.ui-btn-text{position:relative;z-index:1}.ui-btn-icon-notext .ui-btn-text{position:absolute;left:-9999px}.ui-btn-icon-left .ui-btn-inner{padding-left:33px}.ui-btn-icon-right .ui-btn-inner{padding-right:33px}.ui-btn-icon-top .ui-btn-inner{padding-top:33px}.ui-btn-icon-bottom .ui-btn-inner{padding-bottom:33px}.ui-btn-icon-notext .ui-icon{display:block;z-index:0}.ui-btn-icon-left .ui-icon,.ui-btn-icon-right .ui-icon{position:absolute;top:50%;margin-top:-9px}.ui-btn-icon-top .ui-icon,.ui-btn-icon-bottom .ui-icon{position:absolute;left:50%;margin-left:-9px}.ui-btn-icon-left .ui-icon{left:10px}.ui-btn-icon-right .ui-icon{right:10px}.ui-btn-icon-top .ui-icon{top:10px}.ui-btn-icon-bottom .ui-icon{bottom:10px}.ui-mini.ui-btn-icon-left .ui-icon{left:8px}.ui-mini.ui-btn-icon-right .ui-icon{right:8px}.ui-mini.ui-btn-icon-top .ui-icon{top:8px}.ui-mini.ui-btn-icon-bottom .ui-icon{bottom:8px}.ui-btn-hidden{position:absolute;top:0;left:0;width:100%;height:100%;-webkit-appearance:button;opacity:.1;cursor:pointer;background:#fff;background:rgba(255,255,255,0);filter:Alpha(Opacity=.0001);font-size:1px;border:0;text-indent:-9999px}.ui-collapsible{margin:.5em 0}.ui-collapsible-heading{font-size:16px;display:block;margin:0 -8px;padding:0;border-width:0 0 1px 0;position:relative}.ui-collapsible-heading a{text-align:left;margin:0}.ui-collapsible-heading .ui-btn-inner,.ui-collapsible-heading .ui-btn-icon-left .ui-btn-inner{padding-left:40px}.ui-collapsible-heading .ui-btn-icon-right .ui-btn-inner{padding-left:12px;padding-right:40px}.ui-collapsible-heading .ui-btn-icon-top .ui-btn-inner,.ui-collapsible-heading .ui-btn-icon-bottom .ui-btn-inner{padding-right:40px;text-align:center}.ui-collapsible-heading a span.ui-btn{position:absolute;left:6px;top:50%;margin:-12px 0 0 0;width:20px;height:20px;padding:1px 0 1px 2px;text-indent:-9999px}.ui-collapsible-heading a span.ui-btn .ui-btn-inner{padding:10px 0}.ui-collapsible-heading a span.ui-btn .ui-icon{left:0;margin-top:-10px}.ui-collapsible-heading-status{position:absolute;top:-9999px;left:0}.ui-collapsible-content{display:block;margin:0 -8px;padding:10px 16px;border-top:0;background-image:none;font-weight:normal}.ui-collapsible-content-collapsed{display:none}.ui-collapsible-set{margin:.5em 0}.ui-collapsible-set .ui-collapsible{margin:-1px 0 0}.ui-controlgroup,fieldset.ui-controlgroup{padding:0;margin:0 0 .5em}.ui-bar .ui-controlgroup{margin:0 .3em}.ui-controlgroup-label{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .4em}.ui-controlgroup-controls{display:block;width:100%}.ui-controlgroup li{list-style:none}.ui-controlgroup-vertical .ui-btn,.ui-controlgroup-vertical .ui-checkbox,.ui-controlgroup-vertical .ui-radio{margin:0;border-bottom-width:0}.ui-controlgroup-controls label.ui-select{position:absolute;left:-9999px}.ui-controlgroup-vertical .ui-controlgroup-last{border-bottom-width:1px}.ui-controlgroup-horizontal{padding:0}.ui-controlgroup-horizontal .ui-btn,.ui-controlgroup-horizontal .ui-select{display:inline-block;margin:0 -5px 0 0}.ui-controlgroup-horizontal .ui-checkbox,.ui-controlgroup-horizontal .ui-radio{float:left;margin:0 -1px 0 0}.ui-controlgroup-horizontal .ui-checkbox .ui-btn,.ui-controlgroup-horizontal .ui-radio .ui-btn,.ui-controlgroup-horizontal .ui-checkbox:last-child,.ui-controlgroup-horizontal .ui-radio:last-child{margin-right:0}.ui-controlgroup-horizontal .ui-controlgroup-last{margin-right:0}.ui-controlgroup .ui-checkbox label,.ui-controlgroup .ui-radio label{font-size:16px}@media all and (min-width:450px){.ui-field-contain .ui-controlgroup-label{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-controlgroup-controls{width:60%;display:inline-block}.ui-field-contain .ui-controlgroup .ui-select{width:100%}.ui-field-contain .ui-controlgroup-horizontal .ui-select{width:auto}}.ui-dialog{background:none!important}.ui-dialog-contain{width:92.5%;max-width:500px;margin:10% auto 15px auto;padding:0}.ui-dialog .ui-header{margin-top:15%}.ui-dialog .ui-header,.ui-dialog .ui-content,.ui-dialog .ui-footer{display:block;position:relative;width:auto}.ui-dialog .ui-header,.ui-dialog .ui-footer{z-index:10;padding:0}.ui-dialog .ui-footer{padding:0 15px}.ui-dialog .ui-content{padding:15px}.ui-dialog{margin-top:-15px}.ui-checkbox,.ui-radio{position:relative;margin:.2em 0 .5em;z-index:1}.ui-checkbox .ui-btn,.ui-radio .ui-btn{margin:0;text-align:left;z-index:2}.ui-checkbox .ui-btn-inner,.ui-radio .ui-btn-inner{white-space:normal}.ui-checkbox .ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-btn-icon-left .ui-btn-inner{padding-left:45px}.ui-checkbox .ui-btn-icon-right .ui-btn-inner,.ui-radio .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-checkbox .ui-icon,.ui-radio .ui-icon{top:1.1em}.ui-checkbox .ui-btn-icon-left .ui-icon,.ui-radio .ui-btn-icon-left .ui-icon{left:15px}.ui-checkbox .ui-mini.ui-btn-icon-left .ui-icon,.ui-radio .ui-mini.ui-btn-icon-left .ui-icon{left:12px}.ui-checkbox .ui-btn-icon-right .ui-icon,.ui-radio .ui-btn-icon-right .ui-icon{right:15px}.ui-checkbox .ui-mini.ui-btn-icon-right .ui-icon,.ui-radio .ui-mini.ui-btn-icon-right .ui-icon{right:12px}.ui-checkbox input,.ui-radio input{position:absolute;left:20px;top:50%;width:10px;height:10px;margin:-5px 0 0 0;outline:0!important;z-index:1}.ui-field-contain,fieldset.ui-field-contain{padding:.8em 0;margin:0;border-width:0 0 1px 0;overflow:visible}.ui-field-contain:first-child{border-top-width:0}.ui-header .ui-field-contain-left,.ui-header .ui-field-contain-right{position:absolute;top:0;width:25%}.ui-header .ui-field-contain-left{left:1em}.ui-header .ui-field-contain-right{right:1em}@media all and (min-width:450px){.ui-field-contain,.ui-mobile fieldset.ui-field-contain{border-width:0;padding:0;margin:1em 0}}.ui-select{display:block;position:relative}.ui-select select{position:absolute;left:-9999px;top:-9999px}.ui-select .ui-btn{overflow:hidden;opacity:1;margin:0}.ui-select .ui-btn select{cursor:pointer;-webkit-appearance:button;left:0;top:0;width:100%;min-height:1.5em;min-height:100%;height:3em;max-height:100%;opacity:0;-ms-filter:"alpha(opacity=0)";filter:alpha(opacity=0);z-index:2}.ui-select .ui-disabled{opacity:.3}@-moz-document url-prefix(){.ui-select .ui-btn select{opacity:.0001}}.ui-select .ui-btn select.ui-select-nativeonly{opacity:1;text-indent:0}.ui-select .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-select .ui-btn-icon-right .ui-icon{right:15px}.ui-select .ui-mini.ui-btn-icon-right .ui-icon{right:7px}label.ui-select{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}.ui-select .ui-btn-text,.ui-selectmenu .ui-btn-text{display:block;min-height:1em;overflow:hidden}.ui-select .ui-btn-text{text-overflow:ellipsis}.ui-selectmenu{position:absolute;padding:0;z-index:1100!important;width:80%;max-width:350px;padding:6px}.ui-selectmenu .ui-listview{margin:0}.ui-selectmenu .ui-btn.ui-li-divider{cursor:default}.ui-selectmenu-hidden{top:-9999px;left:-9999px}.ui-selectmenu-screen{position:absolute;top:0;left:0;width:100%;height:100%;z-index:99}.ui-screen-hidden,.ui-selectmenu-list .ui-li .ui-icon{display:none}.ui-selectmenu-list .ui-li .ui-icon{display:block}.ui-li.ui-selectmenu-placeholder{display:none}.ui-selectmenu .ui-header .ui-title{margin:.6em 46px .8em}@media all and (min-width:450px){.ui-field-contain label.ui-select{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-select{width:60%;display:inline-block}}.ui-selectmenu .ui-header h1:after{content:'.';visibility:hidden}label.ui-input-text{font-size:16px;line-height:1.4;display:block;font-weight:normal;margin:0 0 .3em}input.ui-input-text,textarea.ui-input-text{background-image:none;padding:.4em;line-height:1.4;font-size:16px;display:block;width:97%;outline:0}.ui-header input.ui-input-text,.ui-footer input.ui-input-text{margin-left:1.25%;padding:.4em 1%;width:95.5%}input.ui-input-text{-webkit-appearance:none}textarea.ui-input-text{height:50px;-webkit-transition:height 200ms linear;-moz-transition:height 200ms linear;-o-transition:height 200ms linear;transition:height 200ms linear}.ui-input-search{padding:0 30px;background-image:none;position:relative}.ui-icon-searchfield:after{position:absolute;left:7px;top:50%;margin-top:-9px;content:"";width:18px;height:18px;opacity:.5}.ui-input-search input.ui-input-text{border:0;width:98%;padding:.4em 0;margin:0;display:block;background:transparent none;outline:0!important}.ui-input-search .ui-input-clear{position:absolute;right:0;top:50%;margin-top:-13px}.ui-mini .ui-input-clear{right:-3px}.ui-input-search .ui-input-clear-hidden{display:none}input.ui-mini,.ui-mini input{font-size:14px!important}textarea.ui-mini{height:45px}@media all and (min-width:450px){.ui-field-contain label.ui-input-text{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain input.ui-input-text,.ui-field-contain textarea.ui-input-text,.ui-field-contain .ui-input-search{width:60%;display:inline-block}.ui-field-contain .ui-input-search{width:50%}.ui-hide-label input.ui-input-text,.ui-hide-label textarea.ui-input-text,.ui-hide-label .ui-input-search{padding:.4em;width:97%}.ui-input-search input.ui-input-text{width:98%}}.ui-listview{margin:0;counter-reset:listnumbering}.ui-content .ui-listview{margin:-15px}.ui-content .ui-listview-inset{margin:1em 0}.ui-listview,.ui-li{list-style:none;padding:0}.ui-li,.ui-li.ui-field-contain{display:block;margin:0;position:relative;overflow:visible;text-align:left;border-width:0;border-top-width:1px}.ui-li .ui-btn-text a.ui-link-inherit{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-divider,.ui-li-static{padding:.5em 15px;font-size:14px;font-weight:bold}.ui-li-divider{counter-reset:listnumbering}ol.ui-listview .ui-link-inherit:before,ol.ui-listview .ui-li-static:before,.ui-li-dec{font-size:.8em;display:inline-block;padding-right:.3em;font-weight:normal;counter-increment:listnumbering;content:counter(listnumbering) ". "}ol.ui-listview .ui-li-jsnumbering:before{content:""!important}.ui-listview-inset .ui-li{border-right-width:1px;border-left-width:1px}.ui-li:last-child,.ui-li.ui-field-contain:last-child{border-bottom-width:1px}.ui-li>.ui-btn-inner{display:block;position:relative;padding:0}.ui-li .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li{padding:.7em 15px .7em 15px;display:block}.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-thumb{min-height:60px;padding-left:100px}.ui-li-has-icon .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-icon{min-height:20px;padding-left:40px}.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-count{padding-right:45px}.ui-li-has-arrow .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-arrow{padding-right:30px}.ui-li-has-arrow.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-arrow.ui-li-has-count{padding-right:75px}.ui-li-has-count .ui-btn-text{padding-right:15px}.ui-li-heading{font-size:16px;font-weight:bold;display:block;margin:.6em 0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-desc{font-size:12px;font-weight:normal;display:block;margin:-.5em 0 .6em;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-thumb,.ui-listview .ui-li-icon{position:absolute;left:1px;top:0;max-height:80px;max-width:80px}.ui-listview .ui-li-icon{max-height:40px;max-width:40px;left:10px;top:.9em}.ui-li-thumb,.ui-listview .ui-li-icon,.ui-li-content{float:left;margin-right:10px}.ui-li-aside{float:right;width:50%;text-align:right;margin:.3em 0}@media all and (min-width:480px){.ui-li-aside{width:45%}}.ui-li-divider{cursor:default}.ui-li-has-alt .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-alt{padding-right:95px}.ui-li-has-count .ui-li-count{position:absolute;font-size:11px;font-weight:bold;padding:.2em .5em;top:50%;margin-top:-.9em;right:38px}.ui-li-divider .ui-li-count,.ui-li-static .ui-li-count{right:10px}.ui-li-has-alt .ui-li-count{right:55px}.ui-li-link-alt{position:absolute;width:40px;height:100%;border-width:0;border-left-width:1px;top:0;right:0;margin:0;padding:0;z-index:2}.ui-li-link-alt .ui-btn{overflow:hidden;position:absolute;right:8px;top:50%;margin:-11px 0 0 0;border-bottom-width:1px;z-index:-1}.ui-li-link-alt .ui-btn-inner{padding:0;height:100%;position:absolute;width:100%;top:0;left:0}.ui-li-link-alt .ui-btn .ui-icon{right:50%;margin-right:-9px}.ui-listview * .ui-btn-inner>.ui-btn>.ui-btn-inner{border-top:0}.ui-listview-filter{border-width:0;overflow:hidden;margin:-15px -15px 15px -15px}.ui-listview-filter .ui-input-search{margin:5px;width:auto;display:block}.ui-listview-filter-inset{margin:-15px -5px -15px -5px;background:transparent}.ui-li.ui-screen-hidden{display:none}@media only screen and (min-device-width:768px) and (max-device-width:1024px){.ui-li .ui-btn-text{overflow:visible}}label.ui-slider{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}input.ui-slider-input,.ui-field-contain input.ui-slider-input{display:inline-block;width:50px}select.ui-slider-switch{display:none}div.ui-slider{position:relative;display:inline-block;overflow:visible;height:15px;padding:0;margin:0 2% 0 20px;top:4px;width:65%}div.ui-slider-mini{height:12px;margin-left:10px}div.ui-slider-bg{border:0;height:100%;padding-right:8px}.ui-controlgroup a.ui-slider-handle,a.ui-slider-handle{position:absolute;z-index:1;top:50%;width:28px;height:28px;margin-top:-15px;margin-left:-15px;outline:0}a.ui-slider-handle .ui-btn-inner{padding-left:0}div.ui-slider-mini a.ui-slider-handle{height:14px;width:14px;margin:-8px 0 0 -7px}div.ui-slider-mini a.ui-slider-handle .ui-btn-inner{height:30px;width:30px;padding:0;margin:-9px 0 0 -9px}@media all and (min-width:320px){.ui-field-contain label.ui-slider{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain div.ui-slider{width:43%}.ui-field-contain div.ui-slider-switch{width:5.5em}}div.ui-slider-switch{height:32px;margin-left:0;width:5em}a.ui-slider-handle-snapping{-webkit-transition:left 70ms linear;-moz-transition:left 70ms linear}div.ui-slider-switch .ui-slider-handle{margin-top:1px}.ui-slider-inneroffset{margin:0 16px;position:relative;z-index:1}div.ui-slider-switch.ui-slider-mini{width:4.5em;height:29px}div.ui-slider-switch.ui-slider-mini .ui-slider-inneroffset{margin:0 15px 0 14px}div.ui-slider-switch.ui-slider-mini .ui-slider-handle{width:25px;height:25px;margin:1px 0 0 -13px}div.ui-slider-switch.ui-slider-mini a.ui-slider-handle .ui-btn-inner{height:30px;width:30px;padding:0;margin:0}span.ui-slider-label{position:absolute;text-align:center;width:100%;overflow:hidden;font-size:16px;top:0;line-height:2;min-height:100%;border-width:0}.ui-slider-mini span.ui-slider-label{font-size:14px}span.ui-slider-label-a{z-index:1;left:0;text-indent:-1.5em}span.ui-slider-label-b{z-index:0;right:0;text-indent:1.5em}.ui-slider-inline{width:120px;display:inline-block}
\ No newline at end of file
+/*! jQuery Mobile vGit Build: SHA1: b49cc06499abf8f987cf90f35349cfac0918c939 <> Date: Tue Oct 2 11:22:34 2012 -0700 jquerymobile.com | jquery.org/license !*/
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-05 07:30:55
|
Revision: 812
http://tutos.svn.sourceforge.net/tutos/?rev=812&view=rev
Author: gokohnert
Date: 2012-10-05 07:30:48 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
fix ldap
Modified Paths:
--------------
trunk/php/ldap/ldap.pinc
trunk/php/location.pinc
Modified: trunk/php/ldap/ldap.pinc
===================================================================
--- trunk/php/ldap/ldap.pinc 2012-10-05 07:30:17 UTC (rev 811)
+++ trunk/php/ldap/ldap.pinc 2012-10-05 07:30:48 UTC (rev 812)
@@ -78,22 +78,26 @@
$this->basedn = $tutos['ldap:'. $this->host .":". $this->port]['basedn'];
}
}
-
/**
*
*/
function connect() {
+global $tutos;
$this->ds = false;
$retry = 0;
while (!$this->ds && ($retry < 3)) {
$retry++;
- $this->ds = ldap_connect($this->host,$this->port);
+ #$this->ds = ldap_connect($this->host,$this->port);
+ $this->ds = ldap_connect('ldap://'.$this->host.':'.$this->port);
+error_log('ldap_connect:'.$this->host.' '.$this->port.' '.$retry.' '.$this->ds."\n",3,$tutos[errlog]);
# echo $this->host.":".$this->port."<br />";
}
if ( $this->ds == false ) {
+error_log('ldap_connect: FALSE '.$this->ds."\n",3,$tutos[errlog]);
return false;
}
if (! ldap_bind($this->ds) ) { // this is an "anonymous" bind, typically
+error_log('ldap_bind: FALSE '.$this->ds.' '.$this->error()."\n",3,$tutos[errlog]);
return false;
}
return true;
@@ -349,7 +353,7 @@
$loc[$c]->category = 3; # = LDAP retrieved data
}
$loc[$c]->lname = 'ldap:'.$tutos['ldap:'.$this->host.':'.$this->port]['servername'];
- foreach($loc[$c]->larray as $i => $f ) {
+ foreach(location::$larray as $f ) {
if (isset($tutos['ldap:'. $this->host .":". $this->port][$f]) ) {
$v = strtolower($tutos['ldap:'. $this->host .":". $this->port][$f]);
if (isset($import[$c][$v][0]) ) {
@@ -585,4 +589,4 @@
return $r;
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/php/location.pinc
===================================================================
--- trunk/php/location.pinc 2012-10-05 07:30:17 UTC (rev 811)
+++ trunk/php/location.pinc 2012-10-05 07:30:48 UTC (rev 812)
@@ -109,7 +109,7 @@
*/
class Location extends Tutos_base {
- static protected $larray = array('desc1','city','zip','state','country','street1','street2','email_1','email_2','phone_1','phone_2','fax_1','acc_info1','acc_info2','acc_nr','customer_id');
+ static $larray = array('desc1','city','zip','state','country','street1','street2','email_1','email_2','phone_1','phone_2','fax_1','acc_info1','acc_info2','acc_nr','customer_id');
/* ---------------------------------------------------------------------------
*/
function location(tutos_db $dbconn) {
@@ -731,4 +731,4 @@
}
}
-?>
\ 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...> - 2012-10-05 07:30:28
|
Revision: 811
http://tutos.svn.sourceforge.net/tutos/?rev=811&view=rev
Author: gokohnert
Date: 2012-10-05 07:30:17 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
mark diffs
Modified Paths:
--------------
trunk/php/subversion/svn.pinc
Added Paths:
-----------
trunk/php/subversion/default.css
Added: trunk/php/subversion/default.css
===================================================================
--- trunk/php/subversion/default.css (rev 0)
+++ trunk/php/subversion/default.css 2012-10-05 07:30:17 UTC (rev 811)
@@ -0,0 +1,26 @@
+/**
+ * Copyright 1999- 2012 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: default.css 747 2012-08-06 13:17:18Z gokohnert $
+ * $Author: gokohnert $
+ *
+ * Default Style Settings for testmanager module
+ *
+ * DO NOT MODIFY THIS FILE !
+ * For customization please use/create a file html/custom.css
+ *
+ */
+
+.svn_plus {
+ background: #0C0;
+}
+
+.svn_minus {
+ background: #C00;
+}
+
+/* EOF */
Modified: trunk/php/subversion/svn.pinc
===================================================================
--- trunk/php/subversion/svn.pinc 2012-10-01 18:02:23 UTC (rev 810)
+++ trunk/php/subversion/svn.pinc 2012-10-05 07:30:17 UTC (rev 811)
@@ -303,6 +303,8 @@
while(!feof($p)) {
$r .= fread($p,1024);
}
+ $r = preg_replace('#^\+(.*)$#m','<span class="svn_plus">+$1</span>',$r);
+ $r = preg_replace('#^-(.*)$#m','<span class="svn_minus">-$1</span>',$r);
return $r;
}
@@ -775,4 +777,4 @@
}
}
-?>
\ 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...> - 2012-10-01 18:02:33
|
Revision: 810
http://tutos.svn.sourceforge.net/tutos/?rev=810&view=rev
Author: gokohnert
Date: 2012-10-01 18:02:23 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
mobile updates
Modified Paths:
--------------
trunk/php/testmanager/testcase_select.php
trunk/php/testmanager/testmanager.pinc
trunk/php/testmanager/testrun_select.php
trunk/php/testmanager/testsuite_select.php
Modified: trunk/php/testmanager/testcase_select.php
===================================================================
--- trunk/php/testmanager/testcase_select.php 2012-10-01 16:06:26 UTC (rev 809)
+++ trunk/php/testmanager/testcase_select.php 2012-10-01 18:02:23 UTC (rev 810)
@@ -17,6 +17,8 @@
// Check if user is allowed to use it
check_user();
+
+$tutos['mobileok'] = 1;
loadmodules('testcase','select');
loadmodule('testcase');
loadlayout();
@@ -38,14 +40,15 @@
$this->addHidden('ext',$this->ext);
$r .= $this->headline($lang['TestcaseSearch']);
- $r .= "<tr>\n";
- $r .= $this->showfieldc($lang['NoteName']);
- $r .= " <td ><input type=\"text\" value=\"\" name=\"name\" /></td>\n";
- $r .= " <td align=\"center\">\n";
- $r .= " <input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
+ $r .= $this->ContentRowStart();
+ $r .= $this->showfieldc($lang['NoteName'],0,'name');
+ $r .= $this->showdata('<input type="text" value="" name="name" />',1);
+ $r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" title="'.$lang['TestcaseSearch'].'"/>',1);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr>\n";
+ $r .= $this->ContentRowStart();
$r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
+ $r .= $this->ContentRowEnd();
$tutos['pagescript'] .= "
$( \"#toggler\" ).click(function() {
@@ -64,31 +67,25 @@
\n";
}
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['TestcaseRef']);
- $r .= '<td colspan="2">';
- $r .= select_from_array_or_input($this,'ref',null,0,array(useprojects,usetestsuite));
- $r .= '</td>';
+ $r .= $this->showdata(select_from_array_or_input($this,'ref',null,0,array(useprojects,usetestsuite)),2);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['TestcaseResult']);
- $r .= '<td colspan="2">';
- $r .= SelectLangArray('result','TestcaseResults',-1,true);
+ $r .= $this->showdata(SelectLangArray('result','TestcaseResults',-1,true),2);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr class=\"ext\">\n";
-
// add custom selectors
$x = get_custom_selectors('testcase');
foreach ($x as $s) {
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($s[0]);
- $r .= " <td colspan=\"2\">\n";
- $r .= $s[1];
- $r .= " </td>\n";
+ $r .= $this->showdata($s[1]);
+ $r .= $this->ContentRowEnd();
}
-
- $r .= "</tr>\n";
$r .= $this->SelectTableEnd();
$r .= hiddenFormElements();
$r .= $this->getHidden();
Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc 2012-10-01 16:06:26 UTC (rev 809)
+++ trunk/php/testmanager/testmanager.pinc 2012-10-01 18:02:23 UTC (rev 810)
@@ -1374,7 +1374,7 @@
return 0;
}
if ( $this->state == TS_RELEASED ) {
- # return 0;
+# return 0;
}
return parent::mod_ok();
}
@@ -2364,7 +2364,7 @@
}
/**
- *
+ * collect statistics for a testrun
*/
function collectStats() {
$this->read_reference();
@@ -3296,7 +3296,7 @@
if (is_object($val)) {
if ($val->getTypeId() == usetestrun) {
$val->collectStats();
- return $val->run->statarr[3];
+ return $val->statarr[3];
}
} else {
$r[] = $val;
Modified: trunk/php/testmanager/testrun_select.php
===================================================================
--- trunk/php/testmanager/testrun_select.php 2012-10-01 16:06:26 UTC (rev 809)
+++ trunk/php/testmanager/testrun_select.php 2012-10-01 18:02:23 UTC (rev 810)
@@ -42,14 +42,15 @@
$this->addHidden('ext',$this->ext);
$r .= $this->headline($lang['TestrunSearch']);
- $r .= "<tr>\n";
- $r .= $this->showfieldc($lang['TestrunName']);
- $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 .= $this->ContentRowStart();
+ $r .= $this->showfieldc($lang['TestrunName'],0,"name");
+ $r .= $this->showdata('<input id="name" type="text" value="" name="name" />',1);
+ $r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" title="'. $lang['TestrunSearch'] .'" />',1);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr>\n";
+ $r .= $this->ContentRowStart();
$r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
+ $r .= $this->ContentRowEnd();
$tutos['pagescript'] .= "
$( \"#toggler\" ).click(function() {
$(\".ext\").toggle();
@@ -67,28 +68,24 @@
\n";
}
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['TestrunRef']);
- $r .= '<td colspan="2">';
- $r .= select_from_array_or_input($this,'ref',null,0,'p');
- $r .= '</td>';
+ $r .= $this->showdata(select_from_array_or_input($this,'ref',null,0,'p'),2);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['TestrunState']);
- $r .= '<td colspan="2">';
- $r .= SelectLangArray('state','TestrunStates',-1,true);
- $r .= '</td>';
+ $r .= $this->showdata(SelectLangArray('state','TestrunStates',-1,true),2);
+ $r .= $this->ContentRowEnd();
// add custom selectors
$x = get_custom_selectors('testrun');
foreach ($x as $s) {
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($s[0]);
- $r .= " <td colspan=\"2\">\n";
- $r .= $s[1];
- $r .= " </td>\n";
+ $r .= $this->showdata($s[1],2);
+ $r .= $this->ContentRowEnd();
}
- $r .= "</tr>\n";
$r .= $this->SelectTableEnd();
$r .= hiddenFormElements();
$r .= $this->getHidden();
@@ -102,6 +99,7 @@
$r .= $this->setfocus("testrunsearch.name");
return $r;
}
+
/**
* prepare
*/
Modified: trunk/php/testmanager/testsuite_select.php
===================================================================
--- trunk/php/testmanager/testsuite_select.php 2012-10-01 16:06:26 UTC (rev 809)
+++ trunk/php/testmanager/testsuite_select.php 2012-10-01 18:02:23 UTC (rev 810)
@@ -17,6 +17,8 @@
// Check if user is allowed to use it
check_user();
+
+$tutos['mobileok'] = 1;
loadmodules('testsuite','select');
loadmodule('testsuite');
loadlayout();
@@ -39,13 +41,15 @@
$this->addHidden('ext',$this->ext);
$r .= $this->headline($lang['TestsuiteSearch']);
- $r .= "<tr>\n";
+ $r .= $this->ContentRowStart();
$r .= $this->showfieldc($lang['NoteName']);
- $r .= " <td ><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 .= $this->showdata('<input id="name" type="text" value="" name="name" />',1);
+ $r .= $this->showdata('<input type="submit" value="'. $lang['Search'] .'" title="'. $lang['TestsuiteSearch'] .'" />',1);
+ $r .= $this->ContentRowEnd();
+
+ $r .= $this->ContentRowStart();
$r .= ' <td colspan="3" align="right"><span id="toggler">'. $lang['extended'] ."</span></td>\n";
+ $r .= $this->ContentRowEnd();
$tutos['pagescript'] .= "
$( \"#toggler\" ).click(function() {
$(\".ext\").toggle();
@@ -63,27 +67,24 @@
\n";
}
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['TestsuiteRef']);
- $r .= '<td colspan="2">';
- $r .= select_from_array_or_input($this,'ref',null,0,array(useprojects,usetestsuite));
- $r .= '</td>';
+ $r .= $this->showdata(select_from_array_or_input($this,'ref',null,0,array(useprojects,usetestsuite)),2);
+ $r .= $this->ContentRowEnd();
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($lang['TestsuiteState']);
- $r .= '<td colspan="2">';
- $r .= SelectLangArray('state','TestsuiteStates',-1,true);
+ $r .= $this->showdata(SelectLangArray('state','TestsuiteStates',-1,true),2);
+ $r .= $this->ContentRowEnd();
// add custom selectors
$x = get_custom_selectors('testsuite');
foreach ($x as $s) {
- $r .= "</tr><tr class=\"ext\">\n";
+ $r .= $this->ContentRowStart('ext');
$r .= $this->showfieldc($s[0]);
- $r .= " <td colspan=\"2\">\n";
- $r .= $s[1];
- $r .= " </td>\n";
+ $r .= $this->showdata($s[1],2);
+ $r .= $this->ContentRowEnd();
}
- $r .= "</tr>\n";
$r .= $this->SelectTableEnd();
$r .= hiddenFormElements();
$r .= $this->getHidden();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-10-01 16:06:32
|
Revision: 809
http://tutos.svn.sourceforge.net/tutos/?rev=809&view=rev
Author: gokohnert
Date: 2012-10-01 16:06:26 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
less checks
Modified Paths:
--------------
trunk/php/file/file.pinc
Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc 2012-10-01 15:39:45 UTC (rev 808)
+++ trunk/php/file/file.pinc 2012-10-01 16:06:26 UTC (rev 809)
@@ -1262,7 +1262,7 @@
$this->take_file($this->tmploc,$this->getFileName());
} else if ( $this->vsys == FILE_COPY ) {
// check Uber Upload
- if ( ($tutos['file_local_allow'] != 1) && (false === is_uploaded_file($this->tmploc)) ) die ($this->tmploc. ' was not uploaded');
+ if ( ($tutos['file_local_allow'] != 1) && (false === is_uploaded_file($this->tmploc)) ) die ('E2:'.$this->tmploc. ' was not uploaded');
// Copy Version Control
$this->fileloc_old = $this->getFileName() .'_'. $this->oldversion;
if ( $this->savemode == 1) {
@@ -1273,7 +1273,7 @@
$this->take_file($this->tmploc,$this->getFileName());
} else if ( ($this->vsys == FILE_RCS) && (is_executable($tutos[file_ci])) ) {
// check Uber Upload
- if (($tutos['file_local_allow'] != 1) && (false === is_uploaded_file($this->tmploc)) ) die ($this->tmploc. ' was not uploaded');
+ if (($tutos['file_local_allow'] != 1) && (false === is_uploaded_file($this->tmploc)) ) die ('E3:'.$this->tmploc. ' was not uploaded');
// RCS
// Checkin the old one
if ( $this->savemode == 1) {
@@ -1303,7 +1303,8 @@
if (!file_exists($from)) die('missing source file: '. $from);
if (!is_file($from)) die('source file not a file: '. $from);
- if ( (!isset($this->nocheck) || $this->vsys != FILE_NOCHECK) && false === is_uploaded_file($from) ) die ($from. ' was not uploaded');
+ if ($tutos['file_local_allow'] != 1)
+ if ( (!isset($this->nocheck) || $this->vsys != FILE_NOCHECK) && false === is_uploaded_file($from) ) die ('E1: '.$from. ' was not uploaded');
// copy and compress
if ($this->stor_m == FILE_GZ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|