Changes for new icon theming

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10782 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/addressbook.php b/functions/addressbook.php
index d35e9eeaeee0c23548a0d11766565cd655399c56..0e14b97a9e611906d5ff7ac735676c24384fb51f 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -20,8 +20,9 @@ if (!defined('SM_PATH'))  {
     define('SM_PATH','../');
 }
 
-/* make sure that display_messages.php is loaded */
+/* required includes */
 include_once(SM_PATH . 'functions/display_messages.php');
+include_once(SM_PATH . 'templates/util_global.php');
 
 global $addrbook_dsn, $addrbook_global_dsn;
 
@@ -382,10 +383,11 @@ function get_abook_sort() {
  * @param string $alt_tag alt tag value (string visible to text only browsers)
  * @param integer $Down sort value when list is sorted ascending
  * @param integer $Up sort value when list is sorted descending
+ * @param string $icon_theme_path Path to user's current icon theme
  * @return string html code with sorting images and urls
  */
 function show_abook_sort_button($abook_sort_order, $alt_tag, $Down, $Up ) {
-    global $form_url;
+    global $form_url, $icon_theme_path;
 
      /* Figure out which image we want to use. */
     if ($abook_sort_order != $Up && $abook_sort_order != $Down) {
@@ -399,11 +401,11 @@ function show_abook_sort_button($abook_sort_order, $alt_tag, $Down, $Up ) {
         $which = 8;
     }
 
-      /* Now that we have everything figured out, show the actual button. */
-    return ' <a href="' . $form_url .'?abook_sort_order=' . $which
-         . '"><img src="../images/' . $img
-         . '" border="0" width="12" height="10" alt="' . $alt_tag . '" title="'
-         . _("Click here to change the sorting of the address list") .'" /></a>';
+    /* Now that we have everything figured out, show the actual button. */
+    return ' <a href="' . $form_url .'?abook_sort_order=' . $which .
+           '">' .
+           getIcon($icon_theme_path, $img, $alt_tag, _("Click here to change the sorting of the address list")) .
+           '</a>';
 }
 
 

diff --git a/images/blank.png b/images/themes/default/blank.png
similarity index 100%
rename from images/blank.png
rename to images/themes/default/blank.png

diff --git a/images/delitem.png b/images/themes/default/delitem.png
similarity index 100%
rename from images/delitem.png
rename to images/themes/default/delitem.png

diff --git a/images/down_pointer.png b/images/themes/default/down_pointer.png
similarity index 100%
rename from images/down_pointer.png
rename to images/themes/default/down_pointer.png

diff --git a/images/draft.png b/images/themes/default/draft.png
similarity index 100%
rename from images/draft.png
rename to images/themes/default/draft.png

diff --git a/images/folder.png b/images/themes/default/folder.png
similarity index 100%
rename from images/folder.png
rename to images/themes/default/folder.png

diff --git a/images/folder_noinf.png b/images/themes/default/folder_noinf.png
similarity index 100%
rename from images/folder_noinf.png
rename to images/themes/default/folder_noinf.png

diff --git a/images/inbox.png b/images/themes/default/inbox.png
similarity index 100%
rename from images/inbox.png
rename to images/themes/default/inbox.png

diff --git a/images/minus.png b/images/themes/default/minus.png
similarity index 100%
rename from images/minus.png
rename to images/themes/default/minus.png

diff --git a/images/plus.png b/images/themes/default/plus.png
similarity index 100%
rename from images/plus.png
rename to images/themes/default/plus.png

diff --git a/images/senti.png b/images/themes/default/senti.png
similarity index 100%
rename from images/senti.png
rename to images/themes/default/senti.png

diff --git a/images/sort_none.png b/images/themes/default/sort_none.png
similarity index 100%
rename from images/sort_none.png
rename to images/themes/default/sort_none.png

diff --git a/images/up_pointer.png b/images/themes/default/up_pointer.png
similarity index 100%
rename from images/up_pointer.png
rename to images/themes/default/up_pointer.png