diff options
29 files changed, 180 insertions, 275 deletions
diff --git a/includes/classes/class_menu.php b/includes/classes/class_menu.php index f1137a583c..b1fa0a6133 100644 --- a/includes/classes/class_menu.php +++ b/includes/classes/class_menu.php @@ -86,12 +86,23 @@ class Menu { $this->onclick = $onclick; } - function addIcon($icon, $hovericon=null) - { - if (file_exists($icon)) $this->icon = $icon; - else $this->icon = null; - if (file_exists($hovericon)) $this->hovericon = $hovericon; - else $this->hovericon = null; + function addIcon($icon, $hovericon=null) { + global $WT_IMAGES; + + if (isset($WT_IMAGES[$icon]['large'])) { + $this->icon = $WT_IMAGES[$icon]['large']; + } elseif (isset($WT_IMAGES[$icon]['small'])) { + $this->icon = $WT_IMAGES[$icon]['small']; + } else { + $this->icon = null; + } + if (isset($WT_IMAGES[$hovericon]['large'])) { + $this->hovericon = $WT_IMAGES[$hovericon]['large']; + } elseif (isset($WT_IMAGES[$hovericon]['small'])) { + $this->hovericon = $WT_IMAGES[$hovericon]['small']; + } else { + $this->hovericon = null; + } } function addFlyout($flyout='down') diff --git a/includes/classes/class_menubar.php b/includes/classes/class_menubar.php index 544cd363f5..616c5802ad 100644 --- a/includes/classes/class_menubar.php +++ b/includes/classes/class_menubar.php @@ -50,7 +50,7 @@ class MenuBar //-- main home menu item $menu = new Menu($HOME_SITE_TEXT, $HOME_SITE_URL, "down"); if (!empty($WT_IMAGES["home"]["large"])) - $menu->addIcon($WT_IMAGES["home"]["large"]); + $menu->addIcon('home'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_home"); return $menu; } @@ -66,7 +66,7 @@ class MenuBar //-- main menu $menu = new Menu(i18n::translate('Home page'), 'index.php?ctype=gedcom', 'down'); if (!empty($WT_IMAGES['gedcom']['large'])) - $menu->addIcon($WT_IMAGES['gedcom']['large']); + $menu->addIcon('gedcom'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", 'icon_large_gedcom'); //-- gedcom list $gedcom_titles=get_gedcom_titles(); @@ -74,7 +74,7 @@ class MenuBar foreach ($gedcom_titles as $gedcom_title) { $submenu = new Menu(PrintReady($gedcom_title->gedcom_title, true), encode_url('index.php?ctype=gedcom&ged='.$gedcom_title->gedcom_name)); if (!empty($WT_IMAGES['gedcom']['small'])) { - $submenu->addIcon($WT_IMAGES['gedcom']['small']); + $submenu->addIcon('gedcom'); } $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", '', 'icon_small_gedcom'); $menu->addSubmenu($submenu); @@ -108,24 +108,18 @@ class MenuBar //-- main menu $menu = new Menu(i18n::translate('My Page'), "index.php?ctype=user", "down"); - if (!empty($WT_IMAGES["mypage"]["large"])) { - $menu->addIcon($WT_IMAGES["mypage"]["large"]); - } elseif (!empty($WT_IMAGES["gedcom"]["large"])) { - $menu->addIcon($WT_IMAGES["gedcom"]["large"]); - } + $menu->addIcon('mypage'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_mypage"); //-- mypage submenu $submenu = new Menu(i18n::translate('My Page'), "index.php?ctype=user"); - if (!empty($WT_IMAGES["mypage"]["small"])) - $submenu->addIcon($WT_IMAGES["mypage"]["small"]); + $submenu->addIcon('mypage'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_mypage"); $menu->addSubmenu($submenu); //-- editaccount submenu if (get_user_setting(WT_USER_ID, 'editaccount')) { $submenu = new Menu(i18n::translate('My account'), "edituser.php"); - if (!empty($WT_IMAGES["mypage"]["small"])) - $submenu->addIcon($WT_IMAGES["mypage"]["small"]); + $submenu->addIcon('mypage'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_mypage"); $menu->addSubmenu($submenu); } @@ -133,13 +127,12 @@ class MenuBar //-- my_pedigree submenu $submenu = new Menu(i18n::translate('My Pedigree'), encode_url("pedigree.php?rootid=".WT_USER_GEDCOM_ID."&show_full={$showFull}&talloffset={$showLayout}")); if (!empty($WT_IMAGES["pedigree"]["small"])) - $submenu->addIcon($WT_IMAGES["pedigree"]["small"]); + $submenu->addIcon('pedigree'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_pedigree"); $menu->addSubmenu($submenu); //-- my_indi submenu $submenu = new Menu(i18n::translate('My Individual Record'), "individual.php?pid=".WT_USER_GEDCOM_ID); - if (!empty($WT_IMAGES["indis"]["small"])) - $submenu->addIcon($WT_IMAGES["indis"]["small"]); + $submenu->addIcon('indis'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_indis"); $menu->addSubmenu($submenu); } @@ -147,28 +140,24 @@ class MenuBar $menu->addSeparator(); //-- admin submenu $submenu = new Menu(i18n::translate('Admin'), "admin.php"); - if (!empty($WT_IMAGES["admin"]["small"])) - $submenu->addIcon($WT_IMAGES["admin"]["small"]); + $submenu->addIcon('admin'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_admin"); $menu->addSubmenu($submenu); //-- manage_gedcoms submenu $submenu = new Menu(i18n::translate('GEDCOM administration'), "editgedcoms.php"); - if (!empty($WT_IMAGES["admin"]["small"])) - $submenu->addIcon($WT_IMAGES["admin"]["small"]); + $submenu->addIcon('admin'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_admin"); $menu->addSubmenu($submenu); //-- user_admin submenu if (WT_USER_IS_ADMIN) { $submenu = new Menu(i18n::translate('User administration'), "useradmin.php"); - if (!empty($WT_IMAGES["admin"]["small"])) - $submenu->addIcon($WT_IMAGES["admin"]["small"]); + $submenu->addIcon('admin'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_admin"); $menu->addSubmenu($submenu); //-- manage_media submenu if (is_writable($MEDIA_DIRECTORY) && $MULTI_MEDIA) { $submenu = new Menu(i18n::translate('Manage multimedia'), "media.php"); - if (!empty($WT_IMAGES["menu_media"]["small"])) - $submenu->addIcon($WT_IMAGES["menu_media"]["small"]); + $submenu->addIcon('menu_media'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_media"); $menu->addSubmenu($submenu); } @@ -179,8 +168,7 @@ class MenuBar if (is_writable($MEDIA_DIRECTORY) && $MULTI_MEDIA) { $menu->addSeparator(); $submenu = new Menu(i18n::translate('Upload media files'), "uploadmedia.php"); - if (!empty($WT_IMAGES["menu_media"]["small"])) - $submenu->addIcon($WT_IMAGES["menu_media"]["small"]); + $submenu->addIcon('menu_media'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_media"); $menu->addSubmenu($submenu); } @@ -220,15 +208,13 @@ class MenuBar if ($rootid) $link .= "&rootid={$rootid}"; if ($style=="sub") { $menu = new Menu(i18n::translate('Charts'), encode_url($link)); - if (!empty($WT_IMAGES["pedigree"]["small"])) - $menu->addIcon($WT_IMAGES["pedigree"]["small"]); + $menu->addIcon('pedigree'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "", "icon_small_pedigree"); } else { // top menubar $menu = new Menu(i18n::translate('Charts'), encode_url($link), "down"); - if (!empty($WT_IMAGES["pedigree"]["large"])) - $menu->addIcon($WT_IMAGES["pedigree"]["large"]); + $menu->addIcon('pedigree'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_pedigree"); } @@ -259,8 +245,7 @@ class MenuBar $link = "pedigree.php?ged=".WT_GEDCOM."&show_full={$showFull}&talloffset={$showLayout}"; if ($rootid) $link .= "&rootid={$rootid}"; $submenu = new Menu(i18n::translate('Pedigree Chart'), encode_url($link)); - if (!empty($WT_IMAGES["pedigree"]["small"])) - $submenu->addIcon($WT_IMAGES["pedigree"]["small"]); + $submenu->addIcon('pedigree'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_pedigree"); $menu->addSubmenu($submenu); break; @@ -270,8 +255,7 @@ class MenuBar $link = "descendancy.php?ged=".WT_GEDCOM; if ($rootid) $link .= "&pid={$rootid}&show_full={$showFull}"; $submenu = new Menu(i18n::translate('Descendancy chart'), encode_url($link)); - if (!empty($WT_IMAGES["descendant"]["small"])) - $submenu->addIcon($WT_IMAGES["descendant"]["small"]); + $submenu->addIcon('descendant'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_descendant"); $menu->addSubmenu($submenu); break; @@ -281,8 +265,7 @@ class MenuBar $link = "ancestry.php?ged=".WT_GEDCOM; if ($rootid) $link .= "&rootid={$rootid}&show_full={$showFull}"; $submenu = new Menu(i18n::translate('Ancestry chart'), encode_url($link)); - if (!empty($WT_IMAGES["ancestry"]["small"])) - $submenu->addIcon($WT_IMAGES["ancestry"]["small"]); + $submenu->addIcon('ancestry'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_ancestry"); $menu->addSubmenu($submenu); break; @@ -292,8 +275,7 @@ class MenuBar $link = "compact.php?ged=".WT_GEDCOM; if ($rootid) $link .= "&rootid=".$rootid; $submenu = new Menu(i18n::translate('Compact Chart'), encode_url($link)); - if (!empty($WT_IMAGES["ancestry"]["small"])) - $submenu->addIcon($WT_IMAGES["ancestry"]["small"]); + $submenu->addIcon('ancestry'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_ancestry"); $menu->addSubmenu($submenu); break; @@ -303,8 +285,7 @@ class MenuBar $link = "fanchart.php?ged=".WT_GEDCOM; if ($rootid) $link .= "&rootid=".$rootid; $submenu = new Menu(i18n::translate('Circle diagram'), encode_url($link)); - if (!empty($WT_IMAGES["fanchart"]["small"])) - $submenu->addIcon($WT_IMAGES["fanchart"]["small"]); + $submenu->addIcon('fanchart'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_fanchart"); $menu->addSubmenu($submenu); break; @@ -314,8 +295,7 @@ class MenuBar $link = "hourglass.php?ged=".WT_GEDCOM; if ($rootid) $link .= "&pid={$rootid}&show_full={$showFull}"; $submenu = new Menu(i18n::translate('Hourglass chart'), encode_url($link)); - if (!empty($WT_IMAGES["hourglass"]["small"])) - $submenu->addIcon($WT_IMAGES["hourglass"]["small"]); + $submenu->addIcon('hourglass'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_hourglass"); $menu->addSubmenu($submenu); break; @@ -325,8 +305,7 @@ class MenuBar $link = "familybook.php?ged=".WT_GEDCOM; if ($rootid) $link .= "&pid={$rootid}&show_full={$showFull}"; $submenu = new Menu(i18n::translate('Family book chart'), encode_url($link)); - if (!empty($WT_IMAGES["fambook"]["small"])) - $submenu->addIcon($WT_IMAGES["fambook"]["small"]); + $submenu->addIcon('fambook'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_fambook"); $menu->addSubmenu($submenu); break; @@ -336,8 +315,7 @@ class MenuBar $link = "timeline.php?ged=".WT_GEDCOM; if ($rootid) $link .= "&pids[]=".$rootid; $submenu = new Menu(i18n::translate('Timeline chart'), $link); - if (!empty($WT_IMAGES["timeline"]["small"])) - $submenu->addIcon($WT_IMAGES["timeline"]["small"]); + $submenu->addIcon('timeline'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_timeline"); $menu->addSubmenu($submenu); if (isset($controller) && !empty($controller->famid)) { @@ -392,8 +370,7 @@ class MenuBar $link = "lifespan.php?ged=".WT_GEDCOM; if ($rootid) $link .= "&pids[]={$rootid}&addFamily=1"; $submenu = new Menu(i18n::translate('Lifespan chart'), encode_url($link)); - if (!empty($WT_IMAGES["timeline"]["small"])) - $submenu->addIcon($WT_IMAGES["timeline"]["small"]); + $submenu->addIcon('timeline'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_timeline"); $menu->addSubmenu($submenu); break; @@ -431,9 +408,7 @@ class MenuBar encode_url("relationship.php?pid1={$pid1}&pretty=2&followspouse=1&ged=".WT_GEDCOM) ); } - if (!empty($WT_IMAGES["relationship"]["small"])) { - $submenu->addIcon($WT_IMAGES["relationship"]["small"]); - } + $submenu->addIcon('relationship'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_relationship"); $menu->addSubmenu($submenu); } @@ -444,8 +419,7 @@ class MenuBar case "statistics": //-- statistics plot $submenu = new Menu(i18n::translate('Statistics'), encode_url("statistics.php?ged=".WT_GEDCOM)); - if (!empty($WT_IMAGES["statistic"]["small"])) - $submenu->addIcon($WT_IMAGES["statistic"]["small"]); + $submenu->addIcon('statistic'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_statistic"); $menu->addSubmenu($submenu); break; @@ -455,8 +429,7 @@ class MenuBar $link = "treenav.php?ged=".WT_GEDCOM; if ($rootid) $link .= "&rootid=".$rootid; $submenu = new Menu(i18n::translate('Interactive tree'), encode_url($link)); - if (!empty($WT_IMAGES["tree"]["small"])) - $submenu->addIcon($WT_IMAGES["tree"]["small"]); + $submenu->addIcon('tree'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_gedcom"); $menu->addSubmenu($submenu); break; @@ -506,14 +479,12 @@ class MenuBar if ($style=="sub") { $link .= "&surname={$surname}"; $menu = new Menu(i18n::translate('Lists'), encode_url($link)); - if (!empty($WT_IMAGES["indis"]["small"])) - $menu->addIcon($WT_IMAGES["indis"]["small"]); + $menu->addIcon('indis'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_small_indis"); } else { $menu = new Menu(i18n::translate('Lists'), encode_url($link), "down"); - if (!empty($WT_IMAGES["indis"]["large"])) - $menu->addIcon($WT_IMAGES["indis"]["large"]); + $menu->addIcon('indis'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_indis"); } @@ -521,8 +492,7 @@ class MenuBar if (get_site_setting('ALLOW_CHANGE_GEDCOM')) { foreach (get_all_gedcoms() as $ged_id=>$gedcom) { $submenu = new Menu(i18n::translate('Individuals')." - ".PrintReady(get_gedcom_setting($ged_id, 'title')), encode_url('indilist.php?ged='.$gedcom)); - if (!empty($WT_IMAGES["gedcom"]["small"])) - $submenu->addIcon($WT_IMAGES["gedcom"]["small"]); + $submenu->addIcon('gedcom'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_gedcom"); $menu->addSubmenu($submenu); } @@ -534,14 +504,12 @@ class MenuBar if ($style=="sub") { $link .= "&surname=".$surname; $menu = new Menu(i18n::translate('Lists'), encode_url($link)); - if (!empty($WT_IMAGES["indis"]["small"])) - $menu->addIcon($WT_IMAGES["indis"]["small"]); + $menu->addIcon('indis'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_indis"); } else { $menu = new Menu(i18n::translate('Lists'), $link, "down"); - if (!empty($WT_IMAGES["indis"]["large"])) - $menu->addIcon($WT_IMAGES["indis"]["large"]); + $menu->addIcon('indis'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_indis"); } @@ -566,8 +534,7 @@ class MenuBar $link = "indilist.php?ged=".WT_GEDCOM; if ($surname) $link .= "&surname=".$surname; $submenu = new Menu(i18n::translate('Individuals'), encode_url($link)); - if (!empty($WT_IMAGES["indis"]["small"])) - $submenu->addIcon($WT_IMAGES["indis"]["small"]); + $submenu->addIcon('indis'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_indis"); $menu->addSubmenu($submenu); break; @@ -577,8 +544,7 @@ class MenuBar $link = "famlist.php?ged=".WT_GEDCOM; if ($surname) $link .= "&surname=".$surname; $submenu = new Menu(i18n::translate('Families'), $link); - if (!empty($WT_IMAGES["cfamily"]["small"])) - $submenu->addIcon($WT_IMAGES["cfamily"]["small"]); + $submenu->addIcon('cfamily'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_cfamily"); $menu->addSubmenu($submenu); break; @@ -588,8 +554,7 @@ class MenuBar $link = "branches.php?ged=".WT_GEDCOM; if ($surname) $link .= "&surn=".$surname; $submenu = new Menu(i18n::translate('Branches'), $link); - if (!empty($WT_IMAGES["patriarch"]["small"])) - $submenu->addIcon($WT_IMAGES["patriarch"]["small"]); + $submenu->addIcon('patriarch'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_patriarch"); $menu->addSubmenu($submenu); break; @@ -597,8 +562,7 @@ class MenuBar case "source": //-- source $submenu = new Menu(i18n::translate('Sources'), encode_url('sourcelist.php?ged='.WT_GEDCOM)); - if (!empty($WT_IMAGES["menu_source"]["small"])) - $submenu->addIcon($WT_IMAGES["menu_source"]["small"]); + $submenu->addIcon('menu_source'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_source"); $menu->addSubmenu($submenu); break; @@ -606,10 +570,7 @@ class MenuBar case "note": //-- shared note $submenu = new Menu(i18n::translate('Shared Notes'), encode_url('notelist.php?ged='.WT_GEDCOM)); - if (!empty($WT_IMAGES["menu_note"]["small"])) - $submenu->addIcon($WT_IMAGES["menu_note"]["small"]); - else if (!empty($WT_IMAGES["notes"]["small"])) - $submenu->addIcon($WT_IMAGES["notes"]["small"]); + $submenu->addIcon('menu_note'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_notes"); $menu->addSubmenu($submenu); break; @@ -617,8 +578,7 @@ class MenuBar case "repository": //-- repository $submenu = new Menu(i18n::translate('Repositories'), "repolist.php"); - if (!empty($WT_IMAGES["menu_repository"]["small"])) - $submenu->addIcon($WT_IMAGES["menu_repository"]["small"]); + $submenu->addIcon('menu_repository'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_repository"); $menu->addSubmenu($submenu); break; @@ -626,8 +586,7 @@ class MenuBar case "places": //-- places $submenu = new Menu(i18n::translate('Place hierarchy'), encode_url('placelist.php?ged='.WT_GEDCOM)); - if (!empty($WT_IMAGES["place"]["small"])) - $submenu->addIcon($WT_IMAGES["place"]["small"]); + $submenu->addIcon('place'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_place"); $menu->addSubmenu($submenu); break; @@ -635,8 +594,7 @@ class MenuBar case "media": //-- medialist $submenu = new Menu(i18n::translate('Multimedia'), encode_url('medialist.php?ged='.WT_GEDCOM)); - if (!empty($WT_IMAGES["menu_media"]["small"])) - $submenu->addIcon($WT_IMAGES["menu_media"]["small"]); + $submenu->addIcon('menu_media'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_media"); $menu->addSubmenu($submenu); break; @@ -661,25 +619,21 @@ class MenuBar } //-- main calendar menu item $menu = new Menu(i18n::translate('Calendar'), encode_url('calendar.php?ged='.WT_GEDCOM), "down"); - if (!empty($WT_IMAGES["calendar"]["large"])) - $menu->addIcon($WT_IMAGES["calendar"]["large"]); + $menu->addIcon('calendar'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_calendar"); //-- viewday sub menu $submenu = new Menu(i18n::translate('View Day'), encode_url('calendar.php?ged='.WT_GEDCOM)); - if (!empty($WT_IMAGES["calendar"]["small"])) - $submenu->addIcon($WT_IMAGES["calendar"]["small"]); + $submenu->addIcon('calendar'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_calendar"); $menu->addSubmenu($submenu); //-- viewmonth sub menu $submenu = new Menu(i18n::translate('View Month'), encode_url("calendar.php?ged=".WT_GEDCOM."&action=calendar")); - if (!empty($WT_IMAGES["calendar"]["small"])) - $submenu->addIcon($WT_IMAGES["calendar"]["small"]); + $submenu->addIcon('calendar'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_calendar"); $menu->addSubmenu($submenu); //-- viewyear sub menu $submenu = new Menu(i18n::translate('View Year'), encode_url("calendar.php?ged=".WT_GEDCOM."&action=year")); - if (!empty($WT_IMAGES["calendar"]["small"])) - $submenu->addIcon($WT_IMAGES["calendar"]["small"]); + $submenu->addIcon('calendar'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_calendar"); $menu->addSubmenu($submenu); return $menu; @@ -715,15 +669,12 @@ class MenuBar //-- main reports menu item if ($style=="sub") { $menu = new Menu(i18n::translate('Reports'), "#"); - if (!empty($WT_IMAGES["reports"]["small"])) - $menu->addIcon($WT_IMAGES["reports"]["small"]); + $menu->addIcon('reports'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); - } - else { + } else { // top menubar $menu = new Menu(i18n::translate('Reports'), encode_url('reportengine.php?ged='.WT_GEDCOM), "down"); - if (!empty($WT_IMAGES["reports"]["large"])) - $menu->addIcon($WT_IMAGES["reports"]["large"]); + $menu->addIcon('reports'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_reports"); } @@ -767,32 +718,27 @@ class MenuBar } //-- main search menu item $menu = new Menu(i18n::translate('Search'), encode_url('search.php?ged='.WT_GEDCOM), "down"); - if (!empty($WT_IMAGES["search"]["large"])) - $menu->addIcon($WT_IMAGES["search"]["large"]); + $menu->addIcon('search'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_search"); //-- search_general sub menu $submenu = new Menu(i18n::translate('General Search'), encode_url("search.php?ged=".WT_GEDCOM."&action=general")); - if (!empty($WT_IMAGES["search"]["small"])) - $submenu->addIcon($WT_IMAGES["search"]["small"]); + $submenu->addIcon('search'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_search"); $menu->addSubmenu($submenu); //-- search_soundex sub menu $submenu = new Menu(i18n::translate('Soundex Search'), encode_url("search.php?ged=".WT_GEDCOM."&action=soundex")); - if (!empty($WT_IMAGES["search"]["small"])) - $submenu->addIcon($WT_IMAGES["search"]["small"]); + $submenu->addIcon('search'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_search"); $menu->addSubmenu($submenu); //-- advanced search $submenu = new Menu(i18n::translate('Advanced search'), encode_url("search_advanced.php?ged=".WT_GEDCOM)); - if (!empty($WT_IMAGES["search"]["small"])) - $submenu->addIcon($WT_IMAGES["search"]["small"]); + $submenu->addIcon('search'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_search"); $menu->addSubmenu($submenu); //-- search_replace sub menu if (WT_USER_CAN_EDIT) { $submenu = new Menu(i18n::translate('Search and replace'), encode_url("search.php?ged=".WT_GEDCOM."&action=replace")); - if (!empty($WT_IMAGES["search"]["small"])) - $submenu->addIcon($WT_IMAGES["search"]["small"]); + $submenu->addIcon('search'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_search"); $menu->addSubmenu($submenu); } @@ -802,8 +748,7 @@ class MenuBar $sitelist = get_server_list(); if (count($sitelist)>0) { $submenu = new Menu(i18n::translate('Multi Site Search'), encode_url("search.php?ged=".WT_GEDCOM."&action=multisite")); - if (!empty($WT_IMAGES["search"]["small"])) - $submenu->addIcon($WT_IMAGES["search"]["small"]); + $submenu->addIcon('search'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_search"); $menu->addSubmenu($submenu); } @@ -841,8 +786,7 @@ class MenuBar } //-- main help menu item $menu = new Menu(i18n::translate('Help'), "#", "down"); - if (!empty($WT_IMAGES["help"]["large"])) - $menu->addIcon($WT_IMAGES["help"]["large"]); + $menu->addIcon('help'); if (empty($helpindex)) $menu->addOnclick("return helpPopup('".WT_SCRIPT_NAME."');"); else @@ -851,8 +795,7 @@ class MenuBar //-- help_for_this_page sub menu $submenu = new Menu(i18n::translate('Help with this page'), "#"); - if (!empty($WT_IMAGES["menu_help"]["small"])) - $submenu->addIcon($WT_IMAGES["menu_help"]["small"]); + $submenu->addIcon('menu_help'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_help"); if (empty($helpindex)) $submenu->addOnclick("return helpPopup('".WT_SCRIPT_NAME."');"); @@ -861,8 +804,7 @@ class MenuBar $menu->addSubmenu($submenu); //-- help_contents sub menu $submenu = new Menu(i18n::translate('Help Contents'), "#"); - if (!empty($WT_IMAGES["menu_help"]["small"])) - $submenu->addIcon($WT_IMAGES["menu_help"]["small"]); + $submenu->addIcon('menu_help'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_help"); $submenu->addOnclick("return helpPopup('help_contents_help');"); $menu->addSubmenu($submenu); @@ -870,16 +812,14 @@ class MenuBar if (array_key_exists('faq', WT_Module::getActiveModules()) && WT_DB::prepare("SELECT COUNT(*) FROM `##block` WHERE module_name='faq'")->fetchOne()) { $submenu = new Menu(i18n::translate('FAQ'), "module.php?mod=faq&mod_action=show"); - if (!empty($WT_IMAGES["menu_help"]["small"])) - $submenu->addIcon($WT_IMAGES["menu_help"]["small"]); + $submenu->addIcon('menu_help'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_help"); $menu->addSubmenu($submenu); } //-- add wiki links $menu->addSeparator(); $submenu = new Menu(i18n::translate('Wiki Main Page'), WT_WEBTREES_WIKI.'" target="_blank'); - if (!empty($WT_IMAGES["wiki"]["small"])) - $submenu->addIcon($WT_IMAGES["wiki"]["small"]); + $submenu->addIcon('wiki'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_wiki"); $menu->addSubmenu($submenu); // These two sub menu items temporarily removed as the WIKI pages do not exist @@ -898,8 +838,7 @@ class MenuBar $menuitems = contact_menus(); foreach($menuitems as $menuitem) { $submenu = new Menu($menuitem["label"], $menuitem["link"]); - if (!empty($WT_IMAGES["mypage"]["small"])) - $submenu->addIcon($WT_IMAGES["mypage"]["small"]); + $submenu->addIcon('mypage'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_contact"); if (!empty($menuitem["onclick"])) $submenu->addOnclick($menuitem["onclick"]); $menu->addSubmenu($submenu); @@ -910,8 +849,7 @@ class MenuBar $submenu = new Menu(i18n::translate('Hide contextual help'), WT_SCRIPT_NAME.normalize_query_string($QUERY_STRING."&show_context_help=no")); else $submenu = new Menu(i18n::translate('Show contextual help'), WT_SCRIPT_NAME.normalize_query_string($QUERY_STRING."&show_context_help=yes")); - if (!empty($WT_IMAGES["menu_help"]["small"])) - $submenu->addIcon($WT_IMAGES["menu_help"]["small"]); + $submenu->addIcon('menu_help'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_help"); $menu->addSubmenu($submenu); return $menu; @@ -1030,9 +968,7 @@ class MenuBar if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menu=new Menu(i18n::translate('Favorites'), '#', 'down'); - if (!empty($WT_IMAGES['gedcom']['large'])) { - $menu->addIcon($WT_IMAGES['gedcom']['large']); - } + $menu->addIcon('gedcom'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_gedcom"); if (array_key_exists('gedcom_favorites', WT_Module::getActiveModules())) { diff --git a/includes/controllers/family_ctrl.php b/includes/controllers/family_ctrl.php index 2ada9a3799..d59854f220 100644 --- a/includes/controllers/family_ctrl.php +++ b/includes/controllers/family_ctrl.php @@ -240,9 +240,7 @@ class FamilyController extends BaseController { // charts menu $menu = new Menu(i18n::translate('Charts'), encode_url('timeline.php?'.$link)); - if (!empty($WT_IMAGES["timeline"]["small"])) { - $menu->addIcon($WT_IMAGES['timeline']['small']); - } + $menu->addIcon('timeline'); $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); // Build a sortable list of submenu items and then sort it in localized name order $menuList = array(); @@ -258,9 +256,7 @@ class FamilyController extends BaseController { case "parentTimeLine": // charts / parents_timeline $submenu = new Menu(i18n::translate('Show couple on timeline chart'), encode_url('timeline.php?'.$link)); - if (!empty($WT_IMAGES["timeline"]["small"])) { - $submenu->addIcon($WT_IMAGES['timeline']['small']); - } + $submenu->addIcon('timeline'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); break; @@ -268,9 +264,7 @@ class FamilyController extends BaseController { case "childTimeLine": // charts / children_timeline $submenu = new Menu(i18n::translate('Show children on timeline chart'), encode_url('timeline.php?'.$this->getChildrenUrlTimeline())); - if (!empty($WT_IMAGES["timeline"]["small"])) { - $submenu->addIcon($WT_IMAGES['timeline']['small']); - } + $submenu->addIcon('timeline'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); break; @@ -278,9 +272,7 @@ class FamilyController extends BaseController { case "familyTimeLine": // charts / family_timeline $submenu = new Menu(i18n::translate('Show family on timeline chart'), encode_url('timeline.php?'.$link.'&'.$this->getChildrenUrlTimeline($c))); - if (!empty($WT_IMAGES["timeline"]["small"])) { - $submenu->addIcon($WT_IMAGES['timeline']['small']); - } + $submenu->addIcon('timeline'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); break; @@ -304,38 +296,28 @@ class FamilyController extends BaseController { } // edit menu $menu = new Menu(i18n::translate('Edit')); - if (!empty($WT_IMAGES["edit_fam"]["large"])) { - $menu->addIcon($WT_IMAGES["edit_fam"]["large"]); - } elseif (!empty($WT_IMAGES["edit_fam"]["small"])) { - $menu->addIcon($WT_IMAGES["edit_fam"]["small"]); - } - $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); + $menu->addIcon('edit_fam'); + $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}", 'icon_large_gedcom'); if (WT_USER_CAN_EDIT) { // edit_fam / edit_fam $submenu = new Menu(i18n::translate('Edit Family')); $submenu->addOnclick("return edit_family('".$this->getFamilyID()."');"); - if (!empty($WT_IMAGES["edit_fam"]["small"])) { - $submenu->addIcon($WT_IMAGES["edit_fam"]["small"]); - } + $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); // edit_fam / members $submenu = new Menu(i18n::translate('Change Family Members')); $submenu->addOnclick("return change_family_members('".$this->getFamilyID()."');"); - if (!empty($WT_IMAGES["edit_fam"]["small"])) { - $submenu->addIcon($WT_IMAGES["edit_fam"]["small"]); - } + $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); // edit_fam / add child $submenu = new Menu(i18n::translate('Add a child to this family')); $submenu->addOnclick("return addnewchild('".$this->getFamilyID()."');"); - if (!empty($WT_IMAGES["edit_fam"]["small"])) { - $submenu->addIcon($WT_IMAGES["edit_fam"]["small"]); - } + $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); @@ -343,9 +325,7 @@ class FamilyController extends BaseController { if ($this->family->getNumberOfChildren() > 1) { $submenu = new Menu(i18n::translate('Re-order children')); $submenu->addOnclick("return reorder_children('".$this->getFamilyID()."');"); - if (!empty($WT_IMAGES["edit_fam"]["small"])) { - $submenu->addIcon($WT_IMAGES["edit_fam"]["small"]); - } + $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } @@ -363,17 +343,17 @@ class FamilyController extends BaseController { $link = $this->family->getLinkUrl().'&show_changes=no'; } $submenu = new Menu($label, encode_url($link)); - $submenu->addIcon($WT_IMAGES["edit_fam"]["small"]); + $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); if (WT_USER_CAN_ACCEPT) { $submenu = new Menu(i18n::translate('Undo all changes'), encode_url("family.php?famid={$this->famid}&action=undo")); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); - $submenu->addIcon($WT_IMAGES["edit_fam"]["small"]); + $submenu->addIcon('edit_fam'); $menu->addSubmenu($submenu); $submenu = new Menu(i18n::translate('Accept all changes'), encode_url("family.php?famid={$this->famid}&action=accept")); - $submenu->addIcon($WT_IMAGES["edit_fam"]["small"]); + $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } @@ -385,12 +365,12 @@ class FamilyController extends BaseController { if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) { $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->getFamilyID()."');"); - $submenu->addIcon($WT_IMAGES["edit_fam"]["small"]); + $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } elseif ($SHOW_GEDCOM_RECORD) { $submenu = new Menu(i18n::translate('View GEDCOM Record')); - $submenu->addIcon($WT_IMAGES["gedcom"]["small"]); + $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); } else { @@ -404,14 +384,14 @@ class FamilyController extends BaseController { if (WT_USER_CAN_EDIT) { $submenu = new Menu(i18n::translate('Delete family')); $submenu->addOnclick("if (confirm('".i18n::translate('Deleting the family will unlink all of the individuals from each other but will leave the individuals in place. Are you sure you want to delete this family?')."')) return delete_family('".$this->getFamilyID()."'); else return false;"); - $submenu->addIcon($WT_IMAGES["edit_fam"]["small"]); + $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } // add to favorites $submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url('family.php?action=addfav&famid='.$this->getFamilyID().'&gid='.$this->getFamilyID())); - $submenu->addIcon($WT_IMAGES["favorites"]["small"]); + $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/includes/controllers/individual_ctrl.php b/includes/controllers/individual_ctrl.php index 6881e9b361..7a11c71078 100644 --- a/includes/controllers/individual_ctrl.php +++ b/includes/controllers/individual_ctrl.php @@ -519,12 +519,8 @@ class IndividualController extends BaseController { } // edit menu $menu = new Menu(i18n::translate('Edit')); - if (!empty($WT_IMAGES["edit_indi"]["large"])) { - $menu->addIcon($WT_IMAGES["edit_indi"]["large"]); - } elseif (!empty($WT_IMAGES["edit_indi"]["small"])) { - $menu->addIcon($WT_IMAGES["edit_indi"]["small"]); - } - $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); + $menu->addIcon('edit_indi'); + $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}", 'icon_large_gedcom'); if (WT_USER_CAN_EDIT) { if (count($this->indi->getSpouseFamilyIds())>1) { @@ -569,17 +565,17 @@ class IndividualController extends BaseController { $link = $this->indi->getLinkUrl().'&show_changes=no'; } $submenu = new Menu($label, encode_url($link)); - $submenu->addIcon($WT_IMAGES["edit_indi"]["small"]); + $submenu->addIcon('edit_indi'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); if (WT_USER_CAN_ACCEPT) { $submenu = new Menu(i18n::translate('Undo all changes'), encode_url($this->indi->getLinkUrl()."&action=undo")); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); - $submenu->addIcon($WT_IMAGES["edit_indi"]["small"]); + $submenu->addIcon('edit_indi'); $menu->addSubmenu($submenu); $submenu = new Menu(i18n::translate('Accept all changes'), encode_url($this->indi->getLinkUrl()."&action=accept")); - $submenu->addIcon($WT_IMAGES["edit_indi"]["small"]); + $submenu->addIcon('edit_indi'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } @@ -591,12 +587,12 @@ class IndividualController extends BaseController { if (WT_USER_IS_ADMIN || $this->canShowGedcomRecord()) { $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->pid."');"); - $submenu->addIcon($WT_IMAGES["edit_indi"]["small"]); + $submenu->addIcon('edit_indi'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } elseif ($SHOW_GEDCOM_RECORD) { $submenu = new Menu(i18n::translate('View GEDCOM Record')); - $submenu->addIcon($WT_IMAGES["gedcom"]["small"]); + $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); } else { @@ -610,14 +606,14 @@ class IndividualController extends BaseController { if (WT_USER_CAN_EDIT) { $submenu = new Menu(i18n::translate('Delete this individual')); $submenu->addOnclick("return deleteperson('".$this->pid."');"); - $submenu->addIcon($WT_IMAGES["edit_indi"]["small"]); + $submenu->addIcon('edit_indi'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } // add to favorites $submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url($this->indi->getLinkUrl()."&action=addfav&gid={$this->pid}")); - $submenu->addIcon($WT_IMAGES["favorites"]["small"]); + $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/includes/controllers/media_ctrl.php b/includes/controllers/media_ctrl.php index e56dc36e68..b15d707943 100644 --- a/includes/controllers/media_ctrl.php +++ b/includes/controllers/media_ctrl.php @@ -179,25 +179,20 @@ class MediaController extends BaseController{ // edit menu $menu = new Menu(i18n::translate('Edit')); - if (!empty($WT_IMAGES["edit_media"]["large"])) { - $menu->addIcon($WT_IMAGES["edit_media"]["large"]); - } elseif (!empty($WT_IMAGES["edit_media"]["small"])) { - $menu->addIcon($WT_IMAGES["edit_media"]["small"]); - } - $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); + $menu->addIcon('edit_media'); + $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}", 'icon_large_gedcom'); if (WT_USER_CAN_EDIT) { $submenu = new Menu(i18n::translate('Edit media')); $submenu->addOnclick("window.open('addmedia.php?action=editmedia&pid={$this->pid}&linktoid={$linktoid}', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1')"); - $submenu->addIcon($WT_IMAGES["edit_media"]["small"]); + $submenu->addIcon('edit_media'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); if ($SHOW_GEDCOM_RECORD || WT_USER_IS_ADMIN) { $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->pid."');"); - if (!empty($WT_IMAGES["edit_media"]["small"])) - $submenu->addIcon($WT_IMAGES["edit_media"]["small"]); + $submenu->addIcon('edit_media'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } @@ -212,9 +207,8 @@ class MediaController extends BaseController{ // GEDFact assistant Add Media Links ======================= if (WT_USER_GEDCOM_ADMIN && file_exists(WT_ROOT.'modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php')) { $submenu->addOnclick("return ilinkitem('".$this->pid."','manage');"); - if (!empty($WT_IMAGES["edit_media"]["small"])) - $submenu->addIcon($WT_IMAGES["edit_media"]["small"]); - $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); + $submenu->addIcon('edit_media'); + $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); // Do not print ssubmunu } else { $submenu->addOnclick("return ilinkitem('".$this->pid."','person');"); @@ -256,10 +250,10 @@ class MediaController extends BaseController{ if (WT_USER_CAN_ACCEPT) { $submenu = new Menu(i18n::translate('Undo all changes'), encode_url("mediaviewer.php?mid={$this->pid}&action=undo")); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); - $submenu->addIcon($WT_IMAGES["notes"]["small"]); + $submenu->addIcon('notes'); $menu->addSubmenu($submenu); $submenu = new Menu(i18n::translate('Accept all changes'), encode_url("mediaviewer.php?mid={$this->pid}&action=accept")); - $submenu->addIcon($WT_IMAGES["notes"]["small"]); + $submenu->addIcon('notes'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } @@ -271,12 +265,12 @@ class MediaController extends BaseController{ if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) { $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->pid."');"); - $submenu->addIcon($WT_IMAGES["gedcom"]["small"]); + $submenu->addIcon('gedcom'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } elseif ($SHOW_GEDCOM_RECORD) { $submenu = new Menu(i18n::translate('View GEDCOM Record')); - $submenu->addIcon($WT_IMAGES["gedcom"]["small"]); + $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); } else { @@ -291,14 +285,14 @@ class MediaController extends BaseController{ $submenu = new Menu(i18n::translate('Remove object')); $submenu->addLink(encode_url("media.php?action=removeobject&xref=".$this->pid)); $submenu->addOnclick("return confirm('".i18n::translate('Are you sure you want to remove this object from the database?')."')"); - $submenu->addIcon($WT_IMAGES["edit_media"]["small"]); + $submenu->addIcon('edit_media'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } // add to favorites $submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url("mediaviewer.php?action=addfav&mid={$this->mid}&gid={$this->mid}")); - $submenu->addIcon($WT_IMAGES["favorites"]["small"]); + $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/includes/controllers/note_ctrl.php b/includes/controllers/note_ctrl.php index 5aa3109a51..14d8a758aa 100644 --- a/includes/controllers/note_ctrl.php +++ b/includes/controllers/note_ctrl.php @@ -162,17 +162,13 @@ class NoteController extends BaseController { } // edit menu $menu = new Menu(i18n::translate('Edit')); - if (!empty($WT_IMAGES["edit_note"]["large"])) { - $menu->addIcon($WT_IMAGES["edit_note"]["large"]); - } elseif (!empty($WT_IMAGES["edit_note"]["small"])) { - $menu->addIcon($WT_IMAGES["edit_note"]["small"]); - } - $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); + $menu->addIcon('edit_note'); + $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}", 'icon_large_gedcom'); if (WT_USER_CAN_EDIT) { $submenu = new Menu(i18n::translate('Edit note')); $submenu->addOnclick('return edit_note(\''.$this->nid.'\');'); - $submenu->addIcon($WT_IMAGES["notes"]["small"]); + $submenu->addIcon('notes'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); @@ -183,10 +179,10 @@ class NoteController extends BaseController { if (find_updated_record($this->nid, WT_GED_ID)!==null) { if (!$this->show_changes) { $submenu = new Menu(i18n::translate('This record has been updated. Click here to show changes.'), encode_url("note.php?nid={$this->nid}&show_changes=yes")); - $submenu->addIcon($WT_IMAGES["notes"]["small"]); + $submenu->addIcon('notes'); } else { $submenu = new Menu(i18n::translate('Click here to hide changes.'), encode_url("note.php?nid={$this->nid}&show_changes=no")); - $submenu->addIcon($WT_IMAGES["notes"]["small"]); + $submenu->addIcon('notes'); } $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); @@ -194,10 +190,10 @@ class NoteController extends BaseController { if (WT_USER_CAN_ACCEPT) { $submenu = new Menu(i18n::translate('Undo all changes'), encode_url("note.php?nid={$this->nid}&action=undo")); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); - $submenu->addIcon($WT_IMAGES["notes"]["small"]); + $submenu->addIcon('notes'); $menu->addSubmenu($submenu); $submenu = new Menu(i18n::translate('Accept all changes'), encode_url("note.php?nid={$this->nid}&action=accept")); - $submenu->addIcon($WT_IMAGES["notes"]["small"]); + $submenu->addIcon('notes'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } @@ -209,12 +205,12 @@ class NoteController extends BaseController { if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) { $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->nid."');"); - $submenu->addIcon($WT_IMAGES["gedcom"]["small"]); + $submenu->addIcon('gedcom'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } elseif ($SHOW_GEDCOM_RECORD) { $submenu = new Menu(i18n::translate('View GEDCOM Record')); - $submenu->addIcon($WT_IMAGES["gedcom"]["small"]); + $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); } else { @@ -228,14 +224,14 @@ class NoteController extends BaseController { if (WT_USER_CAN_EDIT) { $submenu = new Menu(i18n::translate('Delete this Shared Note')); $submenu->addOnclick("if (confirm('".i18n::translate('Are you sure you want to delete this Shared Note?')."')) return deletenote('".$this->nid."'); else return false;"); - $submenu->addIcon($WT_IMAGES["notes"]["small"]); + $submenu->addIcon('notes'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } // add to favorites $submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url("note.php?action=addfav&nid={$this->nid}&gid={$this->nid}")); - $submenu->addIcon($WT_IMAGES["favorites"]["small"]); + $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/includes/controllers/repository_ctrl.php b/includes/controllers/repository_ctrl.php index 9d9d7c78cf..0e704e0b8d 100644 --- a/includes/controllers/repository_ctrl.php +++ b/includes/controllers/repository_ctrl.php @@ -162,12 +162,8 @@ class RepositoryController extends BaseController { } // edit menu $menu = new Menu(i18n::translate('Edit')); - if (!empty($WT_IMAGES["edit_repo"]["large"])) { - $menu->addIcon($WT_IMAGES["edit_repo"]["large"]); - } elseif (!empty($WT_IMAGES["edit_repo"]["small"])) { - $menu->addIcon($WT_IMAGES["edit_repo"]["small"]); - } - $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); + $menu->addIcon('edit_repo'); + $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}", 'icon_large_gedcom'); if (WT_USER_CAN_EDIT) { // For consistency with other controllers, we need an "edit repo" option @@ -177,10 +173,10 @@ class RepositoryController extends BaseController { if (find_updated_record($this->rid, WT_GED_ID)!==null) { if (!$this->show_changes) { $submenu = new Menu(i18n::translate('This record has been updated. Click here to show changes.'), encode_url("repo.php?rid={$this->rid}&show_changes=yes")); - $submenu->addIcon($WT_IMAGES["edit_repo"]["small"]); + $submenu->addIcon('edit_repo'); } else { $submenu = new Menu(i18n::translate('Click here to hide changes.'), encode_url("repo.php?rid={$this->rid}&show_changes=no")); - $submenu->addIcon($WT_IMAGES["edit_repo"]["small"]); + $submenu->addIcon('edit_repo'); } $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); @@ -188,10 +184,10 @@ class RepositoryController extends BaseController { if (WT_USER_CAN_ACCEPT) { $submenu = new Menu(i18n::translate('Undo all changes'), encode_url("repo.php?rid={$this->rid}&action=undo")); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); - $submenu->addIcon($WT_IMAGES["edit_repo"]["small"]); + $submenu->addIcon('edit_repo'); $menu->addSubmenu($submenu); $submenu = new Menu(i18n::translate('Accept all changes'), encode_url("repo.php?rid={$this->rid}&action=accept")); - $submenu->addIcon($WT_IMAGES["edit_repo"]["small"]); + $submenu->addIcon('edit_repo'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } @@ -203,12 +199,12 @@ class RepositoryController extends BaseController { if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) { $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->rid."');"); - $submenu->addIcon($WT_IMAGES["gedcom"]["small"]); + $submenu->addIcon('gedcom'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } elseif ($SHOW_GEDCOM_RECORD) { $submenu = new Menu(i18n::translate('View GEDCOM Record')); - $submenu->addIcon($WT_IMAGES["gedcom"]["small"]); + $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); } else { @@ -222,14 +218,14 @@ class RepositoryController extends BaseController { if (WT_USER_CAN_EDIT) { $submenu = new Menu(i18n::translate('Delete repository')); $submenu->addOnclick("if (confirm('".i18n::translate('Are you sure you want to delete this Repository?')."')) return deleterepository('".$this->rid."'); else return false;"); - $submenu->addIcon($WT_IMAGES["edit_repo"]["small"]); + $submenu->addIcon('edit_repo'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } // add to favorites $submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url("repo.php?action=addfav&rid={$this->rid}&gid={$this->rid}")); - $submenu->addIcon($WT_IMAGES["favorites"]["small"]); + $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/includes/controllers/source_ctrl.php b/includes/controllers/source_ctrl.php index 07f6e2ff01..8556416eee 100644 --- a/includes/controllers/source_ctrl.php +++ b/includes/controllers/source_ctrl.php @@ -162,17 +162,13 @@ class SourceController extends BaseController { } // edit menu $menu = new Menu(i18n::translate('Edit')); - if (!empty($WT_IMAGES["edit_source"]["large"])) { - $menu->addIcon($WT_IMAGES["edit_source"]["large"]); - } elseif (!empty($WT_IMAGES["edit_source"]["small"])) { - $menu->addIcon($WT_IMAGES["edit_source"]["small"]); - } - $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); + $menu->addIcon('edit_sour'); + $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}", 'icon_large_gedcom'); if (WT_USER_CAN_EDIT) { $submenu = new Menu(i18n::translate('Edit Source')); $submenu->addOnclick('return edit_source(\''.$this->sid.'\');'); - $submenu->addIcon($WT_IMAGES["edit_sour"]["small"]); + $submenu->addIcon('edit_sour'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } @@ -181,10 +177,10 @@ class SourceController extends BaseController { if (find_updated_record($this->sid, WT_GED_ID)!==null) { if (!$this->show_changes) { $submenu = new Menu(i18n::translate('This record has been updated. Click here to show changes.'), encode_url("source.php?sid={$this->sid}&show_changes=yes")); - $submenu->addIcon($WT_IMAGES["edit_sour"]["small"]); + $submenu->addIcon('edit_sour'); } else { $submenu = new Menu(i18n::translate('Click here to hide changes.'), encode_url("source.php?sid={$this->sid}&show_changes=no")); - $submenu->addIcon($WT_IMAGES["edit_sour"]["small"]); + $submenu->addIcon('edit_sour'); } $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); @@ -192,10 +188,10 @@ class SourceController extends BaseController { if (WT_USER_CAN_ACCEPT) { $submenu = new Menu(i18n::translate('Undo all changes'), encode_url("source.php?sid={$this->sid}&action=undo")); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); - $submenu->addIcon($WT_IMAGES["edit_sour"]["small"]); + $submenu->addIcon('edit_sour'); $menu->addSubmenu($submenu); $submenu = new Menu(i18n::translate('Accept all changes'), encode_url("source.php?sid={$this->sid}&action=accept")); - $submenu->addIcon($WT_IMAGES["edit_sour"]["small"]); + $submenu->addIcon('edit_sour'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } @@ -207,12 +203,12 @@ class SourceController extends BaseController { if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) { $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->sid."');"); - $submenu->addIcon($WT_IMAGES["gedcom"]["small"]); + $submenu->addIcon('gedcom'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } elseif ($SHOW_GEDCOM_RECORD) { $submenu = new Menu(i18n::translate('View GEDCOM Record')); - $submenu->addIcon($WT_IMAGES["gedcom"]["small"]); + $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); } else { @@ -226,14 +222,14 @@ class SourceController extends BaseController { if (WT_USER_CAN_EDIT) { $submenu = new Menu(i18n::translate('Delete this Source')); $submenu->addOnclick("if (confirm('".i18n::translate('Are you sure you want to delete this Source?')."')) return deletesource('".$this->sid."'); else return false;"); - $submenu->addIcon($WT_IMAGES["edit_sour"]["small"]); + $submenu->addIcon('edit_sour'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } // add to favorites $submenu = new Menu(i18n::translate('Add to My Favorites'), encode_url("source.php?action=addfav&sid={$this->sid}&gid={$this->sid}")); - $submenu->addIcon($WT_IMAGES["favorites"]["small"]); + $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/modules/address_label_report/module.php b/modules/address_label_report/module.php index 3dfacbae5a..e070897360 100644 --- a/modules/address_label_report/module.php +++ b/modules/address_label_report/module.php @@ -57,7 +57,7 @@ class address_label_report_WT_Module extends WT_Module implements WT_Module_Repo $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'); - $menu->addIcon($WT_IMAGES['place']['small']); + $menu->addIcon('place'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/address_report/module.php b/modules/address_report/module.php index ab786f2a69..0792e0f793 100644 --- a/modules/address_report/module.php +++ b/modules/address_report/module.php @@ -57,7 +57,7 @@ class address_report_WT_Module extends WT_Module implements WT_Module_Report { $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'); - $menu->addIcon($WT_IMAGES['place']['small']); + $menu->addIcon('place'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/ahnentafel_report/module.php b/modules/ahnentafel_report/module.php index 42ab439877..5a1bab3895 100644 --- a/modules/ahnentafel_report/module.php +++ b/modules/ahnentafel_report/module.php @@ -65,7 +65,7 @@ class ahnentafel_report_WT_Module extends WT_Module implements WT_Module_Report $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); - $menu->addIcon($WT_IMAGES['ancestry']['small']); + $menu->addIcon('ancestry'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/bdm_report/module.php b/modules/bdm_report/module.php index 5aef86aca5..623e5662af 100644 --- a/modules/bdm_report/module.php +++ b/modules/bdm_report/module.php @@ -57,7 +57,7 @@ class bdm_report_WT_Module extends WT_Module implements WT_Module_Report { $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'); - $menu->addIcon($WT_IMAGES['place']['small']); + $menu->addIcon('place'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/birth_report/module.php b/modules/birth_report/module.php index d4cf0a9439..dfa529e7d7 100644 --- a/modules/birth_report/module.php +++ b/modules/birth_report/module.php @@ -57,7 +57,7 @@ class birth_report_WT_Module extends WT_Module implements WT_Module_Report { $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'); - $menu->addIcon($WT_IMAGES['place']['small']); + $menu->addIcon('place'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/cemetery_report/module.php b/modules/cemetery_report/module.php index d7a9362f14..4c42fc71de 100644 --- a/modules/cemetery_report/module.php +++ b/modules/cemetery_report/module.php @@ -57,7 +57,7 @@ class cemetery_report_WT_Module extends WT_Module implements WT_Module_Report { $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'); - $menu->addIcon($WT_IMAGES['place']['small']); + $menu->addIcon('place'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/change_report/module.php b/modules/change_report/module.php index 7e1803b34f..8cd01f85aa 100644 --- a/modules/change_report/module.php +++ b/modules/change_report/module.php @@ -57,7 +57,7 @@ class change_report_WT_Module extends WT_Module implements WT_Module_Report { $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'); - $menu->addIcon($WT_IMAGES['place']['small']); + $menu->addIcon('place'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/clippings/module.php b/modules/clippings/module.php index ddb95a2314..056155685f 100644 --- a/modules/clippings/module.php +++ b/modules/clippings/module.php @@ -75,38 +75,36 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module } //-- main clippings menu item $menu = new Menu($this->getTitle(), encode_url('module.php?mod=clippings&mod_action=index&ged='.$GEDCOM), "down"); - if (!empty($WT_IMAGES["clippings"]["large"])) { - $menu->addIcon($WT_IMAGES["clippings"]["large"]); - } + $menu->addIcon('clippings'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_clippings"); if (isset($controller->indi) && $controller->indi->canDisplayDetails()) { $submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->pid}&type=indi")); - if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]); + $submenu->addIcon('clippings'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff"); $menu->addSubmenu($submenu); } else if (isset($controller->family) && $controller->family->canDisplayDetails()) { $submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->famid}&type=fam")); - if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]); + $submenu->addIcon('clippings'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff"); $menu->addSubmenu($submenu); } else if (isset($controller->mediaobject) && $controller->mediaobject->canDisplayDetails()) { $submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->mid}&type=obje")); - if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]); + $submenu->addIcon('clippings'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff"); $menu->addSubmenu($submenu); } else if (isset($controller->source) && $controller->source->canDisplayDetails()) { $submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->sid}&type=sour")); - if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]); + $submenu->addIcon('clippings'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff"); $menu->addSubmenu($submenu); } else if (isset($controller->note) && $controller->note->canDisplayDetails()) { $submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->nid}&type=note")); - if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]); + $submenu->addIcon('clippings'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff"); $menu->addSubmenu($submenu); } else if (isset($controller->repository) && $controller->repository->canDisplayDetails()) { $submenu = new Menu(i18n::translate('Add to Clippings Cart'), encode_url("module.php?mod=clippings&mod_action=index&action=add&id={$controller->rid}&type=repo")); - if (!empty($WT_IMAGES["clippings"]["small"])) $submenu->addIcon($WT_IMAGES["clippings"]["small"]); + $submenu->addIcon('clippings'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff"); $menu->addSubmenu($submenu); } diff --git a/modules/death_report/module.php b/modules/death_report/module.php index b0cffd797c..0a1ad6cca1 100644 --- a/modules/death_report/module.php +++ b/modules/death_report/module.php @@ -57,7 +57,7 @@ class death_report_WT_Module extends WT_Module implements WT_Module_Report { $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'); - $menu->addIcon($WT_IMAGES['place']['small']); + $menu->addIcon('place'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/descendancy_report/module.php b/modules/descendancy_report/module.php index 007c73a292..70d01e5f1a 100644 --- a/modules/descendancy_report/module.php +++ b/modules/descendancy_report/module.php @@ -65,7 +65,7 @@ class descendancy_report_WT_Module extends WT_Module implements WT_Module_Report $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); - $menu->addIcon($WT_IMAGES['descendant']['small']); + $menu->addIcon('descendant'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/family_group_report/module.php b/modules/family_group_report/module.php index 80a3c60e6e..342d1e0d00 100644 --- a/modules/family_group_report/module.php +++ b/modules/family_group_report/module.php @@ -63,7 +63,7 @@ class family_group_report_WT_Module extends WT_Module implements WT_Module_Repor $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); - $menu->addIcon($WT_IMAGES['sfamily']['small']); + $menu->addIcon('sfamily'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/individual_ext_report/module.php b/modules/individual_ext_report/module.php index 90955dbba0..31f2ed4af3 100644 --- a/modules/individual_ext_report/module.php +++ b/modules/individual_ext_report/module.php @@ -65,7 +65,7 @@ class individual_ext_report_WT_Module extends WT_Module implements WT_Module_Rep $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); - $menu->addIcon($WT_IMAGES['indis']['small']); + $menu->addIcon('indis'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/individual_report/module.php b/modules/individual_report/module.php index 0739acb4d8..71d1b950fa 100644 --- a/modules/individual_report/module.php +++ b/modules/individual_report/module.php @@ -65,7 +65,7 @@ class individual_report_WT_Module extends WT_Module implements WT_Module_Report $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); - $menu->addIcon($WT_IMAGES['indis']['small']); + $menu->addIcon('indis'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/lightbox/functions/lb_link.php b/modules/lightbox/functions/lb_link.php index 82606b8633..6c0ee83eda 100644 --- a/modules/lightbox/functions/lb_link.php +++ b/modules/lightbox/functions/lb_link.php @@ -42,8 +42,11 @@ if (!defined('WT_WEBTREES')) { * @param string $mediaid */ // function print_link_menu2($mediaid) { - $mediaid=$media["XREF"]; - global $TEXT_DIRECTION; + $mediaid=$media["XREF"]; + global $TEXT_DIRECTION, $WT_IMAGES; + if (!isset($WT_IMAGES['image_link'])) { + $WT_IMAGES['image_link']='modules/lightbox/images/image_link.gif'; + } $classSuffix = ""; if ($TEXT_DIRECTION=="rtl") $classSuffix = "_rtl"; @@ -51,7 +54,7 @@ if (!defined('WT_WEBTREES')) { // main link displayed on page $menu = new Menu(); if ($LB_ML_THUMB_LINKS == "icon" || $LB_ML_THUMB_LINKS == "both") { - $menu->addIcon("modules/lightbox/images/image_link.gif"); + $menu->addIcon('image_link'); } if ($LB_ML_THUMB_LINKS == "both") { $menu->addLabel(i18n::translate('Set link'), "down"); diff --git a/modules/marriage_report/module.php b/modules/marriage_report/module.php index a2d307b81d..b9d9f55c4b 100644 --- a/modules/marriage_report/module.php +++ b/modules/marriage_report/module.php @@ -57,7 +57,7 @@ class marriage_report_WT_Module extends WT_Module implements WT_Module_Report { $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'); - $menu->addIcon($WT_IMAGES['sfamily']['small']); + $menu->addIcon('sfamily'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/missing_facts_report/module.php b/modules/missing_facts_report/module.php index 6a4865f97c..66145b12e2 100644 --- a/modules/missing_facts_report/module.php +++ b/modules/missing_facts_report/module.php @@ -57,7 +57,7 @@ class missing_facts_report_WT_Module extends WT_Module implements WT_Module_Repo $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'); - $menu->addIcon($WT_IMAGES['indis']['small']); + $menu->addIcon('indis'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/page_menu/module.php b/modules/page_menu/module.php index 54d5093ab5..93f3ac3cb3 100644 --- a/modules/page_menu/module.php +++ b/modules/page_menu/module.php @@ -68,7 +68,6 @@ class page_menu_WT_Module extends WT_Module implements WT_Module_Menu { if ($menu) { $menu->addClass('menuitem'.$ff, 'menuitem_hover'.$ff, 'submenu'.$ff, 'icon_large_gedcom'); $menu->addLabel($menu->label, 'down'); - $menu->addIcon($menu->icon); } } return $menu; diff --git a/modules/pedigree_report/module.php b/modules/pedigree_report/module.php index 3d7bad7ef0..848b3e1fd6 100644 --- a/modules/pedigree_report/module.php +++ b/modules/pedigree_report/module.php @@ -65,13 +65,13 @@ class pedigree_report_WT_Module extends WT_Module implements WT_Module_Report { $menus=array(); $menu=new Menu($this->getTitle().' - '.i18n::translate('Portrait'), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report_portrait.xml'.$pid); - $menu->addIcon($WT_IMAGES['pedigree']['small']); + $menu->addIcon('pedigree'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; $menu=new Menu($this->getTitle().' - '.i18n::translate('Landscape'), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report_landscape.xml'.$pid); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); - $menu->addIcon($WT_IMAGES['pedigree']['small']); + $menu->addIcon('pedigree'); $menus[]=$menu; return $menus; diff --git a/modules/relative_ext_report/module.php b/modules/relative_ext_report/module.php index c3787de834..2f4dc67c58 100644 --- a/modules/relative_ext_report/module.php +++ b/modules/relative_ext_report/module.php @@ -66,7 +66,7 @@ class relative_ext_report_WT_Module extends WT_Module implements WT_Module_Repor $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); - $menu->addIcon($WT_IMAGES['cfamily']['small']); + $menu->addIcon('cfamily'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/relative_report/module.php b/modules/relative_report/module.php index c215c5f9fa..fac2bb72f4 100644 --- a/modules/relative_report/module.php +++ b/modules/relative_report/module.php @@ -65,7 +65,7 @@ class relative_report_WT_Module extends WT_Module implements WT_Module_Report { $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); - $menu->addIcon($WT_IMAGES['cfamily']['small']); + $menu->addIcon('cfamily'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/source_report/module.php b/modules/source_report/module.php index e60a6d570a..eaa065087d 100644 --- a/modules/source_report/module.php +++ b/modules/source_report/module.php @@ -57,7 +57,7 @@ class source_report_WT_Module extends WT_Module implements WT_Module_Report { $menus=array(); $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.urlencode(WT_GEDCOM).'&action=setup&report=modules/'.$this->getName().'/report.xml'); - $menu->addIcon($WT_IMAGES['source']['small']); + $menu->addIcon('source'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; |