Skip to content

Commit

Permalink
Change from deprecated Horde::img() method
Browse files Browse the repository at this point in the history
  • Loading branch information
@slusarz
slusarz committed Oct 4, 2013
1 parent 48706c4 commit a1ea1cf
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 13 deletions.
6 changes: 3 additions & 3 deletions imp/lib/Ajax/Imple/ItipRequest.php
View file
Expand Up @@ -165,7 +165,7 @@ protected function _handle(Horde_Variables $vars)
$notification->push(
_("The event was updated in your calendar.") . ' ' .
Horde::link($url, _("View event"), null, '_blank') .
Horde::img('mime/icalendar.png', _("View event")) .
Horde_Themes_Image::tag('mime/icalendar.png', array('alt' => _("View event"))) .
'</a>',
'horde.success',
array('content.raw')
Expand All @@ -189,7 +189,7 @@ protected function _handle(Horde_Variables $vars)
$notification->push(
_("The event was added to your calendar.") . '&nbsp;' .
Horde::link($url, _("View event"), null, '_blank') .
Horde::img('mime/icalendar.png', _("View event")) .
Horde_Themes_Image::tag('mime/icalendar.png', array('alt' => _("View event"))) .
'</a>',
'horde.success',
array('content.raw')
Expand Down Expand Up @@ -231,7 +231,7 @@ protected function _handle(Horde_Variables $vars)
$notification->push(
_("The task has been added to your tasklist.") . '&nbsp;' .
Horde::link($url, _("View task"), null, '_blank') .
Horde::img('mime/icalendar.png', _("View task")) .
Horde_Themes_Image::tag('mime/icalendar.png', array('alt' => _("View task"))) .
'</a>',
'horde.success',
array('content.raw')
Expand Down
4 changes: 2 additions & 2 deletions imp/lib/Basic/Compose.php
View file
Expand Up @@ -864,7 +864,7 @@ protected function _init()
'class' => 'widget',
'id' => 'addressbook_popup'
)),
'img' => Horde::img('addressbook_browse.png'),
'img' => Horde_Themes_Image::tag('addressbook_browse.png'),
'label' => _("Address Book")
);
$js_vars['ImpCompose.contacts_url'] = strval(IMP_Basic_Contacts::url()->setRaw(true));
Expand All @@ -883,7 +883,7 @@ protected function _init()
$url = new Horde_Url('#attachments');
$compose_options[] = array(
'url' => $url->link(array('class' => 'widget')),
'img' => Horde::img('attachment.png'),
'img' => Horde_Themes_Image::tag('attachment.png'),
'label' => _("Attachments")
);
}
Expand Down
6 changes: 5 additions & 1 deletion imp/lib/Contents.php
View file
Expand Up @@ -781,7 +781,11 @@ public function getSummary($id, $mask = 0)
($mask & self::SUMMARY_ICON_RAW)) {
$part['icon'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_MimeViewer')->getIcon($mime_type);
if ($mask & self::SUMMARY_ICON) {
$part['icon'] = Horde::img($part['icon'], '', array('title' => $mime_type), '');
$part['icon'] = Horde_Themes_Image::tag($part['icon'], array(
'attr' => array(
'title' => $mime_type
)
));
}
} else {
$part['icon'] = null;
Expand Down
2 changes: 1 addition & 1 deletion imp/lib/Dynamic/Mailbox.php
View file
Expand Up @@ -43,7 +43,7 @@ protected function _init()

if ($imp_imap->access(IMP_Imap::ACCESS_FLAGS)) {
$page_output->addScriptFile('colorpicker.js', 'horde');
$this->view->picker_img = Horde::img('colorpicker.png', _("Color Picker"));
$this->view->picker_img = Horde_Themes_Image::tag('colorpicker.png', array('alt' => _("Color Picker")));
}

if ($imp_imap->access(IMP_Imap::ACCESS_REMOTE)) {
Expand Down
2 changes: 1 addition & 1 deletion imp/lib/Mime/Status.php
View file
Expand Up @@ -116,7 +116,7 @@ public function addText($text)
*/
public function icon($img, $alt = null)
{
$this->_icon = Horde::img($img, $alt);
$this->_icon = Horde_Themes_Image::tag($img, array('alt' => $alt));
}

/**
Expand Down
5 changes: 4 additions & 1 deletion imp/lib/Notification/Event/Status.php
View file
Expand Up @@ -43,7 +43,10 @@ public function __toString()
return parent::__toString();
}

return Horde::img(Horde_Themes::img($img, 'imp'), $label) . parent::__toString();
return Horde_Themes_Image::tag(
Horde_Themes::img($img, 'imp'),
array('alt' => $label)
) . parent::__toString();
}

}
4 changes: 3 additions & 1 deletion imp/lib/Prefs/Special/Flag.php
View file
Expand Up @@ -56,7 +56,9 @@ public function display(Horde_Core_Prefs_Ui $ui)
$view->addHelper('Tag');

$view->locked = $prefs->isLocked('msgflags');
$view->picker_img = Horde::img('colorpicker.png', _("Color Picker"));
$view->picker_img = Horde_Themes_Image::tag('colorpicker.png', array(
'alt' => _("Color Picker")
));

$out = array();
$flaglist = $injector->getInstance('IMP_Flags')->getList();
Expand Down
6 changes: 3 additions & 3 deletions imp/templates/prefs/remote.html.php
View file
Expand Up @@ -19,21 +19,21 @@
<option value="pop3"><?php echo _("POP3") ?></option>
</select>
</td>
<td class="required"><?php echo Horde::img('required.png', '*') ?></td>
<td class="required"><?php echo Horde_Themes_Image::tag('required.png', array('alt' => '*')) ?></td>
</tr>
<tr>
<td class="horde-form-label"><?php echo _("Server") ?>:</td>
<td>
<input name="remote_server" size="30" />
</td>
<td class="required"><?php echo Horde::img('required.png', '*') ?></td>
<td class="required"><?php echo Horde_Themes_Image::tag('required.png', array('alt' => '*')) ?></td>
</tr>
<tr>
<td class="horde-form-label"><?php echo _("Username") ?>:</td>
<td>
<input name="remote_user" size="30" />
</td>
<td class="required"><?php echo Horde::img('required.png', '*') ?></td>
<td class="required"><?php echo Horde_Themes_Image::tag('required.png', array('alt' => '*')) ?></td>
</tr>
<tr>
<td class="horde-form-label"><?php echo _("Port") ?>:</td>
Expand Down

0 comments on commit a1ea1cf

Please sign in to comment.