summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/db_schema/db_schema_21_22.php14
-rw-r--r--themes/clouds/style.css2
-rw-r--r--themes/colors/css/colors.css2
-rw-r--r--themes/fab/style.css2
-rw-r--r--themes/minimal/style.css2
-rw-r--r--themes/webtrees/header.php41
-rw-r--r--themes/webtrees/style.css2
-rw-r--r--themes/xenea/style.css2
8 files changed, 30 insertions, 37 deletions
diff --git a/includes/db_schema/db_schema_21_22.php b/includes/db_schema/db_schema_21_22.php
index 1f6d7ade69..8fa871eda8 100644
--- a/includes/db_schema/db_schema_21_22.php
+++ b/includes/db_schema/db_schema_21_22.php
@@ -44,6 +44,20 @@ self::exec("DELETE FROM `##gedcom_setting` WHERE setting_name IN ('AUTO_GENERATE
// Delete old settings
self::exec("DELETE FROM `##module_setting` WHERE module_name='lightbox'");
+// Very old versions of phpGedView allowed media paths beginning “./”
+// Remove these
+self::exec(
+ "UPDATE `##media` m".
+ " SET".
+ " m_filename = TRIM(LEADING './' FROM m_filename),".
+ " m_gedcom = REPLACE(m_gedcom, '\n1 FILE ./', '\n1 FILE ')"
+);
+self::exec(
+ "UPDATE `##change` c".
+ " SET new_gedcom = REPLACE(new_gedcom, '\n1 FILE ./', '\n1 FILE ')"
+ " WHERE status = 'pending'"
+);
+
// Previous versions of webtrees included the MEDIA_DIRECTORY setting in the
// FILE tag of the OBJE records. Remove it…
self::exec(
diff --git a/themes/clouds/style.css b/themes/clouds/style.css
index a873e096dc..a8bdffa1bf 100644
--- a/themes/clouds/style.css
+++ b/themes/clouds/style.css
@@ -1699,7 +1699,7 @@ overflow:visible !important;
.person_box_template .noprint { width:25px;height:50px; position:relative;}
.person_box_template .chart_textbox {height:auto;overflow: hidden;}
.person_box_template .details div {display:block;}
-.person_box_template img {float:left;height:50px;width:auto;max-width:50px;margin:0 3px 0 0;}
+.person_box_template img {float:left;height:50px;width:auto;max-width:80px;margin:0 3px 0 0;}
html[dir="rtl"] .person_box_template img {float:right; margin:0 0 0 3px;}
.person_box_template i[class^="icon-silhouette"]{float:left;}
html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;}
diff --git a/themes/colors/css/colors.css b/themes/colors/css/colors.css
index 35bf5d76dd..2bfe2eb65e 100644
--- a/themes/colors/css/colors.css
+++ b/themes/colors/css/colors.css
@@ -574,7 +574,7 @@ a.showit:hover > span{background:#444;border-bottom:2px solid #000;border-left:1
.person_box_template .noprint { width:25px;height:50px; position:relative;}
.person_box_template .chart_textbox {height:auto;overflow: hidden;}
.person_box_template .details div {display:block;}
-.person_box_template img {float:left;margin:0 3px 0 0;height:50px;width:auto;max-width:50px;}
+.person_box_template img {float:left;margin:0 3px 0 0;height:50px;width:auto;max-width:80px;}
html[dir="rtl"] .person_box_template img {float:right;margin:0 0 0 3px;}
.person_box_template i[class^="icon-silhouette"]{float:left;}
html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;}
diff --git a/themes/fab/style.css b/themes/fab/style.css
index cca03fb948..35fc79f7be 100644
--- a/themes/fab/style.css
+++ b/themes/fab/style.css
@@ -1031,7 +1031,7 @@ overflow:visible !important;
.person_box_template .noprint { width:25px;height:50px; position:relative;}
.person_box_template .chart_textbox {height:auto;overflow: hidden;}
.person_box_template .details div {display:block;}
-.person_box_template img {float:left;height:50px;width:auto;max-width:50px;margin:0 3px 0 0;}
+.person_box_template img {float:left;height:50px;width:auto;max-width:80px;margin:0 3px 0 0;}
html[dir="rtl"] .person_box_template img {float:right; margin:0 0 0 3px;}
.person_box_template i[class^="icon-silhouette"]{float:left;}
html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;}
diff --git a/themes/minimal/style.css b/themes/minimal/style.css
index 8227cff653..72ce4c01a9 100644
--- a/themes/minimal/style.css
+++ b/themes/minimal/style.css
@@ -1245,7 +1245,7 @@ overflow:visible !important;
.person_box_template .noprint { width:25px;height:50px; position:relative;}
.person_box_template .chart_textbox {height:auto;overflow: hidden;}
.person_box_template .details div {display:block;}
-.person_box_template img {float:left;height:50px;width:auto;max-width:50px;border:solid #555 1px; margin:0 3px 0 0;}
+.person_box_template img {float:left;height:50px;width:auto;max-width:80px;border:solid #555 1px; margin:0 3px 0 0;}
html[dir="rtl"] .person_box_template img {float:right; margin:0 0 0 3px;}
.person_box_template i[class^="icon-silhouette"]{float:left;}
html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;}
diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php
index 4022727f99..4624d1b836 100644
--- a/themes/webtrees/header.php
+++ b/themes/webtrees/header.php
@@ -62,6 +62,7 @@ echo
// begin header section
if ($view!='simple') {
+ global $WT_IMAGES;
echo
'<div id="header">',
'<div class="header_img"><img src="', WT_THEME_URL, 'images/webtrees.png" width="242" height="50" alt="', WT_WEBTREES, '"></div>',
@@ -71,20 +72,11 @@ if ($view!='simple') {
} else {
echo '<li>', login_link(), '</li> ';
}
- $menu=WT_MenuBar::getFavoritesMenu();
- if ($menu) {
- echo $menu->getMenuAsList();
- }
- $menu=WT_MenuBar::getThemeMenu();
- if ($menu) {
- echo $menu->getMenuAsList();
- }
- $menu=WT_MenuBar::getLanguageMenu();
- if ($menu) {
- echo $menu->getMenuAsList();
- }
- global $WT_IMAGES;
- echo '</ul>',
+ echo
+ WT_MenuBar::getFavoritesMenu(),
+ WT_MenuBar::getThemeMenu(),
+ WT_MenuBar::getLanguageMenu(),
+ '</ul>',
'<div class="title" dir="auto">', WT_TREE_TITLE, '</div>',
'<div class="header_search">',
'<form action="search.php" method="post">',
@@ -93,8 +85,9 @@ if ($view!='simple') {
'<input type="search" name="query" size="25" placeholder="', WT_I18N::translate('Search'), '" dir="auto">',
'<input type="image" class="image" src="', $WT_IMAGES['search'], '" alt="', WT_I18N::translate('Search'), '" title="', WT_I18N::translate('Search'), '">',
'</form>',
- '</div>';
- $menu_items=array(
+ '</div>',
+ '<div id="topMenu">',
+ '<ul id="main-menu">',
WT_MenuBar::getGedcomMenu(),
WT_MenuBar::getMyPageMenu(),
WT_MenuBar::getChartsMenu(),
@@ -102,21 +95,7 @@ if ($view!='simple') {
WT_MenuBar::getCalendarMenu(),
WT_MenuBar::getReportsMenu(),
WT_MenuBar::getSearchMenu(),
- );
- foreach (WT_MenuBar::getModuleMenus() as $menu) {
- $menu_items[]=$menu;
- }
- // Print the menu bar
- echo
- '<div id="topMenu">',
- '<ul id="main-menu">';
- foreach ($menu_items as $menu) {
- if ($menu) {
- echo $menu->getMenuAsList();
- }
- }
- unset($menu_items, $menu);
- echo
+ implode('', WT_MenuBar::getModuleMenus()),
'</ul>', // <ul id="main-menu">
'</div>', // <div id="topMenu">
'</div>'; // <div id="header">
diff --git a/themes/webtrees/style.css b/themes/webtrees/style.css
index d70725705e..4aac2e912f 100644
--- a/themes/webtrees/style.css
+++ b/themes/webtrees/style.css
@@ -370,7 +370,7 @@ td.descriptionbox a {color:#fff;}/* this keeps the tag color the same when it is
.person_box_template .noprint {width:25px;height:50px; position:relative;}
.person_box_template .chart_textbox {height:auto;overflow: hidden;}
.person_box_template .details div {display:block;}
-.person_box_template img {float:left;margin:0 4px 0 0;height:50px;width:auto;max-width:50px;}
+.person_box_template img {float:left;margin:0 4px 0 0;height:50px;width:auto;max-width:80px;}
html[dir="rtl"] .person_box_template img {float:right;margin:0 0 0 4px;}
.person_box_template i[class^="icon-silhouette"]{float:left;}
html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;}
diff --git a/themes/xenea/style.css b/themes/xenea/style.css
index dcca58703c..3e16e2adf8 100644
--- a/themes/xenea/style.css
+++ b/themes/xenea/style.css
@@ -1565,7 +1565,7 @@ overflow:visible !important;
.person_box_template .noprint { width:25px;height:50px; position:relative;}
.person_box_template .chart_textbox {height:auto;overflow: hidden;}
.person_box_template .details div {display:block;}
-.person_box_template img {height:50px;width:auto;max-width:50px;border:solid black 1px;margin:0 3px 0 0;float:left;}
+.person_box_template img {height:50px;width:auto;max-width:80px;border:solid black 1px;margin:0 3px 0 0;float:left;}
html[dir="rtl"] .person_box_template img {float:right;margin:0 0 0 3px;}
.person_box_template i[class^="icon-silhouette"]{float:left;}
html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;}
generated by cgit v1.3 (git 2.53.0) at 2026-07-05 06:37:35 +0000