tabindex and accesskey

etemplate/inc/class.date_widget.inc.php

@@ -231,6 +231,9 @@
 			for ($i=0,$n= substr($type,-4) == 'only' ? 3 : 0; $n < ($type == 'date' ? 3 : 5); ++$n,++$i)
 			{
 				$dcell = $tpl->empty_cell();
+				if ($cell['tabindex']) $dcell['tabindex'] = $cell['tabindex'];
+				if (!$i && $cell['accesskey']) $dcell['accesskey'] = $cell['accesskey'];
+				
 				// test if we can use jsCalendar
 				if ($n == 0 && $this->jscal && $tmpl->java_script())
 				{
@@ -258,6 +261,7 @@
 				if ($n == 2 && ($options & 2))	// Today button
 				{
 					$dcell = $tpl->empty_cell();
+					if ($cell['tabindex']) $dcell['tabindex'] = $cell['tabindex'];
 					$dcell['name'] = 'today';
 					$dcell['label'] = 'Today';
 					$dcell['help'] = 'sets today as date';
@@ -386,6 +390,7 @@
 					'h' => 'hours',
 					'd' => 'days',
 				);
+				if ($cell['tabindex']) $selbox['tabindex'] = $cell['tabindex'];
 				
 				$tpl->data[0] = array();
 				$tpl->data[1] =array(

etemplate/inc/class.uietemplate.inc.php

@@ -19,11 +19,11 @@
 	 *
 	 * etemplate or uietemplate extends boetemplate, all vars and public functions are inherited
 	 *
-	 * $tmpl = CreateObject('etemplate.etemplate','app.template.name');
+	 * $tmpl =& CreateObject('etemplate.etemplate','app.template.name');
 	 * $tmpl->exec('app.class.callback',$content_to_show);
 	 * This creates a form from the eTemplate 'app.template.name' and takes care that
-	 * the method / public function 'callback' in (bo)class 'class' of 'app' gets called
+	 * the method / public function 'callback' in class 'class' of 'app' gets called
-	 * if the user submitts the form. Vor the complete param's see the description of exec.
+	 * if the user submitts the form. For the complete param's see the description of exec.
 	 *
 	 * @package etemplate
 	 * @subpackage api
@@ -712,10 +712,14 @@
 
 			$value = $this->get_array($content,$name);
 
+			$options = '';
 			if ($readonly = $cell['readonly'] || @$readonlys[$name] && !is_array($readonlys[$name]) || $readonlys['__ALL__'])
 			{
-				$options .= ' readonly="1"';
+				$options .= ' readonly="readonly"';
 			}
+			if ((int) $cell['tabindex']) $options .= ' tabindex="'.(int)$cell['tabindex'].'"';
+			if ($cell['accesskey']) $options .= ' accesskey="'.$this->html->htmlspecialchars($cell['accesskey']).'"';
+
 			if ($cell['disabled'] && $readonlys[$name] !== false || $readonly && $cell['type'] == 'button' && !strstr($cell['size'],','))
 			{
 				if ($this->rows == 1) {
@@ -918,7 +922,7 @@
 					}
 					else
 					{
-						if ($value) $options .= ' checked="1"';
+						if ($value) $options .= ' checked="checked"';
 
 						if (($multiple = substr($cell['name'],-2) == '[]'))
 						{
@@ -946,7 +950,7 @@
 
 					if ($value == $set_val)
 					{
-						$options .= ' checked="1"';
+						$options .= ' checked="checked"';
 					}
 					// add the set_val to the id to make it unique
 					$options = str_replace('id="'.$form_name,'id="'.$form_name."[$set_val]",$options);

etemplate/setup/phpgw_de.lang

@@ -14,6 +14,8 @@
 '%1' is not a valid floatingpoint number !!!	etemplate	de	'%1' ist keine gültige Kommazahl !!!
 '%1' is not a valid integer !!!	etemplate	de	'%1' ist keine gültige Ganzzahl !!!
 a pattern to be searched for	etemplate	de	ein Muster nach dem gesucht werden soll
+accesskey	etemplate	de	Tastaturkürzel
+accesskeys can also be specified with an & in the label (eg. &name)	etemplate	de	Ein Tastaturkürzel kann auch über ein & in der Beschriftung angegeben werden
 add a new column (after the existing ones)	etemplate	de	Neue Spalte hinzufügen (hinter den bestehenden)
 add a new multi-column index	etemplate	de	Fügt einen mehrspaltigen Index hinzu
 add column	etemplate	de	Spalte zufügen
@@ -76,6 +78,7 @@ css-class name for this row, preset: 'nmh' = nextmatch header, 'nmr' = alternati
 css-class name for this row, preset: 'th' = header, 'row' = alternating row, 'row_off'+'row_on' rows	etemplate	de	Name der CSS class dieser Zeile, vorbelegt sind: 'th' = Kopfzeile, 'row' = zeilenweise wechselnde Farbe bzw. 'row_on', 'row_off'
 css-styles	etemplate	de	CSS Stile
 custom	etemplate	de	Benutzerdefiniert
+custom fields	etemplate	de	Benutzerdefinierte Felder
 cut	etemplate	de	Ausschneiden
 date+time	etemplate	de	Datum+Uhrzeit
 datum	etemplate	de	Datum
@@ -238,6 +241,7 @@ onclick	etemplate	de	onClick
 only an other version found !!!	etemplate	de	nur eine andere Version gefunden !!!
 optional note about the link	etemplate	de	optionale Notiz zur Verknüpfung
 options	etemplate	de	Optionen
+order to navigating by tab key through the form	etemplate	de	Reihenfolger bei der Navigation mit der Tabulator Taste durch das Formular
 overflow	etemplate	de	Überbreite
 padding	etemplate	de	Innenabstand
 parent is a '%1' !!!	etemplate	de	Elternelement is ein '%1' !!!
@@ -315,6 +319,7 @@ swap with next column	etemplate	de	tauscht Spalte mit der n
 swap with next row	etemplate	de	tauscht Zeile mit der nächsten
 switch to a parent widget	etemplate	de	wechselt zum Elternelement
 switch to an other widgets of that container	etemplate	de	wechselt zu einem anderen Element dieses Containers
+tabindex	etemplate	de	Tab-Reihenfolge
 table unchanged, no write necessary !!!	etemplate	de	Tabelle nicht geändert, kein schreiben notwendig !!!
 tablename	etemplate	de	Tabellenname
 tabs	etemplate	de	Karteikarten

etemplate/setup/phpgw_en.lang

@@ -14,11 +14,14 @@
 '%1' is not a valid floatingpoint number !!!	etemplate	en	'%1' is not a valid floatingpoint number !!!
 '%1' is not a valid integer !!!	etemplate	en	'%1' is not a valid integer !!!
 a pattern to be searched for	etemplate	en	a pattern to be searched for
+accesskey	etemplate	en	Accesskey
+accesskeys can also be specified with an & in the label (eg. &name)	etemplate	en	Accesskeys can also be specified with an & in the label (eg. &Name)
 add a new column (after the existing ones)	etemplate	en	Add a new column (after the existing ones)
 add a new multi-column index	etemplate	en	Add a new multi-column index
 add column	etemplate	en	Add Column
 add index	etemplate	en	Add Index
 add table	etemplate	en	Add Table
+advanced search	etemplate	en	Advanced search
 align	etemplate	en	Align
 alignment of label and input-field in table-cell	etemplate	en	alignment of label and input-field in table-cell
 alignment of the v/hbox containing table-cell	etemplate	en	Alignment of the V/HBox containing table-cell
@@ -75,6 +78,7 @@ css-class name for this row, preset: 'nmh' = nextmatch header, 'nmr' = alternati
 css-class name for this row, preset: 'th' = header, 'row' = alternating row, 'row_off'+'row_on' rows	etemplate	en	CSS-class name for this row, preset: 'th' = header, 'row' = alternating row, 'row_off'+'row_on' rows
 css-styles	etemplate	en	CSS-styles
 custom	etemplate	en	custom
+custom fields	etemplate	en	custom fields
 cut	etemplate	en	Cut
 date+time	etemplate	en	Date+Time
 datum	etemplate	en	Datum
@@ -236,6 +240,7 @@ onclick	etemplate	en	onClick
 only an other version found !!!	etemplate	en	only an other Version found !!!
 optional note about the link	etemplate	en	optional note about the Link
 options	etemplate	en	Options
+order to navigating by tab key through the form	etemplate	en	Order to navigating by tab key through the form
 overflow	etemplate	en	Overflow
 padding	etemplate	en	Padding
 parent is a '%1' !!!	etemplate	en	parent is a '%1' !!!
@@ -313,6 +318,7 @@ swap with next column	etemplate	en	swap with next column
 swap with next row	etemplate	en	swap with next row
 switch to a parent widget	etemplate	en	switch to a parent widget
 switch to an other widgets of that container	etemplate	en	switch to an other widgets of that container
+tabindex	etemplate	en	Tabindex
 table unchanged, no write necessary !!!	etemplate	en	Table unchanged, no write necessary !!!
 tablename	etemplate	en	TableName
 tabs	etemplate	en	Tabs