commit 7189e8af98767b3d2b656c754ce33ec5eec956e0
parent b18484d7eb1753535bbf5b7acabe73b1dba804cf
Author: dankert <devnull@localhost>
Date: Wed, 31 Jan 2007 23:25:22 +0100
Bildgr??en-Faktor
Diffstat:
4 files changed, 425 insertions(+), 129 deletions(-)
diff --git a/actionClasses/FileAction.class.php b/actionClasses/FileAction.class.php
@@ -162,6 +162,21 @@ class FileAction extends ObjectAction
+ function imageExt()
+ {
+ switch( $this->imageFormat() )
+ {
+ case IMG_GIF:
+ return 'GIF';
+ case IMG_JPG:
+ return 'JPEG';
+ case IMG_PNG:
+ return 'PNG';
+ }
+ }
+
+
+
function imageFormats()
{
if ( ! function_exists( 'imagetypes' ) )
@@ -190,8 +205,9 @@ class FileAction extends ObjectAction
$height = intval($this->getRequestVar('height' ));
$jpegcompression = $this->getRequestVar('jpeg_compression') ;
$format = $this->getRequestVar('format' ) ;
+ $factor = $this->getRequestVar('factor' ) ;
- $this->file->imageResize( intval($width),intval($height),$this->imageFormat(),$format,$jpegcompression );
+ $this->file->imageResize( intval($width),intval($height),$factor,$this->imageFormat(),$format,$jpegcompression );
$this->file->save(); // Um z.B. Groesse abzuspeichern
$this->file->saveValue();
@@ -280,15 +296,28 @@ class FileAction extends ObjectAction
{
$this->setTemplateVars( $this->file->getProperties() );
- $imageFormat = $this->imageFormat();
+ $format = $this->imageFormat();
- if ( $imageFormat != 0 )
+ if ( $format != 0 )
$formats = $this->imageFormats();
else
$formats = array();
+ $sizes = array();
+ foreach( array(10,25,50,75) as $s )
+ $sizes[strval($s/100)] = $s.'%';
+ $sizes[1] = '-';
+ foreach( array(125,150,175,200,250,300,350,400,500,600,800) as $s )
+ $sizes[strval($s/100)] = $s.'%';
+
+ $jpeglist = array();
+ for ($i=10; $i<=95; $i+=5)
+ $jpeglist[$i]=$i.'%';
+
+ $this->setTemplateVar('factors' ,$sizes );
+ $this->setTemplateVar('jpeglist' ,$jpeglist );
$this->setTemplateVar('formats' ,$formats );
- $this->setTemplateVar('default_format',$imageFormat);
+ $this->setTemplateVar('format' ,$format );
}
diff --git a/objectClasses/File.class.php b/objectClasses/File.class.php
@@ -208,12 +208,12 @@ class File extends Object
*
* @param Neue Breite
* @param Neue Hoehe
+ * @param Bildgrößenfaktor
* @param Altes Format als Integer-Konstante IMG_xxx
* @param Neues Format als Integer-Konstante IMG_xxx
* @param Jpeg-Qualitaet (sofern neues Format = Jpeg)
*/
- function imageResize( $newWidth,$newHeight,$oldformat,$newformat,$jpegquality )
-
+ function imageResize( $newWidth,$newHeight,$factor,$oldformat,$newformat,$jpegquality )
{
global $conf;
@@ -230,9 +230,18 @@ class File extends Object
// Wenn Breite und Hoehe fehlen, dann Bildgroesse beibehalten
if ( $newWidth == 0 && $newHeight == 0)
{
- $newWidth = $oldWidth;
- $newHeight = $oldHeight;
- $resizing = false;
+ if ( $factor != 0 && $factor != 1 )
+ {
+ $newWidth = $oldWidth * $factor;
+ $newHeight = $oldHeight * $factor;
+ $resizing = true;
+ }
+ else
+ {
+ $newWidth = $oldWidth;
+ $newHeight = $oldHeight;
+ $resizing = false;
+ }
}
else
{
diff --git a/themes/default/pages/html/file/size.tpl.php b/themes/default/pages/html/file/size.tpl.php
@@ -1,9 +1,10 @@
-<?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<?php $attr = array('class'=>'main title') ?><?php $attr_class='main title' ?><?php header('Content-Type: text/html; charset='.lang('CHARSET'))
+?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<!-- $Id$ -->
<head>
- <title><?php echo $cms_title ?></title>
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <title><?php echo $attr_title ?></title>
+ <meta http-equiv="content-type" content="text/html; charset=<?php echo lang('CHARSET') ?>" />
<meta name="MSSmartTagsPreventParsing" content="true" />
<meta name="robots" content="noindex,nofollow" />
<link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" />
@@ -12,10 +13,9 @@
<?php } ?>
</head>
-<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>>
+<body class="<?php echo $attr_class ?>">
-
-<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('action'=>'','subaction'=>'','id'=>'','name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_name='' ?><?php $attr_target='_self' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php
+<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_name='' ?><?php $attr_target='_self' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php
if (empty($attr_action))
$attr_action = $actionName;
if (empty($attr_subaction))
@@ -33,13 +33,24 @@
<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php
if ( $conf['interface']['url_sessionid'] )
echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n";
-?><?php unset($attr) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'','name'=>'','icon'=>'','widths'=>'','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='' ?><?php $attr_icon='' ?><?php $attr_widths='' ?><?php $attr_width='85%' ?><?php
+?><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_width='93%' ?><?php $attr_rowclasses='odd,even' ?><?php $attr_columnclasses='1,2,3' ?><?php
$coloumn_widths=array();
if (!empty($attr_widths))
{
$column_widths = explode(',',$attr_widths);
unset($attr['widths']);
}
+ if (!empty($attr_rowclasses))
+ {
+ $row_classes = explode(',',$attr_rowclasses);
+ $row_class_idx = 999;
+ unset($attr['rowclasses']);
+ }
+ if (!empty($attr_columnclasses))
+ {
+ $column_classes = explode(',',$attr_columnclasses);
+ unset($attr['columnclasses']);
+ }
global $image_dir;
echo '<br/><br/><br/><center>';
echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">';
@@ -54,7 +65,13 @@
}
echo '<span class="title">'.lang($windowTitle).'</span>';
?>
- </th>
+ </td><td class="menu" style="align:right;">
+ <?php if (isset($windowIcons)) foreach( $windowIcons as $icon )
+ {
+ ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a> <?php
+ }
+ ?>
+ </td>
</tr>
<tr><td class="subaction">
<?php foreach( $windowMenu as $menu )
@@ -90,28 +107,44 @@
<tr>
<td>
- <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php $attr = array() ?><?php
- global $fx;
- if ( $fx =='f1')
- $fx='f2';
- else $fx='f1';
-
+ <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array() ?><?php
+ $row_class_idx++;
+ if ($row_class_idx > count($row_classes))
+ $row_class_idx=1;
+ $row_class=$row_classes[$row_class_idx-1];
+
+ if (empty($attr_class))
+ $attr_class=$row_class;
+
global $cell_column_nr;
$cell_column_nr=0;
+
+ $column_class_idx = 999;
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php
+// if (empty($attr_class))
+// $attr['class']=$row_class;
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr_class))
+ $attr['class']=$column_class;
global $cell_column_nr;
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'FILE_IMAGE_NEW_WIDTH','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='FILE_IMAGE_NEW_WIDTH' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('for'=>'factor') ?><?php $attr_for='factor' ?><label for="id<?php echo $attr_for ?>"><?php unset($attr) ?><?php unset($attr_for) ?><?php $attr = array('class'=>'text','text'=>'FILE_IMAGE_SIZE_FACTOR') ?><?php $attr_class='text' ?><?php $attr_text='FILE_IMAGE_SIZE_FACTOR' ?><?php
+ if(empty($attr_title))
+ if (!empty($attr_key))
+ $attr_title = lang($attr_key).'_HELP';
+ else
+ $attr_title = '';
+
+?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php
+ $attr_title = '';
if (!empty($attr_array))
{
//geht nicht:
@@ -123,49 +156,93 @@
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></label><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php
+// if (empty($attr_class))
+// $attr['class']=$row_class;
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr_class))
+ $attr['class']=$column_class;
global $cell_column_nr;
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'width','prefix'=>'','value'=>'','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='width' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><?php $attr_onchange='' ?><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 ?>" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_index) ?><?php unset($attr_name) ?><?php unset($attr_prefix) ?><?php unset($attr_value) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php unset($attr_onchange) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
- global $fx;
- if ( $fx =='f1')
- $fx='f2';
- else $fx='f1';
-
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('var'=>'factor','value'=>'1') ?><?php $attr_var='factor' ?><?php $attr_value='1' ?><?php $$attr_var = $attr_value ?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php $attr = array('list'=>'factors','name'=>'factor','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='factors' ?><?php $attr_name='factor' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" id="id<?php echo $attr_name ?>" 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 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>';
+ }
+?></select><?php
+if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" value="'.$box_key.'" />'
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+ $row_class_idx++;
+ if ($row_class_idx > count($row_classes))
+ $row_class_idx=1;
+ $row_class=$row_classes[$row_class_idx-1];
+
+ if (empty($attr_class))
+ $attr_class=$row_class;
+
global $cell_column_nr;
$cell_column_nr=0;
+
+ $column_class_idx = 999;
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php
+// if (empty($attr_class))
+// $attr['class']=$row_class;
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr_class))
+ $attr['class']=$column_class;
global $cell_column_nr;
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'FILE_IMAGE_NEW_HEIGHT','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='FILE_IMAGE_NEW_HEIGHT' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('for'=>'width') ?><?php $attr_for='width' ?><label for="id<?php echo $attr_for ?>"><?php unset($attr) ?><?php unset($attr_for) ?><?php $attr = array('class'=>'text','text'=>'FILE_IMAGE_NEW_WIDTH') ?><?php $attr_class='text' ?><?php $attr_text='FILE_IMAGE_NEW_WIDTH' ?><?php
+ if(empty($attr_title))
+ if (!empty($attr_key))
+ $attr_title = lang($attr_key).'_HELP';
+ else
+ $attr_title = '';
+
+?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php
+ $attr_title = '';
if (!empty($attr_array))
{
//geht nicht:
@@ -177,49 +254,167 @@
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></label><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php
+// if (empty($attr_class))
+// $attr['class']=$row_class;
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr_class))
+ $attr['class']=$column_class;
global $cell_column_nr;
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'height','prefix'=>'','value'=>'','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='height' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><?php $attr_onchange='' ?><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 ?>" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_index) ?><?php unset($attr_name) ?><?php unset($attr_prefix) ?><?php unset($attr_value) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php unset($attr_onchange) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
- global $fx;
- if ( $fx =='f1')
- $fx='f2';
- else $fx='f1';
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'width','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='width' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><?php $attr_onchange='' ?><input id="id<?php echo $attr_name ?>" 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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php unset($attr_onchange) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+ $row_class_idx++;
+ if ($row_class_idx > count($row_classes))
+ $row_class_idx=1;
+ $row_class=$row_classes[$row_class_idx-1];
+
+ if (empty($attr_class))
+ $attr_class=$row_class;
+
+ global $cell_column_nr;
+ $cell_column_nr=0;
+
+ $column_class_idx = 999;
+
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php
+// if (empty($attr_class))
+// $attr['class']=$row_class;
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr_class))
+ $attr['class']=$column_class;
+
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
+ $attr['width']=$column_widths[$cell_column_nr-1];
+
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('for'=>'height') ?><?php $attr_for='height' ?><label for="id<?php echo $attr_for ?>"><?php unset($attr) ?><?php unset($attr_for) ?><?php $attr = array('class'=>'text','text'=>'FILE_IMAGE_NEW_HEIGHT') ?><?php $attr_class='text' ?><?php $attr_text='FILE_IMAGE_NEW_HEIGHT' ?><?php
+ if(empty($attr_title))
+ if (!empty($attr_key))
+ $attr_title = lang($attr_key).'_HELP';
+ else
+ $attr_title = '';
+
+?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php
+ $attr_title = '';
+ if (!empty($attr_array))
+ {
+ //geht nicht:
+ //echo $$attr_array[$attr_var].'%';
+ $tmpArray = $$attr_array;
+ if (!empty($attr_var))
+ $tmp_text = $tmpArray[$attr_var];
+ else
+ $tmp_text = lang($tmpArray[$attr_text]);
+ }
+ elseif (!empty($attr_text))
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
+ elseif (!empty($attr_var))
+ $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
+ elseif (!empty($attr_raw))
+ $tmp_text = str_replace('_',' ',$attr_raw);
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
+
+ if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
+
+ echo $tmp_text;
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></label><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php
+// if (empty($attr_class))
+// $attr['class']=$row_class;
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr_class))
+ $attr['class']=$column_class;
global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
+ $attr['width']=$column_widths[$cell_column_nr-1];
+
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'height','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='height' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><?php $attr_onchange='' ?><input id="id<?php echo $attr_name ?>" 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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php unset($attr_onchange) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+ $row_class_idx++;
+ if ($row_class_idx > count($row_classes))
+ $row_class_idx=1;
+ $row_class=$row_classes[$row_class_idx-1];
+
+ if (empty($attr_class))
+ $attr_class=$row_class;
+
+ global $cell_column_nr;
$cell_column_nr=0;
+
+ $column_class_idx = 999;
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php
+// if (empty($attr_class))
+// $attr['class']=$row_class;
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr_class))
+ $attr['class']=$column_class;
global $cell_column_nr;
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'FILE_IMAGE_FORMAT','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='FILE_IMAGE_FORMAT' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('for'=>'format') ?><?php $attr_for='format' ?><label for="id<?php echo $attr_for ?>"><?php unset($attr) ?><?php unset($attr_for) ?><?php $attr = array('class'=>'text','text'=>'FILE_IMAGE_FORMAT') ?><?php $attr_class='text' ?><?php $attr_text='FILE_IMAGE_FORMAT' ?><?php
+ if(empty($attr_title))
+ if (!empty($attr_key))
+ $attr_title = lang($attr_key).'_HELP';
+ else
+ $attr_title = '';
+
+?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php
+ $attr_title = '';
if (!empty($attr_array))
{
//geht nicht:
@@ -231,61 +426,93 @@
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></label><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php
+// if (empty($attr_class))
+// $attr['class']=$row_class;
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr_class))
+ $attr['class']=$column_class;
global $cell_column_nr;
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('list'=>'formats','name'=>'format','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='formats' ?><?php $attr_name='format' ?><?php $attr_default='' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('list'=>'formats','name'=>'format','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='formats' ?><?php $attr_name='format' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" id="id<?php echo $attr_name ?>" 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 class="'.$attr_class.'" value="'.$box_key.'"';
- if (isset($$attr_name)&&$box_key==$$attr_name || isset($$attr_default)&&$box_key == $$attr_default)
+ if (isset($$attr_name)&&$box_key==$$attr_name || isset($attr_default)&&$box_key == $attr_default)
echo ' selected="selected"';
echo '>'.$box_value.'</option>';
}
?></select><?php
if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" value="'.$box_key.'" />'
-?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
- global $fx;
- if ( $fx =='f1')
- $fx='f2';
- else $fx='f1';
-
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+ $row_class_idx++;
+ if ($row_class_idx > count($row_classes))
+ $row_class_idx=1;
+ $row_class=$row_classes[$row_class_idx-1];
+
+ if (empty($attr_class))
+ $attr_class=$row_class;
+
global $cell_column_nr;
$cell_column_nr=0;
+
+ $column_class_idx = 999;
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php
+// if (empty($attr_class))
+// $attr['class']=$row_class;
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr_class))
+ $attr['class']=$column_class;
global $cell_column_nr;
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'FILE_IMAGE_JPEG_COMPRESSION','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='FILE_IMAGE_JPEG_COMPRESSION' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('for'=>'jpeglist_compression') ?><?php $attr_for='jpeglist_compression' ?><label for="id<?php echo $attr_for ?>"><?php unset($attr) ?><?php unset($attr_for) ?><?php $attr = array('class'=>'text','text'=>'FILE_IMAGE_JPEG_COMPRESSION') ?><?php $attr_class='text' ?><?php $attr_text='FILE_IMAGE_JPEG_COMPRESSION' ?><?php
+ if(empty($attr_title))
+ if (!empty($attr_key))
+ $attr_title = lang($attr_key).'_HELP';
+ else
+ $attr_title = '';
+
+?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php
+ $attr_title = '';
if (!empty($attr_array))
{
//geht nicht:
@@ -297,72 +524,93 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></label><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php
+// if (empty($attr_class))
+// $attr['class']=$row_class;
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr_class))
+ $attr['class']=$column_class;
global $cell_column_nr;
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php
-$jpeglist = array();
-for ($i=10; $i<=95; $i+=5)
-$jpeglist[$i]=$i.'%';
-?>
-<?php $attr = array('var'=>'jpeg_compression','value'=>'70') ?><?php $attr_var='jpeg_compression' ?><?php $attr_value='70' ?><?php $$attr_var = $attr_value ?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php $attr = array('list'=>'jpeglist','name'=>'jpeg_compression','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='jpeglist' ?><?php $attr_name='jpeg_compression' ?><?php $attr_default='' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('var'=>'jpeg_compression','value'=>'70') ?><?php $attr_var='jpeg_compression' ?><?php $attr_value='70' ?><?php $$attr_var = $attr_value ?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php $attr = array('list'=>'jpeglist','name'=>'jpeg_compression','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='jpeglist' ?><?php $attr_name='jpeg_compression' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" id="id<?php echo $attr_name ?>" 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 class="'.$attr_class.'" value="'.$box_key.'"';
- if (isset($$attr_name)&&$box_key==$$attr_name || isset($$attr_default)&&$box_key == $$attr_default)
+ if (isset($$attr_name)&&$box_key==$$attr_name || isset($attr_default)&&$box_key == $attr_default)
echo ' selected="selected"';
echo '>'.$box_value.'</option>';
}
?></select><?php
if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" value="'.$box_key.'" />'
-?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
- global $fx;
- if ( $fx =='f1')
- $fx='f2';
- else $fx='f1';
-
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+ $row_class_idx++;
+ if ($row_class_idx > count($row_classes))
+ $row_class_idx=1;
+ $row_class=$row_classes[$row_class_idx-1];
+
+ if (empty($attr_class))
+ $attr_class=$row_class;
+
global $cell_column_nr;
$cell_column_nr=0;
+
+ $column_class_idx = 999;
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'act','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='act' ?><?php $attr_colspan='2' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'act','colspan'=>'2') ?><?php $attr_class='act' ?><?php $attr_colspan='2' ?><?php
+// if (empty($attr_class))
+// $attr['class']=$row_class;
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr_class))
+ $attr['class']=$column_class;
global $cell_column_nr;
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('type'=>'ok') ?><?php $attr_type='ok' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr_type='ok' ?><?php $attr_class='ok' ?><?php $attr_value='ok' ?><?php $attr_text='button_ok' ?><?php
if ($attr_type=='ok')
{
$attr_type = 'submit';
- $attr_class = 'ok';
- $attr_text = 'BUTTON_OK';
- $attr_value = 'ok';
+// $attr_class = 'ok';
+// $attr_text = 'BUTTON_OK';
+// $attr_value = 'ok';
}
-?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table>
+?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table>
</td>
</tr>
</table>
@@ -376,10 +624,15 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu
<?php $dur = time()-START_TIME;
echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small>
<?php } ?>
-<?php unset($attr) ?><?php $attr = array() ?></form><?php unset($attr) ?><?php $attr = array('field'=>'width') ?><?php $attr_field='width' ?><script name="JavaScript" type="text/javascript"><!--
+<?php unset($attr) ?><?php $attr = array() ?></form>
+
+<?php unset($attr) ?><?php $attr = array('field'=>'width') ?><?php $attr_field='width' ?>
+<script name="JavaScript" type="text/javascript">
+<!--
document.forms[0].<?php echo $attr_field ?>.focus();
document.forms[0].<?php echo $attr_field ?>.select();
-//--></script>
+// -->
+</script>
<?php unset($attr) ?><?php unset($attr_field) ?><?php $attr = array() ?>
<!-- $Id$ -->
diff --git a/themes/default/templates/file/size.tpl.src.php b/themes/default/templates/file/size.tpl.src.php
@@ -4,33 +4,38 @@ page
row
cell class:fx
- text text:FILE_IMAGE_NEW_WIDTH
+ label for:factor
+ text text:FILE_IMAGE_SIZE_FACTOR
+ cell class:fx
+ set var:factor value:1
+ selectbox name:factor list:factors
+
+ row
+ cell class:fx
+ label for:width
+ text text:FILE_IMAGE_NEW_WIDTH
cell class:fx
input name:width
row
cell class:fx
- text text:FILE_IMAGE_NEW_HEIGHT
+ label for:height
+ text text:FILE_IMAGE_NEW_HEIGHT
cell class:fx
input name:height
row
cell class:fx
- text text:FILE_IMAGE_FORMAT
+ label for:format
+ text text:FILE_IMAGE_FORMAT
cell class:fx
selectbox name:format list:formats
row
cell class:fx
- text text:FILE_IMAGE_JPEG_COMPRESSION
+ label for:jpeglist_compression
+ text text:FILE_IMAGE_JPEG_COMPRESSION
cell class:fx
-RAW
-<?php
- $jpeglist = array();
- for ($i=10; $i<=95; $i+=5)
- $jpeglist[$i]=$i.'%';
-?>
-END
set var:jpeg_compression value:70
selectbox list:jpeglist name:jpeg_compression
row
