diff options
| author | fisharebest <fisharebest@gmail.com> | 2011-01-01 15:25:47 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2011-01-01 15:25:47 +0000 |
| commit | 7b875f8eadc778f1083f315494737802a57c123a (patch) | |
| tree | 37c40ab23177d0a14ec595ecdfd764f77bc13953 | |
| parent | 3137f53fe8b54364db98d5bfd24a565d0aa801c6 (diff) | |
| download | webtrees-7b875f8eadc778f1083f315494737802a57c123a.tar.gz webtrees-7b875f8eadc778f1083f315494737802a57c123a.tar.bz2 webtrees-7b875f8eadc778f1083f315494737802a57c123a.zip | |
Refactoring class names and use autoloading.
47 files changed, 386 insertions, 403 deletions
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index d44a69d50f..d341350546 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -39,7 +39,6 @@ if (!defined('WT_WEBTREES')) { define('WT_FUNCTIONS_PRINT_PHP', ''); require_once WT_ROOT.'includes/functions/functions_charts.php'; -require_once WT_ROOT.'includes/classes/class_menubar.php'; /** * print the information for an individual chart box @@ -733,22 +732,22 @@ function print_favorite_selector($option=0) { echo "<div class=\"favorites_form\">"; switch($option) { case 1: - $menu = new Menu(i18n::translate('Favorites'), "#", "right", "down"); + $menu = new WT_Menu(i18n::translate('Favorites'), "#", "right", "down"); $menu->addClass("favmenuitem", "favmenuitem_hover", "favsubmenu"); if (count($userfavs)>0 || $gid!='') { - $submenu = new Menu("<strong>".i18n::translate('My Favorites')."</strong>", "#", "right"); + $submenu = new WT_Menu("<strong>".i18n::translate('My Favorites')."</strong>", "#", "right"); $submenu->addClass("favsubmenuitem", "favsubmenuitem_hover"); $menu->addSubMenu($submenu); if ($gid!='') { - $submenu = new Menu('<em>'.i18n::translate('Add to My Favorites').'</em>', get_query_url(array('action'=>'addfav', 'gid'=>$gid)), "right"); + $submenu = new WT_Menu('<em>'.i18n::translate('Add to My Favorites').'</em>', get_query_url(array('action'=>'addfav', 'gid'=>$gid)), "right"); $submenu->addClass("favsubmenuitem", "favsubmenuitem_hover"); $menu->addSubMenu($submenu); } foreach ($userfavs as $key=>$favorite) { $GEDCOM = $favorite["file"]; - $submenu = new Menu(); + $submenu = new WT_Menu(); if ($favorite["type"]=="URL" && !empty($favorite["url"])) { $submenu->addLink($favorite["url"]); $submenu->addLabel(PrintReady($favorite["title"]), "right"); @@ -770,12 +769,12 @@ function print_favorite_selector($option=0) { } } if (count($gedcomfavs)>0) { - $submenu = new Menu("<strong>".i18n::translate('This GEDCOM\'s Favorites')."</strong>", "#", "right"); + $submenu = new WT_Menu("<strong>".i18n::translate('This GEDCOM\'s Favorites')."</strong>", "#", "right"); $submenu->addClass("favsubmenuitem", "favsubmenuitem_hover"); $menu->addSubMenu($submenu); foreach ($gedcomfavs as $key=>$favorite) { $GEDCOM = $favorite["file"]; - $submenu = new Menu(); + $submenu = new WT_Menu(); if ($favorite["type"]=="URL" && !empty($favorite["url"])) { $submenu->addLink($favorite["url"]); $submenu->addLabel(PrintReady($favorite["title"]), "right"); @@ -50,6 +50,7 @@ if ($ctype=='user') { $blocks=get_gedcom_blocks(WT_GED_ID); } +require_once WT_ROOT.'includes/classes/class_module.php'; $all_blocks=WT_Module::getActiveBlocks(); // We generate individual blocks using AJAX diff --git a/library/WT/Controller/Family.php b/library/WT/Controller/Family.php index 6a8d683742..e09c6ab5da 100644 --- a/library/WT/Controller/Family.php +++ b/library/WT/Controller/Family.php @@ -29,7 +29,6 @@ if (!defined('WT_WEBTREES')) { } require_once WT_ROOT.'includes/functions/functions_print_facts.php'; -require_once WT_ROOT.'includes/classes/class_menu.php'; require_once WT_ROOT.'includes/functions/functions_import.php'; require_once WT_ROOT.'includes/functions/functions_charts.php'; @@ -205,20 +204,20 @@ class WT_Controller_Family extends WT_Controller_Base { $ff=""; } // edit menu - $menu = new Menu(i18n::translate('Edit')); + $menu = new WT_Menu(i18n::translate('Edit')); $menu->addIcon('edit_fam'); $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}", 'icon_large_gedcom'); if (WT_USER_CAN_EDIT) { // edit_fam / members - $submenu = new Menu(i18n::translate('Change Family Members')); + $submenu = new WT_Menu(i18n::translate('Change Family Members')); $submenu->addOnclick("return change_family_members('".$this->getFamilyID()."');"); $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 = new WT_Menu(i18n::translate('Add a child to this family')); $submenu->addOnclick("return addnewchild('".$this->getFamilyID()."');"); $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -226,7 +225,7 @@ class WT_Controller_Family extends WT_Controller_Base { // edit_fam / reorder_children if ($this->family->getNumberOfChildren() > 1) { - $submenu = new Menu(i18n::translate('Re-order children')); + $submenu = new WT_Menu(i18n::translate('Re-order children')); $submenu->addOnclick("return reorder_children('".$this->getFamilyID()."');"); $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -245,17 +244,17 @@ class WT_Controller_Family extends WT_Controller_Base { $label = i18n::translate('Click here to hide changes.'); $link = $this->family->getHtmlUrl().'&show_changes=no'; } - $submenu = new Menu($label, $link); + $submenu = new WT_Menu($label, $link); $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'), "family.php?famid={$this->famid}&action=undo"); + $submenu = new WT_Menu(i18n::translate('Undo all changes'), "family.php?famid={$this->famid}&action=undo"); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $submenu->addIcon('edit_fam'); $menu->addSubmenu($submenu); - $submenu = new Menu(i18n::translate('Approve all changes'), "family.php?famid={$this->famid}&action=accept"); + $submenu = new WT_Menu(i18n::translate('Approve all changes'), "family.php?famid={$this->famid}&action=accept"); $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); @@ -266,13 +265,13 @@ class WT_Controller_Family extends WT_Controller_Base { // edit/view raw gedcom if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) { - $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); + $submenu = new WT_Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->getFamilyID()."');"); $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 = new WT_Menu(i18n::translate('View GEDCOM Record')); $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); @@ -285,7 +284,7 @@ class WT_Controller_Family extends WT_Controller_Base { // delete if (WT_USER_CAN_EDIT) { - $submenu = new Menu(i18n::translate('Delete family')); + $submenu = new WT_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('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -293,7 +292,7 @@ class WT_Controller_Family extends WT_Controller_Base { } // add to favorites - $submenu = new Menu(i18n::translate('Add to My Favorites'), 'family.php?action=addfav&famid='.$this->getFamilyID().'&gamp;id='.$this->getFamilyID()); + $submenu = new WT_Menu(i18n::translate('Add to My Favorites'), 'family.php?action=addfav&famid='.$this->getFamilyID().'&gamp;id='.$this->getFamilyID()); $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/library/WT/Controller/Individual.php b/library/WT/Controller/Individual.php index 2fe4b3dc12..3bf07e4f7c 100644 --- a/library/WT/Controller/Individual.php +++ b/library/WT/Controller/Individual.php @@ -29,7 +29,6 @@ if (!defined('WT_WEBTREES')) { } require_once WT_ROOT.'includes/functions/functions_print_facts.php'; -require_once WT_ROOT.'includes/classes/class_menu.php'; require_once WT_ROOT.'includes/functions/functions_import.php'; require_once WT_ROOT.'includes/classes/class_module.php'; @@ -426,7 +425,7 @@ class WT_Controller_Individual extends WT_Controller_Base { $ff=""; } // edit menu - $menu = new Menu(i18n::translate('Edit')); + $menu = new WT_Menu(i18n::translate('Edit')); $menu->addIcon('edit_indi'); $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}", 'icon_large_gedcom'); @@ -434,21 +433,21 @@ class WT_Controller_Individual extends WT_Controller_Base { //--make sure the totals are correct $this->getGlobalFacts(); if ($this->total_names<2) { - $submenu = new Menu(i18n::translate('Edit name')); + $submenu = new WT_Menu(i18n::translate('Edit name')); $submenu->addOnclick("return edit_name('".$this->pid."', $this->NAME_LINENUM);"); $submenu->addIcon('edit_indi'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); } - $submenu = new Menu(i18n::translate('Add new Name')); + $submenu = new WT_Menu(i18n::translate('Add new Name')); $submenu->addOnclick("return add_name('".$this->pid."');"); $submenu->addIcon('edit_indi'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); if ($this->SEX_COUNT<2) { - $submenu = new Menu(i18n::translate('Edit gender')); + $submenu = new WT_Menu(i18n::translate('Edit gender')); if ($this->SEX_LINENUM=="new") { $submenu->addOnclick("return add_new_record('".$this->pid."', 'SEX');"); } else { @@ -460,7 +459,7 @@ class WT_Controller_Individual extends WT_Controller_Base { } if (count($this->indi->getSpouseFamilyIds())>1) { - $submenu = new Menu(i18n::translate('Reorder families')); + $submenu = new WT_Menu(i18n::translate('Reorder families')); $submenu->addOnclick("return reorder_families('".$this->pid."');"); $submenu->addIcon('edit_fam'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -479,17 +478,17 @@ class WT_Controller_Individual extends WT_Controller_Base { $label = i18n::translate('Click here to hide changes.'); $link = $this->indi->getHtmlUrl().'&show_changes=no'; } - $submenu = new Menu($label, $link); + $submenu = new WT_Menu($label, $link); $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'), $this->indi->getHtmlUrl()."&action=undo"); + $submenu = new WT_Menu(i18n::translate('Undo all changes'), $this->indi->getHtmlUrl()."&action=undo"); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $submenu->addIcon('edit_indi'); $menu->addSubmenu($submenu); - $submenu = new Menu(i18n::translate('Approve all changes'), $this->indi->getHtmlUrl()."&action=accept"); + $submenu = new WT_Menu(i18n::translate('Approve all changes'), $this->indi->getHtmlUrl()."&action=accept"); $submenu->addIcon('edit_indi'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); @@ -500,13 +499,13 @@ class WT_Controller_Individual extends WT_Controller_Base { // edit/view raw gedcom if (WT_USER_IS_ADMIN || $this->canShowGedcomRecord()) { - $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); + $submenu = new WT_Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->pid."');"); $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 = new WT_Menu(i18n::translate('View GEDCOM Record')); $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); @@ -519,7 +518,7 @@ class WT_Controller_Individual extends WT_Controller_Base { // delete if (WT_USER_CAN_EDIT) { - $submenu = new Menu(i18n::translate('Delete this individual')); + $submenu = new WT_Menu(i18n::translate('Delete this individual')); $submenu->addOnclick("return deleteperson('".$this->pid."');"); $submenu->addIcon('edit_indi'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -527,7 +526,7 @@ class WT_Controller_Individual extends WT_Controller_Base { } // add to favorites - $submenu = new Menu(i18n::translate('Add to My Favorites'), $this->indi->getHtmlUrl()."&action=addfav&gid=".$this->pid); + $submenu = new WT_Menu(i18n::translate('Add to My Favorites'), $this->indi->getHtmlUrl()."&action=addfav&gid=".$this->pid); $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/library/WT/Controller/Media.php b/library/WT/Controller/Media.php index 866189f52b..030eebdcab 100644 --- a/library/WT/Controller/Media.php +++ b/library/WT/Controller/Media.php @@ -1,5 +1,5 @@ <?php -// Controller for the Media Menu +// Controller for the Media Page // // webtrees: Web based Family History software // Copyright (C) 2011 webtrees development team. @@ -29,7 +29,6 @@ if (!defined('WT_WEBTREES')) { } require_once WT_ROOT.'includes/functions/functions_print_facts.php'; -require_once WT_ROOT.'includes/classes/class_menu.php'; require_once WT_ROOT.'includes/functions/functions_import.php'; class WT_Controller_Media extends WT_Controller_Base { @@ -185,12 +184,12 @@ class WT_Controller_Media extends WT_Controller_Base { } // edit menu - $menu = new Menu(i18n::translate('Edit')); + $menu = new WT_Menu(i18n::translate('Edit')); $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 = new WT_Menu(i18n::translate('Edit media')); $submenu->addOnclick("window.open('addmedia.php?action=editmedia&pid={$this->pid}', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1')"); $submenu->addIcon('edit_media'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -198,9 +197,9 @@ class WT_Controller_Media extends WT_Controller_Base { // main link displayed on page if (WT_USER_GEDCOM_ADMIN && file_exists(WT_ROOT.'modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php')) { - $submenu = new Menu(i18n::translate('Manage links')); + $submenu = new WT_Menu(i18n::translate('Manage links')); } else { - $submenu = new Menu(i18n::translate('Set link')); + $submenu = new WT_Menu(i18n::translate('Set link')); } // GEDFact assistant Add Media Links ======================= @@ -213,17 +212,17 @@ class WT_Controller_Media extends WT_Controller_Base { $submenu->addOnclick("return ilinkitem('".$this->pid."','person');"); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); - $ssubmenu = new Menu(i18n::translate('To Person')); + $ssubmenu = new WT_Menu(i18n::translate('To Person')); $ssubmenu->addOnclick("return ilinkitem('".$this->pid."','person');"); $ssubmenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $submenu->addSubMenu($ssubmenu); - $ssubmenu = new Menu(i18n::translate('To Family')); + $ssubmenu = new WT_Menu(i18n::translate('To Family')); $ssubmenu->addOnclick("return ilinkitem('".$this->pid."','family');"); $ssubmenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $submenu->addSubMenu($ssubmenu); - $ssubmenu = new Menu(i18n::translate('To Source')); + $ssubmenu = new WT_Menu(i18n::translate('To Source')); $ssubmenu->addOnclick("return ilinkitem('".$this->pid."','source');"); $ssubmenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $submenu->addSubMenu($ssubmenu); @@ -242,16 +241,16 @@ class WT_Controller_Media extends WT_Controller_Base { $label = i18n::translate('Click here to hide changes.'); $link = "mediaviewer.php?mid={$this->pid}&samp;how_changes=no"; } - $submenu = new Menu($label, $link); + $submenu = new WT_Menu($label, $link); $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'), "mediaviewer.php?mid={$this->pid}&action=undo"); + $submenu = new WT_Menu(i18n::translate('Undo all changes'), "mediaviewer.php?mid={$this->pid}&action=undo"); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $submenu->addIcon('notes'); $menu->addSubmenu($submenu); - $submenu = new Menu(i18n::translate('Approve all changes'), "mediaviewer.php?mid={$this->pid}&action=accept"); + $submenu = new WT_Menu(i18n::translate('Approve all changes'), "mediaviewer.php?mid={$this->pid}&action=accept"); $submenu->addIcon('notes'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); @@ -262,13 +261,13 @@ class WT_Controller_Media extends WT_Controller_Base { // edit/view raw gedcom if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) { - $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); + $submenu = new WT_Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->pid."');"); $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 = new WT_Menu(i18n::translate('View GEDCOM Record')); $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); @@ -281,7 +280,7 @@ class WT_Controller_Media extends WT_Controller_Base { // delete if (WT_USER_GEDCOM_ADMIN) { - $submenu = new Menu(i18n::translate('Remove object'), "media.php?action=removeobject&xref=".$this->pid); + $submenu = new WT_Menu(i18n::translate('Remove object'), "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('edit_media'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -289,7 +288,7 @@ class WT_Controller_Media extends WT_Controller_Base { } // add to favorites - $submenu = new Menu(i18n::translate('Add to My Favorites'), "mediaviewer.php?action=addfav&mid={$this->mid}&gid={$this->mid}"); + $submenu = new WT_Menu(i18n::translate('Add to My Favorites'), "mediaviewer.php?action=addfav&mid={$this->mid}&gid={$this->mid}"); $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/library/WT/Controller/Note.php b/library/WT/Controller/Note.php index 5047dd103e..bdfb5c5b0f 100644 --- a/library/WT/Controller/Note.php +++ b/library/WT/Controller/Note.php @@ -29,7 +29,6 @@ if (!defined('WT_WEBTREES')) { } require_once WT_ROOT.'includes/functions/functions_print_facts.php'; -require_once WT_ROOT.'includes/classes/class_menu.php'; require_once WT_ROOT.'includes/functions/functions_import.php'; class WT_Controller_Note extends WT_Controller_Base { @@ -147,12 +146,12 @@ class WT_Controller_Note extends WT_Controller_Base { $ff=""; } // edit menu - $menu = new Menu(i18n::translate('Edit')); + $menu = new WT_Menu(i18n::translate('Edit')); $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 = new WT_Menu(i18n::translate('Edit note')); $submenu->addOnclick('return edit_note(\''.$this->nid.'\');'); $submenu->addIcon('edit_note'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -164,21 +163,21 @@ class WT_Controller_Note extends WT_Controller_Base { // show/hide changes 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.'), "note.php?nid={$this->nid}&show_changes=yes"); + $submenu = new WT_Menu(i18n::translate('This record has been updated. Click here to show changes.'), "note.php?nid={$this->nid}&show_changes=yes"); $submenu->addIcon('edit_note'); } else { - $submenu = new Menu(i18n::translate('Click here to hide changes.'), "note.php?nid={$this->nid}&show_changes=no"); + $submenu = new WT_Menu(i18n::translate('Click here to hide changes.'), "note.php?nid={$this->nid}&show_changes=no"); $submenu->addIcon('edit_note'); } $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'), "note.php?nid={$this->nid}&action=undo"); + $submenu = new WT_Menu(i18n::translate('Undo all changes'), "note.php?nid={$this->nid}&action=undo"); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $submenu->addIcon('notes'); $menu->addSubmenu($submenu); - $submenu = new Menu(i18n::translate('Approve all changes'), "note.php?nid={$this->nid}&action=accept"); + $submenu = new WT_Menu(i18n::translate('Approve all changes'), "note.php?nid={$this->nid}&action=accept"); $submenu->addIcon('notes'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); @@ -189,13 +188,13 @@ class WT_Controller_Note extends WT_Controller_Base { // edit/view raw gedcom if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) { - $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); + $submenu = new WT_Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->nid."');"); $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 = new WT_Menu(i18n::translate('View GEDCOM Record')); $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); @@ -208,7 +207,7 @@ class WT_Controller_Note extends WT_Controller_Base { // delete if (WT_USER_CAN_EDIT) { - $submenu = new Menu(i18n::translate('Delete this Shared Note')); + $submenu = new WT_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('edit_note'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -216,7 +215,7 @@ class WT_Controller_Note extends WT_Controller_Base { } // add to favorites - $submenu = new Menu(i18n::translate('Add to My Favorites'), "note.php?action=addfav&nid={$this->nid}&gid={$this->nid}"); + $submenu = new WT_Menu(i18n::translate('Add to My Favorites'), "note.php?action=addfav&nid={$this->nid}&gid={$this->nid}"); $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/library/WT/Controller/Repository.php b/library/WT/Controller/Repository.php index ce9a453fa3..6ed15aa90c 100644 --- a/library/WT/Controller/Repository.php +++ b/library/WT/Controller/Repository.php @@ -29,7 +29,6 @@ if (!defined('WT_WEBTREES')) { } require_once WT_ROOT.'includes/functions/functions_print_facts.php'; -require_once WT_ROOT.'includes/classes/class_menu.php'; require_once WT_ROOT.'includes/functions/functions_import.php'; class WT_Controller_Repository extends WT_Controller_Base { @@ -147,7 +146,7 @@ class WT_Controller_Repository extends WT_Controller_Base { $ff=""; } // edit menu - $menu = new Menu(i18n::translate('Edit')); + $menu = new WT_Menu(i18n::translate('Edit')); $menu->addIcon('edit_repo'); $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}", 'icon_large_gedcom'); @@ -158,21 +157,21 @@ class WT_Controller_Repository extends WT_Controller_Base { // show/hide changes 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.'), "repo.php?rid={$this->rid}&show_changes=yes"); + $submenu = new WT_Menu(i18n::translate('This record has been updated. Click here to show changes.'), "repo.php?rid={$this->rid}&show_changes=yes"); $submenu->addIcon('edit_repo'); } else { - $submenu = new Menu(i18n::translate('Click here to hide changes.'), "repo.php?rid={$this->rid}&show_changes=no"); + $submenu = new WT_Menu(i18n::translate('Click here to hide changes.'), "repo.php?rid={$this->rid}&show_changes=no"); $submenu->addIcon('edit_repo'); } $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'), "repo.php?rid={$this->rid}&action=undo"); + $submenu = new WT_Menu(i18n::translate('Undo all changes'), "repo.php?rid={$this->rid}&action=undo"); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $submenu->addIcon('edit_repo'); $menu->addSubmenu($submenu); - $submenu = new Menu(i18n::translate('Approve all changes'), "repo.php?rid={$this->rid}&action=accept"); + $submenu = new WT_Menu(i18n::translate('Approve all changes'), "repo.php?rid={$this->rid}&action=accept"); $submenu->addIcon('edit_repo'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); @@ -183,13 +182,13 @@ class WT_Controller_Repository extends WT_Controller_Base { // edit/view raw gedcom if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) { - $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); + $submenu = new WT_Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->rid."');"); $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 = new WT_Menu(i18n::translate('View GEDCOM Record')); $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); @@ -202,7 +201,7 @@ class WT_Controller_Repository extends WT_Controller_Base { // delete if (WT_USER_CAN_EDIT) { - $submenu = new Menu(i18n::translate('Delete repository')); + $submenu = new WT_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('edit_repo'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -210,7 +209,7 @@ class WT_Controller_Repository extends WT_Controller_Base { } // add to favorites - $submenu = new Menu(i18n::translate('Add to My Favorites'), "repo.php?action=addfav&rid={$this->rid}&gid={$this->rid}"); + $submenu = new WT_Menu(i18n::translate('Add to My Favorites'), "repo.php?action=addfav&rid={$this->rid}&gid={$this->rid}"); $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/library/WT/Controller/Source.php b/library/WT/Controller/Source.php index 8dc6b2b26b..70e6bb2312 100644 --- a/library/WT/Controller/Source.php +++ b/library/WT/Controller/Source.php @@ -29,7 +29,6 @@ if (!defined('WT_WEBTREES')) { } require_once WT_ROOT.'includes/functions/functions_print_facts.php'; -require_once WT_ROOT.'includes/classes/class_menu.php'; require_once WT_ROOT.'includes/functions/functions_import.php'; class WT_Controller_Source extends WT_Controller_Base { @@ -147,12 +146,12 @@ class WT_Controller_Source extends WT_Controller_Base { $ff=""; } // edit menu - $menu = new Menu(i18n::translate('Edit')); + $menu = new WT_Menu(i18n::translate('Edit')); $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 = new WT_Menu(i18n::translate('Edit Source')); $submenu->addOnclick('return edit_source(\''.$this->sid.'\');'); $submenu->addIcon('edit_sour'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -164,21 +163,21 @@ class WT_Controller_Source extends WT_Controller_Base { // show/hide changes 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.'), "source.php?sid={$this->sid}&show_changes=yes"); + $submenu = new WT_Menu(i18n::translate('This record has been updated. Click here to show changes.'), "source.php?sid={$this->sid}&show_changes=yes"); $submenu->addIcon('edit_sour'); } else { - $submenu = new Menu(i18n::translate('Click here to hide changes.'), "source.php?sid={$this->sid}&show_changes=no"); + $submenu = new WT_Menu(i18n::translate('Click here to hide changes.'), "source.php?sid={$this->sid}&show_changes=no"); $submenu->addIcon('edit_sour'); } $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'), "source.php?sid={$this->sid}&action=undo"); + $submenu = new WT_Menu(i18n::translate('Undo all changes'), "source.php?sid={$this->sid}&action=undo"); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $submenu->addIcon('edit_sour'); $menu->addSubmenu($submenu); - $submenu = new Menu(i18n::translate('Approve all changes'), "source.php?sid={$this->sid}&action=accept"); + $submenu = new WT_Menu(i18n::translate('Approve all changes'), "source.php?sid={$this->sid}&action=accept"); $submenu->addIcon('edit_sour'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); @@ -189,13 +188,13 @@ class WT_Controller_Source extends WT_Controller_Base { // edit/view raw gedcom if (WT_USER_IS_ADMIN || $SHOW_GEDCOM_RECORD) { - $submenu = new Menu(i18n::translate('Edit raw GEDCOM record')); + $submenu = new WT_Menu(i18n::translate('Edit raw GEDCOM record')); $submenu->addOnclick("return edit_raw('".$this->sid."');"); $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 = new WT_Menu(i18n::translate('View GEDCOM Record')); $submenu->addIcon('gedcom'); if ($this->show_changes && WT_USER_CAN_EDIT) { $submenu->addOnclick("return show_gedcom_record('new');"); @@ -208,7 +207,7 @@ class WT_Controller_Source extends WT_Controller_Base { // delete if (WT_USER_CAN_EDIT) { - $submenu = new Menu(i18n::translate('Delete this Source')); + $submenu = new WT_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('edit_sour'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); @@ -216,7 +215,7 @@ class WT_Controller_Source extends WT_Controller_Base { } // add to favorites - $submenu = new Menu(i18n::translate('Add to My Favorites'), "source.php?action=addfav&sid={$this->sid}&gid={$this->sid}"); + $submenu = new WT_Menu(i18n::translate('Add to My Favorites'), "source.php?action=addfav&sid={$this->sid}&gid={$this->sid}"); $submenu->addIcon('favorites'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); diff --git a/library/WT/Family.php b/library/WT/Family.php index fdecbeb823..638a852c37 100644 --- a/library/WT/Family.php +++ b/library/WT/Family.php @@ -304,7 +304,7 @@ class WT_Family extends WT_GedcomRecord { function getMarriageYear($est = true, $cal = '') { // TODO - change the design to use julian days, not gregorian years. $mdate = $this->getMarriageDate(); - $mdate = $mdate->WT_Date(); + $mdate = $mdate->MinDate(); if ($cal) $mdate = $mdate->convert_to_cal($cal); return $mdate->y; } diff --git a/includes/classes/class_menu.php b/library/WT/Menu.php index 33b498e5de..02dffde878 100644 --- a/includes/classes/class_menu.php +++ b/library/WT/Menu.php @@ -1,39 +1,34 @@ <?php -/** -* System for generating menus. -* -* webtrees: Web based Family History software - * Copyright (C) 2010 webtrees development team. - * - * Derived from PhpGedView -* Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -* -* @package webtrees -* @version $Id$ -*/ +// System for generating menus. +// +// webtrees: Web based Family History software +// Copyright (C) 2011 webtrees development team. +// +// Derived from PhpGedView +// Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// @version $Id$ if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); exit; } -define('WT_CLASS_MENU_PHP', ''); - -class Menu { +class WT_Menu { var $separator = false; var $label = ' '; var $labelpos = 'right'; @@ -125,7 +120,7 @@ class Menu { } function addSeparator() { - $submenu = new Menu(); + $submenu = new WT_Menu(); $submenu->isSeparator(); $this->submenus[] = $submenu; } diff --git a/includes/classes/class_menubar.php b/library/WT/MenuBar.php index 5f3b1f1129..7b27e34cdf 100644 --- a/includes/classes/class_menubar.php +++ b/library/WT/MenuBar.php @@ -1,54 +1,48 @@ <?php -/** -* System for generating menus. -* -* webtrees: Web based Family History software - * Copyright (C) 2010 webtrees development team. - * - * Derived from PhpGedView -* Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. -* -* Modifications Copyright (c) 2010 Greg Roach -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -* -* @package webtrees -* @version $Id$ -*/ +// System for generating menus. +// +// webtrees: Web based Family History software +// Copyright (C) 2010 webtrees development team. +// +// Derived from PhpGedView +// Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. +// +// Modifications Copyright (c) 2010 Greg Roach +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// @version $Id$ if (!defined('WT_WEBTREES')) { header('HTTP/1.0 403 Forbidden'); exit; } -define('WT_CLASS_MENUBAR_PHP', ''); - -require_once WT_ROOT.'includes/classes/class_menu.php'; require_once WT_ROOT.'includes/classes/class_module.php'; -class MenuBar { +class WT_MenuBar { /** * get the menu with links to the gedcom portals - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getGedcomMenu() { global $TEXT_DIRECTION, $WT_IMAGES; if ($TEXT_DIRECTION=='rtl') $ff='_rtl'; else $ff=''; //-- main menu - $menu = new Menu(i18n::translate('Home page'), 'index.php?ctype=gedcom', 'down'); + $menu = new WT_Menu(i18n::translate('Home page'), 'index.php?ctype=gedcom', 'down'); if (!empty($WT_IMAGES['home'])) $menu->addIcon('home'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", 'icon_large_gedcom'); @@ -56,7 +50,7 @@ class MenuBar { $gedcom_titles=get_gedcom_titles(); if (count($gedcom_titles)>1 && get_site_setting('ALLOW_CHANGE_GEDCOM')) { foreach ($gedcom_titles as $gedcom_title) { - $submenu = new Menu(PrintReady($gedcom_title->gedcom_title, true), 'index.php?ctype=gedcom&ged='.rawurlencode($gedcom_title->gedcom_name)); + $submenu = new WT_Menu(PrintReady($gedcom_title->gedcom_title, true), 'index.php?ctype=gedcom&ged='.rawurlencode($gedcom_title->gedcom_name)); if (!empty($WT_IMAGES['gedcom'])) { $submenu->addIcon('gedcom'); } @@ -75,7 +69,7 @@ class MenuBar { /** * get the mypage menu - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getMyPageMenu() { global $MEDIA_DIRECTORY, $MULTI_MEDIA; @@ -91,31 +85,31 @@ class MenuBar { } //-- main menu - $menu = new Menu(i18n::translate('My Page'), "index.php?ctype=user&ged=".WT_GEDURL, "down"); + $menu = new WT_Menu(i18n::translate('My Page'), "index.php?ctype=user&ged=".WT_GEDURL, "down"); $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&ged=".WT_GEDURL); + $submenu = new WT_Menu(i18n::translate('My Page'), "index.php?ctype=user&ged=".WT_GEDURL); $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"); + $submenu = new WT_Menu(i18n::translate('My account'), "edituser.php"); $submenu->addIcon('mypage'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_mypage"); $menu->addSubmenu($submenu); } if (WT_USER_GEDCOM_ID) { //-- my_pedigree submenu - $submenu = new Menu(i18n::translate('My Pedigree'), "pedigree.php?ged=".WT_GEDURL."&rootid=".WT_USER_GEDCOM_ID."&show_full={$showFull}&talloffset={$showLayout}"); + $submenu = new WT_Menu(i18n::translate('My Pedigree'), "pedigree.php?ged=".WT_GEDURL."&rootid=".WT_USER_GEDCOM_ID."&show_full={$showFull}&talloffset={$showLayout}"); if (!empty($WT_IMAGES["pedigree"])) $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?ged=".WT_GEDURL."&pid=".WT_USER_GEDCOM_ID); + $submenu = new WT_Menu(i18n::translate('My individual record'), "individual.php?ged=".WT_GEDURL."&pid=".WT_USER_GEDCOM_ID); $submenu->addIcon('indis'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_indis"); $menu->addSubmenu($submenu); @@ -123,24 +117,24 @@ class MenuBar { if (WT_USER_GEDCOM_ADMIN) { $menu->addSeparator(); //-- admin submenu - $submenu = new Menu(i18n::translate('Administration'), "admin.php"); + $submenu = new WT_Menu(i18n::translate('Administration'), "admin.php"); $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"); + $submenu = new WT_Menu(i18n::translate('GEDCOM administration'), "editgedcoms.php"); $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"); + $submenu = new WT_Menu(i18n::translate('User administration'), "useradmin.php"); $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?ged=".WT_GEDURL); + $submenu = new WT_Menu(i18n::translate('Manage multimedia'), "media.php?ged=".WT_GEDURL); $submenu->addIcon('menu_media'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_media"); $menu->addSubmenu($submenu); @@ -151,7 +145,7 @@ class MenuBar { //-- upload_media submenu if (is_writable($MEDIA_DIRECTORY) && $MULTI_MEDIA) { $menu->addSeparator(); - $submenu = new Menu(i18n::translate('Upload media files'), "uploadmedia.php?ged=".WT_GEDURL); + $submenu = new WT_Menu(i18n::translate('Upload media files'), "uploadmedia.php?ged=".WT_GEDURL); $submenu->addIcon('menu_media'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_media"); $menu->addSubmenu($submenu); @@ -162,7 +156,7 @@ class MenuBar { /** * get the menu for the charts - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getChartsMenu($rootid='') { global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER; @@ -187,7 +181,7 @@ class MenuBar { //-- main charts menu item $link = "pedigree.php?ged=".WT_GEDURL."&show_full={$showFull}&talloffset={$showLayout}"; if ($rootid) $link .= "&rootid={$rootid}"; - $menu = new Menu(i18n::translate('Charts'), $link, "down"); + $menu = new WT_Menu(i18n::translate('Charts'), $link, "down"); $menu->addIcon('charts'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_pedigree"); @@ -217,7 +211,7 @@ class MenuBar { //-- pedigree $link = "pedigree.php?ged=".WT_GEDURL."&show_full={$showFull}&talloffset={$showLayout}"; if ($rootid) $link .= "&rootid={$rootid}"; - $submenu = new Menu(i18n::translate('Pedigree Chart'), $link); + $submenu = new WT_Menu(i18n::translate('Pedigree Chart'), $link); $submenu->addIcon('pedigree'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_pedigree"); $menu->addSubmenu($submenu); @@ -227,7 +221,7 @@ class MenuBar { //-- descendancy $link = "descendancy.php?ged=".WT_GEDURL; if ($rootid) $link .= "&pid={$rootid}&show_full={$showFull}"; - $submenu = new Menu(i18n::translate('Descendancy chart'), $link); + $submenu = new WT_Menu(i18n::translate('Descendancy chart'), $link); $submenu->addIcon('descendant'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_descendant"); $menu->addSubmenu($submenu); @@ -237,7 +231,7 @@ class MenuBar { //-- ancestry $link = "ancestry.php?ged=".WT_GEDURL; if ($rootid) $link .= "&rootid={$rootid}&show_full={$showFull}"; - $submenu = new Menu(i18n::translate('Ancestry chart'), $link); + $submenu = new WT_Menu(i18n::translate('Ancestry chart'), $link); $submenu->addIcon('ancestry'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_ancestry"); $menu->addSubmenu($submenu); @@ -247,7 +241,7 @@ class MenuBar { //-- compact $link = "compact.php?ged=".WT_GEDURL; if ($rootid) $link .= "&rootid=".$rootid; - $submenu = new Menu(i18n::translate('Compact chart'), $link); + $submenu = new WT_Menu(i18n::translate('Compact chart'), $link); $submenu->addIcon('ancestry'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_ancestry"); $menu->addSubmenu($submenu); @@ -257,7 +251,7 @@ class MenuBar { //-- fan chart $link = "fanchart.php?ged=".WT_GEDURL; if ($rootid) $link .= "&rootid=".$rootid; - $submenu = new Menu(i18n::translate('Circle diagram'), $link); + $submenu = new WT_Menu(i18n::translate('Circle diagram'), $link); $submenu->addIcon('fanchart'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_fanchart"); $menu->addSubmenu($submenu); @@ -267,7 +261,7 @@ class MenuBar { //-- hourglass $link = "hourglass.php?ged=".WT_GEDURL; if ($rootid) $link .= "&pid={$rootid}&show_full={$showFull}"; - $submenu = new Menu(i18n::translate('Hourglass chart'), $link); + $submenu = new WT_Menu(i18n::translate('Hourglass chart'), $link); $submenu->addIcon('hourglass'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_hourglass"); $menu->addSubmenu($submenu); @@ -277,7 +271,7 @@ class MenuBar { //-- familybook $link = "familybook.php?ged=".WT_GEDURL; if ($rootid) $link .= "&pid={$rootid}&show_full={$showFull}"; - $submenu = new Menu(i18n::translate('Family book chart'), $link); + $submenu = new WT_Menu(i18n::translate('Family book chart'), $link); $submenu->addIcon('fambook'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_fambook"); $menu->addSubmenu($submenu); @@ -287,7 +281,7 @@ class MenuBar { //-- timeline $link = "timeline.php?ged=".WT_GEDURL; if ($rootid) $link .= "&pids[]=".$rootid; - $submenu = new Menu(i18n::translate('Timeline chart'), $link); + $submenu = new WT_Menu(i18n::translate('Timeline chart'), $link); $submenu->addIcon('timeline'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_timeline"); $menu->addSubmenu($submenu); @@ -304,7 +298,7 @@ class MenuBar { switch ($menuType) { case "parentTimeLine": // charts / parents_timeline - $submenu = new Menu(i18n::translate('Show couple on timeline chart'), 'timeline.php?'.$controller->getTimelineIndis(array('HUSB','WIFE')).'&ged='.WT_GEDURL); + $submenu = new WT_Menu(i18n::translate('Show couple on timeline chart'), 'timeline.php?'.$controller->getTimelineIndis(array('HUSB','WIFE')).'&ged='.WT_GEDURL); if (!empty($WT_IMAGES["timeline"])) { $submenu->addIcon('timeline'); } @@ -314,7 +308,7 @@ class MenuBar { case "childTimeLine": // charts / children_timeline - $submenu = new Menu(i18n::translate('Show children on timeline chart'), 'timeline.php?'.$controller->getTimelineIndis(array('CHIL')).'&ged='.WT_GEDURL); + $submenu = new WT_Menu(i18n::translate('Show children on timeline chart'), 'timeline.php?'.$controller->getTimelineIndis(array('CHIL')).'&ged='.WT_GEDURL); if (!empty($WT_IMAGES["timeline"])) { $submenu->addIcon('timeline'); } @@ -324,7 +318,7 @@ class MenuBar { case "familyTimeLine": // charts / family_timeline - $submenu = new Menu(i18n::translate('Show family on timeline chart'), 'timeline.php?'.$controller->getTimelineIndis(array('HUSB','WIFE','CHIL')).'&ged='.WT_GEDURL); + $submenu = new WT_Menu(i18n::translate('Show family on timeline chart'), 'timeline.php?'.$controller->getTimelineIndis(array('HUSB','WIFE','CHIL')).'&ged='.WT_GEDURL); if (!empty($WT_IMAGES["timeline"])) { $submenu->addIcon('timeline'); } @@ -342,7 +336,7 @@ class MenuBar { //-- lifespan $link = "lifespan.php?ged=".WT_GEDURL; if ($rootid) $link .= "&pids[]={$rootid}&addFamily=1"; - $submenu = new Menu(i18n::translate('Lifespan chart'), $link); + $submenu = new WT_Menu(i18n::translate('Lifespan chart'), $link); $submenu->addIcon('timeline'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_timeline"); $menu->addSubmenu($submenu); @@ -372,12 +366,12 @@ class MenuBar { if (isset($controller) && !empty($controller->indi)) { $person=WT_Person::getInstance($pid2); if ($person instanceof WT_Person) { - $submenu = new Menu( + $submenu = new WT_Menu( i18n::translate('Relationship chart').': '.PrintReady($person->getFullName()), "relationship.php?pid1={$pid2}&pid2={$pid1}&pretty=2&followspouse=1&ged=".WT_GEDURL ); } else { - $submenu = new Menu( + $submenu = new WT_Menu( i18n::translate('Relationship chart'), "relationship.php?pid1={$pid1}&pretty=2&followspouse=1&ged=".WT_GEDURL ); @@ -386,7 +380,7 @@ class MenuBar { $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_relationship"); $menu->addSubmenu($submenu); } else { - $submenu = new Menu( + $submenu = new WT_Menu( i18n::translate('Relationship chart'), "relationship.php?pid1={$pid1}&pretty=2&followspouse=1&ged=".WT_GEDURL ); @@ -402,7 +396,7 @@ class MenuBar { case "statistics": //-- statistics plot - $submenu = new Menu(i18n::translate('Statistics'), "statistics.php?ged=".WT_GEDURL); + $submenu = new WT_Menu(i18n::translate('Statistics'), "statistics.php?ged=".WT_GEDURL); $submenu->addIcon('statistic'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_statistic"); $menu->addSubmenu($submenu); @@ -412,7 +406,7 @@ class MenuBar { //-- interactive tree $link = "treenav.php?ged=".WT_GEDURL; if ($rootid) $link .= "&rootid=".$rootid; - $submenu = new Menu(i18n::translate('Interactive tree'), $link); + $submenu = new WT_Menu(i18n::translate('Interactive tree'), $link); $submenu->addIcon('tree'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_gedcom"); $menu->addSubmenu($submenu); @@ -423,7 +417,7 @@ class MenuBar { //-- pedigree map $link = "module.php?ged=".WT_GEDURL."&mod=googlemap&mod_action=pedigree_map"; if ($rootid) $link .= "&rootid=".$rootid; - $submenu = new Menu(i18n::translate('Pedigree Map'), $link); + $submenu = new WT_Menu(i18n::translate('Pedigree Map'), $link); global $WT_IMAGES; $WT_IMAGES['pedigree_map']='modules/googlemap/images/pedigree_map.gif'; $submenu->addIcon('pedigree_map'); @@ -438,7 +432,7 @@ class MenuBar { /** * get the menu for the lists - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getListsMenu() { global $TEXT_DIRECTION, $WT_IMAGES, $MULTI_MEDIA, $SEARCH_SPIDER, $controller; @@ -457,7 +451,7 @@ class MenuBar { if ($TEXT_DIRECTION=='rtl') $ff='_rtl'; else $ff=''; // The top level menu shows the individual list - $menu=new Menu(i18n::translate('Lists'), 'indilist.php?ged='.WT_GEDURL, 'down'); + $menu=new WT_Menu(i18n::translate('Lists'), 'indilist.php?ged='.WT_GEDURL, 'down'); $menu->addIcon('lists'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", 'icon_large_indis'); @@ -484,52 +478,52 @@ class MenuBar { switch ($page) { case 'indilist.php': if ($surname) $link .= '&surname='.$surname; - $submenu = new Menu($name, $link); + $submenu = new WT_Menu($name, $link); $submenu->addIcon('indis'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", '', 'icon_small_indis'); break; case 'famlist.php': if ($surname) $link .= '&surname='.$surname; - $submenu = new Menu($name, $link); + $submenu = new WT_Menu($name, $link); $submenu->addIcon('cfamily'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", '', 'icon_small_cfamily'); break; case 'branches.php': if ($surname) $link .= '&surn='.$surname; - $submenu = new Menu($name, $link); + $submenu = new WT_Menu($name, $link); $submenu->addIcon('patriarch'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", '', 'icon_small_patriarch'); break; case 'sourcelist.php': - $submenu = new Menu($name, $link); + $submenu = new WT_Menu($name, $link); $submenu->addIcon('menu_source'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", '', 'icon_small_menu_source'); break; case 'notelist.php': - $submenu = new Menu($name, $link); + $submenu = new WT_Menu($name, $link); $submenu->addIcon('menu_note'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", '', 'icon_small_notes'); break; case 'repolist.php': - $submenu = new Menu($name, $link); + $submenu = new WT_Menu($name, $link); $submenu->addIcon('menu_repository'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", '', 'icon_small_menu_repository'); break; case 'placelist.php': - $submenu = new Menu($name, $link); + $submenu = new WT_Menu($name, $link); $submenu->addIcon('place'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", '', 'icon_small_place'); break; case 'medialist.php': if ($MULTI_MEDIA) { - $submenu = new Menu($name, $link); + $submenu = new WT_Menu($name, $link); $submenu->addIcon('menu_media'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", '', 'icon_small_menu_media'); } @@ -543,32 +537,32 @@ class MenuBar { /** * get the menu for the calendar - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getCalendarMenu() { global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER; if ($TEXT_DIRECTION=='rtl') $ff='_rtl'; else $ff=''; if ((!file_exists(WT_ROOT.'calendar.php')) || (!empty($SEARCH_SPIDER))) { - $menu = new Menu('', '', ''); + $menu = new WT_Menu('', '', ''); return $menu; } //-- main calendar menu item - $menu = new Menu(i18n::translate('Calendar'), 'calendar.php?ged='.WT_GEDURL, 'down'); + $menu = new WT_Menu(i18n::translate('Calendar'), 'calendar.php?ged='.WT_GEDURL, 'down'); $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'), 'calendar.php?ged='.WT_GEDURL); + $submenu = new WT_Menu(i18n::translate('View Day'), 'calendar.php?ged='.WT_GEDURL); $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'), "calendar.php?ged=".WT_GEDURL."&action=calendar"); + $submenu = new WT_Menu(i18n::translate('View Month'), "calendar.php?ged=".WT_GEDURL."&action=calendar"); $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'), "calendar.php?ged=".WT_GEDURL."&action=year"); + $submenu = new WT_Menu(i18n::translate('View Year'), "calendar.php?ged=".WT_GEDURL."&action=year"); $submenu->addIcon('calendar'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_calendar"); $menu->addSubmenu($submenu); @@ -577,7 +571,7 @@ class MenuBar { /** * get the reports menu - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getReportsMenu($pid="", $famid="") { global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER, $controller; @@ -593,7 +587,7 @@ class MenuBar { $ff=""; } - $menu = new Menu(i18n::translate('Reports'), 'reportengine.php?ged='.WT_GEDURL, "down"); + $menu = new WT_Menu(i18n::translate('Reports'), 'reportengine.php?ged='.WT_GEDURL, "down"); $menu->addIcon('reports'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_reports"); @@ -607,7 +601,7 @@ class MenuBar { /** * get the search menu - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getSearchMenu() { global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER; @@ -617,27 +611,27 @@ class MenuBar { return null; } //-- main search menu item - $menu = new Menu(i18n::translate('Search'), 'search.php?ged='.WT_GEDURL, "down"); + $menu = new WT_Menu(i18n::translate('Search'), 'search.php?ged='.WT_GEDURL, "down"); $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'), "search.php?ged=".WT_GEDURL."&action=general"); + $submenu = new WT_Menu(i18n::translate('General Search'), "search.php?ged=".WT_GEDURL."&action=general"); $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'), "search.php?ged=".WT_GEDURL."&action=soundex"); + $submenu = new WT_Menu(i18n::translate('Soundex Search'), "search.php?ged=".WT_GEDURL."&action=soundex"); $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'), "search_advanced.php?ged=".WT_GEDURL); + $submenu = new WT_Menu(i18n::translate('Advanced search'), "search_advanced.php?ged=".WT_GEDURL); $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'), "search.php?ged=".WT_GEDURL."&action=replace"); + $submenu = new WT_Menu(i18n::translate('Search and replace'), "search.php?ged=".WT_GEDURL."&action=replace"); $submenu->addIcon('search'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_search"); $menu->addSubmenu($submenu); @@ -662,7 +656,7 @@ class MenuBar { /** * get the help menu - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getHelpMenu() { global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER, $helpindex, $action; @@ -672,7 +666,7 @@ class MenuBar { return null; } //-- main help menu item - $menu = new Menu(i18n::translate('Help'), "#", "down"); + $menu = new WT_Menu(i18n::translate('Help'), "#", "down"); $menu->addIcon('menu_help'); if (empty($helpindex)) $menu->addOnclick("return helpPopup('".WT_SCRIPT_NAME."');"); @@ -681,7 +675,7 @@ class MenuBar { $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_help"); //-- help_contents sub menu - $submenu = new Menu(i18n::translate('Help contents'), "#"); + $submenu = new WT_Menu(i18n::translate('Help contents'), "#"); $submenu->addIcon('help'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_help"); $submenu->addOnclick("return helpPopup('help_contents_help');"); @@ -689,14 +683,14 @@ class MenuBar { //-- faq sub menu 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"); + $submenu = new WT_Menu(i18n::translate('FAQ'), "module.php?mod=faq&mod_action=show"); $submenu->addIcon('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'); + $submenu = new WT_Menu(i18n::translate('Wiki Main Page'), WT_WEBTREES_WIKI.'" target="_blank'); $submenu->addIcon('wiki'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_wiki"); $menu->addSubmenu($submenu); @@ -705,7 +699,7 @@ class MenuBar { $menu->addSeparator(); $menuitems = contact_menus(); foreach ($menuitems as $menuitem) { - $submenu = new Menu($menuitem["label"], $menuitem["link"]); + $submenu = new WT_Menu($menuitem["label"], $menuitem["link"]); $submenu->addIcon('mypage'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_contact"); if (!empty($menuitem["onclick"])) $submenu->addOnclick($menuitem["onclick"]); @@ -714,9 +708,9 @@ class MenuBar { //-- add show/hide context_help $menu->addSeparator(); if ($_SESSION["show_context_help"]) - $submenu = new Menu(i18n::translate('Hide contextual help'), get_query_url(array('show_context_help'=>'no'))); + $submenu = new WT_Menu(i18n::translate('Hide contextual help'), get_query_url(array('show_context_help'=>'no'))); else - $submenu = new Menu(i18n::translate('Show contextual help'), get_query_url(array('show_context_help'=>'yes'))); + $submenu = new WT_Menu(i18n::translate('Show contextual help'), get_query_url(array('show_context_help'=>'yes'))); $submenu->addIcon('help'); $submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_help"); $menu->addSubmenu($submenu); @@ -725,16 +719,16 @@ class MenuBar { /** * get the menu with links change to each theme - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getThemeMenu() { global $SEARCH_SPIDER, $ALLOW_THEME_DROPDOWN; if ($ALLOW_THEME_DROPDOWN && !$SEARCH_SPIDER && get_site_setting('ALLOW_USER_THEMES')) { - $menu=new Menu(i18n::translate('Theme')); + $menu=new WT_Menu(i18n::translate('Theme')); $menu->addClass('thememenuitem', 'thememenuitem_hover', 'themesubmenu', "icon_small_theme"); foreach (get_theme_names() as $themename=>$themedir) { - $submenu=new Menu($themename, get_query_url(array('theme'=>$themedir))); + $submenu=new WT_Menu($themename, get_query_url(array('theme'=>$themedir))); if ($themedir==WT_THEME_DIR) { $submenu->addClass('favsubmenuitem_selected', 'favsubmenuitem_hover'); } else { @@ -749,31 +743,31 @@ class MenuBar { } /** * get the menu with links change to each color themes subcolor type - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getColorMenu($COLOR_THEME_LIST) { - $menu=new Menu(i18n::translate('Color Palette')); + $menu=new WT_Menu(i18n::translate('Color Palette')); $menu->addClass('thememenuitem', 'thememenuitem_hover', 'themesubmenu', "icon_small_theme"); foreach ($COLOR_THEME_LIST as $colorChoice=>$colorName) { - $submenu=new Menu($colorName, get_query_url(array('themecolor'=>$colorChoice))); + $submenu=new WT_Menu($colorName, get_query_url(array('themecolor'=>$colorChoice))); $menu->addSubMenu($submenu); } return $menu; } /** * get the menu with links to change language - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getLanguageMenu() { global $WT_IMAGES, $TEXT_DIRECTION; if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; - $menu=new Menu(i18n::translate('Language'), '#', 'down'); + $menu=new WT_Menu(i18n::translate('Language'), '#', 'down'); $menu->addClass("langmenuitem$ff", "langmenuitem_hover$ff", "submenu$ff", "icon_language"); foreach (i18n::installed_languages() as $lang=>$name) { - $submenu=new Menu($name, get_query_url(array('lang'=>$lang))); + $submenu=new WT_Menu($name, get_query_url(array('lang'=>$lang))); if ($lang==WT_LOCALE) { $submenu->addClass('favsubmenuitem_selected', 'favsubmenuitem_hover'); } else { @@ -789,7 +783,7 @@ class MenuBar { } /** * get the menu with links to the user/gedcom favorites - * @return Menu the menu item + * @return WT_Menu the menu item */ public static function getFavoritesMenu() { global $REQUIRE_AUTHENTICATION, $GEDCOM, $WT_IMAGES, $TEXT_DIRECTION; @@ -798,7 +792,7 @@ class MenuBar { if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; - $menu=new Menu(i18n::translate('Favorites'), '#', 'down'); + $menu=new WT_Menu(i18n::translate('Favorites'), '#', 'down'); $menu->addIcon('gedcom'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_gedcom"); @@ -818,7 +812,7 @@ class MenuBar { // User favorites if ($userfavs || WT_USER_ID) { - $submenu=new Menu('<strong>'.i18n::translate('My Favorites').'</strong>'); + $submenu=new WT_Menu('<strong>'.i18n::translate('My Favorites').'</strong>'); $submenu->addClass('favsubmenuitem', 'favsubmenuitem_hover'); $menu->addSubMenu($submenu); while (WT_USER_ID && isset($controller)) { @@ -842,7 +836,7 @@ class MenuBar { default: break 2; } - $submenu=new Menu('<em>'.i18n::translate('Add to My Favorites').'</em>', get_query_url(array('action'=>'addfav', 'gid'=>$gid))); + $submenu=new WT_Menu('<em>'.i18n::translate('Add to My Favorites').'</em>', get_query_url(array('action'=>'addfav', 'gid'=>$gid))); $submenu->addClass('favsubmenuitem', 'favsubmenuitem_hover'); $menu->addSubMenu($submenu); break; @@ -851,7 +845,7 @@ class MenuBar { $GEDCOM=$fav['file']; switch($fav['type']) { case 'URL': - $submenu=new Menu(PrintReady($fav['title']), $fav['url']); + $submenu=new WT_Menu(PrintReady($fav['title']), $fav['url']); $submenu->addClass('favsubmenuitem', 'favsubmenuitem_hover'); $menu->addSubMenu($submenu); break; @@ -861,7 +855,7 @@ class MenuBar { case 'OBJE': $obj=WT_GedcomRecord::getInstance($fav['gid']); if ($obj && $obj->canDisplayName()) { - $submenu=new Menu(PrintReady($obj->getFullName()), $obj->getHtmlUrl()); + $submenu=new WT_Menu(PrintReady($obj->getFullName()), $obj->getHtmlUrl()); $submenu->addClass('favsubmenuitem', 'favsubmenuitem_hover'); $menu->addSubMenu($submenu); } @@ -876,14 +870,14 @@ class MenuBar { } // Gedcom favorites if ($gedfavs) { - $submenu=new Menu('<strong>'.i18n::translate('This GEDCOM\'s Favorites').'</strong>'); + $submenu=new WT_Menu('<strong>'.i18n::translate('This GEDCOM\'s Favorites').'</strong>'); $submenu->addClass('favsubmenuitem', 'favsubmenuitem_hover'); $menu->addSubMenu($submenu); foreach ($gedfavs as $fav) { $GEDCOM=$fav['file']; switch($fav['type']) { case 'URL': - $submenu=new Menu(PrintReady($fav['title']), $fav['url']); + $submenu=new WT_Menu(PrintReady($fav['title']), $fav['url']); $submenu->addClass('favsubmenuitem', 'favsubmenuitem_hover'); $menu->addSubMenu($submenu); break; @@ -893,7 +887,7 @@ class MenuBar { case 'OBJE': $obj=WT_GedcomRecord::getInstance($fav['gid']); if ($obj && $obj->canDisplayName()) { - $submenu=new Menu(PrintReady($obj->getFullName()), $obj->getHtmlUrl()); + $submenu=new WT_Menu(PrintReady($obj->getFullName()), $obj->getHtmlUrl()); $submenu->addClass('favsubmenuitem', 'favsubmenuitem_hover'); $menu->addSubMenu($submenu); } @@ -731,7 +731,7 @@ if (check_media_structure()) { if ($TEXT_DIRECTION=="rtl") $classSuffix = "_rtl"; // main link displayed on page - $menu = new Menu(); + $menu = new WT_Menu(); // GEDFact assistant Add Media Links ======================= if (file_exists('modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php')) { @@ -744,17 +744,17 @@ if (check_media_structure()) { } else { $menu->addLabel(i18n::translate('Set link')); $menu->addOnclick("return ilinkitem('$mediaid', 'person')"); - $submenu = new Menu(i18n::translate('To Person')); + $submenu = new WT_Menu(i18n::translate('To Person')); $submenu->addClass("submenuitem".$classSuffix, "submenuitem_hover".$classSuffix); $submenu->addOnclick("return ilinkitem('$mediaid', 'person')"); $menu->addSubMenu($submenu); - $submenu = new Menu(i18n::translate('To Family')); + $submenu = new WT_Menu(i18n::translate('To Family')); $submenu->addClass("submenuitem".$classSuffix, "submenuitem_hover".$classSuffix); $submenu->addOnclick("return ilinkitem('$mediaid', 'family')"); $menu->addSubMenu($submenu); - $submenu = new Menu(i18n::translate('To Source')); + $submenu = new WT_Menu(i18n::translate('To Source')); $submenu->addClass("submenuitem".$classSuffix, "submenuitem_hover".$classSuffix); $submenu->addOnclick("return ilinkitem('$mediaid', 'source')"); $menu->addSubMenu($submenu); diff --git a/modules/GEDFact_assistant/_CENS/census_3_search_add.php b/modules/GEDFact_assistant/_CENS/census_3_search_add.php index e4cc76b15e..7178d6c0f5 100644 --- a/modules/GEDFact_assistant/_CENS/census_3_search_add.php +++ b/modules/GEDFact_assistant/_CENS/census_3_search_add.php @@ -164,10 +164,10 @@ if (!defined('WT_WEBTREES')) { $fulmn = rtrim($nam[$i]['givn'],'*')." ".$nam[$i]['surname']; } } - $menu = new Menu($people["husb"]->getLabel()); + $menu = new WT_Menu($people["husb"]->getLabel()); $slabel = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $people["husb"]->getLabel(), $censdate); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); ?> @@ -299,10 +299,10 @@ if (!defined('WT_WEBTREES')) { $fulmn = rtrim($nam[$i]['givn'],'*')." ".$husbnam; } } - $menu = new Menu($people["wife"]->getLabel()); + $menu = new WT_Menu($people["wife"]->getLabel()); $slabel = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $people["wife"]->getLabel(), $censyear); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); ?> <tr> @@ -439,10 +439,10 @@ if (!defined('WT_WEBTREES')) { } } - $menu = new Menu($child->getLabel()); + $menu = new WT_Menu($child->getLabel()); $slabel = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $child->getLabel(), $censyear); $slabel .= $spouselinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if ($child->getXref()==$pid) { @@ -611,7 +611,7 @@ if (!defined('WT_WEBTREES')) { $fulmn = rtrim($nam[$i]['givn'],'*')." ".$nam[$i]['surname']; } } - $menu = new Menu(); + $menu = new WT_Menu(); if ($people["husb"]->getLabel() == ".") { $menu->addLabel(i18n::translate('Step-Father')); } else { @@ -619,7 +619,7 @@ if (!defined('WT_WEBTREES')) { } $slabel = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $people["husb"]->getLabel(), $censyear); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if (PrintReady($people["husb"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["husb"]->getDeathYear()); } if (PrintReady($people["husb"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["husb"]->getBirthYear()); } @@ -758,7 +758,7 @@ if (!defined('WT_WEBTREES')) { $fulmn = rtrim($nam[$i]['givn'],'*')." ".$husbnam; } } - $menu = new Menu(); + $menu = new WT_Menu(); if ($people["wife"]->getLabel() == ".") { $menu->addLabel(i18n::translate('Step-Mother')); } else { @@ -766,7 +766,7 @@ if (!defined('WT_WEBTREES')) { } $slabel = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $people["wife"]->getLabel(), $censyear); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if (PrintReady($people["wife"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["wife"]->getDeathYear()); } if (PrintReady($people["wife"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["wife"]->getBirthYear()); } @@ -900,10 +900,10 @@ if (!defined('WT_WEBTREES')) { $chfulmn = rtrim($chnam[$i]['givn'],'*')." ".$chnam[$i]['surname']; } } - $menu = new Menu($child->getLabel()); + $menu = new WT_Menu($child->getLabel()); $slabel = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $child->getLabel(), $censyear); $slabel .= $spouselinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if (PrintReady($child->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($child->getDeathYear()); } if (PrintReady($child->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($child->getBirthYear()); } @@ -1054,10 +1054,10 @@ if (!defined('WT_WEBTREES')) { $fulmn = rtrim($nam[$i]['givn'],'*')." ".$nam[$i]['surname']; } } - $menu = new Menu($people["husb"]->getLabel()); + $menu = new WT_Menu($people["husb"]->getLabel()); $slabel = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $people["husb"]->getLabel(), $censyear); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if (PrintReady($people["husb"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["husb"]->getDeathYear()); } if (PrintReady($people["husb"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["husb"]->getBirthYear()); } @@ -1201,10 +1201,10 @@ if (!defined('WT_WEBTREES')) { $fulmn = rtrim($nam[$i]['givn'],'*')." ".$husbnam; } } - $menu = new Menu($people["wife"]->getLabel()); + $menu = new WT_Menu($people["wife"]->getLabel()); $slabel = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $people["wife"]->getLabel(), $censyear); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if (PrintReady($people["wife"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["wife"]->getDeathYear()); } if (PrintReady($people["wife"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["wife"]->getBirthYear()); } @@ -1349,10 +1349,10 @@ if (!defined('WT_WEBTREES')) { $chfulmn = rtrim($chnam[$i]['givn'],'*')." ".$chnam[$i]['surname']; } } - $menu = new Menu($child->getLabel()); + $menu = new WT_Menu($child->getLabel()); $slabel = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $child->getLabel(), $censyear); $slabel .= $spouselinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubmenu($submenu); ?> <tr> diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php index 1e36ec43c0..d2dea6e26e 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php +++ b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php @@ -130,11 +130,11 @@ if (!defined('WT_WEBTREES')) { $fulmn = rtrim($nam[1]['givn'],'*')." ".$nam[1]['surname']; $marn = $nam[1]['surname']; } - $menu = new Menu(" " . $people["husb"]->getLabel()); + $menu = new WT_Menu(" " . $people["husb"]->getLabel()); // $menu->addClass("", "", "submenu"); $slabel = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $currpid, $censyear); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); @@ -214,11 +214,11 @@ if (!defined('WT_WEBTREES')) { $marn = $surn; } - $menu = new Menu(" " . $people["wife"]->getLabel()); + $menu = new WT_Menu(" " . $people["wife"]->getLabel()); //$menu->addClass("", "", "submenu"); $slabel = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $currpid, $censyear); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); ?> <tr> @@ -308,11 +308,11 @@ if (!defined('WT_WEBTREES')) { $marn = $nam[1]['surname']; } - $menu = new Menu(" " . $child->getLabel()); + $menu = new WT_Menu(" " . $child->getLabel()); //$menu->addClass("", "", "submenu"); $slabel = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $currpid, $censyear); $slabel .= $spouselinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if ($child->getXref()==$pid) { @@ -425,7 +425,7 @@ if (!defined('WT_WEBTREES')) { $fulmn = rtrim($nam[1]['givn'],'*')." ".$nam[1]['surname']; $marn = $nam[1]['surname']; } - $menu = new Menu(); + $menu = new WT_Menu(); if ($people["husb"]->getLabel() == ".") { $menu->addLabel(" " . i18n::translate('Step-Father')); } else { @@ -434,7 +434,7 @@ if (!defined('WT_WEBTREES')) { //$menu->addClass("", "", "submenu"); $slabel = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $currpid, $censyear); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if (PrintReady($people["husb"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["husb"]->getDeathYear()); } if (PrintReady($people["husb"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["husb"]->getBirthYear()); } @@ -516,7 +516,7 @@ if (!defined('WT_WEBTREES')) { $fulmn = rtrim($nam[1]['givn'],'*')." ".$nam[1]['surname']; $marn = $nam[1]['surname']; } - $menu = new Menu(); + $menu = new WT_Menu(); if ($people["husb"]->getLabel() == ".") { $menu->addLabel(" " . i18n::translate('Step-Mother')); } else { @@ -525,7 +525,7 @@ if (!defined('WT_WEBTREES')) { //$menu->addClass("", "", "submenu"); $slabel = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $currpid, $censyear); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if (PrintReady($people["wife"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["wife"]->getDeathYear()); } if (PrintReady($people["wife"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["wife"]->getBirthYear()); } @@ -616,11 +616,11 @@ if (!defined('WT_WEBTREES')) { $fulmn = rtrim($nam[1]['givn'],'*')." ".$nam[1]['surname']; $marn = $nam[1]['surname']; } - $menu = new Menu(" " . $child->getLabel()); + $menu = new WT_Menu(" " . $child->getLabel()); //$menu->addClass("", "", "submenu"); $slabel = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $currpid, $censyear); $slabel .= $spouselinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if (PrintReady($child->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($child->getDeathYear()); } if (PrintReady($child->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($child->getBirthYear()); } ?> @@ -708,11 +708,11 @@ if (!defined('WT_WEBTREES')) { $fulmn = rtrim($nam[1]['givn'],'*')." ".$nam[1]['surname']; $marn = $nam[1]['surname']; } - $menu = new Menu(" " . $people["husb"]->getLabel()); + $menu = new WT_Menu(" " . $people["husb"]->getLabel()); //$menu->addClass("", "", "submenu"); $slabel = print_pedigree_person_nav2($people["husb"]->getXref(), 2, 0, $personcount++, $currpid, $censyear); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if (PrintReady($people["husb"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["husb"]->getDeathYear()); } if (PrintReady($people["husb"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["husb"]->getBirthYear()); } @@ -804,11 +804,11 @@ if (!defined('WT_WEBTREES')) { $fulmn = $fulln; $marn = $surn; } - $menu = new Menu(" " . $people["wife"]->getLabel()); + $menu = new WT_Menu(" " . $people["wife"]->getLabel()); //$menu->addClass("", "", "submenu"); $slabel = print_pedigree_person_nav2($people["wife"]->getXref(), 2, 0, $personcount++, $currpid, $censyear); $slabel .= $parentlinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); if (PrintReady($people["wife"]->getDeathYear()) == 0) { $DeathYr = ""; } else { $DeathYr = PrintReady($people["wife"]->getDeathYear()); } if (PrintReady($people["wife"]->getBirthYear()) == 0) { $BirthYr = ""; } else { $BirthYr = PrintReady($people["wife"]->getBirthYear()); } @@ -910,11 +910,11 @@ if (!defined('WT_WEBTREES')) { $fulmn = $fulln; $marn = $surn; } - $menu = new Menu(" " . $child->getLabel()); + $menu = new WT_Menu(" " . $child->getLabel()); //$menu->addClass("", "", "submenu"); $slabel = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $child->getLabel(), $censyear); $slabel .= $spouselinks; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubmenu($submenu); ?> <tr> diff --git a/modules/address_label_report/module.php b/modules/address_label_report/module.php index 1fa74712ba..9374455cf5 100644 --- a/modules/address_label_report/module.php +++ b/modules/address_label_report/module.php @@ -56,7 +56,7 @@ class address_label_report_WT_Module extends WT_Module implements WT_Module_Repo if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $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 e1a9907759..bff200dc24 100644 --- a/modules/address_report/module.php +++ b/modules/address_report/module.php @@ -56,7 +56,7 @@ class address_report_WT_Module extends WT_Module implements WT_Module_Report { if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $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 5fe457f7a5..fb0e9bbd65 100644 --- a/modules/ahnentafel_report/module.php +++ b/modules/ahnentafel_report/module.php @@ -64,7 +64,7 @@ class ahnentafel_report_WT_Module extends WT_Module implements WT_Module_Report } $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); $menu->addIcon('ancestry'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/ancestry_report/module.php b/modules/ancestry_report/module.php index f032b958af..f5eed203c6 100644 --- a/modules/ancestry_report/module.php +++ b/modules/ancestry_report/module.php @@ -61,7 +61,7 @@ class ancestry_report_WT_Module extends WT_Module implements WT_Module_Report { } $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); $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 41f07f6493..73f49b85bd 100644 --- a/modules/bdm_report/module.php +++ b/modules/bdm_report/module.php @@ -56,7 +56,7 @@ class bdm_report_WT_Module extends WT_Module implements WT_Module_Report { if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $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 f445e5c9cb..30bc1390eb 100644 --- a/modules/birth_report/module.php +++ b/modules/birth_report/module.php @@ -56,7 +56,7 @@ class birth_report_WT_Module extends WT_Module implements WT_Module_Report { if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $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 2c43b137ed..d071947670 100644 --- a/modules/cemetery_report/module.php +++ b/modules/cemetery_report/module.php @@ -56,7 +56,7 @@ class cemetery_report_WT_Module extends WT_Module implements WT_Module_Report { if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $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 47f153ac94..152a79939d 100644 --- a/modules/change_report/module.php +++ b/modules/change_report/module.php @@ -56,7 +56,7 @@ class change_report_WT_Module extends WT_Module implements WT_Module_Report { if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $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 0b1cb11e0e..ebf0c42637 100644 --- a/modules/clippings/module.php +++ b/modules/clippings/module.php @@ -71,39 +71,39 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; if ($SEARCH_SPIDER) { - return new Menu("", "", ""); + return new WT_Menu("", "", ""); } //-- main clippings menu item - $menu = new Menu($this->getTitle(), 'module.php?mod=clippings&mod_action=index&ged='.WT_GEDURL, "down"); + $menu = new WT_Menu($this->getTitle(), 'module.php?mod=clippings&mod_action=index&ged='.WT_GEDURL, "down"); $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'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->pid}&type=indi"); + $submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->pid}&type=indi"); $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'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->famid}&type=fam"); + $submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->famid}&type=fam"); $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'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->mid}&type=obje"); + $submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->mid}&type=obje"); $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'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->sid}&type=sour"); + $submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->sid}&type=sour"); $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'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->nid}&type=note"); + $submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->nid}&type=note"); $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'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->rid}&type=repo"); + $submenu = new WT_Menu(i18n::translate('Add to Clippings Cart'), "module.php?mod=clippings&mod_action=index&action=add&id={$controller->rid}&type=repo"); $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 caf9dfbd86..01f86d0f20 100644 --- a/modules/death_report/module.php +++ b/modules/death_report/module.php @@ -56,7 +56,7 @@ class death_report_WT_Module extends WT_Module implements WT_Module_Report { if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $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 33c8985a26..cab0615bbc 100644 --- a/modules/descendancy_report/module.php +++ b/modules/descendancy_report/module.php @@ -64,7 +64,7 @@ class descendancy_report_WT_Module extends WT_Module implements WT_Module_Report } $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); $menu->addIcon('descendant'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/fact_sources/module.php b/modules/fact_sources/module.php index ad7dda6b0f..414bf2d652 100644 --- a/modules/fact_sources/module.php +++ b/modules/fact_sources/module.php @@ -53,7 +53,7 @@ class fact_sources_WT_Module extends WT_Module implements WT_Module_Report { if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $menu->addIcon('menu_source'); $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 1c6deb1680..e69a10a359 100644 --- a/modules/family_group_report/module.php +++ b/modules/family_group_report/module.php @@ -62,7 +62,7 @@ class family_group_report_WT_Module extends WT_Module implements WT_Module_Repor } $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); $menu->addIcon('sfamily'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/family_nav/module.php b/modules/family_nav/module.php index 1eceba1ead..7d51217be3 100644 --- a/modules/family_nav/module.php +++ b/modules/family_nav/module.php @@ -142,7 +142,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { </tr> <?php if (isset($people["husb"])) { - $menu = new Menu(" " . $people["husb"]->getLabel()); + $menu = new WT_Menu(" " . $people["husb"]->getLabel()); // $menu->addClass("", "", "submenu"); if ($TEXT_DIRECTION=="ltr") { $menu->addClass("", "", "submenu flyout2"); @@ -151,7 +151,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } $slabel = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, 0, $personcount++); $slabel .= $parentlinks."<a>"; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); ?> <tr> @@ -172,7 +172,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } if (isset($people["wife"])) { - $menu = new Menu(" " . $people["wife"]->getLabel()); + $menu = new WT_Menu(" " . $people["wife"]->getLabel()); //$menu->addClass("", "", "submenu"); if ($TEXT_DIRECTION=="ltr") { $menu->addClass("", "", "submenu flyout2"); @@ -181,7 +181,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } $slabel = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, 0, $personcount++); $slabel .= $parentlinks."<a>"; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); ?> <tr> @@ -205,7 +205,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { $elderdate = $family->getMarriageDate(); foreach ($people["children"] as $key=>$child) { if ($pid != $child->getXref()) { - $menu = new Menu(" " . $child->getLabel()); + $menu = new WT_Menu(" " . $child->getLabel()); //$menu->addClass("", "", "submenu"); if ($TEXT_DIRECTION=="ltr") { $menu->addClass("", "", "submenu flyout2"); @@ -214,7 +214,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } $slabel = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, 0, $personcount++); $slabel .= $spouselinks."<a>"; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); } ?> @@ -273,7 +273,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { //if (isset($people["husb"]) && $people["husb"]->getLabel() == ".") { if (isset($people["husb"]) ) { - $menu = new Menu(); + $menu = new WT_Menu(); if ($people["husb"]->getLabel() == ".") { $menu->addLabel(i18n::translate('Step-Father')); } else { @@ -287,7 +287,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } $slabel = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, 0, $personcount++); $slabel .= $parentlinks."<a>"; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); ?> <tr> @@ -311,7 +311,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { $styleadd = ""; //if (isset($people["wife"]) && $people["wife"]->getLabel() == ".") { if (isset($people["wife"]) ) { - $menu = new Menu(); + $menu = new WT_Menu(); if ($people["wife"]->getLabel() == ".") { $menu->addLabel(i18n::translate('Step-Mother')); } else { @@ -325,7 +325,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } $slabel = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, 0, $personcount++); $slabel .= $parentlinks."<a>"; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); ?> <tr> @@ -348,7 +348,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { if (isset($people["children"])) { $elderdate = $family->getMarriageDate(); foreach ($people["children"] as $key=>$child) { - $menu = new Menu($child->getLabel()); + $menu = new WT_Menu($child->getLabel()); //$menu->addClass("", "", "submenu"); if ($TEXT_DIRECTION=="ltr") { $menu->addClass("", "", "submenu flyout2"); @@ -357,7 +357,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } $slabel = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, 0, $personcount++); $slabel .= $spouselinks."<a>"; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); ?> <tr> @@ -404,7 +404,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } $styleadd = ""; if (isset($people["husb"]) && $spousetag == 'HUSB') { - $menu = new Menu(" " . $people["husb"]->getLabel()); + $menu = new WT_Menu(" " . $people["husb"]->getLabel()); //$menu->addClass("", "", "submenu"); if ($TEXT_DIRECTION=="ltr") { $menu->addClass("", "", "submenu flyout2"); @@ -413,7 +413,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } $slabel = "</a>".$this->print_pedigree_person_nav($people["husb"]->getXref(), 2, 0, $personcount++); $slabel .= $parentlinks."<a>"; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); ?> <tr> @@ -440,7 +440,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } if (isset($people["wife"]) && $spousetag == 'WIFE') { - $menu = new Menu(" " . $people["wife"]->getLabel()); + $menu = new WT_Menu(" " . $people["wife"]->getLabel()); //$menu->addClass("", "", "submenu"); if ($TEXT_DIRECTION=="ltr") { $menu->addClass("", "", "submenu flyout2"); @@ -449,7 +449,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } $slabel = "</a>".$this->print_pedigree_person_nav($people["wife"]->getXref(), 2, 0, $personcount++); $slabel .= $parentlinks."<a>"; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubMenu($submenu); ?> <tr> @@ -478,7 +478,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { $styleadd = ""; if (isset($people["children"])) { foreach ($people["children"] as $key=>$child) { - $menu = new Menu(" " . $child->getLabel()); + $menu = new WT_Menu(" " . $child->getLabel()); //$menu->addClass("", "", "submenu"); if ($TEXT_DIRECTION=="ltr") { $menu->addClass("", "", "submenu flyout2"); @@ -487,7 +487,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } $slabel = "</a>".$this->print_pedigree_person_nav($child->getXref(), 2, 0, $personcount++); $slabel .= $spouselinks."<a>"; - $submenu = new Menu($slabel); + $submenu = new WT_Menu($slabel); $menu->addSubmenu($submenu); ?> <tr> diff --git a/modules/individual_ext_report/module.php b/modules/individual_ext_report/module.php index d7d539194d..6c4d5c9703 100644 --- a/modules/individual_ext_report/module.php +++ b/modules/individual_ext_report/module.php @@ -64,7 +64,7 @@ class individual_ext_report_WT_Module extends WT_Module implements WT_Module_Rep } $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); $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 2e5cf19244..729c8ba7d2 100644 --- a/modules/individual_report/module.php +++ b/modules/individual_report/module.php @@ -64,7 +64,7 @@ class individual_report_WT_Module extends WT_Module implements WT_Module_Report } $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); $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 bec1c79980..cf8a3aef76 100644 --- a/modules/lightbox/functions/lb_link.php +++ b/modules/lightbox/functions/lb_link.php @@ -52,7 +52,7 @@ if (!defined('WT_WEBTREES')) { if ($TEXT_DIRECTION=="rtl") $classSuffix = "_rtl"; // main link displayed on page - $menu = new Menu(); + $menu = new WT_Menu(); if ($LB_ML_THUMB_LINKS == "icon" || $LB_ML_THUMB_LINKS == "both") { $menu->addIcon('image_link'); } @@ -66,17 +66,17 @@ if (!defined('WT_WEBTREES')) { $menu->addClass("", "", "submenu"); $menu->addFlyout("left"); - $submenu = new Menu(i18n::translate('To Person'), "#"); + $submenu = new WT_Menu(i18n::translate('To Person'), "#"); $submenu->addOnclick("return ilinkitem('$mediaid','person')"); $submenu->addClass("submenuitem".$classSuffix, "submenuitem".$classSuffix); $menu->addSubMenu($submenu); - $submenu = new Menu(i18n::translate('To Family'), "#"); + $submenu = new WT_Menu(i18n::translate('To Family'), "#"); $submenu->addOnclick("return ilinkitem('$mediaid','family')"); $submenu->addClass("submenuitem".$classSuffix, "submenuitem".$classSuffix); $menu->addSubMenu($submenu); - $submenu = new Menu(i18n::translate('To Source'), "#"); + $submenu = new WT_Menu(i18n::translate('To Source'), "#"); $submenu->addOnclick("return ilinkitem('$mediaid','source')"); $submenu->addClass("submenuitem".$classSuffix, "submenuitem".$classSuffix); $menu->addSubMenu($submenu); diff --git a/modules/lightbox/functions/lightbox_print_media_row.php b/modules/lightbox/functions/lightbox_print_media_row.php index 0a4698b4e4..23dc71d567 100644 --- a/modules/lightbox/functions/lightbox_print_media_row.php +++ b/modules/lightbox/functions/lightbox_print_media_row.php @@ -194,7 +194,7 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { $submenu_class = "submenuitem"; $submenu_hoverclass = "submenuitem_hover"; } - $menu = new Menu(); + $menu = new WT_Menu(); // Truncate media title to 13 chars (45 chars if Streetview) and add ellipsis $mtitle = $rawTitle; if (strpos($rowm['m_file'], 'http://maps.google.')===0) { @@ -222,7 +222,7 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { // View Notes if (strpos($rowm['m_gedrec'], "\n1 NOTE")) { - $submenu = new Menu(" " . i18n::translate('View Notes') . " ", "#", "right"); + $submenu = new WT_Menu(" " . i18n::translate('View Notes') . " ", "#", "right"); // Notes Tooltip ---------------------------------------------------- $sonclick = "TipTog("; // Contents of Notes @@ -239,29 +239,29 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { $menu->addSubMenu($submenu); } //View Details - $submenu = new Menu(" " . i18n::translate('View Details') . " ", WT_SERVER_NAME.WT_SCRIPT_PATH . "mediaviewer.php?mid=" . $rowm["m_media"], "right"); + $submenu = new WT_Menu(" " . i18n::translate('View Details') . " ", WT_SERVER_NAME.WT_SCRIPT_PATH . "mediaviewer.php?mid=" . $rowm["m_media"], "right"); $submenu->addClass($submenu_class, $submenu_hoverclass); $menu->addSubMenu($submenu); //View Source if (strpos($rowm['m_gedrec'], "\n1 SOUR") && canDisplayRecord(WT_GED_ID, find_source_record($sour, WT_GED_ID))) { - $submenu = new Menu(" " . i18n::translate('View Source') . " ", WT_SERVER_NAME.WT_SCRIPT_PATH . "source.php?sid=" . $sour, "right"); + $submenu = new WT_Menu(" " . i18n::translate('View Source') . " ", WT_SERVER_NAME.WT_SCRIPT_PATH . "source.php?sid=" . $sour, "right"); $submenu->addClass($submenu_class, $submenu_hoverclass); $menu->addSubMenu($submenu); } if (WT_USER_CAN_EDIT) { // Edit Media - $submenu = new Menu(" " . i18n::translate('Edit media') . " ", "#", "right"); + $submenu = new WT_Menu(" " . i18n::translate('Edit media') . " ", "#", "right"); $submenu->addOnclick("return window.open('addmedia.php?action=editmedia&pid={$rowm['m_media']}&linktoid={$rowm['mm_gid']}', '_blank', 'top=50,left=50,width=600,height=700,resizable=1,scrollbars=1');"); $submenu->addClass($submenu_class, $submenu_hoverclass); $menu->addSubMenu($submenu); if (WT_USER_IS_ADMIN) { // Manage Links - $submenu = new Menu(" " . i18n::translate('Manage links') . " ", "#", "right"); + $submenu = new WT_Menu(" " . i18n::translate('Manage links') . " ", "#", "right"); $submenu->addOnclick("return window.open('inverselink.php?mediaid={$rowm['m_media']}&linkto=manage', '_blank', 'top=50,left=50,width=570,height=650,resizable=1,scrollbars=1');"); $submenu->addClass($submenu_class, $submenu_hoverclass); $menu->addSubMenu($submenu); // Unlink Media - $submenu = new Menu(" " . i18n::translate('Unlink Media') . " ", "#", "right"); + $submenu = new WT_Menu(" " . i18n::translate('Unlink Media') . " ", "#", "right"); $submenu->addOnclick("return delete_record('$pid', 'OBJE', '".$rowm['m_media']."');"); $submenu->addClass($submenu_class, $submenu_hoverclass); $menu->addSubMenu($submenu); diff --git a/modules/marriage_report/module.php b/modules/marriage_report/module.php index ed12f9fe10..953bb838da 100644 --- a/modules/marriage_report/module.php +++ b/modules/marriage_report/module.php @@ -56,7 +56,7 @@ class marriage_report_WT_Module extends WT_Module implements WT_Module_Report { if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $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 5ff5d53f5f..55844c1faa 100644 --- a/modules/missing_facts_report/module.php +++ b/modules/missing_facts_report/module.php @@ -56,7 +56,7 @@ class missing_facts_report_WT_Module extends WT_Module implements WT_Module_Repo if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $menu->addIcon('indis'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/occupation_report/module.php b/modules/occupation_report/module.php index 946481dba3..6960fcbf88 100644 --- a/modules/occupation_report/module.php +++ b/modules/occupation_report/module.php @@ -53,7 +53,7 @@ class occupation_report_WT_Module extends WT_Module implements WT_Module_Report if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $menu->addIcon('indis'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/pedigree_report/module.php b/modules/pedigree_report/module.php index e9d8999e2e..50e49cfbcb 100644 --- a/modules/pedigree_report/module.php +++ b/modules/pedigree_report/module.php @@ -64,12 +64,12 @@ 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='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report_portrait.xml'.$pid); + $menu=new WT_Menu($this->getTitle().' - '.i18n::translate('Portrait'), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report_portrait.xml'.$pid); $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='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report_landscape.xml'.$pid); + $menu=new WT_Menu($this->getTitle().' - '.i18n::translate('Landscape'), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report_landscape.xml'.$pid); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menu->addIcon('pedigree'); $menus[]=$menu; diff --git a/modules/relative_ext_report/module.php b/modules/relative_ext_report/module.php index 93359d2ecf..cdb8c9e59f 100644 --- a/modules/relative_ext_report/module.php +++ b/modules/relative_ext_report/module.php @@ -65,7 +65,7 @@ class relative_ext_report_WT_Module extends WT_Module implements WT_Module_Repor $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); $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 bda1ac8a12..fed8ff5305 100644 --- a/modules/relative_report/module.php +++ b/modules/relative_report/module.php @@ -64,7 +64,7 @@ class relative_report_WT_Module extends WT_Module implements WT_Module_Report { } $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'.$pid); $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 928029cf4e..8fcf05bf7c 100644 --- a/modules/source_report/module.php +++ b/modules/source_report/module.php @@ -56,7 +56,7 @@ class source_report_WT_Module extends WT_Module implements WT_Module_Report { if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; $menus=array(); - $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); + $menu=new WT_Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml'); $menu->addIcon('menu_source'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; diff --git a/modules/theme_select/module.php b/modules/theme_select/module.php index a000d0f9cf..40c74c1357 100644 --- a/modules/theme_select/module.php +++ b/modules/theme_select/module.php @@ -47,9 +47,9 @@ class theme_select_WT_Module extends WT_Module implements WT_Module_Block { public function getBlock($block_id, $template=true, $cfg=null) { $id=$this->getName().$block_id; $title=i18n::translate('Change theme').help_link('change_theme'); - $menu=MenuBar::getThemeMenu(); + $menu=WT_MenuBar::getThemeMenu(); if ($menu) { - $content='<br /><div class="center theme_form">'.MenuBar::getThemeMenu()->getMenuAsDropdown().'</div><br />'; + $content='<br /><div class="center theme_form">'.WT_MenuBar::getThemeMenu()->getMenuAsDropdown().'</div><br />'; if ($template) { require WT_THEME_DIR.'templates/block_main_temp.php'; diff --git a/themes/clouds/header.php b/themes/clouds/header.php index 7d8ed23dd7..4be5c2d7c0 100644 --- a/themes/clouds/header.php +++ b/themes/clouds/header.php @@ -141,49 +141,49 @@ echo '<table id="toplinks">', '<td class="toplinks_left">', '<table align="', $TEXT_DIRECTION=="ltr"?"left":"right", '">', '<tr>'; - $menu=MenuBar::getGedcomMenu(); + $menu=WT_MenuBar::getGedcomMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getMyPageMenu(); + $menu=WT_MenuBar::getMyPageMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getChartsMenu(); + $menu=WT_MenuBar::getChartsMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getListsMenu(); + $menu=WT_MenuBar::getListsMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getCalendarMenu(); + $menu=WT_MenuBar::getCalendarMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getReportsMenu(); + $menu=WT_MenuBar::getReportsMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getSearchMenu(); + $menu=WT_MenuBar::getSearchMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menus=MenuBar::getModuleMenus(); + $menus=WT_MenuBar::getModuleMenus(); foreach ($menus as $menu) { if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } } - $menu=MenuBar::getHelpMenu(); + $menu=WT_MenuBar::getHelpMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; @@ -193,14 +193,14 @@ echo '<table id="toplinks">', if (empty($SEARCH_SPIDER)) { echo '<td class="toplinks_right">'; echo '<div style="float:', WT_CSS_REVERSE_ALIGN, ';"><ul class="makeMenu">'; - echo MenuBar::getFavoritesMenu()->getMenuAsList(); + echo WT_MenuBar::getFavoritesMenu()->getMenuAsList(); global $ALLOW_THEME_DROPDOWN; - $language_menu=MenuBar::getLanguageMenu(); + $language_menu=WT_MenuBar::getLanguageMenu(); if ($language_menu) { echo ' | ', $language_menu->getMenuAsList(); } if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) { - echo ' | ', MenuBar::getThemeMenu()->getMenuAsList(); + echo ' | ', WT_MenuBar::getThemeMenu()->getMenuAsList(); } echo '</ul></div></td>'; } diff --git a/themes/colors/header.php b/themes/colors/header.php index ca436738d2..e70b419402 100644 --- a/themes/colors/header.php +++ b/themes/colors/header.php @@ -126,14 +126,14 @@ if ($view!='simple') { } else { echo '<li>', login_link('class="icon_color"'), '</li>'; } - echo '<span class="link"> | ', MenuBar::getFavoritesMenu()->getMenuAsList(); - $language_menu=MenuBar::getLanguageMenu(); + echo '<span class="link"> | ', WT_MenuBar::getFavoritesMenu()->getMenuAsList(); + $language_menu=WT_MenuBar::getLanguageMenu(); if ($language_menu) { echo ' | ', $language_menu->getMenuAsList(); } global $ALLOW_THEME_DROPDOWN; if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) { - echo ' | ', MenuBar::getThemeMenu()->getMenuAsList(); + echo ' | ', WT_MenuBar::getThemeMenu()->getMenuAsList(); } echo '</span> | <form style="display:inline;" action="search.php" method="get">', @@ -154,49 +154,49 @@ if ($view!='simple') { '<table id="toplinks"><tr><td class="toplinks_left">', '<table align="', $TEXT_DIRECTION=="ltr"?"left":"right", '">', '<tr>'; - $menu=MenuBar::getGedcomMenu(); + $menu=WT_MenuBar::getGedcomMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getMyPageMenu(); + $menu=WT_MenuBar::getMyPageMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getChartsMenu(); + $menu=WT_MenuBar::getChartsMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getListsMenu(); + $menu=WT_MenuBar::getListsMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getCalendarMenu(); + $menu=WT_MenuBar::getCalendarMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getReportsMenu(); + $menu=WT_MenuBar::getReportsMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getSearchMenu(); + $menu=WT_MenuBar::getSearchMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } - $menus=MenuBar::getModuleMenus(); + $menus=WT_MenuBar::getModuleMenus(); foreach ($menus as $m=>$menu) { if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; } } - $menu=MenuBar::getHelpMenu(); + $menu=WT_MenuBar::getHelpMenu(); if ($menu) { $menu->addLabel('', 'none'); echo '<td>', $menu->getMenu(), '</td>'; diff --git a/themes/colors/theme.php b/themes/colors/theme.php index a9fc809b6f..77d9a2a448 100644 --- a/themes/colors/theme.php +++ b/themes/colors/theme.php @@ -39,9 +39,9 @@ function color_theme_dropdown($style=0) { if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) { switch ($style) { case 0: - return '<div class="color_form">'.MenuBar::getColorMenu($COLOR_THEME_LIST)->getMenuAsDropdown().'</div>'; + return '<div class="color_form">'.WT_MenuBar::getColorMenu($COLOR_THEME_LIST)->getMenuAsDropdown().'</div>'; case 1: - return '<div class="color_form">'.MenuBar::getColorMenu($COLOR_THEME_LIST)->getMenu().'</div>'; + return '<div class="color_form">'.WT_MenuBar::getColorMenu($COLOR_THEME_LIST)->getMenu().'</div>'; } } return ' '; diff --git a/themes/fab/header.php b/themes/fab/header.php index 71e180ba59..429f14fd82 100644 --- a/themes/fab/header.php +++ b/themes/fab/header.php @@ -86,9 +86,9 @@ if ($view!='simple') { // Use "simple" headers for popup windows if ($SEARCH_SPIDER) { // Search engines get a reduced menu $menu_items=array( - MenuBar::getGedcomMenu(), - MenuBar::getListsMenu(), - MenuBar::getCalendarMenu() + WT_MenuBar::getGedcomMenu(), + WT_MenuBar::getListsMenu(), + WT_MenuBar::getCalendarMenu() ); } else { // Options for real users @@ -106,14 +106,14 @@ if ($view!='simple') { // Use "simple" headers for popup windows } else { echo '<li>', login_link(), '</li>'; } - echo '<span class="link"> | ', MenuBar::getFavoritesMenu()->getMenuAsList(); - $language_menu=MenuBar::getLanguageMenu(); + echo '<span class="link"> | ', WT_MenuBar::getFavoritesMenu()->getMenuAsList(); + $language_menu=WT_MenuBar::getLanguageMenu(); if ($language_menu) { echo ' | ', $language_menu->getMenuAsList(); } global $ALLOW_THEME_DROPDOWN; if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) { - echo ' | ', MenuBar::getThemeMenu()->getMenuAsList(); + echo ' | ', WT_MenuBar::getThemeMenu()->getMenuAsList(); } echo '</span> | <form style="display:inline;" action="search.php" method="get">', @@ -123,18 +123,18 @@ if ($view!='simple') { // Use "simple" headers for popup windows '</form>', '</ul></div>'; $menu_items=array( - MenuBar::getGedcomMenu(), - MenuBar::getMyPageMenu(), - MenuBar::getChartsMenu(), - MenuBar::getListsMenu(), - MenuBar::getCalendarMenu(), - MenuBar::getReportsMenu(), - MenuBar::getSearchMenu(), + WT_MenuBar::getGedcomMenu(), + WT_MenuBar::getMyPageMenu(), + WT_MenuBar::getChartsMenu(), + WT_MenuBar::getListsMenu(), + WT_MenuBar::getCalendarMenu(), + WT_MenuBar::getReportsMenu(), + WT_MenuBar::getSearchMenu(), ); - foreach (MenuBar::getModuleMenus() as $menu) { + foreach (WT_MenuBar::getModuleMenus() as $menu) { $menu_items[]=$menu; } - $menu_items[]=MenuBar::getHelpMenu(); + $menu_items[]=WT_MenuBar::getHelpMenu(); echo '<div style="float:', WT_CSS_ALIGN, '; clear:', WT_CSS_ALIGN, '; font-size:175%;">', diff --git a/themes/minimal/header.php b/themes/minimal/header.php index b64cc80678..a931897ac3 100644 --- a/themes/minimal/header.php +++ b/themes/minimal/header.php @@ -107,11 +107,11 @@ if (!defined('WT_WEBTREES')) { <?php if (empty($SEARCH_SPIDER)) { ?> <td align="<?php echo $TEXT_DIRECTION=="rtl"?"left":"right"; ?>" valign="middle" > <?php - $menu=MenuBar::getThemeMenu(); + $menu=WT_MenuBar::getThemeMenu(); if ($menu) { echo $menu->getMenuAsDropdown(); } - $menu=MenuBar::getLanguageMenu(); + $menu=WT_MenuBar::getLanguageMenu(); if ($menu) { echo $menu->getMenuAsDropdown(); } @@ -136,49 +136,49 @@ if (!defined('WT_WEBTREES')) { <table width="100%" border="1" cellspacing="0"> <tr> <?php - $menu=MenuBar::getGedcomMenu(); + $menu=WT_MenuBar::getGedcomMenu(); if ($menu) { $menu->addIcon(null); echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getMyPageMenu(); + $menu=WT_MenuBar::getMyPageMenu(); if ($menu) { $menu->addIcon(null); echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getChartsMenu(); + $menu=WT_MenuBar::getChartsMenu(); if ($menu) { $menu->addIcon(null); echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getListsMenu(); + $menu=WT_MenuBar::getListsMenu(); if ($menu) { $menu->addIcon(null); echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getCalendarMenu(); + $menu=WT_MenuBar::getCalendarMenu(); if ($menu) { $menu->addIcon(null); echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getReportsMenu(); + $menu=WT_MenuBar::getReportsMenu(); if ($menu) { $menu->addIcon(null); echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getSearchMenu(); + $menu=WT_MenuBar::getSearchMenu(); if ($menu) { $menu->addIcon(null); echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menus=MenuBar::getModuleMenus(); + $menus=WT_MenuBar::getModuleMenus(); foreach ($menus as $menu) { if ($menu) { $menu->addIcon(null); echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } } - $menu=MenuBar::getHelpMenu(); + $menu=WT_MenuBar::getHelpMenu(); if ($menu) { $menu->addIcon(null); echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php index 6df52994fb..974bfc9725 100644 --- a/themes/webtrees/header.php +++ b/themes/webtrees/header.php @@ -108,12 +108,12 @@ if ($view!='simple') { '<div align="', $TEXT_DIRECTION=="rtl"?"left":"right", '">', '<ul class="makeMenu" align="', $TEXT_DIRECTION=="rtl"?"left":"right", '" >'; if (!$SEARCH_SPIDER) { - echo MenuBar::getFavoritesMenu()->getMenuAsList(); + echo WT_MenuBar::getFavoritesMenu()->getMenuAsList(); global $ALLOW_THEME_DROPDOWN; if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) { - echo ' | ', MenuBar::getThemeMenu()->getMenuAsList(); + echo ' | ', WT_MenuBar::getThemeMenu()->getMenuAsList(); } - $language_menu=MenuBar::getLanguageMenu(); + $language_menu=WT_MenuBar::getLanguageMenu(); if ($language_menu) { echo ' | ', $language_menu->getMenuAsList(); } @@ -149,41 +149,41 @@ if ($view!='simple') { '<img src="', $WT_IMAGES['hline'], '" width="100%" height="3" alt="" />', '<table id="topMenu" width="100%">', '<tr>'; - $menu=MenuBar::getGedcomMenu(); + $menu=WT_MenuBar::getGedcomMenu(); if ($menu) { echo '<td width="1" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getMyPageMenu(); + $menu=WT_MenuBar::getMyPageMenu(); if ($menu) { echo '<td width="1" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getChartsMenu(); + $menu=WT_MenuBar::getChartsMenu(); if ($menu) { echo '<td width="1" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getListsMenu(); + $menu=WT_MenuBar::getListsMenu(); if ($menu) { echo '<td width="1" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getCalendarMenu(); + $menu=WT_MenuBar::getCalendarMenu(); if ($menu) { echo '<td width="1" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getReportsMenu(); + $menu=WT_MenuBar::getReportsMenu(); if ($menu) { echo '<td width="1" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getSearchMenu(); + $menu=WT_MenuBar::getSearchMenu(); if ($menu) { echo '<td width="1" valign="top">', $menu->getMenu(), '</td>'; } - $menus=MenuBar::getModuleMenus(); + $menus=WT_MenuBar::getModuleMenus(); foreach ($menus as $m=>$menu) { if ($menu) { echo '<td width="1" valign="top">', $menu->getMenu(), '</td>'; } } - $menu=MenuBar::getHelpMenu(); + $menu=WT_MenuBar::getHelpMenu(); if ($menu) { echo '<td width="1" valign="top">', $menu->getMenu(), '</td>'; } diff --git a/themes/xenea/header.php b/themes/xenea/header.php index 234070453a..c60320443e 100644 --- a/themes/xenea/header.php +++ b/themes/xenea/header.php @@ -121,7 +121,7 @@ $displayDate=timestamp_to_gedcom_date(client_time())->Display(false, $DATE_FORMA <td width="10" height="40"><img src="<?php echo WT_THEME_DIR; ?>images/pixel.gif" width="1" height="18" alt="" /></td> <td width="115"><div id="favtheme" align="<?php echo $TEXT_DIRECTION=="rtl"?"right":"left"; ?>" > <?php - $menu=MenuBar::getThemeMenu(); + $menu=WT_MenuBar::getThemeMenu(); if ($menu) { echo $menu->getMenu(); } @@ -143,7 +143,7 @@ $displayDate=timestamp_to_gedcom_date(client_time())->Display(false, $DATE_FORMA </div></td> <td width="120" align="<?php echo $TEXT_DIRECTION=="rtl"?"left":"right"; ?>" > <div class="makeMenu"><?php - $language_menu=MenuBar::getLanguageMenu(); + $language_menu=WT_MenuBar::getLanguageMenu(); if ($language_menu) { echo $language_menu->getMenuAsList(); } @@ -164,41 +164,41 @@ $displayDate=timestamp_to_gedcom_date(client_time())->Display(false, $DATE_FORMA </td> <?php - $menu=MenuBar::getGedcomMenu(); + $menu=WT_MenuBar::getGedcomMenu(); if ($menu) { echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getMyPageMenu(); + $menu=WT_MenuBar::getMyPageMenu(); if ($menu) { echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getChartsMenu(); + $menu=WT_MenuBar::getChartsMenu(); if ($menu) { echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getListsMenu(); + $menu=WT_MenuBar::getListsMenu(); if ($menu) { echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getCalendarMenu(); + $menu=WT_MenuBar::getCalendarMenu(); if ($menu) { echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getReportsMenu(); + $menu=WT_MenuBar::getReportsMenu(); if ($menu) { echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menu=MenuBar::getSearchMenu(); + $menu=WT_MenuBar::getSearchMenu(); if ($menu) { echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } - $menus=MenuBar::getModuleMenus(); + $menus=WT_MenuBar::getModuleMenus(); foreach ($menus as $menu) { if ($menu) { echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } } - $menu=MenuBar::getHelpMenu(); + $menu=WT_MenuBar::getHelpMenu(); if ($menu) { echo '<td width="7%" valign="top">', $menu->getMenu(), '</td>'; } |