extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-31 11:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed typo in adding classes causing image to be lost and cleaned up adding of classes

Browse Source
This commit is contained in:
Ralf Becker 2014-02-13 11:00:29 +00:00
parent a33ca94d27
commit 80d74f863e
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
phpgwapi/inc/class.html.inc.php
View File

@ -692,6 +692,9 @@ egw_LAB.wait(function() {
{
$options .= ' style="cursor: pointer;"';
}
// add et2_classes to "old" buttons
$classes = array('et2_button');
if ($image != '')
{
$image = str_replace(array('.gif','.GIF','.png','.PNG'),'',$image);
@ -701,14 +704,11 @@ egw_LAB.wait(function() {
$path = $image; // name may already contain absolut path
}
$image = ' src="'.$path.'"';
if (strpos($options, 'class="') !== false)
{
$options = str_replace('class="', 'class="image_button ', $options);
}
else
{
$options .= ' class="image_button"';
}
$classes[] = 'image_button';
}
else
{
$classes[] = 'et_button_text';
}
if (!$no_lang)
{
@ -728,8 +728,6 @@ egw_LAB.wait(function() {
}
if ($onClick) $options .= ' onclick="'.str_replace('"','\\"',$onClick).'"';
// add et2_classes to "old" buttons
$classes = array('et2_button', 'et2_button_text');
// add default background-image to get et2 like buttons
foreach(self::$default_background_images as $img => $reg_exp)
{
@ -749,9 +747,9 @@ egw_LAB.wait(function() {
break;
}
}
if (strpos($options, 'class="'))
if (strpos($options, 'class="') !== false)
{
$options = str_replace($options, 'class="', 'class="'.implode(' ', $classes).' ', $options);
$options = str_replace('class="', 'class="'.implode(' ', $classes).' ', $options);
}
else
{