-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
RESOLVED #JJ162: Upgrade to webtrees 1.5.2 - Adapt Perso add-ons
- Loading branch information
Showing
139 changed files
with
63 additions
and
60 deletions.
There are no files selected for viewing
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
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
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
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.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
* To learn more about CSS visit http: //www.w3.org/TR/REC-CSS2/ | ||
* | ||
* webtrees: Web based Family History software | ||
* Copyright (C) 2011 webtrees development team. | ||
* Copyright (C) 2014 webtrees development team. | ||
* | ||
* Derived from PhpGedView | ||
* Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. | ||
|
@@ -22,14 +22,9 @@ | |
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program; if not, write to the Free Software | ||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
* | ||
* @package webtrees | ||
* @subpackage Themes | ||
* @version $Id: style.css 11049 2011-03-05 12:51:27Z greg $ | ||
* @author Jonathan Jaubart ($Author: webtrees.geneajaubart $) | ||
* @version p_$Revision: 78 $ $Date: 2013-12-05 00:05:18 +0000 (Thu 05 Dec 2013) $ | ||
* $HeadURL: http://subversion.assembla.com/svn/webtrees-geneajaubart/trunk/themes/rural/css-1.5.1/style.css $ | ||
* @author Jonathan Jaubart <[email protected]> | ||
*/ | ||
|
||
/* Add a permanent scrollbar, to prevent "flickering" when hover effects lengthen page */ | ||
|
@@ -49,8 +44,8 @@ img {border: none;} | |
legend img {height: 20px;vertical-align: middle;width: 20px;} | ||
img.block, #calendar_img_indi, #calendar_img_fam, #biglink img, #mycart img {border: none;height: 25px;vertical-align: middle;} | ||
|
||
.line1, .line2, .line3 {vertical-align:bottom;} | ||
.line4 {vertical-align:middle;} | ||
.line1, .line2, .line3 {vertical-align:middle;} | ||
#hourglass_chart img.line4 {vertical-align:middle;} | ||
.line5 {vertical-align:top;} | ||
|
||
#mycart img {height: 20px;} | ||
|
@@ -210,7 +205,7 @@ table.center {margin-left: auto;margin-right: auto;} | |
#familybook_chart td {margin:0; padding:0;} | ||
#familybook_chart h2 {text-align:center;} | ||
#familybook_chart .line3, #familybook_chart .pvline, #familybook_chart .spacer{width: 3px;} | ||
#familybook_chart .line4 {width: 7px;} | ||
#familybook_chart .line4 {width: 7px; vertical-align:middle;} | ||
[ID^="vline"] {width:3px;} | ||
#familybook_chart h3 {font-size: 16px;text-align:center;} | ||
#relationship-page h3 {margin:20px 0 0 20px;} | ||
|
@@ -723,6 +718,22 @@ dd .editlink, dd .deletelink {float:right;} | |
#indi_note .fact_NOTE, | ||
#indi_note .fact_SOUR {clear: both;} | ||
|
||
.markdown p { | ||
margin: 0 0 0.5em; | ||
white-space: pre-wrap; | ||
} | ||
.markdown table { | ||
border-collapse: collapse; | ||
} | ||
.markdown th { | ||
font-weight: bold; | ||
} | ||
.markdown td, | ||
.markdown th { | ||
border: solid thin #000; | ||
padding: 3px; | ||
} | ||
|
||
html[dir=rtl] #indi_header {float:right;} | ||
html[dir=rtl] #indi_header h3 {padding: 0 30px 0 10px; text-align:right;} | ||
html[dir=rtl] #indi_header h3 .header_age {padding:5px 5px 5px 0; float:left;} | ||
|
@@ -802,21 +813,21 @@ html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;} | |
.list_table_controls td {min-width:40px;text-align:center;} | ||
|
||
/* ============== medialist.php ======================= */ | ||
#lightbox-menu {margin-bottom:60px;} | ||
.lb-menu {position:relative; float:left; list-style-type:none; margin:0;} | ||
.lb-menu ul {list-style-type:none;} | ||
.lb-menu li {font-weight:normal; float:left; top:0;} | ||
.lb-menu > li ul {display:none;width:80px;} | ||
.lb-menu {display:inline-block; margin:0;} | ||
.lb-menu ul {display:block;list-style-type:none;} | ||
.lb-menu > li {font-weight:normal; float:left; top:0;} | ||
.lb-menu li:first-child {padding-left:0;} | ||
.lb-menu > li ul {display:none;} | ||
.lb-menu > li:hover ul {display:block; top:36px;} | ||
.lb-menu a {display:block;} | ||
.lb-menu li a {padding-top:24px;} | ||
.lb-menu li li a {padding:1px 10px 1px 5px;} | ||
html[dir=rtl] .lb-menu {float:right;} | ||
html[dir=rtl] .lb-menu li {float:right;} | ||
.makeMenu.lb-menu li{border:none;} | ||
html[dir=rtl] .lb-menu > li {float:right;} | ||
|
||
li#lb-image_edit {background:url(images/image_edit.png) no-repeat 50% 20%;} | ||
li#lb-image_link {background:url(images/image_link.png) no-repeat 50% 20%;} | ||
li#lb-image_view {background:url(images/image_view.png) no-repeat 50% 20%;} | ||
.lb-image_edit {background:url(images/image_edit.png) no-repeat 50% 20%;} | ||
.lb-image_link {background:url(images/image_link.png) no-repeat 50% 20%;} | ||
.lb-image_view {background:url(images/image_view.png) no-repeat 50% 20%;} | ||
|
||
|
||
/* ============== login.php ======================= */ | ||
|
@@ -1057,13 +1068,16 @@ html[dir=rtl] #edituser-table .value {margin:0 260px 0 0;} | |
|
||
|
||
@media print { | ||
#backprint { display:none;} | ||
#backprint, #separator {display:none;} | ||
#header, #footer, .noprint {display:none !important;} | ||
form, button, input {display:none;} /* buttons and input are used out of forms in sortable tables*/ | ||
.lifespan_outer {position:relative; width:auto; height:auto; overflow:visible; border:none;} | ||
.lifespan_people {position:absolute; width:auto; left:-10px; top:-60px; z-index:1;} | ||
#pedigree_chart {left:right;left:-80px;} | ||
#header_accordion1 {width: 510px!important} | ||
html[dir=rtl] #pedigree_chart {left:auto;right:-80px;} | ||
form, button, input {display:none;} | ||
#familybook_chart h3 {margin-bottom: 10px;} | ||
.lifespan_outer {position:relative;width:auto;height:auto;overflow:visible;border:none;} | ||
.lifespan_people {position:absolute;width:auto; left:-10px; top:-60px;z-index:1;} | ||
#CB_All {display:none;} | ||
|
||
} | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
// Footer for webtrees theme | ||
// | ||
// webtrees: Web based Family History software | ||
// Copyright (C) 2013 webtrees development team. | ||
// Copyright (C) 2014 webtrees development team. | ||
// | ||
// Derived from PhpGedView | ||
// Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. | ||
|
@@ -19,11 +19,9 @@ | |
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with this program; if not, write to the Free Software | ||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
// | ||
// $Id: footer.php 13642 2012-03-24 13:06:08Z greg $ | ||
// @version p_$Revision: 74 $ $Date: 2013-11-23 11:50:07 +0000 (Sat 23 Nov 2013) $ | ||
// $HeadURL: http://subversion.assembla.com/svn/webtrees-geneajaubart/trunk/themes/rural/footer.php $ | ||
// @author Jonathan Jaubart <[email protected]> | ||
|
||
if (!defined('WT_WEBTREES')) { | ||
header('HTTP/1.0 403 Forbidden'); | ||
|
@@ -45,7 +43,7 @@ | |
?> | ||
|
||
<p class="logo"> | ||
<a href="<?php echo WT_WEBTREES_URL; ?>" target="_blank" class="icon-webtrees" title="<?php echo WT_WEBTREES.' '.WT_VERSION_TEXT; ?>"></a> | ||
<a href="<?php echo WT_WEBTREES_URL; ?>" target="_blank" class="icon-webtrees" title="<?php echo WT_WEBTREES.' '.WT_VERSION; ?>"></a> | ||
</p> | ||
|
||
<?php | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
// Header for Rural theme | ||
// | ||
// webtrees: Web based Family History software | ||
// Copyright (C) 2012 webtrees development team. | ||
// Copyright (C) 2014 webtrees development team. | ||
// | ||
// Derived from PhpGedView | ||
// Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. | ||
|
@@ -19,12 +19,9 @@ | |
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with this program; if not, write to the Free Software | ||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
// @package webtrees | ||
// @subpackage Themes | ||
// @author Jonathan Jaubart ($Author: webtrees.geneajaubart $) | ||
// @version p_$Revision: 78 $ $Date: 2013-12-05 00:05:18 +0000 (Thu 05 Dec 2013) $ | ||
// $HeadURL: http://subversion.assembla.com/svn/webtrees-geneajaubart/trunk/themes/rural/header.php $ | ||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
// | ||
// @author Jonathan Jaubart <[email protected]> | ||
|
||
if (!defined('WT_WEBTREES')) { | ||
header('HTTP/1.0 403 Forbidden'); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ | |
// $content - the content of the block | ||
// | ||
// webtrees: Web based Family History software | ||
// Copyright (C) 2011 webtrees development team. | ||
// Copyright (C) 2014 webtrees development team. | ||
// | ||
// Derived from PhpGedView | ||
// Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. | ||
|
@@ -25,9 +25,9 @@ | |
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with this program; if not, write to the Free Software | ||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
// | ||
// $Id: block_main_temp.php 12663 2011-11-10 00:29:50Z greg $ | ||
// @author Jonathan Jaubart <[email protected]> | ||
|
||
if (!defined('WT_WEBTREES')) { | ||
header('HTTP/1.0 403 Forbidden'); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ | |
// $content - the content of the block | ||
// | ||
// webtrees: Web based Family History software | ||
// Copyright (C) 2011 webtrees development team. | ||
// Copyright (C) 2014 webtrees development team. | ||
// | ||
// Derived from PhpGedView | ||
// Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. | ||
|
@@ -25,9 +25,9 @@ | |
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with this program; if not, write to the Free Software | ||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
// | ||
// $Id: block_small_temp.php 12663 2011-11-10 00:29:50Z greg $ | ||
// @author Jonathan Jaubart <[email protected]> | ||
|
||
if (!defined('WT_WEBTREES')) { | ||
header('HTTP/1.0 403 Forbidden'); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
// $addname, $showid, $float | ||
// | ||
// webtrees: Web based Family History software | ||
// Copyright (C) 2012 webtrees development team. | ||
// Copyright (C) 2014 webtrees development team. | ||
// | ||
// Derived from PhpGedView | ||
// Copyright (C) 2010 PGV Development Team. All rights reserved. | ||
|
@@ -23,11 +23,9 @@ | |
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with this program; if not, write to the Free Software | ||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
// | ||
// $Id: compactbox_template.php 13642 2012-03-24 13:06:08Z greg $ | ||
// @version: p_$Revision: 74 $ $Date: 2013-11-23 11:50:07 +0000 (Sat 23 Nov 2013) $ | ||
// $HeadURL: http://subversion.assembla.com/svn/webtrees-geneajaubart/trunk/themes/rural/templates/compactbox_template.php $ | ||
// @author Jonathan Jaubart <[email protected]> | ||
|
||
if (!defined('WT_WEBTREES')) { | ||
header('HTTP/1.0 403 Forbidden'); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,11 +23,9 @@ | |
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with this program; if not, write to the Free Software | ||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
// | ||
// $Id: personbox_template.php 13401 2012-02-07 13:09:37Z rob $ | ||
// @version: p_$Revision: 74 $ $Date: 2013-11-23 11:50:07 +0000 (Sat 23 Nov 2013) $ | ||
// $HeadURL: http://subversion.assembla.com/svn/webtrees-geneajaubart/trunk/themes/rural/templates/personbox_template.php $ | ||
// @author Jonathan Jaubart <[email protected]> | ||
|
||
if (!defined('WT_WEBTREES')) { | ||
header('HTTP/1.0 403 Forbidden'); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
// Rural theme | ||
// | ||
// webtrees: Web based Family History software | ||
// Copyright (C) 2013 webtrees development team. | ||
// Copyright (C) 2014 webtrees development team. | ||
// | ||
// Derived from PhpGedView | ||
// Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved. | ||
|
@@ -19,13 +19,11 @@ | |
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with this program; if not, write to the Free Software | ||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
// | ||
// PNG Icons By:Alessandro Rei; License: GPL; http://www.kde-look.org/content/show.php/Dark-Glass+reviewed?content=67902 | ||
// | ||
// @author Jonathan Jaubart ($Author: webtrees.geneajaubart $) | ||
// @version p_$Revision: 78 $ $Date: 2013-12-05 00:05:18 +0000 (Thu 05 Dec 2013) $ | ||
// $HeadURL: http://subversion.assembla.com/svn/webtrees-geneajaubart/trunk/themes/rural/theme.php $ | ||
// @author Jonathan Jaubart <[email protected]> | ||
|
||
if (!defined('WT_WEBTREES')) { | ||
header('HTTP/1.0 403 Forbidden'); | ||
|
@@ -36,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.1/'); | ||
define('WT_CSS_URL', WT_THEME_URL . 'css-1.5.2/'); | ||
|
||
$headerfile = WT_THEME_DIR.'header.php'; | ||
$footerfile = WT_THEME_DIR.'footer.php'; | ||
|