commit f17acf3ec4c6308dbb0a6d7b749676397f7052c6 parent 4660e09a599a0ee41bc0e5335566e1d155775f3a Author: dankert <devnull@localhost> Date: Sun, 19 Dec 2004 16:29:00 +0100 Sprachvariablen korrigiert, Verwendung von Html::form() Diffstat:
30 files changed, 87 insertions(+), 200 deletions(-)
diff --git a/themes/default/pages/html/element.tpl.php b/themes/default/pages/html/element.tpl.php @@ -5,10 +5,8 @@ <span style="text-align:center; "> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="action" value="template" /> -<input type="hidden" name="subaction" value="elementrename" /> +<?php echo Html::form('template','elementrename',$templateid,array('elementid'=>$elementid) ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -55,10 +53,8 @@ </form> -<form action="<?php echo $self ?>" method="post" target="_self"> +<?php echo Html::form('element','changetype',$templateid,array('elementid'=>$elementid) ) ?> -<input type="hidden" name="action" value="element"> -<input type="hidden" name="subaction" value="changetype"> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -78,11 +74,7 @@ </form> - -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="action" value="template"> -<input type="hidden" name="subaction" value="elementsave"> +<?php echo Html::form('template','elementsave',$templateid,array('elementid'=>$elementid) ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -95,7 +87,7 @@ if (isset($subtype)) { $fx = fx($fx); ?> <tr> - <td class="<?php echo $fx ?>" width="30%"><?php echo lang('SUBTYPE') ?></td> + <td class="<?php echo $fx ?>" width="30%"><?php echo lang('ELEMENT_SUBTYPE') ?></td> <td class="<?php echo $fx ?>"><?php echo Html::selectBox('subtype',$subtype,$act_subtype) ?></td> </tr> <?php } ?> @@ -280,37 +272,23 @@ $fx = fx($fx); ?> <tr> <td></td> - <td class="help"><?php echo $dynamic_class_description ?></td> + <td class="help"><?php echo $dynamic_class_description['description'] ?></td> </tr> - <?php if ( count($dynamic_class_parameters) > 0 ) + <?php if ( count($dynamic_class_description['parameters']) > 0 ) { ?> <tr> <td class="<?php echo $fx ?>"><?php echo lang('EL_PROP_DYNAMIC_PARAMETERS') ?></td> <td class="<?php echo $fx ?>"><textarea name="code" rows="15" cols="40"><?php echo $parameters ?></textarea></td> </tr> - <?php foreach( $dynamic_class_parameters as $paramName=>$paramDesc ) { ?> - <tr> - <td class="<?php echo $fx ?>"><?php echo $paramName ?></td> - <td class="<?php echo $fx ?>"><input type="text" name="<?php echo $paramName ?>" /></td> - </tr> - <tr> - <td class="help"> </td> - <td class="help"><?php echo $paramDesc ?></td> - </tr> - <?php } ?> <tr> <td></td> - <td class="help"><ul><?php foreach( $dynamic_class_parameters as $paramName=>$paramDesc ) + <td class="help"><ul><?php foreach( $dynamic_class_description['parameters'] as $paramName=>$paramDesc ) { ?> - <li><strong><?php echo $paramName ?></strong>: <?php echo $paramDesc ?></li> + <li><strong><?php echo $paramName ?></strong>: <?php echo $paramDesc['description'] ?><br/><?php echo lang('GLOBAL_DEFAULT') ?>: <em><?php echo $paramDesc['default'] ?></em></li> <?php } ?> </ul> </td> </tr> - <tr> - <td></td> - <td class="help"><?php echo lang('EL_PROP_DYNAMIC_PARAMETERS_DESC') ?></td> - </tr> <?php } ?> <?php } ?> diff --git a/themes/default/pages/html/file/edit.tpl.php b/themes/default/pages/html/file/edit.tpl.php @@ -14,10 +14,9 @@ <tr> <td colspan="2" class="act"> - <form action="<?php echo $self ?>" method="post" enctype="multipart/form-data"> - <input type="hidden" name="action" value="file"> - <input type="hidden" name="subaction" value="replace"> - <input type="file" name="file"> <input type="submit" class="submit" value="<?php echo lang('GLOBAL_UPLOAD') ?>"> + <?php echo Html::form( 'file','replace',$id,array('enctype'=>'multipart/form-data') ) ?> + + <input type="file" name="file"> <input type="submit" class="submit" value="<?php echo lang('GLOBAL_UPLOAD') ?>"> </form> </td> @@ -27,10 +26,7 @@ <?php if ( count($formats) > 0 ) { ?> -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="action" value="file"> -<input type="hidden" name="subaction" value="resize"> +<?php echo Html::form( 'file','resize',$id ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -79,10 +75,7 @@ <?php if ( substr($mimetype,0,5) == 'text/' ) { ?> -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="action" value="file"> -<input type="hidden" name="subaction" value="savevalue"> +<?php echo Html::form( 'file','savevalue',$id ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -103,8 +96,6 @@ </form> <?php } ?> - - </center> <?php Html::focusField('name') ?> diff --git a/themes/default/pages/html/file/pub.tpl.php b/themes/default/pages/html/file/pub.tpl.php @@ -2,10 +2,7 @@ <center> -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="<?php echo session_name() ?>" value="<?php echo session_id() ?>"> -<input type="hidden" name="subaction" value="pub2"> +<?php echo Html::form('file','pubnow','-' ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -29,8 +26,5 @@ </center> -<script name="JavaScript" type="text/javascript"><!-- -document.forms[0].subdirs.focus(); -//--></script> <?php include( $tpl_dir.'footer.tpl.php') ?> \ No newline at end of file diff --git a/themes/default/pages/html/folder/new.tpl.php b/themes/default/pages/html/folder/new.tpl.php @@ -3,9 +3,7 @@ <!-- $Id$ --> <center> -<form enctype="multipart/form-data" action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="subaction" value="createnew" /> -<input type="hidden" name="<?php echo session_name() ?>" value="<?php echo session_id() ?>" /> +<?php echo Html::form( 'folder','createnew',$objectid,array('enctype'=>'multipart/form-data') ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> diff --git a/themes/default/pages/html/folder/prop.tpl.php b/themes/default/pages/html/folder/prop.tpl.php @@ -2,10 +2,7 @@ <center> -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="<?php echo session_name() ?>" value="<?php echo session_id() ?>"> -<input type="hidden" name="subaction" value="save"> +<?php echo Html::form('folder','save') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> diff --git a/themes/default/pages/html/folder/pub.tpl.php b/themes/default/pages/html/folder/pub.tpl.php @@ -2,10 +2,7 @@ <center> -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="<?php echo session_name() ?>" value="<?php echo session_id() ?>"> -<input type="hidden" name="subaction" value="pub2"> +<?php echo Html::form('folder','pubnow') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -14,8 +11,8 @@ </tr> <tr> -<td width="50%" class="f1"><?php echo Html::checkbox('pages',true) ?> <?php echo lang('GLOBAL_pages') ?><br> - <?php echo Html::checkbox('files',true) ?> <?php echo lang('GLOBAL_files') ?></td> +<td width="50%" class="f1"><?php echo Html::checkbox('pages',true) ?> <?php echo lang('GLOBAL_pages') ?><br> + <?php echo Html::checkbox('files',true) ?> <?php echo lang('GLOBAL_files') ?></td> <td width="50%" class="f1"><?php echo Html::checkbox('subdirs',false) ?> <?php echo lang('GLOBAL_PUBLISH_WITH_SUBDIRS') ?></td> </tr> @@ -35,8 +32,6 @@ </center> -<script name="JavaScript" type="text/javascript"><!-- -document.forms[0].subdirs.focus(); -//--></script> +<?php Html::focusField('subdirs') ?> <?php include( $tpl_dir.'footer.tpl.php') ?> \ No newline at end of file diff --git a/themes/default/pages/html/folder/show.tpl.php b/themes/default/pages/html/folder/show.tpl.php @@ -91,7 +91,7 @@ else { ?> <tr> -<td colspan="2" class="<?php if($f1==true) {echo'f1'; } else{echo'f2'; }?>"><?php echo lang('NOT_FOUND') ?></td> +<td colspan="2" class="<?php if($f1==true) {echo'f1'; } else{echo'f2'; }?>"><?php echo lang('GLOBAL_NOT_FOUND') ?></td> </tr> <?php } ?> diff --git a/themes/default/pages/html/language/edit.tpl.php b/themes/default/pages/html/language/edit.tpl.php @@ -4,9 +4,7 @@ <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="action" value="language"> -<input type="hidden" name="subaction" value="save"> +<?php echo Html::form('language','save',$languageid) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -16,12 +14,9 @@ <tr> <td width="50%" class="f1"><?php echo lang('GLOBAL_LANGUAGE') ?></a></td> -<td width="50%" class="f1"><input type="text" size="50" name="name" value="<?php echo $name ?>"></td> -</tr> -<tr> -<td width="50%" class="f2"><?php echo lang('LANGUAGE_ISOCODE') ?></a></td> -<td width="50%" class="f2"><input type="text" size="10" name="isocode" maxlength="10" value="<?php echo $isocode ?>"></td> +<td width="50%" class="f2"><?php echo Html::selectBox('isocode',$isocodes,$act_isocode) ?></td> </tr> + <?php if ( $delete ) { ?> <tr> @@ -30,8 +25,8 @@ </tr> <tr> <td class="help"><?php echo lang('HELP_LANGUAGE_DELETE') ?></td> -</tr> <?php } ?> +</tr> <tr> <td colspan="2" class="act"><input type="submit" class="submit" value="<?php echo lang('GLOBAL_SAVE') ?>"></a></td> diff --git a/themes/default/pages/html/language/list.tpl.php b/themes/default/pages/html/language/list.tpl.php @@ -3,9 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="action" value="language"> -<input type="hidden" name="subaction" value="add"> +<?php echo Html::form('language','add') ?> <table class="main" width="60%" cellspacing="0" cellpadding="4"> <tr> @@ -18,15 +16,15 @@ <tr> <?php if ( isset($e['url'])) { ?> -<td width="50%" class="<?php if($f1==true) {echo'f1'; } else{echo'f2'; }?>"><a href="<?php echo $e['url'] ?>"><img src="<?php echo $image_dir.'icon_lang.png' ?>" align="left" border="0" /><?php echo $e['name'] ?></a></td> -<td width="25%" class="<?php if($f1==true) {echo'f1';$f1=false;} else{echo'f2';$f1=true;}?>"><?php if (!isset($e['default_url'])) echo '<strong>'.lang('GLOBAL_default').'</strong>'; else echo '<a href="'.$e['default_url'].'">'.lang('GLOBAL_make_default').'</a>' ?></td> +<td width="50%" class="<?php if($f1==true) {echo'f1'; } else{echo'f2'; }?>"><a href="<?php echo $e['url'] ?>"><img src="<?php echo $image_dir.'icon_lang'.IMG_EXT ?>" align="left" border="0" /><?php echo $e['name'] ?></a></td> +<td width="25%" class="<?php if($f1==true) {echo'f1';$f1=false;} else{echo'f2';$f1=true;}?>"><?php if (!isset($e['default_url'])) echo '<strong>'.lang('GLOBAL_default').'</strong>'; else echo '<a href="'.$e['default_url'].'" target="_self">'.lang('GLOBAL_make_default').'</a>' ?></td> <?php } else { ?> <td width="50%" class="<?php if($f1==true) {echo'f1'; } else{echo'f2'; }?>"><img src="<?php echo $image_dir.'icon_lang.png' ?>" align="left"/><?php echo $e['name'] ?></td> <td width="25%" class="<?php if($f1==true) {echo'f1';$f1=false;} else{echo'f2';$f1=true;}?>"> </td> <?php } ?> -<td width="25%" class="<?php if($f1==true) {echo'f1';$f1=false;} else{echo'f2';$f1=true;}?>"><?php if (!isset($e['select_url' ])) echo '<strong>'.lang('GLOBAL_selected').'</strong>'; else echo '<a href="'.'?'.$e['select_url'].'">'.lang('GLOBAL_select').'</a>' ?></td> +<td width="25%" class="<?php if($f1==true) {echo'f1';$f1=false;} else{echo'f2';$f1=true;}?>"><?php if (!isset($e['select_url' ])) echo '<strong>'.lang('GLOBAL_selected').'</strong>'; else echo '<a href="'.$e['select_url'].'" target="_top">'.lang('GLOBAL_select').'</a>' ?></td> </tr> <?php } ?> diff --git a/themes/default/pages/html/login.tpl.php b/themes/default/pages/html/login.tpl.php @@ -5,7 +5,7 @@ <center> -<?php echo Html::form( array('name'=>'login','action'=>'index','subaction'=>'login','target'=>'_top') ) ?> +<?php echo Html::form( 'index','login','',array('target'=>'_top') ) ?> <table class="main" width="400" cellspacing="0" cellpadding="4"> @@ -61,10 +61,6 @@ </center> -<script name="JavaScript" type="text/javascript"> -<!-- -window.document.login.login_name.focus(); -//--> -</script> +<?php Html::focusField('login_name') ?> <?php include( $tpl_dir.'footer.tpl.php') ?> \ No newline at end of file diff --git a/themes/default/pages/html/model/list.tpl.php b/themes/default/pages/html/model/list.tpl.php @@ -3,9 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="action" value="model"> -<input type="hidden" name="subaction" value="add"> +<?php echo Html::form('model','add') ?> <table class="main" width="60%" cellspacing="0" cellpadding="4"> @@ -20,14 +18,14 @@ <?php if (isset($e['url'])) { ?> <td width="50%" class="<?php if($f1==true) {echo'f1'; } else{echo'f2'; }?>"><a href="<?php echo $e['url'] ?>"><?php echo $e['name'] ?></a></td> -<td width="25%" class="<?php if($f1==true) {echo'f1';$f1=false;} else{echo'f2';$f1=true;}?>"><?php if ( !isset($e['default_url'])) echo '<strong>'.lang('GLOBAL_default' ).'</strong>'; else echo '<a href="'.$e['default_url'].'">'.lang('GLOBAL_make_default').'</a>' ?></td> +<td width="25%" class="<?php if($f1==true) {echo'f1';$f1=false;} else{echo'f2';$f1=true;}?>"><?php if ( !isset($e['default_url'])) echo '<strong>'.lang('GLOBAL_default' ).'</strong>'; else echo '<a href="'.$e['default_url'].'" target="_self">'.lang('GLOBAL_make_default').'</a>' ?></td> <?php } else { ?> <td width="50%" class="<?php if($f1==true) {echo'f1'; } else{echo'f2'; }?>"><?php echo $e['name'] ?></td> <td width="25%" class="<?php if($f1==true) {echo'f1';$f1=false;} else{echo'f2';$f1=true;}?>"> </td> <?php } ?> -<td width="25%" class="<?php if($f1==true) {echo'f1';$f1=false;} else{echo'f2';$f1=true;}?>"><?php if ( !isset($e['select_url' ])) echo '<strong>'.lang('GLOBAL_selected').'</strong>'; else echo '<a href="'.$e['select_url' ].'">'.lang('GLOBAL_select' ).'</a>' ?></td> +<td width="25%" class="<?php if($f1==true) {echo'f1';$f1=false;} else{echo'f2';$f1=true;}?>"><?php if ( !isset($e['select_url' ])) echo '<strong>'.lang('GLOBAL_selected').'</strong>'; else echo '<a href="'.$e['select_url' ].'" target="_top" >'.lang('GLOBAL_select' ).'</a>' ?></td> </tr> <?php } ?> diff --git a/themes/default/pages/html/object/rights.tpl.php b/themes/default/pages/html/object/rights.tpl.php @@ -26,15 +26,15 @@ <tr> <?php if ( $z['username'] != '' ) { ?> -<td width="50%" class="<?php echo $fx ?>"><img src="<?php echo $image_dir.'icon_user.png' ?>" align="left"><?php echo $z['username'] ?></td> +<td width="50%" class="<?php echo $fx ?>"><img src="<?php echo $image_dir.'icon_user'.IMG_EXT ?>" align="left"><?php echo $z['username'] ?></td> <?php } elseif ( $z['groupname'] != '' ) { ?> -<td width="50%" class="<?php echo $fx ?>"><img src="<?php echo $image_dir.'icon_group.png' ?>" align="left"><?php echo $z['groupname'] ?></td> +<td width="50%" class="<?php echo $fx ?>"><img src="<?php echo $image_dir.'icon_group'.IMG_EXT ?>" align="left"><?php echo $z['groupname'] ?></td> <?php } else { ?> -<td width="50%" class="<?php echo $fx ?>"><img src="<?php echo $image_dir.'icon_group.png' ?>" align="left"><?php echo lang('GLOBAL_ALL') ?></td> +<td width="50%" class="<?php echo $fx ?>"><img src="<?php echo $image_dir.'icon_group'.IMG_EXT ?>" align="left"><?php echo lang('GLOBAL_ALL') ?></td> <?php } ?> <td class="<?php echo $fx ?>"><?php echo $z['languagename'] ?></td> @@ -60,7 +60,7 @@ <br/><br/><br/> -<?php echo Html::form( array('subaction'=>'addacl','action'=>$action,'objectid'=>$objectid,'method'=>'post','target'=>'_self') ) ?> +<?php echo Html::form( $action,'addacl',$objectid ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> <tr> diff --git a/themes/default/pages/html/page/element.tpl.php b/themes/default/pages/html/page/element.tpl.php @@ -6,7 +6,7 @@ <table class="main" width="90%" cellspacing="0" cellpadding="4"> <tr> - <th colspan="3"><?php echo lang('ELEMENTS') ?></th> + <th colspan="3"><?php echo lang('TEMPLATE_ELEMENTS') ?></th> </tr> <?php if ( count($el) > 0 ) @@ -23,7 +23,7 @@ $fx = fx($f1); ?> <tr> - <td width="25%" class="<?php echo $fx ?>"><a href="<?php echo $e['url'] ?>" title="<?php echo $e['desc'] ?>"><img src="<?php echo $image_dir.'icon_el_'.$e['type'].'.png' ?>" border="0" align="left"><?php echo $e['name'] ?></a></td> + <td width="25%" class="<?php echo $fx ?>"><a href="<?php echo $e['url'] ?>" title="<?php echo $e['desc'] ?>"><img src="<?php echo $image_dir.'icon_el_'.$e['type'].IMG_EXT ?>" border="0" align="left"><?php echo $e['name'] ?></a></td> <td width="40%" class="<?php echo $fx ?>"><?php echo $e['value'] ?> </td> <td width="15%" class="<?php echo $fx ?>"><a href="<?php echo $e['archive_url'] ?>"><?php echo lang('GLOBAL_ARCHIVE') ?></a> (<?php echo $e['archive_count'] ?>)</td> </tr> diff --git a/themes/default/pages/html/page/form.tpl.php b/themes/default/pages/html/page/form.tpl.php @@ -3,15 +3,12 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="action" value="page" /> -<input type="hidden" name="subaction" value="saveform"/> +<?php echo Html::form('page','saveform') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> <tr> - <th colspan="4"><?php echo lang('ELEMENTS') ?></th> + <th colspan="4"><?php echo lang('TEMPLATE_ELEMENTS') ?></th> </tr> <?php if ( count($el) > 0 ) diff --git a/themes/default/pages/html/page/prop.tpl.php b/themes/default/pages/html/page/prop.tpl.php @@ -3,10 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="action" value="page" /> -<input type="hidden" name="subaction" value="propsave"/> +<?php echo Html::form('page','propsave') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -36,7 +33,7 @@ <td width="50%" class="f1"><?php echo lang('GLOBAL_TEMPLATE') ?></a></td> <?php if (isset($template_url)) { ?> - <td width="50%" class="f1"><a href="<?php echo $template_url ?>" target="cms_main"><img src="<?php echo $image_dir ?>icon_tpl.png" border="0" align="left"><?php echo $template_name ?></a></td> + <td width="50%" class="f1"><a href="<?php echo $template_url ?>" target="cms_main"><img src="<?php echo $image_dir ?>icon_tpl<?php echo IMG_EXT ?>" border="0" align="left"><?php echo $template_name ?></a></td> <?php } else { ?> @@ -68,10 +65,7 @@ <!-- Vorlage tauschen --> <?php if (count($templates)>0) // Nur anzeigen, wenn es Vorlagen zu tauschen gibt { ?> -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="action" value="page" /> -<input type="hidden" name="subaction" value="replaceTemplateSelectElements" /> +<?php echo Html::form('page','replacetemplateselectelements') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> diff --git a/themes/default/pages/html/page/pub.tpl.php b/themes/default/pages/html/page/pub.tpl.php @@ -2,10 +2,7 @@ <center> -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="<?php echo session_name() ?>" value="<?php echo session_id() ?>"> -<input type="hidden" name="subaction" value="pub2"> +<?php echo Html::form('page','pubnow') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> diff --git a/themes/default/pages/html/page/replacetemplate.tpl.php b/themes/default/pages/html/page/replacetemplate.tpl.php @@ -3,11 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="action" value="page" /> -<input type="hidden" name="subaction" value="replaceTemplate"/> -<input type="hidden" name="newTemplateId" value="<?php echo $newTemplateId ?>" /> +<?php echo Html::form('page','replacetemplate','',array('newTemplateId'=>$newTemplateId)) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> diff --git a/themes/default/pages/html/pageelement/archive.tpl.php b/themes/default/pages/html/pageelement/archive.tpl.php @@ -6,7 +6,7 @@ <table class="main" width="90%" cellspacing="0" cellpadding="4"> <tr> - <th colspan="6"><?php echo lang('GLOBAL_ARCHIVE') ?> (<?php echo lang('ELEMENT') ?>: <?php echo $name ?>)</th> + <th colspan="6"><?php echo lang('GLOBAL_ARCHIVE') ?> (<?php echo lang('PAGE_PAGEELEMENT') ?>: <?php echo $name ?>)</th> </tr> <?php if (count($el)>0) { ?> @@ -40,7 +40,7 @@ else { ?> <tr> - <td class="f1" colspan="6"><strong><?php echo lang('NOT_FOUND') ?></strong></td> + <td class="f1" colspan="6"><strong><?php echo lang('GLOBAL_NOT_FOUND') ?></strong></td> </tr> <?php } ?> @@ -50,9 +50,7 @@ <?php if (count($version_list)>1) { ?> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="action" value="pageelement" /> -<input type="hidden" name="subaction" value="diff" /> +<?php echo Html::form('pageelement','diff') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -71,7 +69,7 @@ <td class="<?php echo $fx ?>" width="50%"><?php echo lang('GLOBAL_WITH' ) ?> <?php echo Html::selectBox('value2id',$version_list,$default2id) ?></td> </tr> <tr> - <td colspan="2" class="act"><input class="submit" type="submit" value="<?php echo lang('SAVE') ?>" /></td> + <td colspan="2" class="act"><input class="submit" type="submit" value="<?php echo lang('MENU_SHOW') ?>" /></td> </tr> </table> diff --git a/themes/default/pages/html/pageelement/edit/date.tpl.php b/themes/default/pages/html/pageelement/edit/date.tpl.php @@ -3,11 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" name="date" target="_self"> -<input type="hidden" name="action" value="page"> -<input type="hidden" name="subaction" value="elsave"> -<input type="hidden" name="old_pageaction" value="<?php echo $old_pageaction ?>"> -<input type="hidden" name="valueid" value="<?php echo $valueid ?>"> +<?php echo Html::form('page','elsave') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -25,7 +21,7 @@ echo '<tr>'; for ( $wday=0; $wday<=6; $wday++ ) { - echo '<td class="help">'.lang('WEEKDAY'.$wday).'</th>'; + echo '<td class="help">'.lang('DATE_WEEKDAY'.$wday).'</th>'; } echo '</tr>'; @@ -52,7 +48,7 @@ $d++; if ($d == $day) echo "<strong>$d</strong>"; - else echo '<a href="'.Html::url(array('action'=>'pageelement','year'=>$year,'month'=>$month,'day'=>$d,'hour'=>$hour,'minute'=>$minute,'second'=>$second)).'">'.$d.'</a>'; + else echo '<a href="'.Html::url('pageelement','edit','-',array('year'=>$year,'month'=>$month,'day'=>$d,'hour'=>$hour,'minute'=>$minute,'second'=>$second)).'">'.$d.'</a>'; echo '</td>'; } else echo '<td></td'; @@ -67,7 +63,7 @@ <tr> <?php $lastyear = $year-1; - echo '<td colspan="3"><a href="'.Html::url(array('action'=>'pageelement','year'=>$lastyear,'month'=>$month,'day'=>$day,'hour'=>$hour,'minute'=>$minute,'second'=>$second)).'">'.lang('LAST_YEAR').'</a> « '; + echo '<td colspan="3"><a href="'.Html::url('pageelement','edit','-',array('year'=>$lastyear,'month'=>$month,'day'=>$day,'hour'=>$hour,'minute'=>$minute,'second'=>$second)).'">'.lang('DATE_LAST_YEAR').'</a> « '; $lastyear = $year; $lastmonth = $month - 1; @@ -77,10 +73,10 @@ $lastyear--; $lastmonth = 12; } - echo ' <a href="'.Html::url(array('action'=>'pageelement','year'=>$lastyear,'month'=>$lastmonth,'day'=>$day,'hour'=>$hour,'minute'=>$minute,'second'=>$second)).'">'.lang('LAST_MONTH').'</a> « </td>'; + echo ' <a href="'.Html::url('pageelement','edit','-',array('year'=>$lastyear,'month'=>$lastmonth,'day'=>$day,'hour'=>$hour,'minute'=>$minute,'second'=>$second)).'">'.lang('DATE_LAST_MONTH').'</a> « </td>'; // Link auf heutiges Datum - echo '<td style="text-align:center"><a href="'.$todayurl.'">'.lang('TODAY').'</a></td>'; + echo '<td style="text-align:center"><a href="'.$todayurl.'">'.lang('DATE_TODAY').'</a></td>'; $nextyear = $year; $nextmonth = $month + 1; @@ -90,10 +86,10 @@ $nextyear++; $nextmonth = 1; } - echo '<td colspan="3" style="text-align:right">» <a href="'.Html::url(array('action'=>'pageelement','year'=>$lastyear,'month'=>$nextmonth,'day'=>$day,'hour'=>$hour,'minute'=>$minute,'second'=>$second)).'">'.lang('NEXT_MONTH').'</a>'; + echo '<td colspan="3" style="text-align:right">» <a href="'.Html::url('pageelement','edit','-',array('year'=>$lastyear,'month'=>$nextmonth,'day'=>$day,'hour'=>$hour,'minute'=>$minute,'second'=>$second)).'">'.lang('DATE_NEXT_MONTH').'</a>'; $nextyear = $year+1; - echo ' » <a href="'.Html::url(array('action'=>'pageelement','year'=>$nextyear,'month'=>$month,'day'=>$day,'hour'=>$hour,'minute'=>$minute,'second'=>$second)).'">'.lang('NEXT_YEAR').'</a></td>'; + echo ' » <a href="'.Html::url('pageelement','edit','-',array('year'=>$nextyear,'month'=>$month,'day'=>$day,'hour'=>$hour,'minute'=>$minute,'second'=>$second)).'">'.lang('DATE_NEXT_YEAR').'</a></td>'; ?> </tr> @@ -109,12 +105,11 @@ <?php echo Html::selectBox('month',$all_months,$month) ?> <strong>-</strong> <?php echo Html::selectBox('day' ,$all_days ,$day ) ?> </td><td class="f1" colspan="2"> -<!--<noscript><input type="submit" class="submit" value="<?php echo lang('REFRESH') ?>"></noscript>--> </td> </tr> <tr> -<td class="f1"><?php echo lang('TIME') ?> +<td class="f1"><?php echo lang('DATE_TIME') ?> <td class="f1" colspan="4"> <?php echo Html::selectBox('hour' ,$all_hours ,$hour ) ?> : <?php echo Html::selectBox('minute',$all_minutes ,$minute) ?> : @@ -128,7 +123,7 @@ <td class="help" colspan="7"><?php echo lang('HELP_DATE_ANSIDATE') ?>:</td> </tr> <tr> -<td class="f2"><?php echo lang('ANSI') ?> +<td class="f2"><?php echo lang('DATE_ANSI') ?> <td class="f2" colspan="4"><input type="text" name="ansidate" class="ansidate" width="25" maxlength="25" value="<?php echo $ansidate ?>"> <input type="hidden" name="ansidate_orig" value="<?php echo $ansidate ?>"> </td><td class="f1" colspan="2"> @@ -138,7 +133,7 @@ <tr> <td class="act" colspan="7"><?php echo lang('DATE').': <strong>'.$actdate ?></strong><br><br> <!--<input type="hidden" name="date" value="<?php echo $date ?>">--> -<input type="submit" class="submit" value="<?php echo lang('SAVE') ?>"></td> +<input type="submit" class="submit" value="<?php echo lang('GLOBAL_SAVE') ?>"></td> </tr> </table> @@ -147,8 +142,6 @@ </center> -<script language="JavaScript" type="text/javascript"> - document.forms.date.ansidate.focus(); -</script> +<?php Html::focusField('ansidate') ?> <?php include( $tpl_dir.'footer.tpl.php') ?> \ No newline at end of file diff --git a/themes/default/pages/html/pageelement/edit/link.tpl.php b/themes/default/pages/html/pageelement/edit/link.tpl.php @@ -3,10 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="action" value="page"> -<input type="hidden" name="subaction" value="elsave"> -<input type="hidden" name="old_pageaction" value="<?php echo $old_pageaction ?>"> +<?php echo Html::form('page','elsave') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> diff --git a/themes/default/pages/html/pageelement/edit/list.tpl.php b/themes/default/pages/html/pageelement/edit/list.tpl.php @@ -3,10 +3,8 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="action" value="page"> -<input type="hidden" name="subaction" value="elsave"> -<input type="hidden" name="old_pageaction" value="<?php echo $old_pageaction ?>"> +<?php echo Html::form('page','elsave') ?> + <table class="main" width="90%" cellspacing="0" cellpadding="4"> diff --git a/themes/default/pages/html/pageelement/edit/longtext.tpl.php b/themes/default/pages/html/pageelement/edit/longtext.tpl.php @@ -3,10 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="action" value="page"> -<input type="hidden" name="subaction" value="elsave"> -<input type="hidden" name="old_pageaction" value="<?php echo $old_pageaction ?>"> +<?php echo Html::form('page','elsave') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> diff --git a/themes/default/pages/html/pageelement/edit/number.tpl.php b/themes/default/pages/html/pageelement/edit/number.tpl.php @@ -3,10 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="subaction" value="elsave"> -<input type="hidden" name="action" value="page"> -<input type="hidden" name="old_pageaction" value="<?php echo $old_pageaction ?>"> +<?php echo Html::form('page','elsave') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -38,8 +35,6 @@ </center> -<script name="JavaScript" type="text/javascript"><!-- -document.forms[0].number.focus(); -//--></script> +<?php Html::focusField('number') ?> <?php include( $tpl_dir.'footer.tpl.php') ?> \ No newline at end of file diff --git a/themes/default/pages/html/pageelement/edit/select.tpl.php b/themes/default/pages/html/pageelement/edit/select.tpl.php @@ -3,10 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="subaction" value="elsave" /> -<input type="hidden" name="action" value="page" /> -<input type="hidden" name="old_pageaction" value="<?php echo $old_pageaction ?>" /> +<?php echo Html::form('page','elsave') ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> diff --git a/themes/default/pages/html/pageelement/edit/text.tpl.php b/themes/default/pages/html/pageelement/edit/text.tpl.php @@ -3,10 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="subaction" value="elsave"> -<input type="hidden" name="action" value="page"> -<input type="hidden" name="old_pageaction" value="<?php echo $old_pageaction ?>"> +<?php echo Html::form('page','elsave','-',array('old_pageaction'=>$old_pageaction,'elementid'=>$elementid)) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> diff --git a/themes/default/pages/html/project/edit.tpl.php b/themes/default/pages/html/project/edit.tpl.php @@ -3,9 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="action" value="project" /> -<input type="hidden" name="subaction" value="save" /> +<?php echo Html::form('project','save',$projectid ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> diff --git a/themes/default/pages/html/project/list.tpl.php b/themes/default/pages/html/project/list.tpl.php @@ -11,19 +11,22 @@ <table class="main" width="50%" cellspacing="0" cellpadding="4"> <tr> - <th><?php echo lang('GLOBAL_PROJECTS') ?></th> + <th colspan="2"><?php echo lang('GLOBAL_PROJECTS') ?></th> </tr> <?php $f1=true; foreach( $el as $id=>$e ) { ?> <tr> -<td class="<?php if($f1==true) {echo'f1'; } else{echo'f2'; }?>"><a href="<?php echo $e['url'] ?>" target="cms_main"><img src="<?php echo $image_dir ?>icon_project<?php echo IMG_EXT ?>" border="0" align="left"><?php echo $e['name'] ?></a></td> + <td class="<?php if($f1==true) {echo'f1'; } else{echo'f2'; }?>"><a href="<?php echo $e['url'] ?>" target="cms_main"><img src="<?php echo $image_dir ?>icon_project<?php echo IMG_EXT ?>" border="0" align="left"><?php echo $e['name'] ?></a></td> + <td class="<?php if($f1==true) {echo'f1'; } else{echo'f2'; }?>"><a href="<?php echo $e['use_url'] ?>" target="_top" ><?php echo lang('GLOBAL_SELECT') ?></a></td> </tr> <?php } ?> <tr> -<td class="act" colspan="2"><input type="text" name="name" value=""> <input type="submit" class="submit" value="<?php echo lang('GLOBAL_ADD') ?>"></td> + <td class="act" colspan="2"> + <input type="text" name="name" value=""> <input type="submit" class="submit" value="<?php echo lang('GLOBAL_ADD') ?>"> + </td> </tr> </table> diff --git a/themes/default/pages/html/template/el.tpl.php b/themes/default/pages/html/template/el.tpl.php @@ -3,9 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="action" value="template" /> -<input type="hidden" name="subaction" value="addelement" /> +<?php echo Html::form('template','addelement',$templateid ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -18,7 +16,7 @@ if (count($el)>0) foreach( $el as $id=>$e ) { $fx = fx($fx); ?> <tr> -<td width="50%" class="<?php echo $fx ?>"><a href="<?php echo $e['url'] ?>" title="<?php echo $e['desc'] ?>"><img src="<?php echo $image_dir.'icon_el_'.$e['type'].'.png' ?>" border="0" align="left"><?php echo $e['name'] ?></a></td> +<td width="50%" class="<?php echo $fx ?>"><a href="<?php echo $e['url'] ?>" title="<?php echo $e['desc'] ?>"><img src="<?php echo $image_dir.'icon_el_'.$e['type'].IMG_EXT ?>" border="0" align="left"><?php echo $e['name'] ?></a></td> <td width="50%" class="<?php echo $fx ?>"><?php echo lang('el_'.$e['type']) ?></td> </tr> <?php } diff --git a/themes/default/pages/html/template/prop.tpl.php b/themes/default/pages/html/template/prop.tpl.php @@ -3,9 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="action" value="template"> -<input type="hidden" name="subaction" value="propsave"> +<?php echo Html::form('template','propsave',$templateid ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -37,11 +35,7 @@ </form> - -<form action="<?php echo $self ?>" method="post" target="_self"> - -<input type="hidden" name="action" value="template"> -<input type="hidden" name="subaction" value="extensionsave"> +<?php echo Html::form('template','extensionsave',$templateid ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4"> @@ -74,13 +68,13 @@ foreach( $pages as $id=>$p ) { ?> <tr> -<td class="f1"><a href="<?php echo $p['url'] ?>" target="cms_main"><img src="<?php echo $image_dir.'icon_page.png' ?>" border="0" align="left"><?php echo $p['name'] ?></a></td> +<td class="f1"><a href="<?php echo $p['url'] ?>" target="cms_main"><img src="<?php echo $image_dir.'icon_page'.IMG_EXT ?>" border="0" align="left"><?php echo $p['name'] ?></a></td> </tr> <?php } if ( count($pages)==0) { ?> <tr> -<td class="f1"><?php echo lang('NOT_FOUND') ?></td> +<td class="f1"><?php echo lang('GLOBAL_NOT_FOUND') ?></td> </tr> <?php } ?> @@ -90,8 +84,7 @@ </center> -<script name="JavaScript" type="text/javascript"><!-- -document.forms[0].name.focus(); -//--></script> +<?php Html::focusField('name') ?> + <?php include( $tpl_dir.'footer.tpl.php') ?> \ No newline at end of file diff --git a/themes/default/pages/html/template/src.tpl.php b/themes/default/pages/html/template/src.tpl.php @@ -3,8 +3,7 @@ <!-- $Id$ --> <center> -<form action="<?php echo $self ?>" method="post" target="_self"> -<input type="hidden" name="subaction" value="srcsave"> +<?php echo Html::form('template','srcsave',$templateid ) ?> <table class="main" width="90%" cellspacing="0" cellpadding="4">