"fixed last commit r26803 \"allow to specify app in image name\":

thumbnails or other direct url's as image in buttons were no longer displayed"
This commit is contained in:
Ralf Becker 2009-04-22 05:52:07 +00:00
parent 86b126ef3a
commit e6762bf009

View File

@ -1246,7 +1246,10 @@ class etemplate extends boetemplate
case 'cancel': // cancel button case 'cancel': // cancel button
list($app) = explode('.',$this->name); list($app) = explode('.',$this->name);
list($img,$ro_img) = explode(',',$cell_options); list($img,$ro_img) = explode(',',$cell_options);
if (strpos($img,'/') !== false) list($app,$img) = explode('/',$img,2); // allow to specify app in image name if ($img[0] != '/' && strpos($img,'/') !== false && count($img_parts = explode('/',$img)) == 2)
{
list($app,$img) = $img_parts; // allow to specify app in image name (eg. img='addressbook/navbar')
}
$title = strlen($label) <= 1 || $cell['no_lang'] ? $label : lang($label); $title = strlen($label) <= 1 || $cell['no_lang'] ? $label : lang($label);
if ($cell['onclick'] && if ($cell['onclick'] &&
($onclick = $this->expand_name($cell['onclick'],$show_c,$show_row,$content['.c'],$content['.row'],$content))) ($onclick = $this->expand_name($cell['onclick'],$show_c,$show_row,$content['.c'],$content['.row'],$content)))