commit fa30cf7134a5029d8287d8e9abee12294eeadba8
parent ddcf7e577e074c95c1c56acd03d92537d14b8b85
Author: dankert <devnull@localhost>
Date: Tue, 24 Jan 2006 00:01:44 +0100
Zahlreiche Anpassungen
Diffstat:
10 files changed, 57 insertions(+), 37 deletions(-)
diff --git a/themes/default/include/html/checkbox.inc.php b/themes/default/include/html/checkbox.inc.php
@@ -1 +1 @@
-<input type="checkbox" name="<?php echo $attr_prefix.$$attr_name ?>" <?php if ($attr_readonly=='true') echo ' disabled="disabled"' ?> value="1" <?php if( $attr_default=='true' ) echo 'checked="checked"' ?> />-
\ No newline at end of file
+<input type="checkbox" name="<?php echo !empty($$attr_var)?$attr_prefix.$$attr_var:$attr_name ?>" <?php if ($attr_readonly=='true') echo ' disabled="disabled"' ?> value="1" <?php if( ($attr_default=='true')||(isset($$attr_name)&&$$attr_name) ) echo 'checked="checked"' ?> />+
\ No newline at end of file
diff --git a/themes/default/include/html/form.inc.php b/themes/default/include/html/form.inc.php
@@ -1,4 +1,12 @@
-<form name="<?php echo $attr_name ?>"
+<?php
+ if (empty($attr_action))
+ $attr_action = $actionName;
+ if (empty($attr_subaction))
+ $attr_subaction = $targetSubActionName;
+ if (empty($attr_id))
+ $attr_id = $this->getRequestId();
+
+?><form name="<?php echo $attr_name ?>"
target="<?php echo $attr_target ?>"
action="<?php echo Html::url( $attr_action,$attr_subaction,$attr_id ) ?>"
method="<?php echo $attr_method ?>"
diff --git a/themes/default/include/html/image.inc.php b/themes/default/include/html/image.inc.php
@@ -1,9 +1,9 @@
<?php
if (!empty($attr_eltype)) {
-?><img src="<?php echo $image_dir.'icon_el_'.$$attr_eltype.IMG_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+?><img src="<?php echo $image_dir.'icon_el_'.$$attr_eltype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
} elseif (!empty($attr_type)) {
-?><img src="<?php echo $image_dir.'icon_'.$$attr_type.IMG_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+?><img src="<?php echo $image_dir.'icon_'.$$attr_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
} elseif (!empty($$attr_url)) {
?><img src="<?php echo $$attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
} elseif (!empty($attr_file)) {
-?><img src="<?php echo $image_dir.$$attr_file.IMG_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?>-
\ No newline at end of file
+?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?>+
\ No newline at end of file
diff --git a/themes/default/include/html/input.inc.php b/themes/default/include/html/input.inc.php
@@ -1 +1 @@
-<input <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?> value="<?php echo $$attr_name ?>" />-
\ No newline at end of file
+<input name="<?php echo $attr_name ?>" size="<?php echo $attr_size ?>" maxlength="<?php echo $attr_maxlength ?>" class="<?php echo $attr_class ?>" value="<?php echo isset($$attr_name)?$$attr_name:$attr_default ?>" />+
\ No newline at end of file
diff --git a/themes/default/include/html/link.inc.php b/themes/default/include/html/link.inc.php
@@ -1 +1,6 @@
-<a href="<?php echo $$attr_url ?>" target="<?php echo $attr_target ?>" title="<?php echo lang($$attr_title) ?>">-
\ No newline at end of file
+<?php
+ if(!empty($attr_url))
+ $tmp_url = $$attr_url;
+ else
+ $tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>">+
\ No newline at end of file
diff --git a/themes/default/include/html/list.inc.php b/themes/default/include/html/list.inc.php
@@ -7,5 +7,12 @@
foreach( $$attr_list as $$list_tmp_key => $$list_tmp_value )
{
if ( $list_extract )
+ {
+ if ( !is_array($$list_tmp_value) )
+ {
+ print_r($$list_tmp_value);
+ die( 'not an array at key: '.$$list_tmp_key );
+ }
extract($$list_tmp_value);
+ }
?>
\ No newline at end of file
diff --git a/themes/default/include/html/page.inc.php b/themes/default/include/html/page.inc.php
@@ -12,6 +12,6 @@
<?php } ?>
</head>
-<body<?php if( !empty($attr_class) )echo ' class="'.$class.'"' ?>>
+<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>>
diff --git a/themes/default/include/html/selectbox.inc.php b/themes/default/include/html/selectbox.inc.php
@@ -1,10 +1,10 @@
-<select size="1" name="<?php echo $attr_name ?>" <?php
+<select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php
if (count($$attr_list)==1) echo ' disabled="disabled"'
?>><?php
foreach( $$attr_list as $box_key=>$box_value )
{
- echo '<option value="'.$box_key.'"';
- if ($box_key == $$attr_default)
+ echo '<option class="'.$attr_class.'" value="'.$box_key.'"';
+ if (isset($$attr_name)&&$box_key==$$attr_name || isset($$attr_default)&&$box_key == $$attr_default)
echo ' selected="selected"';
echo '>'.$box_value.'</option>';
}
diff --git a/themes/default/include/html/text.inc.php b/themes/default/include/html/text.inc.php
@@ -1,26 +1,26 @@
<?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
- if (!empty($attr_url))
- echo "<a href=\"".$$attr_url."\" title=\"$attr_title\">";
if (!empty($attr_array))
{
//geht nicht:
//echo $$attr_array[$attr_var].'%';
$tmpArray = $$attr_array;
if (!empty($attr_var))
- echo $tmpArray[$attr_var];
+ $tmp_text = $tmpArray[$attr_var];
else
- echo lang($tmpArray[$attr_text]);
+ $tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- echo lang($attr_text);
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_var))
- echo $$attr_var;
+ $tmp_text = $$attr_var;
elseif (!empty($attr_raw))
- echo str_replace('_',' ',$attr_raw);
+ $tmp_text = str_replace('_',' ',$attr_raw);
else echo 'text error';
- if (!empty($attr_url))
- echo '</a';
+ if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
+
+ echo $tmp_text;
?></span>
\ No newline at end of file
diff --git a/themes/default/include/html/window.inc.php b/themes/default/include/html/window.inc.php
@@ -6,25 +6,25 @@
unset($attr['widths']);
}
global $image_dir;
- if ( !isset($attr_width)) $attr['width']='90%';
echo '<br/><br/><br/><center>';
- echo '<table class="main" cellspacing="0" cellpadding="4" ';
- foreach( $attr as $aName=>$aValue )
- echo " $aName=\"$aValue\"";
- echo '>';
- echo '<tr><th>';
+ echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">';
+ echo '<tr><td class="menu">';
if ( !empty($attr_icon) )
- echo '<img src="'.$image_dir.'icon_'.$attr_icon.IMG_EXT.'" align="left" border="0">';
- if ( !isset($$attr_name)) $$attr_name='';
- echo $$attr_name.': ';
- echo lang( $attr_title );
+ echo '<img src="'.$image_dir.'icon_'.$attr_icon.IMG_ICON_EXT.'" align="left" border="0">';
+ foreach( $path as $pathElement)
+ {
+ extract($pathElement);
+ echo '<a href="'.$url.'" class="path">'.lang($name).'</a>';
+ echo ' » ';
+ }
+ echo '<span class="title">'.lang($attr_name).'</span>';
?>
</th>
</tr>
<tr><td class="subaction">
<?php foreach( $windowMenu as $menu )
{
- ?><a href="<?php echo Html::url($actionName,$menu['subaction']) ?>"><?php echo lang($menu['text']) ?></a> <?php
+ ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a> <?php
}
?></td>
</tr>
@@ -37,8 +37,8 @@
<?php foreach( $notices as $notice ) { ?>
- <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_EXT ?>" style="padding:10px" /></td>
- <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td>
+ <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td>
+ <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td>
</tr>
<?php } ?>
