diff options
Diffstat (limited to 'includes/controllers')
| -rw-r--r-- | includes/controllers/ancestry_ctrl.php | 8 | ||||
| -rw-r--r-- | includes/controllers/descendancy_ctrl.php | 10 | ||||
| -rw-r--r-- | includes/controllers/hourglass_ctrl.php | 36 | ||||
| -rw-r--r-- | includes/controllers/individual_ctrl.php | 10 | ||||
| -rw-r--r-- | includes/controllers/timeline_ctrl.php | 4 |
5 files changed, 34 insertions, 34 deletions
diff --git a/includes/controllers/ancestry_ctrl.php b/includes/controllers/ancestry_ctrl.php index 35f3811078..9514c5f06b 100644 --- a/includes/controllers/ancestry_ctrl.php +++ b/includes/controllers/ancestry_ctrl.php @@ -107,10 +107,10 @@ class AncestryController extends BaseController { print "\r\n<li>"; print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td><a name=\"sosa".$sosa."\"></a>"; $new=($pid=="" or !isset($pidarr["$pid"])); - if ($sosa==1) print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n"; + if ($sosa==1) print "<img src=\"".$WT_IMAGES["spacer"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n"; else { - print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"2\" border=\"0\" alt=\"\" />"; - print "<img src=\"".$WT_IMAGES["hline"]["other"]."\" height=\"3\" width=\"".($Dindent-2)."\" border=\"0\" alt=\"\" /></td><td>\n"; + print "<img src=\"".$WT_IMAGES["spacer"]."\" height=\"3\" width=\"2\" border=\"0\" alt=\"\" />"; + print "<img src=\"".$WT_IMAGES["hline"]."\" height=\"3\" width=\"".($Dindent-2)."\" border=\"0\" alt=\"\" /></td><td>\n"; } print_pedigree_person($pid, 1); print "</td>"; @@ -151,7 +151,7 @@ class AncestryController extends BaseController { if (($parents || $SHOW_EMPTY_BOXES) && $new && $depth>0) { // print marriage info print "<span class=\"details1\" style=\"white-space: nowrap;\" >"; - print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"2\" width=\"$Dindent\" border=\"0\" align=\"middle\" alt=\"\" /><a href=\"javascript: ".i18n::translate('View Family')."\" onclick=\"expand_layer('sosa_".$sosa."'); return false;\" class=\"top\"><img id=\"sosa_".$sosa."_img\" src=\"".$WT_IMAGES["minus"]["other"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".i18n::translate('View Family')."\" /></a> "; + print "<img src=\"".$WT_IMAGES["spacer"]."\" height=\"2\" width=\"$Dindent\" border=\"0\" align=\"middle\" alt=\"\" /><a href=\"javascript: ".i18n::translate('View Family')."\" onclick=\"expand_layer('sosa_".$sosa."'); return false;\" class=\"top\"><img id=\"sosa_".$sosa."_img\" src=\"".$WT_IMAGES["minus"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".i18n::translate('View Family')."\" /></a> "; print " <span class=\"person_box\"> ".($sosa*2)." </span> ".i18n::translate('and'); print " <span class=\"person_boxF\"> ".($sosa*2+1)." </span> "; if (!empty($family)) { diff --git a/includes/controllers/descendancy_ctrl.php b/includes/controllers/descendancy_ctrl.php index 99bb5a8c18..d5afb0a9d2 100644 --- a/includes/controllers/descendancy_ctrl.php +++ b/includes/controllers/descendancy_ctrl.php @@ -157,10 +157,10 @@ function print_child_descendancy(&$person, $depth) { //print_r($person); print "<li>"; print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td>"; - if ($depth==$this->generations) print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n"; + if ($depth==$this->generations) print "<img src=\"".$WT_IMAGES["spacer"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n"; else { - print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"3\" border=\"0\" alt=\"\" />"; - print "<img src=\"".$WT_IMAGES["hline"]["other"]."\" height=\"3\" width=\"".($Dindent-3)."\" border=\"0\" alt=\"\" /></td><td>\n"; + print "<img src=\"".$WT_IMAGES["spacer"]."\" height=\"3\" width=\"3\" border=\"0\" alt=\"\" />"; + print "<img src=\"".$WT_IMAGES["hline"]."\" height=\"3\" width=\"".($Dindent-3)."\" border=\"0\" alt=\"\" /></td><td>\n"; } print_pedigree_person($person->getXref(), 1, 0, $personcount); print "</td>"; @@ -233,9 +233,9 @@ function print_family_descendancy(&$person, &$family, $depth) { // print marriage info print "<li>"; - print "<img src=\"".$WT_IMAGES["spacer"]["other"]."\" height=\"2\" width=\"".($Dindent+4)."\" border=\"0\" alt=\"\" />"; + print "<img src=\"".$WT_IMAGES["spacer"]."\" height=\"2\" width=\"".($Dindent+4)."\" border=\"0\" alt=\"\" />"; print "<span class=\"details1\" style=\"white-space: nowrap; \" >"; - print "<a href=\"#\" onclick=\"expand_layer('".$famid.$personcount."'); return false;\" class=\"top\"><img id=\"".$famid.$personcount."_img\" src=\"".$WT_IMAGES["minus"]["other"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".i18n::translate('View Family')."\" /></a>"; + print "<a href=\"#\" onclick=\"expand_layer('".$famid.$personcount."'); return false;\" class=\"top\"><img id=\"".$famid.$personcount."_img\" src=\"".$WT_IMAGES["minus"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".i18n::translate('View Family')."\" /></a>"; $marriage = $family->getMarriage(); if ($marriage->canShow()) { echo ' <a href="', encode_url($family->getLinkUrl()), '" class="details1">'; diff --git a/includes/controllers/hourglass_ctrl.php b/includes/controllers/hourglass_ctrl.php index fbaddcf804..5ee46732a3 100644 --- a/includes/controllers/hourglass_ctrl.php +++ b/includes/controllers/hourglass_ctrl.php @@ -90,13 +90,13 @@ class HourglassController extends BaseController { //-- flip the arrows for RTL languages if ($TEXT_DIRECTION=="rtl") { - $temp = $WT_IMAGES['larrow']['other']; - $WT_IMAGES['larrow']['other'] = $WT_IMAGES['rarrow']['other']; - $WT_IMAGES['rarrow']['other'] = $temp; + $temp = $WT_IMAGES['larrow']; + $WT_IMAGES['larrow'] = $WT_IMAGES['rarrow']; + $WT_IMAGES['rarrow'] = $temp; } //-- get the width and height of the arrow images for adjusting spacing - if (file_exists($WT_IMAGES['larrow']['other'])) { - $temp = getimagesize($WT_IMAGES['larrow']['other']); + if (file_exists($WT_IMAGES['larrow'])) { + $temp = getimagesize($WT_IMAGES['larrow']); $this->arrwidth = $temp[0]; $this->arrheight= $temp[1]; } @@ -141,8 +141,8 @@ class HourglassController extends BaseController { $parents = find_parents($famid); $height="100%"; print "<tr>"; - print "<td valign=\"bottom\"><img name=\"pvline\" src=\"".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"$lh\" alt=\"\" /></td>"; - print "<td><img src=\"".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>"; + print "<td valign=\"bottom\"><img name=\"pvline\" src=\"".$WT_IMAGES["vline"]."\" width=\"3\" height=\"$lh\" alt=\"\" /></td>"; + print "<td><img src=\"".$WT_IMAGES["hline"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>"; print "<td>"; //-- print the father box print_pedigree_person($parents["HUSB"]); @@ -152,14 +152,14 @@ class HourglassController extends BaseController { //-- print an Ajax arrow on the last generation of the adult male if ($count==$this->generations-1 && (count(find_family_ids($ARID))>0) && !is_null (find_family_ids($ARID))) { - print "<a href=\"#\" onclick=\"return ChangeDiv('td_".$ARID."','".$ARID."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."')\"><img src=\"".$WT_IMAGES["rarrow"]["other"]."\" border=\"0\" alt=\"\" /></a> "; + print "<a href=\"#\" onclick=\"return ChangeDiv('td_".$ARID."','".$ARID."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."')\"><img src=\"".$WT_IMAGES["rarrow"]."\" border=\"0\" alt=\"\" /></a> "; } //-- recursively get the father's family $this->print_person_pedigree($parents["HUSB"], $count+1); print "</td>"; print "</tr>\n<tr>\n"; - print "<td valign=\"top\"><img name=\"pvline\" src=\"".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"$lh\" alt=\"\" /></td>"; - print "<td><img src=\"".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>"; + print "<td valign=\"top\"><img name=\"pvline\" src=\"".$WT_IMAGES["vline"]."\" width=\"3\" height=\"$lh\" alt=\"\" /></td>"; + print "<td><img src=\"".$WT_IMAGES["hline"]."\" width=\"7\" height=\"3\" alt=\"\" /></td>"; print "<td>"; //-- print the mother box print_pedigree_person($parents["WIFE"]); @@ -170,7 +170,7 @@ class HourglassController extends BaseController { //-- print an ajax arrow on the last generation of the adult female if ($count==$this->generations-1 && (count(find_family_ids($ARID))>0) && !is_null (find_family_ids($ARID))) { - print "<a href=\"#\" onclick=\"ChangeDiv('td_".$ARID."','".$ARID."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."'); return false;\"><img src=\"".$WT_IMAGES["rarrow"]["other"]."\" border=\"0\" alt=\"\" /></a> "; + print "<a href=\"#\" onclick=\"ChangeDiv('td_".$ARID."','".$ARID."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."'); return false;\"><img src=\"".$WT_IMAGES["rarrow"]."\" border=\"0\" alt=\"\" /></a> "; } //-- recursively print the mother's family @@ -249,16 +249,16 @@ class HourglassController extends BaseController { if ($i==0) { //-- adjust for the number of kids $h = ($bhalfheight+3)*$numkids; - print "<td valign=\"bottom\"><img name=\"tvertline\" id=\"vline_$chil\" src=\"".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"$h\" alt=\"\" /></td>"; + print "<td valign=\"bottom\"><img name=\"tvertline\" id=\"vline_$chil\" src=\"".$WT_IMAGES["vline"]."\" width=\"3\" height=\"$h\" alt=\"\" /></td>"; } else if ($i==$ct-1) { $h = ($bhalfheight+3)*$kids; if ($count<$this->dgenerations-1) { if ($this->show_spouse) $h-=15; else $h += 15; } - print "<td valign=\"top\"><img name=\"bvertline\" id=\"vline_$chil\" src=\"".$WT_IMAGES["vline"]["other"]."\" width=\"3\" height=\"".$h."\" alt=\"\" /></td>"; + print "<td valign=\"top\"><img name=\"bvertline\" id=\"vline_$chil\" src=\"".$WT_IMAGES["vline"]."\" width=\"3\" height=\"".$h."\" alt=\"\" /></td>"; } else { - print "<td style=\"background: url('".$WT_IMAGES["vline"]["other"]."');\"><img src=\"".$WT_IMAGES["spacer"]["other"]."\" width=\"3\" alt=\"\" /></td>"; + print "<td style=\"background: url('".$WT_IMAGES["vline"]."');\"><img src=\"".$WT_IMAGES["spacer"]."\" width=\"3\" alt=\"\" /></td>"; } } print "</tr>"; @@ -283,7 +283,7 @@ class HourglassController extends BaseController { if ($kcount==0) { print "<div style=\"width: ".($this->arrwidth)."px;\"><br /></div>\n</td>\n<td width=\"$bwidth\">"; } else { - print "<div style=\"width: ".($this->arrwidth)."px;\"><a href=\"$pid\" onclick=\"return ChangeDis('td_".$pid."','".$pid."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."')\"><img src=\"".$WT_IMAGES["larrow"]["other"]."\" border=\"0\" alt=\"\" /></a></div>\n"; + print "<div style=\"width: ".($this->arrwidth)."px;\"><a href=\"$pid\" onclick=\"return ChangeDis('td_".$pid."','".$pid."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."')\"><img src=\"".$WT_IMAGES["larrow"]."\" border=\"0\" alt=\"\" /></a></div>\n"; //-- move the arrow up to line up with the correct box if ($this->show_spouse) { foreach($families as $famid => $family) { @@ -302,7 +302,7 @@ class HourglassController extends BaseController { print "<table id=\"table2_$pid\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\"><tr><td>"; print_pedigree_person($pid); - print "</td><td><img src=\"".$WT_IMAGES["hline"]["other"]."\" width=\"7\" height=\"3\" alt=\"\" />"; + print "</td><td><img src=\"".$WT_IMAGES["hline"]."\" width=\"7\" height=\"3\" alt=\"\" />"; //----- Print the spouse if ($this->show_spouse) { @@ -349,7 +349,7 @@ class HourglassController extends BaseController { print "\n\t\t<div class=\"center\" id=\"childarrow\" dir=\"".$TEXT_DIRECTION."\""; print " style=\"position:absolute; width:".$bwidth."px; \">"; print "<a href=\"javascript: ".i18n::translate('Show')."\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow',3);\" onmouseout=\"swap_image('larrow',3);\">"; - print "<img id=\"larrow\" src=\"".$WT_IMAGES["darrow"]["other"]."\" border=\"0\" alt=\"\" />"; + print "<img id=\"larrow\" src=\"".$WT_IMAGES["darrow"]."\" border=\"0\" alt=\"\" />"; print "</a><br />"; print "\n\t\t<div id=\"childbox\" dir=\"".$TEXT_DIRECTION."\" style=\"width:".$bwidth."px; height:".$bheight."px; visibility: hidden;\">"; print "\n\t\t\t<table class=\"person_box\"><tr><td>"; @@ -387,7 +387,7 @@ class HourglassController extends BaseController { } } //-- do we need to print this arrow? - print "<img src=\"".$WT_IMAGES["rarrow"]["other"]."\" border=\"0\" alt=\"\" /> "; + print "<img src=\"".$WT_IMAGES["rarrow"]."\" border=\"0\" alt=\"\" /> "; //-- print the siblings foreach($cfamids as $famid=>$family) { diff --git a/includes/controllers/individual_ctrl.php b/includes/controllers/individual_ctrl.php index 2c8ba132e9..a1ab140197 100644 --- a/includes/controllers/individual_ctrl.php +++ b/includes/controllers/individual_ctrl.php @@ -310,7 +310,7 @@ class IndividualController extends BaseController { $firstmediarec = $this->indi->findHighlightedMedia(); if ($firstmediarec) return true; } - if ($USE_SILHOUETTE && isset($WT_IMAGES["default_image_U"]["other"])) { return true; } + if ($USE_SILHOUETTE && isset($WT_IMAGES["default_image_U"])) { return true; } return false; } /** @@ -369,16 +369,16 @@ class IndividualController extends BaseController { } } } - if ($USE_SILHOUETTE && isset($WT_IMAGES["default_image_U"]["other"])) { + if ($USE_SILHOUETTE && isset($WT_IMAGES["default_image_U"])) { $class = "\" width=\"".$THUMBNAIL_WIDTH; $sex = $this->indi->getSex(); $result = "<img src=\""; if ($sex == 'F') { - $result .= $WT_IMAGES["default_image_F"]["other"]; + $result .= $WT_IMAGES["default_image_F"]; } elseif ($sex == 'M') { - $result .= $WT_IMAGES["default_image_M"]["other"]; + $result .= $WT_IMAGES["default_image_M"]; } else { - $result .= $WT_IMAGES["default_image_U"]["other"]; + $result .= $WT_IMAGES["default_image_U"]; } $result .="\" class=\"".$class."\" border=\"none\" alt=\"\" />"; return $result; diff --git a/includes/controllers/timeline_ctrl.php b/includes/controllers/timeline_ctrl.php index 16b155dbcc..ddc7fd0435 100644 --- a/includes/controllers/timeline_ctrl.php +++ b/includes/controllers/timeline_ctrl.php @@ -215,7 +215,7 @@ class TimelineController extends BaseController { print "\n\t\t<div id=\"fact$factcount\" style=\"position:absolute; ".($TEXT_DIRECTION =="ltr"?"left: ".($xoffset):"right: ".($xoffset))."px; top:".($yoffset)."px; font-size: 8pt; height: ".($this->bheight)."px; \" onmousedown=\"factMD(this, '".$factcount."', ".($yoffset-$tyoffset).");\">\n"; print "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"cursor: hand;\"><tr><td>\n"; - print "<img src=\"".$WT_IMAGES["hline"]["other"]."\" name=\"boxline$factcount\" id=\"boxline$factcount\" height=\"3\" align=\"left\" hspace=\"0\" width=\"10\" vspace=\"0\" alt=\"\" style=\"padding-"; + print "<img src=\"".$WT_IMAGES["hline"]."\" name=\"boxline$factcount\" id=\"boxline$factcount\" height=\"3\" align=\"left\" hspace=\"0\" width=\"10\" vspace=\"0\" alt=\"\" style=\"padding-"; if ($TEXT_DIRECTION=="ltr") print "left"; else print "right"; print ": 3px;\" />\n"; @@ -322,7 +322,7 @@ class TimelineController extends BaseController { } //-- print the diagnal line print "\n\t\t<div id=\"dbox$factcount\" style=\"position:absolute; ".($TEXT_DIRECTION =="ltr"?"left: ".($basexoffset+25):"right: ".($basexoffset+25))."px; top:".($dyoffset)."px; font-size: 8pt; height: ".(abs($tyoffset))."px; width: ".(abs($tyoffset))."px;"; - print " background-image: url('".$WT_IMAGES[$img]["other"]."');"; + print " background-image: url('".$WT_IMAGES[$img]."');"; print " background-position: 0% $ypos; \" >\n"; print "</div>\n"; } |