diff options
| -rw-r--r-- | library/WT/Controller/Ancestry.php | 55 | ||||
| -rw-r--r-- | themes/clouds/style.css | 5 | ||||
| -rw-r--r-- | themes/colors/css/colors.css | 5 | ||||
| -rw-r--r-- | themes/fab/style.css | 6 | ||||
| -rw-r--r-- | themes/minimal/style.css | 6 | ||||
| -rw-r--r-- | themes/webtrees/style.css | 9 | ||||
| -rw-r--r-- | themes/xenea/style.css | 7 |
7 files changed, 54 insertions, 39 deletions
diff --git a/library/WT/Controller/Ancestry.php b/library/WT/Controller/Ancestry.php index 91d89d2a9c..8e63dbcd4c 100644 --- a/library/WT/Controller/Ancestry.php +++ b/library/WT/Controller/Ancestry.php @@ -31,7 +31,7 @@ if (!defined('WT_WEBTREES')) { require_once WT_ROOT.'includes/functions/functions_charts.php'; class WT_Controller_Ancestry extends WT_Controller_Base { - var $pid = ""; + var $pid = ''; var $user = false; var $show_cousins; var $rootid; @@ -106,32 +106,33 @@ class WT_Controller_Ancestry extends WT_Controller_Base { $label=''; } // child - echo "<li>"; - echo "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td><a name=\"sosa".$sosa."\"></a>"; - if ($sosa==1) echo "<img src=\"".$WT_IMAGES["spacer"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>"; - else { - echo "<img src=\"".$WT_IMAGES["spacer"]."\" height=\"3\" width=\"2\" border=\"0\" alt=\"\" />"; - echo "<img src=\"".$WT_IMAGES["hline"]."\" height=\"3\" width=\"".($Dindent-2)."\" border=\"0\" alt=\"\" /></td><td>"; + echo '<li>'; + echo '<table border="0" cellpadding="0" cellspacing="0"><tr><td><a name="sosa', $sosa, '"></a>'; + if ($sosa==1) { + echo '<img src="', $WT_IMAGES['spacer'], '" height="3" width="', $Dindent, '" border="0" alt="" /></td><td>'; + } else { + echo '<img src="', $WT_IMAGES['spacer'], '" height="3" width="2" border="0" alt="" />'; + echo '<img src="', $WT_IMAGES['hline'], '" height="3" width="', ($Dindent-2), '" border="0" alt="" /></td><td>'; } print_pedigree_person($person, 1); - echo "</td>"; - echo "<td>"; + echo '</td>'; + echo '<td>'; if ($sosa>1) { print_url_arrow($pid, "?rootid={$pid}&PEDIGREE_GENERATIONS={$OLD_PGENS}&show_full={$this->show_full}&box_width={$box_width}&chart_style={$this->chart_style}", $label, 3); } - echo "</td>"; - echo "<td class=\"details1\"> <span dir=\"ltr\" class=\"person_box". (($sosa==1)?"NN":(($sosa%2)?"F":"")) . "\"> $sosa </span> "; - echo "</td><td class=\"details1\">"; - $relation =""; - $new=($pid=="" or !isset($pidarr["$pid"])); - if (!$new) $relation = "<br />[=<a href=\"#sosa".$pidarr["$pid"]."\">".$pidarr["$pid"]."</a> - ".get_sosa_name($pidarr["$pid"])."]"; - else $pidarr["$pid"]=$sosa; + echo '</td>'; + echo '<td class="details1"> <span dir="ltr" class="person_box'. (($sosa==1)?'NN':(($sosa%2)?'F':'')) . '"> ', $sosa, ' </span> '; + echo '</td><td class="details1">'; + $relation =''; + $new=($pid=='' or !isset($pidarr[$pid])); + if (!$new) $relation = '<br />[=<a href="#sosa'.$pidarr[$pid].'">'.$pidarr[$pid].'</a> - '.get_sosa_name($pidarr[$pid]).']'; + else $pidarr[$pid]=$sosa; echo get_sosa_name($sosa).$relation; - echo "</td>"; - echo "</tr></table>"; + echo '</td>'; + echo '</tr></table>'; if (is_null($person)) { - echo "</li>"; + echo '</li>'; return; } // parents @@ -142,21 +143,21 @@ class WT_Controller_Ancestry extends WT_Controller_Base { if ($family && $new && $depth>0) { // print marriage info - echo "<span class=\"details1\" style=\"white-space: nowrap;\" >"; - echo "<img src=\"".$WT_IMAGES["spacer"]."\" height=\"2\" width=\"$Dindent\" border=\"0\" align=\"middle\" alt=\"\" /><a href=\"javascript: ".WT_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=\"".WT_I18N::translate('View Family')."\" /></a> "; - echo " <span class=\"person_box\"> ".($sosa*2)." </span> ".WT_I18N::translate('and'); - echo " <span class=\"person_boxF\"> ".($sosa*2+1)." </span> "; + echo '<span class="details1" style="white-space: nowrap;" >'; + echo '<img src="', $WT_IMAGES['spacer'], '" height="2" width="', $Dindent, '" border="0" align="middle" alt="" /><a href="javascript: ', WT_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="', WT_I18N::translate('View Family'), '" /></a>'; + echo ' <span dir="ltr" class="person_box"> ', ($sosa*2), ' </span> ', WT_I18N::translate('and'); + echo ' <span dir="ltr" class="person_boxF"> ', ($sosa*2+1), ' </span> '; $marriage = $family->getMarriage(); if ($marriage->canShow()) { $marriage->print_simple_fact(); } - echo "</span>"; + echo '</span>'; // display parents recursively - or show empty boxes - echo "<ul style=\"list-style: none; display: block;\" id=\"sosa_$sosa\">"; + echo '<ul style="list-style: none; display: block;" id="sosa_', $sosa, '">'; $this->print_child_ascendancy($family->getHusband(), $sosa*2, $depth-1); $this->print_child_ascendancy($family->getWife(), $sosa*2+1, $depth-1); - echo "</ul>"; + echo '</ul>'; } - echo "</li>"; + echo '</li>'; } } diff --git a/themes/clouds/style.css b/themes/clouds/style.css index 9878c54016..7eaa53ed56 100644 --- a/themes/clouds/style.css +++ b/themes/clouds/style.css @@ -1600,7 +1600,7 @@ margin: 0; line-height: 1.5; } -.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #hourglass_chart .itr, #relatives_content .itr { +.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #familybook_chart_rtl .itr, #hourglass_chart .itr, #hourglass_chart_rtl .itr, #relatives_content .itr { position: relative; top: 0; } @@ -1611,7 +1611,9 @@ margin: 0; #ancestry_chart .person_box, #ancestry_chart .person_boxF, #ancestry_chart .person_boxNN, #descendancy_chart .person_box, #descendancy_chart .person_boxF, #descendancy_chart .person_boxNN, #familybook_chart .person_box, #familybook_chart .person_boxF, #familybook_chart .person_boxNN, +#familybook_chart_rtl .person_box, #familybook_chart_rtl .person_boxF, #familybook_chart_rtl .person_boxNN, #hourglass_chart .person_box, #hourglass_chart .person_boxF, #hourglass_chart .person_boxNN, +#hourglass_chart_rtl .person_box, #hourglass_chart_rtl .person_boxF, #hourglass_chart_rtl .person_boxNN, #relatives_content .person_box, #relatives_content .person_boxF, #relatives_content .person_boxNN { overflow: visible !important; } @@ -1642,6 +1644,7 @@ margin: 0; z-index: 9999; } +html[dir='rtl'] .popup dt {float:none;} html[dir='rtl'] .popup dd {margin-right:10px;} html[dir='rtl'] .itr:hover .popup {left:0; right:auto;} diff --git a/themes/colors/css/colors.css b/themes/colors/css/colors.css index 7d1496484c..963317f743 100644 --- a/themes/colors/css/colors.css +++ b/themes/colors/css/colors.css @@ -1549,7 +1549,7 @@ margin: 0; line-height: 1.5; } -.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #hourglass_chart .itr, #relatives_content .itr { +.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #familybook_chart_rtl .itr, #hourglass_chart .itr, #hourglass_chart_rtl .itr, #relatives_content .itr { position: relative; top: 0; } @@ -1560,7 +1560,9 @@ margin: 0; #ancestry_chart .person_box, #ancestry_chart .person_boxF, #ancestry_chart .person_boxNN, #descendancy_chart .person_box, #descendancy_chart .person_boxF, #descendancy_chart .person_boxNN, #familybook_chart .person_box, #familybook_chart .person_boxF, #familybook_chart .person_boxNN, +#familybook_chart_rtl .person_box, #familybook_chart_rtl .person_boxF, #familybook_chart_rtl .person_boxNN, #hourglass_chart .person_box, #hourglass_chart .person_boxF, #hourglass_chart .person_boxNN, +#hourglass_chart_rtl .person_box, #hourglass_chart_rtl .person_boxF, #hourglass_chart_rtl .person_boxNN, #relatives_content .person_box, #relatives_content .person_boxF, #relatives_content .person_boxNN { overflow: visible !important; } @@ -1591,6 +1593,7 @@ margin: 0; z-index: 9999; } +html[dir='rtl'] .popup dt {float:none;} html[dir='rtl'] .popup dd {margin-right:10px;} html[dir='rtl'] .itr:hover .popup {left:0; right:auto;} diff --git a/themes/fab/style.css b/themes/fab/style.css index 90f75a239e..3290368e2c 100644 --- a/themes/fab/style.css +++ b/themes/fab/style.css @@ -981,7 +981,7 @@ dd { line-height: 1.5; } -.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #hourglass_chart .itr, #relatives_content .itr { +.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #familybook_chart_rtl .itr, #hourglass_chart .itr, #hourglass_chart_rtl .itr, #relatives_content .itr { position: relative; top: 0; } @@ -992,7 +992,9 @@ dd { #ancestry_chart .person_box, #ancestry_chart .person_boxF, #ancestry_chart .person_boxNN, #descendancy_chart .person_box, #descendancy_chart .person_boxF, #descendancy_chart .person_boxNN, #familybook_chart .person_box, #familybook_chart .person_boxF, #familybook_chart .person_boxNN, +#familybook_chart_rtl .person_box, #familybook_chart_rtl .person_boxF, #familybook_chart_rtl .person_boxNN, #hourglass_chart .person_box, #hourglass_chart .person_boxF, #hourglass_chart .person_boxNN, +#hourglass_chart_rtl .person_box, #hourglass_chart_rtl .person_boxF, #hourglass_chart_rtl .person_boxNN, #relatives_content .person_box, #relatives_content .person_boxF, #relatives_content .person_boxNN { overflow: visible !important; } @@ -1025,7 +1027,7 @@ dd { z-index: 9999; } - +html[dir='rtl'] .popup dt {float:none;} html[dir='rtl'] .popup dd {margin-right:10px;} html[dir='rtl'] .itr:hover .popup {left:0; right:auto;} diff --git a/themes/minimal/style.css b/themes/minimal/style.css index 60a8b043d7..be87ba4f69 100644 --- a/themes/minimal/style.css +++ b/themes/minimal/style.css @@ -1361,7 +1361,7 @@ dd { line-height: 1.5; } -.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #hourglass_chart .itr, #relatives_content .itr { +.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #familybook_chart_rtl .itr, #hourglass_chart .itr, #hourglass_chart_rtl .itr, #relatives_content .itr { position: relative; top: 0; } @@ -1372,7 +1372,9 @@ dd { #ancestry_chart .person_box, #ancestry_chart .person_boxF, #ancestry_chart .person_boxNN, #descendancy_chart .person_box, #descendancy_chart .person_boxF, #descendancy_chart .person_boxNN, #familybook_chart .person_box, #familybook_chart .person_boxF, #familybook_chart .person_boxNN, +#familybook_chart_rtl .person_box, #familybook_chart_rtl .person_boxF, #familybook_chart_rtl .person_boxNN, #hourglass_chart .person_box, #hourglass_chart .person_boxF, #hourglass_chart .person_boxNN, +#hourglass_chart_rtl .person_box, #hourglass_chart_rtl .person_boxF, #hourglass_chart_rtl .person_boxNN, #relatives_content .person_box, #relatives_content .person_boxF, #relatives_content .person_boxNN { overflow: visible !important; } @@ -1403,7 +1405,7 @@ dd { z-index: 9999; } - +html[dir='rtl'] .popup dt {float:none;} html[dir='rtl'] .popup dd {margin-right:10px;} html[dir='rtl'] .itr:hover .popup {left:0; right:auto;} diff --git a/themes/webtrees/style.css b/themes/webtrees/style.css index ad3d3ad1ca..8a9de9b62a 100644 --- a/themes/webtrees/style.css +++ b/themes/webtrees/style.css @@ -1305,9 +1305,9 @@ td.descriptionbox a {color:#fff;}/* this keeps the tag color the same when it i .place {padding-top:5px;} .logo {text-align:center;} -.itr {position:absolute; top:3em;line-height:1.5;} +.itr {position:absolute; top:3em;line-height:1.5;} -.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #hourglass_chart .itr, #relatives_content .itr { position:relative;top:0;} +.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #familybook_chart_rtl .itr, #hourglass_chart .itr, #hourglass_chart_rtl .itr, #relatives_content .itr {position:relative;top:0;} .user_favorites_block, .charts_block .person_box, .charts_block .person_boxF, .charts_block .person_boxNN, @@ -1315,14 +1315,17 @@ td.descriptionbox a {color:#fff;}/* this keeps the tag color the same when it i #ancestry_chart .person_box, #ancestry_chart .person_boxF, #ancestry_chart .person_boxNN, #descendancy_chart .person_box, #descendancy_chart .person_boxF, #descendancy_chart .person_boxNN, #familybook_chart .person_box, #familybook_chart .person_boxF, #familybook_chart .person_boxNN, +#familybook_chart_rtl .person_box, #familybook_chart_rtl .person_boxF, #familybook_chart_rtl .person_boxNN, #hourglass_chart .person_box, #hourglass_chart .person_boxF, #hourglass_chart .person_boxNN, +#hourglass_chart_rtl .person_box, #hourglass_chart_rtl .person_boxF, #hourglass_chart_rtl .person_boxNN, #relatives_content .person_box, #relatives_content .person_boxF, #relatives_content .person_boxNN {overflow: visible !important;} -.popup { display:none;} +.popup {display:none;} .popup dl {padding:5px; font-size:9px;} .popup dt {float:none;} .popup dd {display: block; margin-left:10px;} .itr:hover .popup {display:block; position:absolute; width:12em;right:0; z-index: 9999;} +html[dir='rtl'] .popup dt {float:none;} html[dir='rtl'] .popup dd {margin-right:10px;} html[dir='rtl'] .itr:hover .popup {left:0; right:auto;} diff --git a/themes/xenea/style.css b/themes/xenea/style.css index 576872fa8c..5c2d096def 100644 --- a/themes/xenea/style.css +++ b/themes/xenea/style.css @@ -1632,7 +1632,7 @@ dd { line-height: 1.5; } -.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #hourglass_chart .itr, #relatives_content .itr { +.block .itr, #family_page .itr, #ancestry_chart .itr, #descendancy_chart .itr, #familybook_chart .itr, #familybook_chart_rtl .itr, #hourglass_chart .itr, #hourglass_chart_rtl .itr, #relatives_content .itr { position: relative; top: 0; } @@ -1643,7 +1643,9 @@ dd { #ancestry_chart .person_box, #ancestry_chart .person_boxF, #ancestry_chart .person_boxNN, #descendancy_chart .person_box, #descendancy_chart .person_boxF, #descendancy_chart .person_boxNN, #familybook_chart .person_box, #familybook_chart .person_boxF, #familybook_chart .person_boxNN, +#familybook_chart_rtl .person_box, #familybook_chart_rtl .person_boxF, #familybook_chart_rtl .person_boxNN, #hourglass_chart .person_box, #hourglass_chart .person_boxF, #hourglass_chart .person_boxNN, +#hourglass_chart_rtl .person_box, #hourglass_chart_rtl .person_boxF, #hourglass_chart_rtl .person_boxNN, #relatives_content .person_box, #relatives_content .person_boxF, #relatives_content .person_boxNN {overflow: visible !important;} .popup { @@ -1672,10 +1674,9 @@ dd { z-index: 9999; } - +html[dir='rtl'] .popup dt {float:none;} html[dir='rtl'] .popup dd {margin-right:10px;} html[dir='rtl'] .itr:hover .popup {left:0; right:auto;} -html[dir='rtl'] .popup dt {float:none;} /* styles for FindFacts pop-up */ #layDefinedTags,#tabDefinedTagsShow { |