commit 0891318beb48e280931d1df5a2eb2798a5b65283
parent 7dbc67a5fa93e7eaab6ffed37d339db18c7e8190
Author: Jan Dankert <devnull@localhost>
Date: Fri, 15 Mar 2013 23:15:10 +0100
Icon-Dateien besser finden.
Diffstat:
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/themes/default/include/html/image.inc.php b/themes/default/include/html/image.inc.php
@@ -10,8 +10,18 @@
$attr_size = '16x16';
/* #END-IF# */
-/* #IF-ATTR icon# */
- $attr_tmp_image_file = $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT;
+/* #IF-ATTR icon# */
+ if ( is_file($image_dir.'icon/'.$attr_icon.IMG_ICON_EXT) )
+ $attr_tmp_image_file = $image_dir.'icon/'.$attr_icon.IMG_ICON_EXT;
+ elseif ( is_file($image_dir.'icon/'.$attr_icon.IMG_EXT) )
+ $attr_tmp_image_file = $image_dir.'icon/'.$attr_icon.IMG_EXT;
+ elseif ( is_file($image_dir.'icon_'.$attr_icon.IMG_ICON_EXT) )
+ $attr_tmp_image_file = $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT;
+ elseif ( is_file($image_dir.'icon_'.$attr_icon.IMG_EXT) )
+ $attr_tmp_image_file = $image_dir.'icon_'.$attr_icon.IMG_EXT;
+ else
+ $attr_tmp_image_file = 'about:blank';
+
$attr_size = '16x16';
/* #END-IF# */
diff --git a/themes/default/templates/title/show.tpl.src.xml b/themes/default/templates/title/show.tpl.src.xml
@@ -74,7 +74,7 @@
</part>
<part class="entry clickable filtered on-action-page">
<link type="dialog" title="message:menu_changetemplate_desc" subaction="changetemplate">
- <image icon="page" align="left"></image>
+ <image icon="changetemplate" align="left"></image>
<text key="menu_changetemplate"></text>
</link>
</part>
@@ -113,7 +113,7 @@
<part class="dropdown">
<part class="entry clickable filtered on-action-folder on-action-link on-action-user on-action-page on-action-file">
<link type="dialog" title="message:menu_rights_desc" subaction="rights">
- <image icon="page" align="left"></image>
+ <image icon="rights" align="left"></image>
<text key="menu_rights"></text>
</link>
</part>
@@ -135,27 +135,27 @@
<part class="toolbar-icon clickable filtered on-action-folder on-action-file on-action-page on-action-link on-action-template on-action-element">
<link type="dialog" subaction="prop" title="message:menu_prop_desc">
- <image icon="pageelement" align="left"></image>
+ <image icon="prop" align="left"></image>
</link>
</part>
<part class="toolbar-icon clickable filtered on-action-folder on-action-file on-action-page on-action-link on-action-user">
<link type="dialog" subaction="rights" title="message:menu_rights_desc">
- <image icon="pageelement" align="left"></image>
+ <image icon="rights" align="left"></image>
</link>
</part>
<part class="toolbar-icon clickable filtered on-action-folder on-action-page on-action-file on-action-pageelement">
<link type="dialog" subaction="pub" title="message:menu_pub_desc">
- <image icon="page" align="left"></image>
+ <image icon="pub" align="left"></image>
</link>
</part>
<part class="toolbar-icon clickable filtered on-action-page">
<link type="dialog" subaction="changetemplate" title="message:menu_changetemplate_desc">
- <image icon="template" align="left"></image>
+ <image icon="changetemplate" align="left"></image>
</link>
</part>
<part class="toolbar-icon clickable filtered on-action-page on-action-file on-action-pageelement on-action-template">
<link type="dialog" subaction="preview" title="message:menu_preview_desc">
- <image icon="page" align="left"></image>
+ <image icon="preview" align="left"></image>
</link>
</part>