diff options
| -rw-r--r-- | library/WT/Controller/Ancestry.php | 8 | ||||
| -rw-r--r-- | library/WT/Controller/Descendancy.php | 8 | ||||
| -rw-r--r-- | library/WT/Controller/Familybook.php | 8 | ||||
| -rw-r--r-- | library/WT/Controller/Hourglass.php | 8 | ||||
| -rw-r--r-- | library/WT/Controller/Pedigree.php | 6 | ||||
| -rw-r--r-- | themes/clouds/theme.php | 4 | ||||
| -rw-r--r-- | themes/colors/theme.php | 4 | ||||
| -rw-r--r-- | themes/fab/theme.php | 4 | ||||
| -rw-r--r-- | themes/minimal/theme.php | 4 | ||||
| -rw-r--r-- | themes/webtrees/theme.php | 4 | ||||
| -rw-r--r-- | themes/xenea/theme.php | 4 |
11 files changed, 43 insertions, 19 deletions
diff --git a/library/WT/Controller/Ancestry.php b/library/WT/Controller/Ancestry.php index 53a3ef4d6c..35fc6b3656 100644 --- a/library/WT/Controller/Ancestry.php +++ b/library/WT/Controller/Ancestry.php @@ -43,7 +43,7 @@ class WT_Controller_Ancestry extends WT_Controller_Chart { var $cellwidth; function __construct() { - global $USE_RIN, $MAX_ALIVE_AGE, $GEDCOM, $bwidth, $bheight, $pbwidth, $pbheight, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS; + global $USE_RIN, $MAX_ALIVE_AGE, $GEDCOM, $bwidth, $bheight, $cbwidth, $cbheight, $pbwidth, $pbheight, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS; global $DEFAULT_PEDIGREE_GENERATIONS, $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $OLD_PGENS, $box_width, $Dbwidth, $Dbheight; global $show_full; @@ -67,10 +67,10 @@ class WT_Controller_Ancestry extends WT_Controller_Chart { $bwidth=$Dbwidth; $bheight=$Dbheight; - // -- adjust size of the non-detailed boxes + // -- adjust size of the compact box if (!$this->show_full) { - $bwidth = $bwidth - 25; - $bheight = $bheight - 32; + $bwidth = $cbwidth; + $bheight = $cbheight; } $pbwidth = $bwidth+12; diff --git a/library/WT/Controller/Descendancy.php b/library/WT/Controller/Descendancy.php index 9bb27c5ebf..19d93cf82e 100644 --- a/library/WT/Controller/Descendancy.php +++ b/library/WT/Controller/Descendancy.php @@ -56,7 +56,7 @@ class WT_Controller_Descendancy extends WT_Controller_Chart { var $show_cousins; function __construct() { - global $USE_RIN, $MAX_ALIVE_AGE, $bwidth, $bheight, $pbwidth, $pbheight, $GEDCOM, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS, $DEFAULT_PEDIGREE_GENERATIONS, $show_full; + global $USE_RIN, $MAX_ALIVE_AGE, $bwidth, $bheight, $cbwidth, $cbheight, $pbwidth, $pbheight, $GEDCOM, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS, $DEFAULT_PEDIGREE_GENERATIONS, $show_full; parent::__construct(); @@ -78,10 +78,10 @@ class WT_Controller_Descendancy extends WT_Controller_Chart { $bwidth=$Dbwidth; $bheight=$Dbheight; - // -- adjust size of the non-detailed boxes + // -- adjust size of the compact box if (!$this->show_full) { - $bwidth = $bwidth - 25; - $bheight = $bheight - 32; + $bwidth = $cbwidth; + $bheight = $cbheight; } $pbwidth = $bwidth+12; diff --git a/library/WT/Controller/Familybook.php b/library/WT/Controller/Familybook.php index 29834f86e8..dd892670d5 100644 --- a/library/WT/Controller/Familybook.php +++ b/library/WT/Controller/Familybook.php @@ -55,16 +55,16 @@ class WT_Controller_Familybook extends WT_Controller_Chart { $this->box_width =safe_GET_integer('box_width', 50, 300, 100); // Box sizes are set globally in the theme. Modify them here. - global $bwidth, $bheight, $Dbwidth, $Dbheight; + global $bwidth, $bheight, $cbwidth, $cbheight, $Dbwidth, $Dbheight; $Dbwidth =$this->box_width * $bwidth / 100; $Dbheight=$this->box_width * $bheight / 100; $bwidth =$Dbwidth; $bheight =$Dbheight; - // -- adjust size of the non-detailed boxes + // -- adjust size of the compact box if (!$this->show_full) { - $bwidth = $bwidth - 25; - $bheight = $bheight - 32; + $bwidth = $cbwidth; + $bheight = $cbheight; } if ($this->root && $this->root->canDisplayName()) { diff --git a/library/WT/Controller/Hourglass.php b/library/WT/Controller/Hourglass.php index f545c18d06..4e3173577a 100644 --- a/library/WT/Controller/Hourglass.php +++ b/library/WT/Controller/Hourglass.php @@ -62,7 +62,7 @@ class WT_Controller_Hourglass extends WT_Controller_Chart { var $arrheight; function __construct($rootid='', $show_full=1, $generations=3) { - global $USE_RIN, $MAX_ALIVE_AGE, $GEDCOM, $bheight, $bwidth, $bhalfheight, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS; + global $USE_RIN, $MAX_ALIVE_AGE, $GEDCOM, $bheight, $bwidth, $cbwidth, $cbheight, $bhalfheight, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS; global $WT_IMAGES, $TEXT_DIRECTION, $show_full; parent::__construct(); @@ -99,10 +99,10 @@ class WT_Controller_Hourglass extends WT_Controller_Chart { $bwidth=$Dbwidth; $bheight=$Dbheight; - // -- adjust size of the non-detailed boxes + // -- adjust size of the compact box if (!$this->show_full) { - $bwidth = $bwidth - 25; - $bheight = $bheight - 32; + $bwidth = $cbwidth; + $bheight = $cbheight; } $bhalfheight = (int)($bheight / 2); diff --git a/library/WT/Controller/Pedigree.php b/library/WT/Controller/Pedigree.php index fe3ea5b7ba..9ea2759493 100644 --- a/library/WT/Controller/Pedigree.php +++ b/library/WT/Controller/Pedigree.php @@ -52,7 +52,7 @@ class WT_Controller_Pedigree extends WT_Controller_Chart { public function __construct() { global $PEDIGREE_FULL_DETAILS, $PEDIGREE_LAYOUT, $MAX_PEDIGREE_GENERATIONS; global $DEFAULT_PEDIGREE_GENERATIONS, $SHOW_EMPTY_BOXES; - global $bwidth, $bheight, $baseyoffset, $basexoffset, $byspacing, $bxspacing; + global $bwidth, $bheight, $cbwidth, $cbheight, $baseyoffset, $basexoffset, $byspacing, $bxspacing; global $BROWSER_TYPE, $show_full, $talloffset; parent::__construct(); @@ -92,8 +92,8 @@ class WT_Controller_Pedigree extends WT_Controller_Chart { // -- adjust size of the compact box if (!$this->show_full) { - $bwidth = $bwidth - 25; - $bheight = $bheight - 32; + $bwidth = $cbwidth; + $bheight = $cbheight; } //-- adjustments for portrait mode if ($this->talloffset==0) { diff --git a/themes/clouds/theme.php b/themes/clouds/theme.php index a9fd18abed..4552c88f9f 100644 --- a/themes/clouds/theme.php +++ b/themes/clouds/theme.php @@ -199,6 +199,10 @@ $Dbheight = 78; // -- horizontal spacing between boxes in all charts $Dindent = 15; // -- width to indent ancestry and descendancy charts boxes $Darrowwidth = 300; // -- not used that I can see *** +// -- Dimensions for compact version of chart displays +$cbwidth=225; +$cbheight=50; + // -- The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels $WT_STATS_S_CHART_X = "440"; $WT_STATS_S_CHART_Y = "125"; diff --git a/themes/colors/theme.php b/themes/colors/theme.php index c937f80833..69dddfe80c 100644 --- a/themes/colors/theme.php +++ b/themes/colors/theme.php @@ -282,6 +282,10 @@ $Dbheight = 78; // -- horizontal spacing between boxes in all charts $Dindent = 15; // -- width to indent ancestry and descendancy charts boxes $Darrowwidth = 300; // -- not used that I can see *** +// -- Dimensions for compact version of chart displays +$cbwidth=225; +$cbheight=50; + // -- The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels $WT_STATS_S_CHART_X = "440"; $WT_STATS_S_CHART_Y = "125"; diff --git a/themes/fab/theme.php b/themes/fab/theme.php index 44cfe10d99..c4914e0eb4 100644 --- a/themes/fab/theme.php +++ b/themes/fab/theme.php @@ -189,6 +189,10 @@ $Dbheight=85; // -- 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=225; +$cbheight=50; + // The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels $WT_STATS_S_CHART_X=440; $WT_STATS_S_CHART_Y=125; diff --git a/themes/minimal/theme.php b/themes/minimal/theme.php index c0f02525a6..1f9697275f 100644 --- a/themes/minimal/theme.php +++ b/themes/minimal/theme.php @@ -171,6 +171,10 @@ $Dindent = 15; // -- width to indent descendancy boxes $Darrowwidth = 30; // -- additional width to include for the up arrows $Darrowwidth = 15; // -- additional width to include for the up arrows +// -- Dimensions for compact version of chart displays +$cbwidth=225; +$cbheight=50; + // -- The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels $WT_STATS_S_CHART_X = "440"; $WT_STATS_S_CHART_Y = "125"; diff --git a/themes/webtrees/theme.php b/themes/webtrees/theme.php index ad90a4a4cf..c84a6450da 100644 --- a/themes/webtrees/theme.php +++ b/themes/webtrees/theme.php @@ -205,6 +205,10 @@ $Dbheight=70; // -- 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=225; +$cbheight=50; + // -- The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels $WT_STATS_S_CHART_X=440; $WT_STATS_S_CHART_Y=125; diff --git a/themes/xenea/theme.php b/themes/xenea/theme.php index a78b38fec4..5493601193 100644 --- a/themes/xenea/theme.php +++ b/themes/xenea/theme.php @@ -199,6 +199,10 @@ $Dbheight = 78; // -- 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=225; +$cbheight=50; + // -- The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels $WT_STATS_S_CHART_X = "440"; $WT_STATS_S_CHART_Y = "125"; |
