commit cc3f54742517bdb00f70dc9972a7056d959c339b
parent d35fa8cabcb137bc0b5385d9b695d982660e8852
Author: dankert <devnull@localhost>
Date: Sun, 1 Mar 2009 13:41:30 +0100
Textausgabe bei Notizen HTML-Kodieren.
Diffstat:
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/themes/default/include/html/window.inc.php b/themes/default/include/html/window.inc.php
@@ -34,7 +34,16 @@
{
echo '<tr><td class="menu">';
echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">';
- echo '<span class="path">'.lang('GLOBAL_'.$actionName).'</span> <strong>»</strong> ';
+
+ if ($this->isEditable()) { ?>
+ <?php if ($this->getRequestVar('mode')=='edit') {
+ ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else {
+ ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/readonly.png" style="vertical-align:top; " border="0" /></a> <?php }
+ ?><?php }
+
+
+
+ echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> ';
// if ( !empty($attr_icon) )
// echo '<img src="'.$image_dir.'icon_'.$attr_icon.IMG_ICON_EXT.'" align="left" border="0">';
if ( !isset($path) || is_array($path) )
@@ -42,19 +51,10 @@
foreach( $path as $pathElement)
{
extract($pathElement);
- echo '<a href="'.$url.'" class="path">'.lang($name).'</a>';
+ echo '<a href="'.$url.'" class="path">'.langHtml($name).'</a>';
echo ' » ';
}
- echo '<span class="title">'.lang($windowTitle).'</span>';
-
- if ($this->isEditable()) { ?>
- <?php if ($this->getRequestVar('mode')=='edit') { ?>
- (<a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo lang('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><?php echo lang('MODE_EDIT_CANCEL') ?></a>)
- <?php } else { ?>
- <!-- "Bearbeiten..:" -->
- <?php } ?>
- <?php }
-
+ echo '<span class="title">'.langHtml($windowTitle).'</span>';
?>
@@ -65,7 +65,7 @@
<?php ?> <!--<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
+ ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.langHtml($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a> <?php
}
?>
</td>-->
@@ -76,24 +76,24 @@
$windowMenu = array();
foreach( $windowMenu as $menu )
{
- $tmp_text = lang($menu['text']);
- $tmp_key = strtoupper(lang($menu['key' ]));
+ $tmp_text = langHtml($menu['text']);
+ $tmp_key = strtoupper(langHtml($menu['key' ]));
$tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key));
if ( $tmp_pos !== false )
$tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1);
if ( isset($menu['url']) )
{
- ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a> <?php
+ ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a> <?php
}
else
{
- ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span> <?php
+ ?><span class="menu_disabled" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span> <?php
}
}
if (@$conf['help']['enabled'] )
{
- ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('MENU_HELP_DESC') ?>" class="menu" style="cursor:help;"><?php echo @$conf['help']['only_question_mark']?'?':lang('MENU_HELP') ?></a><?php
+ ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo langHtml('MENU_HELP_DESC') ?>" class="menu" style="cursor:help;"><?php echo @$conf['help']['only_question_mark']?'?':langHtml('MENU_HELP') ?></a><?php
}
?></td>
</tr>
@@ -115,7 +115,7 @@
<?php } ?>
<tr class="notice_<?php echo $notice['status'] ?>">
<td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td>
- <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?>
+ <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?>
<?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?>
</td>
</tr>