diff options
| -rw-r--r-- | individual.php | 6 | ||||
| -rw-r--r-- | modules/all_tab/module.php | 4 | ||||
| -rw-r--r-- | modules/googlemap/googlemap.php | 5 | ||||
| -rw-r--r-- | modules/googlemap/module.php | 25 | ||||
| -rw-r--r-- | modules/lightbox/module.php | 10 | ||||
| -rw-r--r-- | modules/random_media/module.php | 2 |
6 files changed, 21 insertions, 31 deletions
diff --git a/individual.php b/individual.php index 625cc6cb98..0432f8825b 100644 --- a/individual.php +++ b/individual.php @@ -254,13 +254,13 @@ if (!$controller->indi->canDisplayDetails()) { // Unfortunately, this shows in a tool-tip. How to improve this? if ($tab->getName()==$controller->default_tab) { // Default tab loads immediately - echo '<li class="ui-state-default ui-corner-top ui-tabs-selected"><a title="', $tab->getTitle(), '" href="#', $tab->getName(), '">'; + echo '<li class="ui-state-default ui-corner-top ui-tabs-selected"><a title="', $tab->getName(), '" href="#', $tab->getName(), '">'; } elseif ($tab->canLoadAjax()) { // AJAX tabs load later - echo '<li class="ui-state-default ui-corner-top"><a title="', $tab->getTitle(), '" href="individual.php?action=ajax&module=', $tab->getName(), '&pid=', $controller->pid, '">'; + echo '<li class="ui-state-default ui-corner-top"><a title="', $tab->getName(), '" href="individual.php?action=ajax&module=', $tab->getName(), '&pid=', $controller->pid, '">'; } else { // Non-AJAX tabs load immediately (search engines don't load ajax) - echo '<li class="ui-state-default ui-corner-top"><a title="', $tab->getTitle(), '" href="#', $tab->getName(), '">'; + echo '<li class="ui-state-default ui-corner-top"><a title="', $tab->getName(), '" href="#', $tab->getName(), '">'; } echo '<span>', $tab->getTitle(), '</span></a></li>'; } diff --git a/modules/all_tab/module.php b/modules/all_tab/module.php index 293ba65a6a..8660abd97f 100644 --- a/modules/all_tab/module.php +++ b/modules/all_tab/module.php @@ -55,7 +55,7 @@ class all_tab_WT_Module extends WT_Module implements WT_Module_Tab { // Implement WT_Module_Tab public function getTabContent() { - $out = "<div id=\"all_content\">"; + $out = '<div id="'.$this->getName().'_content">'; $out .= "<!-- all tab doesn't have it's own content -->"; $out .= "</div>"; return $out; @@ -85,7 +85,7 @@ class all_tab_WT_Module extends WT_Module implements WT_Module_Tab { } $out.= ' jQuery("#tabs > div").each(function() {'. - ' if (this.name!="all_tab") {'. + ' if (this.name!="'.$this->getName().'") {'. ' jQuery(this).removeClass("ui-tabs-hide");'. ' }'. ' });'. diff --git a/modules/googlemap/googlemap.php b/modules/googlemap/googlemap.php index 37196788be..b18eaaeeb2 100644 --- a/modules/googlemap/googlemap.php +++ b/modules/googlemap/googlemap.php @@ -420,6 +420,7 @@ function create_indiv_buttons() { return new GControlPosition(G_ANCHOR_TOP_RIGHT, new GSize(2, 2)); } var map_type; + --> </script> <?php } @@ -442,8 +443,8 @@ function build_indiv_map($indifacts, $famids) { echo "\n\t</table>\n<br />"; ?> <script type="text/javascript"> - document.getElementById("googlemap_left").innerHTML = document.getElementById("googlemap_content").innerHTML; - document.getElementById("googlemap_content").innerHTML = ""; + document.getElementById("googlemap_left").innerHTML = document.getElementById("map_content").innerHTML; + document.getElementById("map_content").innerHTML = ""; </script> <?php return; diff --git a/modules/googlemap/module.php b/modules/googlemap/module.php index 8c9e37ac8c..ea6b03e317 100644 --- a/modules/googlemap/module.php +++ b/modules/googlemap/module.php @@ -94,7 +94,6 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu ob_start(); ?> -<div id="gg_map_content"> <table border="0" width="100%"> <tr> <td><?php @@ -103,7 +102,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu print "<tr><td id=\"no_tab8\" colspan=\"2\" class=\"facts_value\">".i18n::translate('GoogleMap module disabled')."</td></tr>\n"; if (WT_USER_IS_ADMIN) { print "<tr><td align=\"center\" colspan=\"2\">\n"; - print "<a href=\"module.php?mod=googlemap&mod_action=editconfig\">".i18n::translate('Manage GoogleMap configuration')."</a>"; + print "<a href=\"module.php?mod=".$this->getName()."&mod_action=editconfig\">".i18n::translate('Manage GoogleMap configuration')."</a>"; print "</td>"; print "</tr>\n"; } @@ -115,14 +114,14 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu //--> </script> <?php } else { - $tNew = str_replace(array("&HIDE_GOOGLEMAP=true", "&HIDE_GOOGLEMAP=false", "action=ajax&module=googlemap&"), "", $_SERVER["REQUEST_URI"]); + $tNew = str_replace(array("&HIDE_GOOGLEMAP=true", "&HIDE_GOOGLEMAP=false", "action=ajax&module=".$this->getName()."&"), "", $_SERVER["REQUEST_URI"]); $tNew = str_replace("&", "&", $tNew); if($SESSION_HIDE_GOOGLEMAP=="true") { - print " <span class=\"font9\"><a href=\"".$tNew."&HIDE_GOOGLEMAP=false#googlemap\">"; + print " <span class=\"font9\"><a href=\"".$tNew."&HIDE_GOOGLEMAP=false#".$this->getName()."\">"; print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["plus"]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"".i18n::translate('Activate')."\" title=\"".i18n::translate('Activate')."\" />"; print " ".i18n::translate('Activate')."</a></span>\n"; } else { - print " <span class=\"font9\"><a href=\"" .$tNew."&HIDE_GOOGLEMAP=true#googlemap\">"; + print " <span class=\"font9\"><a href=\"" .$tNew."&HIDE_GOOGLEMAP=true#".$this->getName()."\">"; print "<img src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["minus"]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"".i18n::translate('Deactivate')."\" title=\"".i18n::translate('Deactivate')."\" />"; print " ".i18n::translate('Deactivate')."</a></span>\n"; } @@ -145,22 +144,20 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu if (WT_USER_IS_ADMIN) { print "<table width=\"100%\"><tr>\n"; print "<td width=\"33%\" align=\"left\">\n"; - print "<a href=\"module.php?mod=googlemap&mod_action=editconfig\">".i18n::translate('Manage GoogleMap configuration')."</a>"; + print "<a href=\"module.php?mod=".$this->getName()."&mod_action=editconfig\">".i18n::translate('Manage GoogleMap configuration')."</a>"; print "</td>\n"; print "<td width=\"33%\" align=\"center\">\n"; - print "<a href=\"module.php?mod=googlemap&mod_action=places\">".i18n::translate('Edit geographic place locations')."</a>"; + print "<a href=\"module.php?mod=".$this->getName()."&mod_action=places\">".i18n::translate('Edit geographic place locations')."</a>"; print "</td>\n"; print "<td width=\"33%\" align=\"right\">\n"; - print "<a href=\"module.php?mod=googlemap&mod_action=placecheck\">".i18n::translate('Place Check')."</a>"; + print "<a href=\"module.php?mod=".$this->getName()."&mod_action=placecheck\">".i18n::translate('Place Check')."</a>"; print "</td>\n"; print "</tr></table>\n"; } print "</div>\n"; print "</td>\n"; print "<td valign=\"top\" width=\"30%\">\n"; - print "<div id=\"googlemap_content\">\n"; - //setup_map(); - + print "<div id=\"map_content\">\n"; $famids = array(); $families = $this->controller->indi->getSpouseFamilies(); foreach ($families as $famid=>$family) { @@ -168,7 +165,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu } $this->controller->indi->add_family_facts(false); create_indiv_buttons(); - build_indiv_map($this->controller->getIndiFacts(), $famids); + build_indiv_map($this->controller->indi->getIndiFacts(), $famids); print "</div>\n"; print "</td>"; print "</tr></table>\n"; @@ -183,10 +180,8 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu </td> </tr> </table> -</div> -</div> <?php - return ob_get_clean(); + return '<div id="'.$this->getName().'_content">'.ob_get_clean().'</div>'; } // Implement WT_Module_Tab diff --git a/modules/lightbox/module.php b/modules/lightbox/module.php index 62e5a20739..9440fe88d7 100644 --- a/modules/lightbox/module.php +++ b/modules/lightbox/module.php @@ -87,8 +87,7 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul ob_start(); $mediacnt = $this->get_media_count(); require_once 'modules/lightbox/functions/lb_head.php'; - echo "<div id=\"lightbox2_content\">"; - + $media_found = false; if (!$this->controller->indi->canDisplayDetails()) { print "<table class=\"facts_table\" cellpadding=\"0\">\n"; @@ -101,12 +100,7 @@ class lightbox_WT_Module extends WT_Module implements WT_Module_Config, WT_Modul include_once('modules/lightbox/album.php'); } } - echo "</div>"; - - $out = ob_get_contents(); - ob_end_clean(); - $out .= "</div>"; - return $out; + return '<div id="'.$this->getName().'_content">'.ob_get_clean().'</div>'; } // Implement WT_Module_Tab diff --git a/modules/random_media/module.php b/modules/random_media/module.php index 0766b7ee73..8acfd68dfa 100644 --- a/modules/random_media/module.php +++ b/modules/random_media/module.php @@ -273,7 +273,7 @@ function openPic(filename, width, height) { // $content .= " ><a href=\"javascript:;\" onclick=\"return openImage('".$medialist[$value]["FILE"]."', $imgwidth, $imgheight);\">"; // $content .= "><a href=\"" . $medialist[$value]["FILE"] . "\" rel=\"clearbox[general_4]\" title=\"" . $mediaid . "\">" . "\n"; $content .= " ><a href=\"mediaviewer.php?mid=".$mediaid."\">"; - }else + }else // --------------------------------------------------------------------------------------------- |