Jonah: Horde::img() -> Horde_Themes::img()

diff --git a/jonah/channels/index.php b/jonah/channels/index.php
index 96b71e3..7f85520 100644 (file)
--- a/jonah/channels/index.php
+++ b/jonah/channels/index.php
@@ -40,12 +40,12 @@ if (is_a($channels, 'PEAR_Error')) {
         /* Edit channel link. */
         $url = Horde::applicationUrl('channels/edit.php');
         $url = Horde_Util::addParameter($url, 'channel_id', $channel['channel_id']);
-        $channels[$key]['edit_link'] = Horde::link($url, _("Edit channel"), '', '', '', _("Edit channel")) . Horde::img('edit.png', _("Edit channel"), '', $registry->getImageDir('horde')) . '</a>';
+        $channels[$key]['edit_link'] = Horde::link($url, _("Edit channel"), '', '', '', _("Edit channel")) . Horde_Themes::img('edit.png') . '</a>';
 
         /* Delete channel link. */
         $url = Horde::applicationUrl('channels/delete.php');
         $url = Horde_Util::addParameter($url, 'channel_id', $channel['channel_id']);
-        $channels[$key]['delete_link'] = Horde::link($url, _("Delete channel"), '', '', '', _("Delete channel")) . Horde::img('delete.png', _("Delete channel"), null, $registry->getImageDir('horde')) . '</a>';
+        $channels[$key]['delete_link'] = Horde::link($url, _("Delete channel"), '', '', '', _("Delete channel")) . Horde_Themes::img('delete.png') . '</a>';
 
         /* View stories link. */
         $url = Horde::applicationUrl('stories/index.php');
@@ -61,7 +61,7 @@ if (is_a($channels, 'PEAR_Error')) {
             /* Add story link. */
             $url = Horde::applicationUrl('stories/edit.php');
             $url = Horde_Util::addParameter($url, 'channel_id', $channel['channel_id']);
-            $channels[$key]['addstory_link'] = Horde::link($url, _("Add story"), '', '', '', _("Add story")) . Horde::img('new.png', _("Add story")) . '</a>';
+            $channels[$key]['addstory_link'] = Horde::link($url, _("Add story"), '', '', '', _("Add story")) . Horde_Themes::img('new.png') . '</a>';
             break;
 
         case JONAH_EXTERNAL_CHANNEL:
@@ -69,7 +69,7 @@ if (is_a($channels, 'PEAR_Error')) {
             /* Refresh cache link. */
             $url = Horde::applicationUrl('stories/index.php');
             $url = Horde_Util::addParameter($url, array('channel_id' => $channel['channel_id'], 'refresh' => '1', 'url' => Horde::selfUrl()));
-            $channels[$key]['refresh_link'] = Horde::link($url, _("Refresh channel"), '', '', '', _("Refresh channel")) . Horde::img('reload.png', _("Refresh channel"), '', $registry->getImageDir('horde')) . '</a>';
+            $channels[$key]['refresh_link'] = Horde::link($url, _("Refresh channel"), '', '', '', _("Refresh channel")) . Horde_Themes::img('reload.png') . '</a>';
             break;
         }
 
@@ -86,7 +86,7 @@ $template->set('listheaders', array(array('attrs' => ' class="sortdown"', 'label
                                     array('attrs' => '', 'label' => _("Last Update"))));
 $template->set('channels', $channels, true);
 $template->set('menu', Jonah::getMenu('string'));
-$template->set('search_img', Horde::img('search.png', _("Search"), '', $registry->getImageDir('horde')));
+$template->set('search_img', Horde_Themes::img('search.png'));
 $template->set('notify', Horde_Util::bufferOutput(array($notification, 'notify'), array('listeners' => 'status')));
 
 $title = _("Feeds");

diff --git a/jonah/lib/Block/delivery.php b/jonah/lib/Block/delivery.php
index 1d7b852..0629004 100644 (file)
--- a/jonah/lib/Block/delivery.php
+++ b/jonah/lib/Block/delivery.php
@@ -43,7 +43,7 @@ class Horde_Block_Jonah_delivery extends Horde_Block {
             $url = Horde_Util::addParameter($url, 'channel_id', $channel['channel_id']);
             $label = sprintf(_("\"%s\" stories in HTML"), $channel['channel_name']);
             $html .= '<tr><td width="140">' .
-                Horde::img('story_marker.png') . ' ' .
+                Horde_Themes::img('story_marker.png') . ' ' .
                 Horde::link($url, $label, '', '', '', $label) .
                 htmlspecialchars($channel['channel_name']) . '</a></td>';
 
@@ -55,7 +55,7 @@ class Horde_Block_Jonah_delivery extends Horde_Block {
             $label = sprintf(_("RSS Feed of \"%s\""), $channel['channel_name']);
             $html .= '<td align="right" class="nowrap">' .
                      Horde::link($url, $label) .
-                     Horde::img('feed.png') . '</a> ';
+                     Horde_Themes::img('feed.png') . '</a> ';
         }
 
         if ($html) {

diff --git a/jonah/lib/Driver.php b/jonah/lib/Driver.php
index bb017f5..0fa6263 100644 (file)
--- a/jonah/lib/Driver.php
+++ b/jonah/lib/Driver.php
@@ -411,7 +411,7 @@ class Jonah_Driver {
             array_walk($stories, array($this, '_escapeStoryDescriptions'));
 
             $template->set('error', false, true);
-            $template->set('story_marker', Horde::img('story_marker.png'));
+            $template->set('story_marker', Horde_Themes::img('story_marker.png'));
             $template->set('image', false, true);
             $template->set('form', false, true);
             if ($from) {

diff --git a/jonah/lib/News.php b/jonah/lib/News.php
index 412b52e..de39706 100644 (file)
--- a/jonah/lib/News.php
+++ b/jonah/lib/News.php
@@ -560,7 +560,7 @@ class Jonah_News {
             array_walk($stories, array($this, '_escapeStoryDescriptions'));
 
             $template->set('error', false, true);
-            $template->set('story_marker', Horde::img('story_marker.png'));
+            $template->set('story_marker', Horde_Themes::img('story_marker.png'));
             $template->set('image', false, true);
             $template->set('form', false, true);
             if ($from) {

diff --git a/jonah/stories/index.php b/jonah/stories/index.php
index 76cb744..ddd7745 100644 (file)
--- a/jonah/stories/index.php
+++ b/jonah/stories/index.php
@@ -84,18 +84,18 @@ foreach ($stories as $key => $story) {
         /* PDF link. */
         $url = Horde::applicationUrl('stories/pdf.php');
         $url = Horde_Util::addParameter($url, array('story_id' => $story['story_id'], 'channel_id' => $channel_id));
-        $stories[$key]['pdf_link'] = Horde::link($url, _("PDF version")) . Horde::img('mime/pdf.png', _("PDF version"), '', $registry->getImageDir('horde')) . '</a>';
+        $stories[$key]['pdf_link'] = Horde::link($url, _("PDF version")) . Horde_Themes::img('mime/pdf.png') . '</a>';
 
         /* Edit story link. */
         $url = Horde::applicationUrl('stories/edit.php');
         $url = Horde_Util::addParameter($url, array('story_id' => $story['story_id'], 'channel_id' => $channel_id));
-        $stories[$key]['edit_link'] = Horde::link($url, _("Edit story")) . Horde::img('edit.png', _("Edit story"), '', $registry->getImageDir('horde')) . '</a>';
+        $stories[$key]['edit_link'] = Horde::link($url, _("Edit story")) . Horde_Themes::img('edit.png') . '</a>';
 
         /* Delete story link. */
         if ($allow_delete) {
             $url = Horde::applicationUrl('stories/delete.php');
             $url = Horde_Util::addParameter($url, array('story_id' => $story['story_id'], 'channel_id' => $channel_id));
-            $stories[$key]['delete_link'] = Horde::link($url, _("Delete story")) . Horde::img('delete.png', _("Delete story"), '', $registry->getImageDir('horde')) . '</a>';
+            $stories[$key]['delete_link'] = Horde::link($url, _("Delete story")) . Horde_Themes::img('delete.png') . '</a>';
         }
 
         /* Comment counter. */
@@ -118,7 +118,7 @@ foreach ($stories as $key => $story) {
 $template = new Horde_Template();
 $template->setOption('gettext', true);
 $template->set('header', htmlspecialchars($channel['channel_name']));
-$template->set('refresh', Horde::link(Horde_Util::addParameter(Horde::selfUrl(true), array('refresh' => 1)), _("Refresh Channel")) . Horde::img('reload.png', '', '', $registry->getImageDir('horde')) . '</a>');
+$template->set('refresh', Horde::link(Horde_Util::addParameter(Horde::selfUrl(true), array('refresh' => 1)), _("Refresh Channel")) . Horde_Themes::img('reload.png') . '</a>');
 $template->set('listheaders', array(_("Story"), _("Date")));
 $template->set('stories', $stories, true);
 $template->set('read', $channel['channel_type'] == JONAH_INTERNAL_CHANNEL || $channel['channel_type'] == JONAH_COMPOSITE_CHANNEL, true);

diff --git a/jonah/stories/results.php b/jonah/stories/results.php
index 3626203..b527845 100644 (file)
--- a/jonah/stories/results.php
+++ b/jonah/stories/results.php
@@ -76,20 +76,20 @@ foreach ($stories as $key => $story) {
     /* PDF link. */
     $url = Horde::applicationUrl('stories/pdf.php');
     $url = Horde_Util::addParameter($url, array('story_id' => $story['story_id'], 'channel_id' => $channel_id));
-    $stories[$key]['pdf_link'] = Horde::link($url, _("PDF version")) . Horde::img('mime/pdf.png', _("PDF version"), '', $registry->getImageDir('horde')) . '</a>';
+    $stories[$key]['pdf_link'] = Horde::link($url, _("PDF version")) . Horde_Themes::img('mime/pdf.png') . '</a>';
 
     /* Edit story link. */
     if (Jonah::checkPermissions(Jonah::typeToPermName(JONAH_INTERNAL_CHANNEL), Horde_Perms::EDIT, $channel_id)) {
         $url = Horde::applicationUrl('stories/edit.php');
         $url = Horde_Util::addParameter($url, array('story_id' => $story['story_id'], 'channel_id' => $channel_id));
-        $stories[$key]['edit_link'] = Horde::link($url, _("Edit story")) . Horde::img('edit.png', _("Edit story"), '', $registry->getImageDir('horde')) . '</a>';
+        $stories[$key]['edit_link'] = Horde::link($url, _("Edit story")) . Horde_Themes::img('edit.png') . '</a>';
     }
 
     /* Delete story link. */
     if (Jonah::checkPermissions(Jonah::typeToPermName(JONAH_INTERNAL_CHANNEL), Horde_Perms::DELETE, $channel_id)) {
         $url = Horde::applicationUrl('stories/delete.php');
         $url = Horde_Util::addParameter($url, array('story_id' => $story['story_id'], 'channel_id' => $channel_id));
-        $stories[$key]['delete_link'] = Horde::link($url, _("Delete story")) . Horde::img('delete.png', _("Delete story"), '', $registry->getImageDir('horde')) . '</a>';
+        $stories[$key]['delete_link'] = Horde::link($url, _("Delete story")) . Horde_Themes::img('delete.png') . '</a>';
     }
 
     /* Comment counter. */