Skip to content

Commit

Permalink
RESOLVED #JJ177: Upgrade to webtrees 1.6.0 - Adapt Perso add-ons
Browse files Browse the repository at this point in the history
  • Loading branch information
jon48 committed Oct 18, 2014
1 parent 7e04369 commit 6213b17
Show file tree
Hide file tree
Showing 142 changed files with 122 additions and 137 deletions.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Diff not rendered.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Diff not rendered.
File renamed without changes
File renamed without changes
Diff not rendered.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Diff not rendered.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
187 changes: 89 additions & 98 deletions css-1.5.3/style.css → css-1.6.0/style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</p>

<?php
if (WT_DEBUG || get_gedcom_setting(WT_GED_ID, 'SHOW_STATS')) {
if ($WT_TREE && $WT_TREE->getPreference('SHOW_STATS')) {
echo execution_stats();
}
if (exists_pending_change()) { ?>
Expand Down
4 changes: 3 additions & 1 deletion header.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
//
// @author Jonathan Jaubart <[email protected]>

use WT\Auth;

if (!defined('WT_WEBTREES')) {
header('HTTP/1.0 403 Forbidden');
exit;
Expand Down Expand Up @@ -111,7 +113,7 @@
<li>
<?php
if (WT_USER_ID) {
echo '<a href="edituser.php">', WT_I18N::translate('Logged in as '), ' ', getUserFullName(WT_USER_ID), '</a></li> <li>', logout_link();
echo '<a href="edituser.php">', WT_I18N::translate('Logged in as '), ' ', WT_Filter::escapeHtml(Auth::user()->getRealName()), '</a></li> <li>', logout_link();
} else {
echo login_link();
}
Expand Down
33 changes: 11 additions & 22 deletions templates/compactbox_template.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// Template for drawing person boxes
// This template expects that the following variables will be set
// $pid, $boxID, $icons, $GEDCOM, $style,
// $name, $classfacts, $genderImage, $BirthDeath, $isF, $outBoxAdd,
// $addname, $showid, $float
// $name, $outBoxAdd, $addname
//
// webtrees: Web based Family History software
// Copyright (C) 2014 webtrees development team.
Expand Down Expand Up @@ -32,27 +31,17 @@
exit;
}

echo '<div id="out-', $boxID ,'" ', $outBoxAdd, '>
echo
'<div data-pid="'. $pid . '"' , $outBoxAdd, '>
<div class="compact_view">',
$thumbnail,
'<a onclick="event.cancelBubble=true;" href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'">
<span id="namedef-',$boxID, '" class="name',$style,' ',$classfacts,'">', $shortname, '</span>
'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '" title="',strip_tags($name.$addname),'">
<span class="namedef name',$style,'">', $shortname, '</span>
</a>
<p>', $person->getLifeSpan(), '</p>
<p>', $birthplace, '</p>
</div>';
// details for zoom view
echo '<div id="fontdef-',$boxID,'" class="details',$style,'" style="display:none;">
<br><hr>
<a onclick="event.cancelBubble=true;" href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '">',
'<span id="namedef-',$boxID, '.2" class="name',$style,' ',$classfacts,'">', $name.$addname, '</span>
<span class="name',$style,'">',$genderImage,'</span>';
echo '</a>',
$BirthDeath,
'</div>
<div id="inout-',$boxID,'" style="display:none;">
<div id="LOADING-inout-',$boxID,'">',WT_I18N::translate('Loading…'),'</div>
</div>';
// end of zoom view
echo '</div>';
</div>
<div class="inout2 details',$style,'">',
$person->getLifeSpan(), '
</div>
<div class="inout"></div>
</div>';

29 changes: 16 additions & 13 deletions templates/personbox_template.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Template for drawing person boxes
// This template expects that the following variables will be set
// $pid, $boxID, $icons, $GEDCOM, $style,
// $name, $classfacts, $genderImage, $BirthDeath, $isF, $outBoxAdd,
// $name, $genderImage, $BirthDeath, $outBoxAdd,
// $addname
//
// webtrees: Web based Family History software
Expand Down Expand Up @@ -32,20 +32,23 @@
exit;
}

echo '<div id="out-',$boxID,'" ',$outBoxAdd,'>
<div class="noprint" id="icons-',$boxID,'" style="',$iconsStyleAdd,'">', $icons, '</div>',
echo
'<div data-pid="'. $pid . '" ',$outBoxAdd,'>
<div class="noprint icons">', $icons, '</div>',
'<div class="chart_textbox" style="max-height:', $bheight,'px;">',
$thumbnail,
'<a onclick="event.cancelBubble=true;" href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '">
<span id="namedef-',$boxID, '" class="name',$style,' ',$classfacts,'">', $name.$addname, '</span>
<span class="name',$style,'"> ',$genderImage,'</span>';
echo '</a>
<div id="fontdef-',$boxID,'" class="details',$style,'">
<div id="inout2-',$boxID,'" style="max-height:', ($bheight*.9),'px;">',$BirthDeath,'</div>
</div>
</div>
<div id="inout-',$boxID,'" style="display:none;">
<div id="LOADING-inout-',$boxID,'">',WT_I18N::translate('Loading…'),'</div>
'<a href="individual.php?pid=', $pid, '&amp;ged=', rawurlencode($GEDCOM), '">
<span class="namedef name',$style,'"> ',
$name,
$genderImage,'
<span class="details',$style,'">' . $LDSord . '</span>
</span>
</a>
<div class="namedef name',$style,'">',$addname,'</div>
<div class="inout2 details',$style,'">',
$BirthDeath,
'</div>
</div>
<div class="inout"></div>
</div>';

4 changes: 2 additions & 2 deletions theme.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
$theme_name = "Rural";

// A version number in the path prevents browser-cache problems during upgrade
define('WT_CSS_URL', WT_THEME_URL . 'css-1.5.3/');
define('WT_CSS_URL', WT_THEME_URL . 'css-1.6.0/');

$headerfile = WT_THEME_DIR.'header.php';
$footerfile = WT_THEME_DIR.'footer.php';
Expand Down Expand Up @@ -65,7 +65,7 @@
//-- variables for the fan chart
$fanChart = array(
'font' =>WT_ROOT.'includes/fonts/DejaVuSans.ttf',
'size' =>'7px',
'size' => 7,
'color' =>'#000000',
'bgColor' =>'#eeeeee',
'bgMColor'=>'#b1cff0',
Expand Down

0 comments on commit 6213b17

Please sign in to comment.