reworked etemplate to have static methods and use the new features of egw_db- & html-class

etemplate/inc/class.customfields_widget.inc.php

@@ -363,7 +363,7 @@
 			}
 			list($span,$class) = explode(',',$cell['span']);	// msie (at least 5.5) shows nothing with div overflow=auto
 			// we dont want to use up the full space for the table created, so we skip the line below
-			//$cell['size'] = '100%,100%,0,'.$class.','.(in_array($type,array('customfields-list','customfields-no-label'))?'0,0':',').($tmpl->html->user_agent != 'msie' ? ',auto' : '');
+			//$cell['size'] = '100%,100%,0,'.$class.','.(in_array($type,array('customfields-list','customfields-no-label'))?'0,0':',').(html::$user_agent != 'msie' ? ',auto' : '');
 
 			return True;	// extra Label is ok
 		}

etemplate/inc/class.link_widget.inc.php

@@ -202,7 +202,7 @@
 				{
 					foreach ($value as $link)
 					{
-						$options .= " onMouseOver=\"self.status='".addslashes($tmpl->html->htmlspecialchars($help))."'; return true;\"";
+						$options .= " onMouseOver=\"self.status='".addslashes(html::htmlspecialchars($help))."'; return true;\"";
 						$options .= " onMouseOut=\"self.status=''; return true;\"";
 						if (($popup = egw_link::is_popup($link['app'],'view')))
 						{
@@ -213,8 +213,8 @@
 						{
 							$options = ' target="_blank"';
 						}
-						$str .= ($str !== '' ? ', ' : '') . $tmpl->html->a_href(
+						$str .= ($str !== '' ? ', ' : '') . html::a_href(
-							$tmpl->html->htmlspecialchars(egw_link::title($link['app'],$link['id'])),
+							html::htmlspecialchars(egw_link::title($link['app'],$link['id'])),
 							'/index.php',egw_link::view($link['app'],$link['id'],$link),$options);
 					}
 				}
@@ -335,7 +335,7 @@
 							$value[$row]['target'] = '_blank';		// we create a new window as the linked page is no popup
 						}
 					}
-					if ($link['app'] == egw_link::vfs_appname)
+					if ($link['app'] == egw_link::VFS_APPNAME)
 					{
 						$value[$row]['label'] = 'Delete';
 						$value[$row]['help'] = lang('Delete this file');
@@ -360,7 +360,7 @@
 					{
 						if(in_array($GLOBALS['egw_info']['user']['preferences']['common']['link_list_format'], array('icons', 'icons_and_text') )) {
 							// Hardcoded sizes to match the mimetype icons.  Uses the navbar image and CSS to resize.
-							$value[$row]['mime_icon'] = $tmpl->html->image($value[$row]['app'], 'navbar', $value[$row]['app'], 'style="width: 16px; height: 16px;"');
+							$value[$row]['mime_icon'] = html::image($value[$row]['app'], 'navbar', $value[$row]['app'], 'style="width: 16px; height: 16px;"');
 						}
 						$value[$row]['label'] = 'Unlink';
 						$value[$row]['help'] = lang('Remove this link (not the entry itself)');
@@ -557,7 +557,7 @@
 							$value['file']['tmp_name'] .= '+';
 						}
 						$link_id = egw_link::link($value['to_app'],$value['to_id'],
-							egw_link::vfs_appname,$value['file'],$value['remark']);
+							egw_link::VFS_APPNAME,$value['file'],$value['remark']);
 						$value['remark'] = '';
 
 						if (isset($value['primary']) && !$value['anz_links'] )

etemplate/inc/class.tree_widget.inc.php

@@ -123,7 +123,7 @@ class tree_widget
 		// creating a div-id and var-name for the tree-object by replacing brackets with underscores and removing exec or evtl. cont parts
 		$tree_id = str_replace(array('exec[cont][','exec[','[',']'),array('','','_',''),$name);
 		$onNodeSelect = 'onNodeSelect_'.$tree_id;
-		$script = $tmpl->html->input_hidden($name,$value,false)."<script type='text/javascript'>";
+		$script = html::input_hidden($name,$value,false)."<script type='text/javascript'>";
 		if (($onclick = $cell['onclick']))
 		{
 			if (strpos($onclick,'$') !== false || $onclick{0} == '@')
@@ -159,7 +159,7 @@ class tree_widget
 		$script .= "</script>\n";
 
 		list(,$class) = explode(',',$cell['span']);
-		$value = $script.$tmpl->html->tree($tmpl->_sel_options($cell,$name),$value,false,$onNodeSelect,$tree_id,$class,'',$onCheck);
+		$value = $script.html::tree($tmpl->_sel_options($cell,$name),$value,false,$onNodeSelect,$tree_id,$class,'',$onCheck);
 
 		$cell = etemplate::empty_cell('html',$cell['name']);
 

etemplate/inc/thumbnail.inc.php

@@ -1,4 +1,13 @@
 <?php
+/**
+* eGroupWare - eTemplates
+*
+* @link http://www.egroupware.org
+* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+* @author Nathan Gray
+* @package etemplate
+* @version $Id$
+*/
 	$GLOBALS['egw_info']['flags'] = array(
 		'currentapp'	=>	'infolog',
 		'noheader'	=>	true,
@@ -177,4 +186,3 @@
 		$gd_ver = $match[0];
 		return $match[0];
 	}
-?>

etemplate/templates/default/link_widget.to.xet

@@ -7,7 +7,7 @@
 				<hbox>
 					<link-apps id="app" statustext="Select application to search" label="@search_label"/>
 					<textbox id="query" blur="Search"/>
-					<button id="query" label="&gt;" statustext="Click here to start the search" onclick="xajax_doXMLHTTP('etemplate.link_widget.ajax_search',document.getElementById(form::name('app')).value,document.getElementById(form::name('query')).value,form::name('id'),form::name('search_line'),form::name('remark')+','+form::name('select_line'),form::name('query')); return false;"/>
+					<button id="start_search" label="&gt;" statustext="Click here to start the search" onclick="xajax_doXMLHTTP('etemplate.link_widget.ajax_search',document.getElementById(form::name('app')).value,document.getElementById(form::name('query')).value,form::name('id'),form::name('search_line'),form::name('remark')+','+form::name('select_line'),form::name('query')); return false;"/>
 				</hbox>
 				<grid>
 					<columns>
@@ -33,9 +33,9 @@
 			<textbox id="remark" size="50" maxlength="50" class="hide_comment" statustext="optional note about the Link" blur="Comment"/>
 		</box>
 		<styles>
-			.link_select { white-space: nowrap; }
+			.link_select { white-space: nowrap; }
-.link_hide { display: none; }
+.link_hide { display: none; }
-.hide_comment input { display: none; width: 99%; }
+.hide_comment input { display: none; width: 99%; }
 
 		</styles>
 	</template>