diff options
| -rw-r--r-- | includes/family_nav.php | 51 | ||||
| -rw-r--r-- | includes/functions/functions_print.php | 50 | ||||
| -rw-r--r-- | themes/clouds/templates/personbox_template.php | 6 | ||||
| -rw-r--r-- | themes/colors/templates/personbox_template.php | 6 | ||||
| -rw-r--r-- | themes/fab/templates/personbox_template.php | 2 | ||||
| -rw-r--r-- | themes/minimal/templates/personbox_template.php | 6 | ||||
| -rw-r--r-- | themes/webtrees/templates/personbox_template.php | 6 | ||||
| -rw-r--r-- | themes/xenea/templates/personbox_template.php | 6 |
8 files changed, 23 insertions, 110 deletions
diff --git a/includes/family_nav.php b/includes/family_nav.php index aadbc1fef4..33441568d0 100644 --- a/includes/family_nav.php +++ b/includes/family_nav.php @@ -572,18 +572,8 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") { // Husband ------------------------------ if ($husb || $num>0) { - if ($TEXT_DIRECTION=="ltr") { - $title = i18n::translate('Family book chart').": ".$famid; - }else{ - $title = $famid." :".i18n::translate('Family book chart'); - } if ($husb) { $person_parent="Yes"; - if ($TEXT_DIRECTION=="ltr") { - $title = i18n::translate('Individual information').": ".$husb->getXref(); - }else{ - $title = $husb->getXref()." :".i18n::translate('Individual information'); - } $parentlinks .= "<a href=\"".encode_url($husb->getLinkUrl()."&tab={$tabno}")."\">"; $parentlinks .= " ".PrintReady($husb->getFullName()); $parentlinks .= "</a>"; @@ -594,18 +584,8 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") { // Wife ------------------------------ if ($wife || $num>0) { - if ($TEXT_DIRECTION=="ltr") { - $title = i18n::translate('Family book chart').": ".$famid; - }else{ - $title = $famid." :".i18n::translate('Family book chart'); - } if ($wife) { $person_parent="Yes"; - if ($TEXT_DIRECTION=="ltr") { - $title = i18n::translate('Individual information').": ".$wife->getXref(); - }else{ - $title = $wife->getXref()." :".i18n::translate('Individual information'); - } $parentlinks .= "<a href=\"".encode_url($wife->getLinkUrl()."&tab={$tabno}")."\">"; $parentlinks .= " ".PrintReady($wife->getFullName()); $parentlinks .= "</a>"; @@ -630,18 +610,8 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") { }else{ // Husband ----------------------- if ($husb || $num>0) { - if ($TEXT_DIRECTION=="ltr") { - $title = i18n::translate('Family book chart').": ".$famid; - }else{ - $title = $famid." :".i18n::translate('Family book chart'); - } if ($husb) { $person_step="Yes"; - if ($TEXT_DIRECTION=="ltr") { - $title = i18n::translate('Individual information').": ".$husb->getXref(); - }else{ - $title = $husb->getXref()." :".i18n::translate('Individual information'); - } $parentlinks .= "<a href=\"".encode_url($husb->getLinkUrl()."&tab={$tabno}")."\">"; $parentlinks .= " ".PrintReady($husb->getFullName()); $parentlinks .= "</a>"; @@ -654,18 +624,8 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") { }else{ // Wife ---------------------------- if ($wife || $num>0) { - if ($TEXT_DIRECTION=="ltr") { - $title = i18n::translate('Family book chart').": ".$famid; - }else{ - $title = $famid." :".i18n::translate('Family book chart'); - } if ($wife) { $person_step="Yes"; - if ($TEXT_DIRECTION=="ltr") { - $title = i18n::translate('Individual information').": ".$wife->getXref(); - }else{ - $title = $wife->getXref()." :".i18n::translate('Individual information'); - } $parentlinks .= "<a href=\"".encode_url($wife->getLinkUrl()."&tab={$tabno}")."\">"; $parentlinks .= " ".PrintReady($wife->getFullName()); $parentlinks .= "</a>"; @@ -686,17 +646,7 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") { // Spouse ------------------------------ if ($spouse || $num>0) { - if ($TEXT_DIRECTION=="ltr") { - $title = i18n::translate('Family book chart').": ".$famid; - }else{ - $title = $famid." :".i18n::translate('Family book chart'); - } if ($spouse) { - if ($TEXT_DIRECTION=="ltr") { - $title = i18n::translate('Individual information').": ".$spouse->getXref(); - }else{ - $title = $spouse->getXref()." :".i18n::translate('Individual information'); - } $spouselinks .= "<a href=\"".encode_url($spouse->getLinkUrl()."&tab={$tabno}")."\">"; $spouselinks .= " ".PrintReady($spouse->getFullName()); $spouselinks .= "</a>"; @@ -710,7 +660,6 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") { foreach($children as $c=>$child) { if ($child) { $persons="Yes"; - $title = i18n::translate('Individual information').": ".$child->getXref(); $spouselinks .= "<li>"; $spouselinks .= "<a href=\"".encode_url($child->getLinkUrl()."&tab={$tabno}")."\">"; $spouselinks .= PrintReady($child->getFullName()); diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index 897b9270b0..c3f35b1c15 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -104,53 +104,35 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") { // NOTE: Start div I.$pid.$personcount.$count.links $personlinks .= "<table class=\"person_box$isF\"><tr><td class=\"details1\">"; // NOTE: Zoom - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Pedigree Chart').": ".$pid; - else $title = $pid." :".i18n::translate('Pedigree Chart'); - $personlinks .= "<a href=\"".encode_url("pedigree.php?rootid={$pid}&show_full={$PEDIGREE_FULL_DETAILS}&PEDIGREE_GENERATIONS={$OLD_PGENS}&talloffset={$talloffset}&ged={$GEDCOM}")."\" title=\"$title\" $mouseAction1><b>".i18n::translate('Pedigree Tree')."</b></a>"; + $personlinks .= "<a href=\"".encode_url("pedigree.php?rootid={$pid}&show_full={$PEDIGREE_FULL_DETAILS}&PEDIGREE_GENERATIONS={$OLD_PGENS}&talloffset={$talloffset}&ged={$GEDCOM}")."\" $mouseAction1><b>".i18n::translate('Pedigree Tree')."</b></a>"; if (file_exists(WT_ROOT.'modules/googlemap/pedigree_map.php')) { - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Pedigree Map').": ".$pid; - else $title = $pid." :".i18n::translate('Pedigree Map'); - $personlinks .= "<br /><a href=\"".encode_url("module.php?mod=googlemap&mod_action=pedigree_map&rootid={$pid}&ged={$GEDCOM}")."\" title=\"$title\" ".$mouseAction1."><b>".i18n::translate('Pedigree Map')."</b></a>"; + $personlinks .= "<br /><a href=\"".encode_url("module.php?mod=googlemap&mod_action=pedigree_map&rootid={$pid}&ged={$GEDCOM}")."\" ".$mouseAction1."><b>".i18n::translate('Pedigree Map')."</b></a>"; } $username = WT_USER_NAME; if (!empty($username)) { $myid=WT_USER_GEDCOM_ID; if ($myid && $myid!=$pid) { - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Relationship Chart').": ".$pid; - else $title = $pid." :".i18n::translate('Relationship Chart'); - $personlinks .= "<br /><a href=\"".encode_url("relationship.php?show_full={$PEDIGREE_FULL_DETAILS}&pid1={$myid}&pid2={$pid}&show_full={$PEDIGREE_FULL_DETAILS}&pretty=2&followspouse=1&ged={$GEDCOM}")."\" title=\"$title\" ".$mouseAction1."><b>".i18n::translate('Relationship to me')."</b></a>"; + $personlinks .= "<br /><a href=\"".encode_url("relationship.php?show_full={$PEDIGREE_FULL_DETAILS}&pid1={$myid}&pid2={$pid}&show_full={$PEDIGREE_FULL_DETAILS}&pretty=2&followspouse=1&ged={$GEDCOM}")."\" ".$mouseAction1."><b>".i18n::translate('Relationship to me')."</b></a>"; } } - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Descendancy chart').": ".$pid; - else $title = $pid." :".i18n::translate('Descendancy chart'); - $personlinks .= "<br /><a href=\"".encode_url("descendancy.php?pid={$pid}&show_full={$PEDIGREE_FULL_DETAILS}&generations={$generations}&box_width={$box_width}&ged={$GEDCOM}")."\" title=\"$title\" $mouseAction1><b>".i18n::translate('Descendancy chart')."</b></a><br />"; + $personlinks .= "<br /><a href=\"".encode_url("descendancy.php?pid={$pid}&show_full={$PEDIGREE_FULL_DETAILS}&generations={$generations}&box_width={$box_width}&ged={$GEDCOM}")."\" $mouseAction1><b>".i18n::translate('Descendancy chart')."</b></a><br />"; if (file_exists(WT_ROOT.'ancestry.php')) { - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Ancestry chart').": ".$pid; - else $title = $pid." :".i18n::translate('Ancestry chart'); - $personlinks .= "<a href=\"".encode_url("ancestry.php?rootid={$pid}&show_full={$PEDIGREE_FULL_DETAILS}&chart_style={$chart_style}&PEDIGREE_GENERATIONS={$OLD_PGENS}&box_width={$box_width}&ged={$GEDCOM}")."\" title=\"$title\" ".$mouseAction1."><b>".i18n::translate('Ancestry chart')."</b></a><br />"; + $personlinks .= "<a href=\"".encode_url("ancestry.php?rootid={$pid}&show_full={$PEDIGREE_FULL_DETAILS}&chart_style={$chart_style}&PEDIGREE_GENERATIONS={$OLD_PGENS}&box_width={$box_width}&ged={$GEDCOM}")."\" ".$mouseAction1."><b>".i18n::translate('Ancestry chart')."</b></a><br />"; } if (file_exists(WT_ROOT.'compact.php')) { - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Compact Chart').": ".$pid; - else $title = $pid." :".i18n::translate('Compact Chart'); - $personlinks .= "<a href=\"".encode_url("compact.php?rootid={$pid}&ged={$GEDCOM}")."\" title=\"$title\" ".$mouseAction1."><b>".i18n::translate('Compact Chart')."</b></a><br />"; + $personlinks .= "<a href=\"".encode_url("compact.php?rootid={$pid}&ged={$GEDCOM}")."\" ".$mouseAction1."><b>".i18n::translate('Compact Chart')."</b></a><br />"; } if (file_exists(WT_ROOT.'fanchart.php') and defined("IMG_ARC_PIE") and function_exists("imagettftext")) { - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Circle diagram').": ".$pid; - else $title = $pid." :".i18n::translate('Circle diagram'); - $personlinks .= "<a href=\"".encode_url("fanchart.php?rootid={$pid}&PEDIGREE_GENERATIONS={$OLD_PGENS}&ged={$GEDCOM}")."\" title=\"$title\" ".$mouseAction1."><b>".i18n::translate('Circle diagram')."</b></a><br />"; + $personlinks .= "<a href=\"".encode_url("fanchart.php?rootid={$pid}&PEDIGREE_GENERATIONS={$OLD_PGENS}&ged={$GEDCOM}")."\" ".$mouseAction1."><b>".i18n::translate('Circle diagram')."</b></a><br />"; } if (file_exists(WT_ROOT.'hourglass.php')) { - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Hourglass chart').": ".$pid; - else $title = $pid." :".i18n::translate('Hourglass chart'); - $personlinks .= "<a href=\"".encode_url("hourglass.php?pid={$pid}&show_full={$PEDIGREE_FULL_DETAILS}&chart_style={$chart_style}&PEDIGREE_GENERATIONS={$OLD_PGENS}&box_width={$box_width}&ged={$GEDCOM}&show_spouse={$show_spouse}")."\" title=\"$title\" ".$mouseAction1."><b>".i18n::translate('Hourglass chart')."</b></a><br />"; + $personlinks .= "<a href=\"".encode_url("hourglass.php?pid={$pid}&show_full={$PEDIGREE_FULL_DETAILS}&chart_style={$chart_style}&PEDIGREE_GENERATIONS={$OLD_PGENS}&box_width={$box_width}&ged={$GEDCOM}&show_spouse={$show_spouse}")."\" ".$mouseAction1."><b>".i18n::translate('Hourglass chart')."</b></a><br />"; } if (file_exists(WT_ROOT.'treenav.php')) { - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Interactive tree').": ".$pid; - else $title = $pid." :".i18n::translate('Interactive tree'); - $personlinks .= "<a href=\"".encode_url("treenav.php?rootid={$pid}&ged={$GEDCOM}")."\" title=\"$title\" ".$mouseAction1."><b>".i18n::translate('Interactive tree')."</b></a><br />"; + $personlinks .= "<a href=\"".encode_url("treenav.php?rootid={$pid}&ged={$GEDCOM}")."\" ".$mouseAction1."><b>".i18n::translate('Interactive tree')."</b></a><br />"; } $fams = $person->getSpouseFamilies(); @@ -162,13 +144,9 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") { $children = $family->getChildren(); $num = count($children); if ((!empty($spouse))||($num>0)) { - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Family book chart').": ".$famid; - else $title = $famid." :".i18n::translate('Family book chart'); - $personlinks .= "<a href=\"".encode_url("family.php?famid={$famid}&show_full=1&ged={$GEDCOM}")."\" title=\"$title\" ".$mouseAction1."><b>".i18n::translate('Family with spouse')."</b></a><br />"; + $personlinks .= "<a href=\"".encode_url("family.php?famid={$famid}&show_full=1&ged={$GEDCOM}")."\" ".$mouseAction1."><b>".i18n::translate('Family with spouse')."</b></a><br />"; if (!empty($spouse)) { - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Individual information').": ".$spouse->getXref(); - else $title = $spouse->getXref()." :".i18n::translate('Individual information'); - $personlinks .= "<a href=\"".encode_url($spouse->getLinkUrl())."\" title=\"$title\" $mouseAction1>"; + $personlinks .= "<a href=\"".encode_url($spouse->getLinkUrl())."\" $mouseAction1>"; if ($spouse->canDisplayName()) $personlinks .= PrintReady($spouse->getFullName()); else $personlinks .= i18n::translate('Private'); $personlinks .= "</a><br />"; @@ -176,9 +154,7 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") { } /* @var $child Person */ foreach($children as $c=>$child) { - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Individual information').": ".$child->getXref(); - else $title = $child->getXref()." :".i18n::translate('Individual information'); - $personlinks .= " <a href=\"".encode_url($child->getLinkUrl())."\" title=\"$title\" $mouseAction1>"; + $personlinks .= " <a href=\"".encode_url($child->getLinkUrl())."\" $mouseAction1>"; if ($child->canDisplayName()) $personlinks .= PrintReady($child->getFullName()); else $personlinks .= i18n::translate('Private'); $personlinks .= "<br /></a>"; @@ -318,8 +294,6 @@ function print_pedigree_person($pid, $style=1, $count=0, $personcount="1") { //$name = PrintReady(htmlspecialchars(strip_tags($name), ENT_QUOTES, 'UTF-8')); $name = PrintReady($name); - if ($TEXT_DIRECTION=="ltr") $title = i18n::translate('Individual information').": ".$pid; - else $title = $pid." :".i18n::translate('Individual information'); // add optional CSS style for each fact $indirec = $person->getGedcomRecord(); $cssfacts = array("BIRT", "CHR", "DEAT", "BURI", "CREM", "ADOP", "BAPM", "BARM", "BASM", "BLES", "CHRA", "CONF", "FCOM", "ORDN", "NATU", "EMIG", "IMMI", "CENS", "PROB", "WILL", "GRAD", "RETI", "CAST", "DSCR", "EDUC", "IDNO", diff --git a/themes/clouds/templates/personbox_template.php b/themes/clouds/templates/personbox_template.php index 3d9c1586c4..281c8e6711 100644 --- a/themes/clouds/templates/personbox_template.php +++ b/themes/clouds/templates/personbox_template.php @@ -2,7 +2,7 @@ /** * Template for drawing person boxes * This template expects that the following variables will be set - * $pid, $boxID, $personlinks, $icons, $title, $GEDCOM, $style, + * $pid, $boxID, $personlinks, $icons, $GEDCOM, $style, * $name, $classfacts, $genderImage, $BirthDeath, $isF, $outBoxAdd, * $addname, $showid, $float * @@ -47,9 +47,7 @@ if (!defined('WT_WEBTREES')) { style="<?php print $iconsStyleAdd; ?> width: 25px; height: 50px;"><?php print $icons; ?> </div> <?php print $thumbnail; ?> - <a onclick="event.cancelBubble = true;" - href="individual.php?pid=<?php print $pid; ?>&ged=<?php print $GEDCOM; ?>" - title="<?php print $title; ?>"> + <a onclick="event.cancelBubble = true;" href="individual.php?pid=<?php print $pid; ?>&ged=<?php print $GEDCOM; ?>"> <span id="namedef-<?php print $boxID; ?>" class="name<?php print $style; ?> <?php print $classfacts; ?>"> <?php print $name.$addname; ?> </span> diff --git a/themes/colors/templates/personbox_template.php b/themes/colors/templates/personbox_template.php index 723e1053f2..292a781a19 100644 --- a/themes/colors/templates/personbox_template.php +++ b/themes/colors/templates/personbox_template.php @@ -2,7 +2,7 @@ /** * Template for drawing person boxes * This template expects that the following variables will be set - * $pid, $boxID, $personlinks, $icons, $title, $GEDCOM, $style, + * $pid, $boxID, $personlinks, $icons, $GEDCOM, $style, * $name, $classfacts, $genderImage, $BirthDeath, $isF, $outBoxAdd, * $addname, $showid, $float * @@ -47,9 +47,7 @@ if (!defined('WT_WEBTREES')) { style="<?php print $iconsStyleAdd; ?> width: 25px; height: 50px;"><?php print $icons; ?> </div> <?php print $thumbnail; ?> - <a onclick="event.cancelBubble = true;" - href="individual.php?pid=<?php print $pid; ?>&ged=<?php print $GEDCOM; ?>" - title="<?php print $title; ?>"> + <a onclick="event.cancelBubble = true;" href="individual.php?pid=<?php print $pid; ?>&ged=<?php print $GEDCOM; ?>"> <span id="namedef-<?php print $boxID; ?>" class="name<?php print $style; ?> <?php print $classfacts; ?>"> <?php print $name.$addname; ?> </span> diff --git a/themes/fab/templates/personbox_template.php b/themes/fab/templates/personbox_template.php index dd2f4727e0..647ca1889b 100644 --- a/themes/fab/templates/personbox_template.php +++ b/themes/fab/templates/personbox_template.php @@ -2,7 +2,7 @@ // Template for drawing person boxes // // This template expects that the following variables will be set -// $pid, $boxID, $personlinks, $icons, $title, $GEDCOM, $style, +// $pid, $boxID, $personlinks, $icons, $GEDCOM, $style, // $name, $classfacts, $genderImage, $BirthDeath, $isF, $outBoxAdd, // $addname, $showid, $float // diff --git a/themes/minimal/templates/personbox_template.php b/themes/minimal/templates/personbox_template.php index 924a42b179..e0e0097898 100644 --- a/themes/minimal/templates/personbox_template.php +++ b/themes/minimal/templates/personbox_template.php @@ -2,7 +2,7 @@ /** * Template for drawing person boxes * This template expects that the following variables will be set - * $pid, $boxID, $personlinks, $icons, $title, $GEDCOM, $style, + * $pid, $boxID, $personlinks, $icons, $GEDCOM, $style, * $name, $classfacts, $genderImage, $BirthDeath, $isF, $outBoxAdd, * $addname, $showid, $float * @@ -47,9 +47,7 @@ if (!defined('WT_WEBTREES')) { style="<?php print $iconsStyleAdd; ?> width: 25px; height: 50px;"><?php print $icons; ?> </div> <?php print $thumbnail; ?> - <a onclick="event.cancelBubble = true;" - href="individual.php?pid=<?php print $pid; ?>&ged=<?php print $GEDCOM; ?>" - title="<?php print $title; ?>"> + <a onclick="event.cancelBubble = true;" href="individual.php?pid=<?php print $pid; ?>&ged=<?php print $GEDCOM; ?>"> <span id="namedef-<?php print $boxID; ?>" class="name<?php print $style; ?> <?php print $classfacts; ?>"> <?php print $name.$addname; ?> </span> diff --git a/themes/webtrees/templates/personbox_template.php b/themes/webtrees/templates/personbox_template.php index 4018684e1d..923910a783 100644 --- a/themes/webtrees/templates/personbox_template.php +++ b/themes/webtrees/templates/personbox_template.php @@ -2,7 +2,7 @@ /**
* Template for drawing person boxes
* This template expects that the following variables will be set
- * $pid, $boxID, $personlinks, $icons, $title, $GEDCOM, $style,
+ * $pid, $boxID, $personlinks, $icons, $GEDCOM, $style,
* $name, $classfacts, $genderImage, $BirthDeath, $isF, $outBoxAdd,
* $addname, $showid, $float
*
@@ -47,9 +47,7 @@ if (!defined('WT_WEBTREES')) { style="<?php print $iconsStyleAdd; ?> width: 25px; height: 50px;"><?php print $icons; ?>
</div>
<?php print $thumbnail; ?>
- <a onclick="event.cancelBubble = true;"
- href="individual.php?pid=<?php print $pid; ?>&ged=<?php print $GEDCOM; ?>"
- title="<?php print $title; ?>">
+ <a onclick="event.cancelBubble = true;" href="individual.php?pid=<?php print $pid; ?>&ged=<?php print $GEDCOM; ?>">
<span id="namedef-<?php print $boxID; ?>" class="name<?php print $style; ?> <?php print $classfacts; ?>">
<?php print $name.$addname; ?>
</span>
diff --git a/themes/xenea/templates/personbox_template.php b/themes/xenea/templates/personbox_template.php index 924a42b179..e0e0097898 100644 --- a/themes/xenea/templates/personbox_template.php +++ b/themes/xenea/templates/personbox_template.php @@ -2,7 +2,7 @@ /** * Template for drawing person boxes * This template expects that the following variables will be set - * $pid, $boxID, $personlinks, $icons, $title, $GEDCOM, $style, + * $pid, $boxID, $personlinks, $icons, $GEDCOM, $style, * $name, $classfacts, $genderImage, $BirthDeath, $isF, $outBoxAdd, * $addname, $showid, $float * @@ -47,9 +47,7 @@ if (!defined('WT_WEBTREES')) { style="<?php print $iconsStyleAdd; ?> width: 25px; height: 50px;"><?php print $icons; ?> </div> <?php print $thumbnail; ?> - <a onclick="event.cancelBubble = true;" - href="individual.php?pid=<?php print $pid; ?>&ged=<?php print $GEDCOM; ?>" - title="<?php print $title; ?>"> + <a onclick="event.cancelBubble = true;" href="individual.php?pid=<?php print $pid; ?>&ged=<?php print $GEDCOM; ?>"> <span id="namedef-<?php print $boxID; ?>" class="name<?php print $style; ?> <?php print $classfacts; ?>"> <?php print $name.$addname; ?> </span> |
