diff options
| -rw-r--r-- | library/WT/Controller/Pedigree.php | 11 | ||||
| -rw-r--r-- | pedigree.php | 245 | ||||
| -rw-r--r-- | themes/clouds/style.css | 2 | ||||
| -rw-r--r-- | themes/clouds/theme.php | 5 | ||||
| -rw-r--r-- | themes/colors/css/colors.css | 2 | ||||
| -rw-r--r-- | themes/colors/theme.php | 5 | ||||
| -rw-r--r-- | themes/fab/style.css | 2 | ||||
| -rw-r--r-- | themes/fab/theme.php | 5 | ||||
| -rw-r--r-- | themes/minimal/style.css | 2 | ||||
| -rw-r--r-- | themes/minimal/theme.php | 5 | ||||
| -rw-r--r-- | themes/webtrees/style.css | 2 | ||||
| -rw-r--r-- | themes/webtrees/theme.php | 37 | ||||
| -rw-r--r-- | themes/xenea/style.css | 2 | ||||
| -rw-r--r-- | themes/xenea/theme.php | 5 |
14 files changed, 179 insertions, 151 deletions
diff --git a/library/WT/Controller/Pedigree.php b/library/WT/Controller/Pedigree.php index c347fcb775..e7ab7ddc58 100644 --- a/library/WT/Controller/Pedigree.php +++ b/library/WT/Controller/Pedigree.php @@ -51,11 +51,19 @@ class WT_Controller_Pedigree extends WT_Controller_Chart { global $PEDIGREE_FULL_DETAILS, $PEDIGREE_LAYOUT, $MAX_PEDIGREE_GENERATIONS; global $DEFAULT_PEDIGREE_GENERATIONS, $SHOW_EMPTY_BOXES; global $bwidth, $bheight, $cbwidth, $cbheight, $baseyoffset, $basexoffset, $byspacing, $bxspacing; + global $linewidth, $shadowcolor, $shadowblur, $shadowoffsetX, $shadowoffsetY; + global $BROWSER_TYPE, $show_full, $talloffset; parent::__construct(); $this->log2 = log(2); - + + $this->linewidth = $linewidth; + $this->shadowcolor = $shadowcolor; + $this->shadowblur = $shadowblur; + $this->shadowoffsetX = $shadowoffsetX; + $this->shadowoffsetY = $shadowoffsetY; + $this->show_full =safe_GET('show_full', array('0', '1'), $PEDIGREE_FULL_DETAILS); $this->talloffset=safe_GET('talloffset', array('0', '1', '2', '3'), $PEDIGREE_LAYOUT); $this->box_width =safe_GET_integer('box_width', 50, 300, 100); @@ -96,7 +104,6 @@ class WT_Controller_Pedigree extends WT_Controller_Chart { //-- adjustments for portrait mode if ($this->talloffset==0) { $bxspacing+=12; - //$bwidth+=20; $baseyoffset -= 20*($this->PEDIGREE_GENERATIONS-1); } diff --git a/pedigree.php b/pedigree.php index 7b35ec201c..89b0d9d0f8 100644 --- a/pedigree.php +++ b/pedigree.php @@ -101,17 +101,18 @@ if ($controller->error_message) { <?php //-- echo the boxes $curgen = 1; -$lastvlength = 0; // -- used to save the last vertical line length where child had both father and mother -$linexoffset = 0; -$vlength = 0; $xoffset = 0; $yoffset = 0; // -- used to offset the position of each box as it is generated $prevxoffset = 0; // -- used to track the horizontal x position of the previous box $prevyoffset = 0; // -- used to track the vertical y position of the previous box $maxyoffset = 0; -$linesize = 3; -if (!isset($brborder)) $brborder = 1; // Avoid errors from old custom themes +$lineDrawx = array(); // -- used to position joining lines on <canvas> +$lineDrawy = array(); // -- used to position joining lines on <canvas> + for ($i=($controller->treesize-1); $i>=0; $i--) { + // set positions for joining lines + $lineDrawx[$i] = $xoffset; + $lineDrawy[$i] = $yoffset; // -- check to see if we have moved to the next generation if ($i < floor($controller->treesize / (pow(2, $curgen)))) { @@ -126,86 +127,12 @@ for ($i=($controller->treesize-1); $i>=0; $i--) { $xoffset = $controller->offsetarray[$i]["y"]; $yoffset = $controller->offsetarray[$i]["x"]; } - // -- if we are in the middle generations then we need to draw the connecting lines - - if (($curgen > 0 && $talloffset > 1) || (($curgen > $talloffset) && ($curgen < $controller->PEDIGREE_GENERATIONS))) { - if ($i%2==1) { - if ($SHOW_EMPTY_BOXES || ($controller->treeid[$i]) || ($controller->treeid[$i+1])) { - - if ($talloffset < 2) { - $vlength = $prevyoffset-$yoffset; - $lastvlength = $vlength; - // If no father then adjust lines - if (!$controller->treeid[$i] && (!$SHOW_EMPTY_BOXES)) { - $vlength = ($lastvlength/2); - if ($talloffset == 0 && $show_full==1) $yoffset = $yoffset+$controller->pbheight+50; - if ($talloffset == 0 && $show_full==0) $yoffset = $yoffset+$controller->pbheight+30; - if ($talloffset == 1) $yoffset = $yoffset+$controller->pbheight+5; - } - } - else { - $vlength = $prevxoffset-$xoffset; - } - if (!$SHOW_EMPTY_BOXES && (empty($controller->treeid[$i+1]))) { - $parent = ceil(($i-1)/2); - $vlength = $controller->offsetarray[$parent]["y"]-$yoffset; - } - $linexoffset = $xoffset; - if ($talloffset < 2) { - echo '<div id="line', $i, '" dir="'; - if ($TEXT_DIRECTION=="rtl") { - echo 'rtl" style="position:absolute; right:'; - } else { - echo 'ltr" style="position:absolute; left:'; - } - - echo ($linexoffset-2), 'px; top:', ($yoffset+1+$controller->pbheight/2), 'px; z-index: 0;">'; // vertical line joining boxes - echo '<img src="', $WT_IMAGES['vline'], '" width="', $linesize, '" height="', ($vlength-1), '" alt="" >'; // vertical line joining boxes - echo '</div>'; - } else { - echo '<div id="vline', $i, '" dir="'; - if ($TEXT_DIRECTION=="rtl") { - echo 'rtl" style="position:absolute; right:'; - } else { - echo 'ltr" style="position:absolute; left:'; - } - if ($talloffset > 2) { - echo ($linexoffset-2+$controller->pbwidth/2+$vlength/2), 'px; top:', ($yoffset+1-$controller->pbheight/2+10), 'px; z-index: 0;">'; - echo '<img src="', $WT_IMAGES['vline'], '" width="', $linesize, '" height="', ($controller->pbheight), '" alt="" >'; - } else { - echo ($linexoffset-1+$controller->pbwidth/2+$vlength/2), 'px; top:', ($yoffset+1+$controller->pbheight/2+10), 'px; z-index: 0;">'; - echo '<img src="', $WT_IMAGES['vline'], '" width="', $linesize, '" height="', ($controller->pbheight), '" alt="" >'; - } - echo '</div>'; - echo '<div id="line', $i, '" dir="'; - if ($TEXT_DIRECTION=="rtl") { - echo 'rtl" style="position:absolute; right:'; - } else { - echo 'ltr" style="position:absolute; left:'; - } - echo ($linexoffset+$controller->pbwidth), 'px; top:', ($yoffset+1+$controller->pbheight/2), 'px; z-index: 0;\">'; - echo '<img src="', $WT_IMAGES['hline'], '" width="', ($vlength-$controller->pbwidth), '" height="', $linesize, '" alt="">'; - echo '</div>'; - } - } else { // here if no parents and no empty boxes - $vlength = $prevxoffset-$xoffset; - $linexoffset = $xoffset; - } - } - } // -- draw the box if (!empty($controller->treeid[$i]) || $SHOW_EMPTY_BOXES) { - // Work around a bug in FireFox that mis-places some boxes in Portrait RTL, resulting in - // vertical lines that themselves appear to be mis-placed. - - if ($TEXT_DIRECTION=="rtl") { - $xoffset += $brborder; // Account for thickness of right box border - } if ($yoffset>$maxyoffset) { $maxyoffset=$yoffset; } - $widthadd = 0; if ($i==0) { $iref = rand(); } else { @@ -215,22 +142,17 @@ for ($i=($controller->treesize-1); $i>=0; $i--) { // Can we go back to an earlier generation? $can_go_back=$curgen==1 && WT_Person::getInstance($controller->treeid[$i]) && WT_Person::getInstance($controller->treeid[$i])->getChildFamilies(); - if ($can_go_back) { - $widthadd = 20; - } elseif ($curgen >2 && $curgen < $controller->PEDIGREE_GENERATIONS) { - $widthadd = 10; - } - if ($talloffset == 2) { + if ($talloffset == 2) { // oldest at top echo '<div id="uparrow" dir="'; if ($TEXT_DIRECTION=="rtl") { echo 'rtl" style="position:absolute; right:'; } else { echo 'ltr" style="position:absolute; left:'; } - echo ($xoffset+$controller->pbwidth/2-5), 'px; top:', ($yoffset-20), 'px; width:10px; height:10px;">'; + echo ($xoffset+$controller->pbwidth/2), 'px; top:', ($yoffset), 'px;">'; if ($can_go_back) { $did = 1; - if ($i > ($controller->treesize/2) + ($controller->treesize/4)-1) { + if ($i > ($controller->treesize/2) + ($controller->treesize/4)) { $did++; } echo '<a href=pedigree.php?PEDIGREE_GENERATIONS=', $controller->PEDIGREE_GENERATIONS, '&rootid=', $controller->treeid[$did], '&show_full=', $controller->show_full, '&talloffset=', $controller->talloffset, ' class="icon-uarrow noprint"></a>'; @@ -238,7 +160,7 @@ for ($i=($controller->treesize-1); $i>=0; $i--) { echo '</div>'; } // beginning of box setup and display - echo '<div id="box'; + echo '<div class="shadow" id="box'; if (empty($controller->treeid[$i])) { echo "$iref"; } else { @@ -250,55 +172,38 @@ for ($i=($controller->treesize-1); $i>=0; $i--) { echo ".1.$iref\" style=\"position:absolute; left:"; } - if ($talloffset == 2) { - $zindex = $PEDIGREE_GENERATIONS-$curgen; - } else { - $zindex = 0; - } - //Correct box spacing for Oldest on bottom - if (($talloffset == 3) && ($curgen ==1)) { - $yoffset +=25; + //Correct box spacing for different layouts + if ($talloffset == 2) {$zindex = $PEDIGREE_GENERATIONS-$curgen;} else {$zindex = 0;} + if (($talloffset == 3) && ($curgen ==1)) {$yoffset +=25;} + if (($talloffset == 3) && ($curgen ==2)) {$yoffset +=10;} - } + echo $xoffset, "px; top:", $yoffset, "px; width:", ($controller->pbwidth), "px; height:", $controller->pbheight, "px; z-index:", $zindex, ";\">"; + + if (!isset($controller->treeid[$i])) {$controller->treeid[$i] = false;} - if (($talloffset == 3) && ($curgen ==2)) { - $yoffset +=10; - } - - echo $xoffset, "px; top:", ($yoffset-1), "px; width:", ($controller->pbwidth+$widthadd), "px; height:", $controller->pbheight, "px; "; - echo "z-index: ", $zindex, ";\">"; - echo "<table class=\"pedigree_chart_table\" dir=\"$TEXT_DIRECTION\">"; - if (($talloffset < 2) && ($curgen > $talloffset) && ($curgen < $controller->PEDIGREE_GENERATIONS)) { - echo "<tr><td>"; - echo "<img src=\"", $WT_IMAGES["hline"], "\" alt=\"\">"; - echo "</td><td class=\"width100\">"; - } else { - echo "<tr><td class=\"width100\">"; - } - if (!isset($controller->treeid[$i])) { - $controller->treeid[$i] = false; - } print_pedigree_person(WT_Person::getInstance($controller->treeid[$i]), 1, $iref, 1); + if ($can_go_back) { $did = 1; - if ($i > ($controller->treesize/2) + ($controller->treesize/4)-1) { + if ($i > ($controller->treesize/2) + ($controller->treesize/4)) { $did++; } if ($talloffset==3) { - echo "</td></tr><tr><td>"; - echo "<a href=\"pedigree.php?PEDIGREE_GENERATIONS={$controller->PEDIGREE_GENERATIONS}&rootid={$controller->treeid[$did]}&show_full={$controller->show_full}&talloffset={$controller->talloffset}\" "; - echo 'class="icon-darrow noprint"></a>'; + echo '<div class="ancestorarrow" dir="ltr" style="position:absolute; left:', $controller->pbwidth/2, 'px; top:', $controller->pbheight, 'px;">'; + echo '<a href="pedigree.php?PEDIGREE_GENERATIONS='.$controller->PEDIGREE_GENERATIONS.'&rootid='.$controller->treeid[$did].'&show_full='.$controller->show_full.'&talloffset='.$controller->talloffset.' class="icon-darrow noprint"></a>'; + echo '</div>'; } elseif ($talloffset < 2) { - echo "</td><td>"; - echo "<a href=\"pedigree.php?PEDIGREE_GENERATIONS={$controller->PEDIGREE_GENERATIONS}&rootid={$controller->treeid[$did]}&show_full={$controller->show_full}&talloffset={$talloffset}\" "; + echo '<div class="ancestorarrow" dir="ltr" style="position:absolute; right:-22px; top:', ($controller->pbheight/2-10), 'px;">'; + echo '<a href="pedigree.php?PEDIGREE_GENERATIONS='.$controller->PEDIGREE_GENERATIONS.'&rootid='.$controller->treeid[$did].'&show_full='.$controller->show_full.'&talloffset='.$talloffset.'"'; if ($TEXT_DIRECTION=="rtl") { - echo 'class="icon-larrow noprint"></a>'; + echo ' class="icon-larrow noprint"></a>'; } else { - echo 'class="icon-rarrow noprint"></a>'; + echo ' class="icon-rarrow noprint"></a>'; } + echo '</div>'; } } - echo "</td></tr></table></div>"; + echo '</div>'; } } @@ -321,7 +226,7 @@ if (count($famids)>0) { } else { $addxoffset = 0; } - echo $addxoffset, 'px; top:', $yoffset, 'px; width:10px; height:10px;">'; + echo $addxoffset, 'px; top:', $yoffset, 'px;">'; if ($TEXT_DIRECTION=='rtl') { echo '<a href="#" onclick="togglechildrenbox(); return false;" class="icon-rarrow"></a>'; } else { @@ -330,7 +235,7 @@ if (count($famids)>0) { break; case 1: if ($PEDIGREE_GENERATIONS<4) $basexoffset += 60; - echo $basexoffset, 'px; top:', $yoffset, 'px; width:10px; height:10px;">'; + echo $basexoffset, 'px; top:', $yoffset, 'px;">'; if ($TEXT_DIRECTION=='rtl') { echo '<a href="#" onclick="togglechildrenbox(); return false;" class="icon-rarrow"></a>'; } else { @@ -338,11 +243,11 @@ if (count($famids)>0) { } break; case 2: - echo ($linexoffset-10+$controller->pbwidth/2+$vlength/2), 'px; top:', ($yoffset+$controller->pbheight/2+10), 'px; width:10px; height:10px;">'; + echo ($xoffset-10+$controller->pbwidth/2), 'px; top:', ($yoffset+$controller->pbheight/2+10), 'px;">'; echo '<a href="#" onclick="togglechildrenbox(); return false;" class="icon-darrow"></a>'; break; case 3: - echo ($linexoffset-10+$controller->pbwidth/2+$vlength/2), 'px; top:', ($yoffset-$controller->pbheight/2-10), 'px; width:10px; height:10px;">'; + echo ($xoffset-10+$controller->pbwidth/2), 'px; top:', ($yoffset-$controller->pbheight/2-10), 'px;">'; echo '<a href="#" onclick="togglechildrenbox(); return false;" class="icon-uarrow"></a>'; break; } @@ -350,12 +255,11 @@ if (count($famids)>0) { $yoffset += ($controller->pbheight / 2)+10; echo '<div id="childbox" dir="'; if ($TEXT_DIRECTION=='rtl') { - echo 'rtl" style="position:absolute; right:'; + echo 'rtl" style="padding: 5px; background-color:white; border:1px solid; position:absolute; right:'; } else { - echo 'ltr" style="position:absolute; left:'; + echo 'ltr" style="padding: 5px; background-color:white; border:1px solid; position:absolute; left:'; } - echo $xoffset, 'px; top:', $yoffset, 'px; width:', $controller->pbwidth, 'px; height:', $controller->pbheight, 'px; visibility: hidden;">'; - echo '<table class="person_box"><tr><td>'; + echo $xoffset, 'px; top:', $yoffset, 'px; visibility: hidden;">'; foreach ($famids as $family) { $spouse=$family->getSpouse($controller->root); if ($spouse) { @@ -396,15 +300,90 @@ if (count($famids)>0) { } } } - echo '</td></tr></table>'; echo '</div>'; } +// calculate canvas width +if ($talloffset < 2) {$canvaswidth = $PEDIGREE_GENERATIONS*($controller->pbwidth+20); +} else { +$canvaswidth = pow(2,$PEDIGREE_GENERATIONS-1)*($controller->pbwidth+20);} +echo '<canvas id="pedigree_canvas" width="'.$canvaswidth.'" height="'.($maxyoffset+200).'"><p>No lines between boxes? Unfortunately your browser does not support he HTML5 canvas feature.</p></canvas>'; echo '</div>'; //close #pedigree_chart echo '</div>'; //close #pedigree-page + // Expand <div id="content"> to include the absolutely-positioned elements. $controller->addInlineJavascript(' content_div = document.getElementById("content"); if (content_div) { content_div.style.height="'.($maxyoffset+30).'px"; } -'); +function getStyle(oElm, strCssRule){ + var strValue = ""; + if(document.defaultView && document.defaultView.getComputedStyle){ + strValue = document.defaultView.getComputedStyle(oElm, "").getPropertyValue(strCssRule); + } + else if(oElm.currentStyle){ + strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){ + return p1.toUpperCase(); + }); + strValue = oElm.currentStyle[strCssRule]; + } + return strValue; +} + // Draw joining lines in <canvas> + // Set variables + var c=document.getElementById("pedigree_canvas"); + var ctx=c.getContext("2d"); + var offset_x = 20; + var offset_x2 = '.$controller->pbwidth.'/2; + var offset_y = '.$controller->pbheight.'/2; + var offset_y2 = '.$controller->pbheight.'*2-10; + var lineDrawx = new Array("'. join(array_reverse ($lineDrawx),'","'). '"); + var lineDrawx2 = new Array("'. join($lineDrawx,'","'). '"); + var lineDrawy = new Array("'. join(array_reverse ($lineDrawy),'","'). '"); + var lineDrawy2 = new Array("'. join($lineDrawy,'","'). '"); + var maxjoins = Math.pow(2,'.$PEDIGREE_GENERATIONS.'-1); + var maxjoins2 = Math.pow(2,'.$PEDIGREE_GENERATIONS.'); + var talloffset = '.$talloffset.'; + + //Draw the lines + if (talloffset < 2) { // landscape and portrait styles + for (var i = 0; i <= maxjoins-3; i++) { + if(i%2==0){ + ctx.moveTo(lineDrawx[i],lineDrawy[i]-0+offset_y); + ctx.lineTo(lineDrawx[i]-offset_x,lineDrawy[i]-0+offset_y); + ctx.lineTo(lineDrawx[i+1]-offset_x,lineDrawy[i+1]-0+offset_y); + ctx.lineTo(lineDrawx[i+1],lineDrawy[i+1]-0+offset_y); + } + } + } + + if (talloffset == 2) { // oldest at top + for (var i = 0; i <= maxjoins2; i++) { + if(i%2!=0){ + ctx.moveTo(lineDrawx2[i]-0+offset_x2,lineDrawy2[i]); + ctx.lineTo(lineDrawx2[i]-0+offset_x2,lineDrawy2[i]-0+offset_y2); + ctx.lineTo(lineDrawx2[i+1]-0+offset_x2,lineDrawy2[i]-0+offset_y2); + ctx.lineTo(lineDrawx2[i+1]-0+offset_x2,lineDrawy2[i]); + } + } + } + + if (talloffset == 3) { // oldest at bottom + for (var i = 0; i <= maxjoins2; i++) { + if(i%2!=0){ + ctx.moveTo(lineDrawx2[i]-0+offset_x2,lineDrawy2[i]); + ctx.lineTo(lineDrawx2[i]-0+offset_x2,lineDrawy2[i]-offset_y2/2); + ctx.lineTo(lineDrawx2[i+1]-0+offset_x2,lineDrawy2[i]-offset_y2/2); + ctx.lineTo(lineDrawx2[i+1]-0+offset_x2,lineDrawy2[i]); + } + } + } + // Set line styles + ctx.strokeStyle = getStyle(document.getElementById("pedigree_canvas"), "color"); + ctx.lineWidth = '.$controller->linewidth.'; + ctx.shadowColor = "'.$controller->shadowcolor.'"; + ctx.shadowBlur = '.$controller->shadowblur.'; + ctx.shadowOffsetX = '.$controller->shadowoffsetX.'; + ctx.shadowOffsetY = '.$controller->shadowoffsetY.'; + ctx.stroke(); +');
\ No newline at end of file diff --git a/themes/clouds/style.css b/themes/clouds/style.css index 0f6c3cc73e..1abc3db8eb 100644 --- a/themes/clouds/style.css +++ b/themes/clouds/style.css @@ -718,6 +718,8 @@ z-index:1; } html[dir='rtl'] #pedigree_chart {left:auto;right:0;} +#pedigree_canvas {color:#8BF;position:absolute;z-index:-1000;} +#pedigree_canvas p{width:300px;padding-top:200px;} #relationship_chart { z-index:1; diff --git a/themes/clouds/theme.php b/themes/clouds/theme.php index e1249dc5aa..0e5377ee70 100644 --- a/themes/clouds/theme.php +++ b/themes/clouds/theme.php @@ -89,6 +89,11 @@ $basexoffset = 10; // -- position the pedigree and timeline charts relative to t $bxspacing = 4; // -- horizontal spacing between boxes on the pedigree chart $byspacing = 5; // -- vertical spacing between boxes on the pedigree chart $brborder = 1; // -- pedigree chart box right border thickness +$linewidth=1.5; // width of joining lines +$shadowcolor=""; // shadow color for joining lines +$shadowblur=0; // shadow blur for joining lines +$shadowoffsetX=0; // shadowOffsetX for joining lines +$shadowoffsetY=0; // shadowOffsetY for joining lines //-- Other settings that should not be touched $Dbxspacing = 5; // -- position vertical line between boxes in relationship chart diff --git a/themes/colors/css/colors.css b/themes/colors/css/colors.css index 231f9c1a70..9ddf7a9782 100644 --- a/themes/colors/css/colors.css +++ b/themes/colors/css/colors.css @@ -333,6 +333,8 @@ html[dir='rtl'] #familybook_chart{margin-right:10px;} .pedigree_chart_table {border:0;border-collapse:collapse;padding:0;width:100%;} #pedigree_chart{position:relative;top:-200px;left:0;z-index:1;} html[dir='rtl'] #pedigree_chart{left:auto;right:0;} +#pedigree_canvas {color:#81A9CB;position:absolute;z-index:-1000;} +#pedigree_canvas p{width:300px;padding-top:200px;} #relationship_chart{margin-left:10px;} html[dir='rtl'] #relationship_chart{margin-right:10px;} diff --git a/themes/colors/theme.php b/themes/colors/theme.php index f2f6a83e88..cbee654754 100644 --- a/themes/colors/theme.php +++ b/themes/colors/theme.php @@ -170,6 +170,11 @@ $basexoffset = 10; // -- position the pedigree and timeline charts relative to t $bxspacing = 4; // -- horizontal spacing between boxes on the pedigree chart $byspacing = 5; // -- vertical spacing between boxes on the pedigree chart $brborder = 1; // -- pedigree chart box right border thickness +$linewidth=1.5; // width of joining lines +$shadowcolor=""; // shadow color for joining lines +$shadowblur=0; // shadow blur for joining lines +$shadowoffsetX=0; // shadowOffsetX for joining lines +$shadowoffsetY=0; // shadowOffsetY for joining lines //-- Other settings that should not be touched $Dbxspacing = 5; // -- position vertical line between boxes in relationship chart diff --git a/themes/fab/style.css b/themes/fab/style.css index 05c2ab2cac..fa885fe017 100644 --- a/themes/fab/style.css +++ b/themes/fab/style.css @@ -323,6 +323,8 @@ html[dir="rtl"] .pedigree_image { top:-230px; left:0; } +#pedigree_canvas {color:darkGray;position:absolute;z-index:-1000;} +#pedigree_canvas p{width:300px;padding-top:200px;} .compact_view {cursor:url(images/zoomin.png),n-resize;} .compact_view p {font-size:90%;margin:0;} diff --git a/themes/fab/theme.php b/themes/fab/theme.php index 9e2dd45112..841d1ceff5 100644 --- a/themes/fab/theme.php +++ b/themes/fab/theme.php @@ -87,6 +87,11 @@ $basexoffset=10; // position the entire pedigree tree relative to the left of th $bxspacing=0; // horizontal spacing between boxes on the pedigree chart $byspacing=5; // vertical spacing between boxes on the pedigree chart $brborder=1; // box right border thickness +$linewidth=1.5; // width of joining lines +$shadowcolor=""; // shadow color for joining lines +$shadowblur=0; // shadow blur for joining lines +$shadowoffsetX=0; // shadowOffsetX for joining lines +$shadowoffsetY=0; // shadowOffsetY for joining lines // -- descendancy - relationship chart variables $Dbaseyoffset=20; // -- position the entire descendancy tree relative to the top of the page diff --git a/themes/minimal/style.css b/themes/minimal/style.css index d2ea9e7804..9251d2c866 100644 --- a/themes/minimal/style.css +++ b/themes/minimal/style.css @@ -727,6 +727,8 @@ html[dir='rtl'] #familybook_chart{margin-right:10px;} top:-240px; left:10px; } +#pedigree_canvas {position:absolute;z-index:-1000;} +#pedigree_canvas p{width:300px;padding-top:200px;} /*-- pedigree chart rtl specific stylesheets --*/ html[dir='rtl'] #pedigree_chart { diff --git a/themes/minimal/theme.php b/themes/minimal/theme.php index 05b1475559..7c2c747e92 100644 --- a/themes/minimal/theme.php +++ b/themes/minimal/theme.php @@ -89,6 +89,11 @@ $basexoffset = 10; // -- position the entire pedigree tree relative to the left $bxspacing = 0; // -- horizontal spacing between boxes on the pedigree chart $byspacing = 5; // -- vertical spacing between boxes on the pedigree chart $brborder = 1; // -- box right border thickness +$linewidth=1.5; // width of joining lines +$shadowcolor=""; // shadow color for joining lines +$shadowblur=0; // shadow blur for joining lines +$shadowoffsetX=0; // shadowOffsetX for joining lines +$shadowoffsetY=0; // shadowOffsetY for joining lines // -- global variables for the descendancy chart $Dbaseyoffset = 20; // -- position the entire descendancy tree relative to the top of the page diff --git a/themes/webtrees/style.css b/themes/webtrees/style.css index b746561d23..b4910ddc5c 100644 --- a/themes/webtrees/style.css +++ b/themes/webtrees/style.css @@ -193,6 +193,8 @@ html[dir='rtl'] #familybook_chart{margin-right:10px;} .pedigree_chart_table {border:0;border-collapse:collapse;padding:0;width:100%;} #pedigree_chart {position:relative;top:-200px;left:0;} html[dir='rtl'] #pedigree_chart {left:auto;right:10px;} +#pedigree_canvas {color:#81A9CB;position:absolute;z-index:-1000;} +#pedigree_canvas p{width:300px;padding-top:200px;} /*-- descendancy chart specific stylesheets --*/ #descendancy_chart ul {background-image:url(images/vline.png);background-repeat:repeat-y;background-position:left top;list-style:none;margin:0 0 5px 15px;padding-top:0;padding-right:0;padding-bottom:0;} diff --git a/themes/webtrees/theme.php b/themes/webtrees/theme.php index 26094bdf26..5752119dee 100644 --- a/themes/webtrees/theme.php +++ b/themes/webtrees/theme.php @@ -84,23 +84,28 @@ $fanChart = array( ); //-- pedigree chart variables -$bwidth=250; // -- width of boxes on pedigree chart -$bheight=80; // -- height of boxes on pedigree chart -$baseyoffset=10; // -- position the entire pedigree tree relative to the top of the page -$basexoffset=10; // -- position the entire pedigree tree relative to the left of the page -$bxspacing=10; // -- horizontal spacing between boxes on the pedigree chart -$byspacing=10; // -- vertical spacing between boxes on the pedigree chart -$brborder=1; // -- box right border thickness +$bwidth=250; // width of boxes on pedigree chart +$bheight=80; // height of boxes on pedigree chart +$baseyoffset=10; // position the entire pedigree tree relative to the top of the page +$basexoffset=10; // position the entire pedigree tree relative to the left of the page +$bxspacing=10; // horizontal spacing between boxes on the pedigree chart +$byspacing=10; // vertical spacing between boxes on the pedigree chart +$brborder=1; // box right border thickness +$linewidth=1.5; // width of joining lines +$shadowcolor=""; // shadow color for joining lines +$shadowblur=0; // shadow blur for joining lines +$shadowoffsetX=0; // shadowOffsetX for joining lines +$shadowoffsetY=0; // shadowOffsetY for joining lines -// -- descendancy - relationship chart variables -$Dbaseyoffset=20; // -- position the entire descendancy tree relative to the top of the page -$Dbasexoffset=20; // -- position the entire descendancy tree relative to the left of the page -$Dbxspacing=5; // -- horizontal spacing between boxes -$Dbyspacing=10; // -- vertical spacing between boxes -$Dbwidth=260; // -- width of DIV layer boxes -$Dbheight=80; // -- height of DIV layer boxes -$Dindent=15; // -- width to indent descendancy boxes -$Darrowwidth=30; // -- additional width to include for the up arrows +// descendancy - relationship chart variables +$Dbaseyoffset=20; // position the entire descendancy tree relative to the top of the page +$Dbasexoffset=20; // position the entire descendancy tree relative to the left of the page +$Dbxspacing=5; // horizontal spacing between boxes +$Dbyspacing=10; // vertical spacing between boxes +$Dbwidth=260; // width of DIV layer boxes +$Dbheight=80; // height of DIV layer boxes +$Dindent=15; // width to indent descendancy boxes +$Darrowwidth=30; // additional width to include for the up arrows // -- Dimensions for compact version of chart displays $cbwidth=240; diff --git a/themes/xenea/style.css b/themes/xenea/style.css index dfba45080b..317f691913 100644 --- a/themes/xenea/style.css +++ b/themes/xenea/style.css @@ -996,6 +996,8 @@ html[dir='rtl'] #familybook_chart{margin-right:10px;} top:-240px; left:0; } +#pedigree_canvas {color:#81A9CB;position:absolute;z-index:-1000;} +#pedigree_canvas p{width:300px;padding-top:200px;} /*-- pedigree chart rtl specific stylesheets --*/ html[dir='rtl'] #pedigree_chart { diff --git a/themes/xenea/theme.php b/themes/xenea/theme.php index 41ab370892..dbe487296b 100644 --- a/themes/xenea/theme.php +++ b/themes/xenea/theme.php @@ -89,6 +89,11 @@ $basexoffset = 10; // -- position the entire pedigree tree relative to the left $bxspacing = 1; // -- horizontal spacing between boxes on the pedigree chart $byspacing = 5; // -- vertical spacing between boxes on the pedigree chart $brborder = 1; // -- box right border thickness +$linewidth=1.5; // width of joining lines +$shadowcolor=""; // shadow color for joining lines +$shadowblur=0; // shadow blur for joining lines +$shadowoffsetX=0; // shadowOffsetX for joining lines +$shadowoffsetY=0; // shadowOffsetY for joining lines // -- global variables for the descendancy chart $Dbaseyoffset = 20; // -- position the entire descendancy tree relative to the top of the page |
