From 8b2f73397be2edb5b1424b7cda25dec86f0d44a5 Mon Sep 17 00:00:00 2001 From: Łukasz Wilenski Date: Mon, 24 Oct 2011 20:14:11 +0000 Subject: #604136 - Nav Options box location display bug-SVN 906651 --- ancestry.php | 27 ++++++++++++++------------- descendancy.php | 24 +++++++++++++----------- includes/functions/functions_charts.php | 4 ++-- themes/clouds/style.css | 3 ++- themes/colors/css/colors.css | 3 ++- themes/fab/style.css | 3 ++- themes/minimal/style.css | 3 ++- themes/webtrees/style.css | 3 ++- themes/xenea/style.css | 3 ++- 9 files changed, 41 insertions(+), 32 deletions(-) diff --git a/ancestry.php b/ancestry.php index 96c118ac20..b675738fd2 100644 --- a/ancestry.php +++ b/ancestry.php @@ -30,17 +30,17 @@ require './includes/session.php'; require_once WT_ROOT.'includes/functions/functions_print_lists.php'; // -- array of GEDCOM elements that will be found but should not be displayed -$nonfacts[] = "FAMS"; -$nonfacts[] = "FAMC"; -$nonfacts[] = "MAY"; -$nonfacts[] = "BLOB"; -$nonfacts[] = "CHIL"; -$nonfacts[] = "HUSB"; -$nonfacts[] = "WIFE"; -$nonfacts[] = "RFN"; -$nonfacts[] = ""; -$nonfamfacts[] = "UID"; -$nonfamfacts[] = ""; +$nonfacts[] = 'FAMS'; +$nonfacts[] = 'FAMC'; +$nonfacts[] = 'MAY'; +$nonfacts[] = 'BLOB'; +$nonfacts[] = 'CHIL'; +$nonfacts[] = 'HUSB'; +$nonfacts[] = 'WIFE'; +$nonfacts[] = 'RFN'; +$nonfacts[] = ''; +$nonfamfacts[] = 'UID'; +$nonfamfacts[] = ''; $controller=new WT_Controller_Ancestry(); $controller->init(); @@ -191,10 +191,10 @@ case 0: case 1: // TODO: this should be a parameter to a function, not a global $show_cousins=$controller->show_cousins; - + echo '
'; // Booklet // first page : show indi facts - print_pedigree_person(WT_Person::getInstance($controller->rootid), 2, 1); + print_pedigree_person(WT_Person::getInstance($controller->rootid), 1, 1); // expand the layer echo WT_JS_START, 'expandbox("', $controller->rootid, '.1", 2);', WT_JS_END; // process the tree @@ -209,6 +209,7 @@ case 1: } } } + echo '
'; break; case 2: // Individual list diff --git a/descendancy.php b/descendancy.php index 5e01f3528b..e879617458 100644 --- a/descendancy.php +++ b/descendancy.php @@ -28,17 +28,17 @@ require './includes/session.php'; require_once WT_ROOT.'includes/functions/functions_print_lists.php'; // -- array of GEDCOM elements that will be found but should not be displayed -$nonfacts[] = "FAMS"; -$nonfacts[] = "FAMC"; -$nonfacts[] = "MAY"; -$nonfacts[] = "BLOB"; -$nonfacts[] = "CHIL"; -$nonfacts[] = "HUSB"; -$nonfacts[] = "WIFE"; -$nonfacts[] = "RFN"; -$nonfacts[] = ""; -$nonfamfacts[] = "UID"; -$nonfamfacts[] = ""; +$nonfacts[] = 'FAMS'; +$nonfacts[] = 'FAMC'; +$nonfacts[] = 'MAY'; +$nonfacts[] = 'BLOB'; +$nonfacts[] = 'CHIL'; +$nonfacts[] = 'HUSB'; +$nonfacts[] = 'WIFE'; +$nonfacts[] = 'RFN'; +$nonfacts[] = ''; +$nonfamfacts[] = 'UID'; +$nonfamfacts[] = ''; $controller=new WT_Controller_Descendancy(); $controller->init(); @@ -132,11 +132,13 @@ case 0: //-- list echo ''; break; case 1: //-- booklet + echo '
'; if ($show_full==0) { echo '', WT_I18N::translate('Click on any of the boxes to get more information about that person.'), '

'; } $show_cousins = true; $controller->print_child_family($controller->descPerson, $controller->generations); + echo '
'; break; case 2: //-- Individual list $descendants=indi_desc($controller->descPerson, $controller->generations, array()); diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php index a0a61b0894..ffafea0aea 100644 --- a/includes/functions/functions_charts.php +++ b/includes/functions/functions_charts.php @@ -659,7 +659,7 @@ function print_cousins($famid, $personcount=1) { $kids = count($fchildren); $save_show_full = $show_full; if ($save_show_full) { - $bheight/=4; + $bheight=$bheight/4+10; $bwidth-=40; } $show_full = false; @@ -692,7 +692,7 @@ function print_cousins($famid, $personcount=1) { } $show_full = $save_show_full; if ($save_show_full) { - $bheight*=4; + $bheight=($bheight-10)*4; $bwidth+=40; } echo ''; diff --git a/themes/clouds/style.css b/themes/clouds/style.css index 82fb6ed589..4811af9c06 100644 --- a/themes/clouds/style.css +++ b/themes/clouds/style.css @@ -1622,7 +1622,8 @@ margin: 0; position: absolute; width: 16em; padding: 0.5em; - left: 0.5em; + white-space:normal; + left:-5em; top: 0.5em; z-index: 9999; } diff --git a/themes/colors/css/colors.css b/themes/colors/css/colors.css index cfa2cf6e54..87bca164c9 100644 --- a/themes/colors/css/colors.css +++ b/themes/colors/css/colors.css @@ -1574,7 +1574,8 @@ margin: 0; position: absolute; width: 16em; padding: 0.5em; - left: 0.5em; + white-space:normal; + left:-5em; top: 0.5em; z-index: 9999; } diff --git a/themes/fab/style.css b/themes/fab/style.css index 680985b0ed..c72c511493 100644 --- a/themes/fab/style.css +++ b/themes/fab/style.css @@ -1002,7 +1002,8 @@ dd { position: absolute; width: 16em; padding: 0.5em; - left: 0.5em; + white-space:normal; + left:-5em; top: 0.5em; z-index: 9999; } diff --git a/themes/minimal/style.css b/themes/minimal/style.css index 0ad511766b..e0928b75aa 100644 --- a/themes/minimal/style.css +++ b/themes/minimal/style.css @@ -1386,7 +1386,8 @@ dd { position: absolute; width: 16em; padding: 0.5em; - left: 0.5em; + white-space:normal; + left:-5em; top: 0.5em; z-index: 9999; } diff --git a/themes/webtrees/style.css b/themes/webtrees/style.css index 7cd81f9284..ecfd2b5945 100644 --- a/themes/webtrees/style.css +++ b/themes/webtrees/style.css @@ -1344,7 +1344,8 @@ td.descriptionbox a {color:#fff;}/* this keeps the tag color the same when it i position:absolute; width:16em; padding:0.5em; - left:0.5em; + white-space:normal; + left:-8em; top:0.5em; z-index:9999; } diff --git a/themes/xenea/style.css b/themes/xenea/style.css index d47889ad0b..4c00e3c62a 100644 --- a/themes/xenea/style.css +++ b/themes/xenea/style.css @@ -1657,7 +1657,8 @@ dd { position: absolute; width: 16em; padding: 0.5em; - left: 0.5em; + white-space:normal; + left:-5em; top: 0.5em; z-index: 9999; } -- cgit v1.3