commit 7d6bdfd6d69450e41602087cfc1d769430642c78 parent 32422002846ed71794199a60238c47fa7d70a99d Author: dankert <devnull@localhost> Date: Tue, 18 Jan 2011 00:45:17 +0100 Neue Icons für Action-Knöpfe. Diffstat:
40 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/themes/default/images/icon/add.png b/themes/default/images/icon/add.png Binary files differ. diff --git a/themes/default/images/icon/addacl.png b/themes/default/images/icon/addacl.png Binary files differ. diff --git a/themes/default/images/icon/adduser.png b/themes/default/images/icon/adduser.png Binary files differ. diff --git a/themes/default/images/icon/advanced.png b/themes/default/images/icon/advanced.png Binary files differ. diff --git a/themes/default/images/icon/archive.png b/themes/default/images/icon/archive.png Binary files differ. diff --git a/themes/default/images/icon/content.png b/themes/default/images/icon/content.png Binary files differ. diff --git a/themes/default/images/icon/create.png b/themes/default/images/icon/create.png Binary files differ. diff --git a/themes/default/images/icon/edit.png b/themes/default/images/icon/edit.png Binary files differ. diff --git a/themes/default/images/icon/el.png b/themes/default/images/icon/el.png Binary files differ. diff --git a/themes/default/images/icon/export.png b/themes/default/images/icon/export.png Binary files differ. diff --git a/themes/default/images/icon/extension.png b/themes/default/images/icon/extension.png Binary files differ. diff --git a/themes/default/images/icon/groups.png b/themes/default/images/icon/groups.png Binary files differ. diff --git a/themes/default/images/icon/help.png b/themes/default/images/icon/help.png Binary files differ. diff --git a/themes/default/images/icon/import.png b/themes/default/images/icon/import.png Binary files differ. diff --git a/themes/default/images/icon/info.png b/themes/default/images/icon/info.png Binary files differ. diff --git a/themes/default/images/icon/link.png b/themes/default/images/icon/link.png Binary files differ. diff --git a/themes/default/images/icon/listing.png b/themes/default/images/icon/listing.png Binary files differ. diff --git a/themes/default/images/icon/login.png b/themes/default/images/icon/login.png Binary files differ. diff --git a/themes/default/images/icon/mail.png b/themes/default/images/icon/mail.png Binary files differ. diff --git a/themes/default/images/icon/maintenance.png b/themes/default/images/icon/maintenance.png Binary files differ. diff --git a/themes/default/images/icon/name.png b/themes/default/images/icon/name.png Binary files differ. diff --git a/themes/default/images/icon/order.png b/themes/default/images/icon/order.png Binary files differ. diff --git a/themes/default/images/icon/pages.png b/themes/default/images/icon/pages.png Binary files differ. diff --git a/themes/default/images/icon/profile.png b/themes/default/images/icon/profile.png Binary files differ. diff --git a/themes/default/images/icon/prop.png b/themes/default/images/icon/prop.png Binary files differ. diff --git a/themes/default/images/icon/properties.png b/themes/default/images/icon/properties.png Binary files differ. diff --git a/themes/default/images/icon/pub.png b/themes/default/images/icon/pub.png Binary files differ. diff --git a/themes/default/images/icon/pw.png b/themes/default/images/icon/pw.png Binary files differ. diff --git a/themes/default/images/icon/pwchange.png b/themes/default/images/icon/pwchange.png Binary files differ. diff --git a/themes/default/images/icon/remove.png b/themes/default/images/icon/remove.png Binary files differ. diff --git a/themes/default/images/icon/rights.png b/themes/default/images/icon/rights.png Binary files differ. diff --git a/themes/default/images/icon/select.png b/themes/default/images/icon/select.png Binary files differ. diff --git a/themes/default/images/icon/settings.png b/themes/default/images/icon/settings.png Binary files differ. diff --git a/themes/default/images/icon/show.png b/themes/default/images/icon/show.png Binary files differ. diff --git a/themes/default/images/icon/src.png b/themes/default/images/icon/src.png Binary files differ. diff --git a/themes/default/images/icon/type.png b/themes/default/images/icon/type.png Binary files differ. diff --git a/themes/default/images/icon/users.png b/themes/default/images/icon/users.png Binary files differ. diff --git a/themes/default/images/icon_open.png b/themes/default/images/icon_open.png Binary files differ. diff --git a/themes/default/include/html/window.inc.php b/themes/default/include/html/window.inc.php @@ -5,7 +5,8 @@ #ELSE# $icon=$actionName; #END-IF# - + $icon=$actionName; + echo '<img src="'.$image_dir.'icon_'.$icon.IMG_ICON_EXT.'" align="left" border="0">'; if ($this->isEditable()) { ?> @@ -15,19 +16,17 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?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="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - - - + echo '<span class="path">'.langHtml($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) ) + if ( !isset($path) || !is_array($path) ) $path = array(); foreach( $path as $pathElement) { extract($pathElement); - echo '<a href="'.$url.'" class="path">'.langHtml($name).'</a>'; - echo ' » '; + echo '<a href="'.$url.'" title="'.$title.'" class="path">'.(!empty($key)?langHtml($key):$name).'</a>'; + echo ' → '; } echo '<span class="title">'.langHtml($windowTitle).'</span>'; @@ -85,16 +84,16 @@ if ( isset($menu['url']) ) { - ?><a class="action<?php echo $this->subActionName==$menu['subaction']?'_active':'' ?>" href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo langHtml($menu['text'].'_DESC') ?>"><!-- <img src="<?php echo $image_dir.'icon_'.$menu['subaction'].'.png' ?>" align="left" />--><?php echo $tmp_text ?></a><?php + ?><a class="action<?php echo $this->subActionName==$menu['subaction']?'_active':'' ?>" href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo langHtml($menu['text'].'_DESC') ?>"><img src="<?php echo $image_dir.'icon/'.$menu['subaction'].'.png' ?>" /><?php echo $tmp_text ?></a><?php } else { - ?><div class="noaction"><!-- <img src="<?php echo $image_dir.'icon_'.$menu['subaction'].'.png' ?>" align="left" />--><?php echo $tmp_text ?></div><?php + ?><div class="noaction"><img src="<?php echo $image_dir.'icon/'.$menu['subaction'].'.png' ?>" /><?php echo $tmp_text ?></div><?php } } if (@$conf['help']['enabled'] ) { - ?><a class="help" href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><!-- <img src="<?php echo $image_dir.'icon_help.png' ?>" align="left" />--><?php echo @$conf['help']['only_question_mark']?'?':langHtml('MENU_HELP') ?></a><?php + ?><a class="help" href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo $image_dir.'icon/help.png' ?>" /><?php echo @$conf['help']['only_question_mark']?'?':langHtml('MENU_HELP') ?></a><?php } ?><br/><?php diff --git a/themes/default/templates/tree/show.tpl.src.php b/themes/default/templates/tree/show.tpl.src.php @@ -1,12 +1,14 @@ part class:breadcrumb - link action:start subaction:projectmenu target:content - image icon:project align:left - text title:message:project var:projectname maxlength:20 + if present:projectname + link action:start subaction:projectmenu target:content + image icon:project align:left + text title:message:project var:projectname maxlength:20 link action:tree subaction:openall class:action + image icon:open text key:open_all link action:start subaction:projectmenu class:action target:content - #image icon:project align:left + image icon:project text key:change_to table space:0 padding:0 class:tree
