diff options
33 files changed, 154 insertions, 174 deletions
@@ -96,7 +96,7 @@ $user_languages = WT_DB::prepare( $stats = new WT_Stats(WT_GEDCOM); ?> -<h2><?php echo $controller->getPageTitle(); ?></h2> +<h1><?php echo $controller->getPageTitle(); ?></h1> <div> <div id="x"> @@ -626,6 +626,7 @@ function old_paths() { WT_ROOT . 'themes/_administration/css-1.6.0', WT_ROOT . 'themes/_administration/jquery-ui-1.10.3', // Removed in 1.7.0 + WT_ROOT . 'admin_site_other.php', WT_ROOT . 'js', WT_ROOT . 'library/WT/MenuBar.php', WT_ROOT . 'save.php', diff --git a/admin_media.php b/admin_media.php index 49d9fe50b7..0a247c06d2 100644 --- a/admin_media.php +++ b/admin_media.php @@ -601,7 +601,8 @@ $controller <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <form> <table class="media_items"> diff --git a/admin_media_upload.php b/admin_media_upload.php index 03ea2312e5..e0edaa338c 100644 --- a/admin_media_upload.php +++ b/admin_media_upload.php @@ -178,7 +178,9 @@ if (empty($filesize)) { <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> + <?php diff --git a/admin_module_blocks.php b/admin_module_blocks.php index c2725e804d..6632c2e38e 100644 --- a/admin_module_blocks.php +++ b/admin_module_blocks.php @@ -56,7 +56,8 @@ $controller <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <form method="post"> <input type="hidden" name="action" value="update_mods"> diff --git a/admin_module_menus.php b/admin_module_menus.php index 97339a1d50..7f82098492 100644 --- a/admin_module_menus.php +++ b/admin_module_menus.php @@ -77,7 +77,8 @@ $controller <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <form method="post"> <input type="hidden" name="action" value="update_mods"> diff --git a/admin_module_reports.php b/admin_module_reports.php index e029ac01a5..a20504742c 100644 --- a/admin_module_reports.php +++ b/admin_module_reports.php @@ -56,7 +56,8 @@ $controller <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <form method="post"> <input type="hidden" name="action" value="update_mods"> diff --git a/admin_module_sidebar.php b/admin_module_sidebar.php index 43686c94b1..3d9c391d55 100644 --- a/admin_module_sidebar.php +++ b/admin_module_sidebar.php @@ -77,7 +77,8 @@ $controller <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <form method="post"> <input type="hidden" name="action" value="update_mods"> diff --git a/admin_module_tabs.php b/admin_module_tabs.php index ec7dac2595..c9b33517f9 100644 --- a/admin_module_tabs.php +++ b/admin_module_tabs.php @@ -77,7 +77,8 @@ $controller <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <form method="post"> <input type="hidden" name="action" value="update_mods"> diff --git a/admin_modules.php b/admin_modules.php index efbd36f905..837afa76ec 100644 --- a/admin_modules.php +++ b/admin_modules.php @@ -131,7 +131,8 @@ $controller <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <form method="post" action="<?php echo WT_SCRIPT_NAME; ?>"> <input type="hidden" name="action" value="update_mods"> diff --git a/admin_pgv_to_wt.php b/admin_pgv_to_wt.php index ad9a28a2fc..0aea91edb4 100644 --- a/admin_pgv_to_wt.php +++ b/admin_pgv_to_wt.php @@ -124,10 +124,12 @@ $controller->pageHeader(); ?> <ol class="breadcrumb small"> <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> -<li><a href="admin_trees_manage.php"><?php echo WT_I18N::translate('Manage family trees'); ?></a></li> -<li class="active"><?php echo $controller->getPageTitle(); ?></li> + <li><a href="admin_trees_manage.php"><?php echo WT_I18N::translate('Manage family trees'); ?></a></li> + <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> + <?php if (!$PGV_PATH) { diff --git a/admin_site_access.php b/admin_site_access.php index 2383a38896..ef763e9374 100644 --- a/admin_site_access.php +++ b/admin_site_access.php @@ -262,13 +262,17 @@ WT_DB::exec( <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <p><?php echo /* I18N: http://en.wikipedia.org/wiki/User_agent */ WT_I18N::translate('Restrict access to the site, using IP addresses and user-agent strings'); ?></p> <p><?php echo WT_I18N::translate('The following rules are used to decide whether a visitor is a human being (allow full access), a search-engine robot (allow restricted access) or an unwanted crawler (deny all access).'); ?></p> <table class="table table-hover table-condensed table-bordered table-site-access-rules"> + <caption class="sr-only"> + <?php echo WT_I18N::translate('The following rules are used to decide whether a visitor is a human being (allow full access), a search-engine robot (allow restricted access) or an unwanted crawler (deny all access).'); ?> + </caption> <thead> <tr> <th><?php echo /* I18N [...] of a range of addresses */ WT_I18N::translate('Start IP address'); ?></th> @@ -286,6 +290,9 @@ WT_DB::exec( <p><?php echo WT_I18N::translate('The following visitors were not recognized, and were assumed to be search engines.'); ?></p> <table class="table table-hover table-condensed table-bordered table-unknown-site-visitors"> + <caption class="sr-only"> + <?php echo WT_I18N::translate('The following visitors were not recognized, and were assumed to be search engines.'); ?> + </caption> <thead> <tr> <th rowspan="2"><?php /* I18N: http://en.wikipedia.org/wiki/IP_address */ echo WT_I18N::translate('IP address'); ?></th> diff --git a/admin_site_change.php b/admin_site_change.php index 9b75be27f5..74f2f674d2 100644 --- a/admin_site_change.php +++ b/admin_site_change.php @@ -281,7 +281,8 @@ foreach (User::all() as $tmp_user) { <li><a href="admin_trees_manage.php"><?php echo WT_I18N::translate('Manage family trees'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <form class="form" name="logs"> <input type="hidden" name="action" value="show"> diff --git a/admin_site_clean.php b/admin_site_clean.php index 2ed737254d..3c5ef910fa 100644 --- a/admin_site_clean.php +++ b/admin_site_clean.php @@ -86,7 +86,8 @@ sort($entries); <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <p> <?php echo WT_I18N::translate('Files marked with %s are required for proper operation and cannot be removed.', $locked_icon); ?> diff --git a/admin_site_config.php b/admin_site_config.php index a28f3242be..f61d0478e2 100644 --- a/admin_site_config.php +++ b/admin_site_config.php @@ -124,7 +124,8 @@ $controller->pageHeader(); <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <form method="post" class="form-horizontal"> <?php echo WT_Filter::getCsrf(); ?> @@ -205,30 +206,30 @@ $controller->pageHeader(); </div> <!-- ALLOW_USER_THEMES --> - <div class="form-group"> - <label for="ALLOW_USER_THEMES" class="col-sm-3 control-label"> + <fieldset class="form-group"> + <legend class="col-sm-3 control-label"> <?php echo /* I18N: A site configuration setting */ WT_I18N::translate('Allow users to select their own theme'); ?> - </label> + </legend> <div class="col-sm-9"> <?php echo edit_field_yes_no('ALLOW_USER_THEMES', WT_Site::getPreference('ALLOW_USER_THEMES')); ?> <p class="small text-muted"> <?php echo /* I18N: Help text for the “Allow users to select their own theme” site configuration setting */ WT_I18N::translate('Gives users the option of selecting their own theme.'); ?> </p> </div> - </div> + </fieldset> <!-- ALLOW_CHANGE_GEDCOM --> - <div class="form-group"> - <label for="ALLOW_CHANGE_GEDCOM" class="col-sm-3 control-label"> + <fieldset class="form-group"> + <legend class="col-sm-3 control-label"> <?php echo /* I18N: A site configuration setting */ WT_I18N::translate('Show list of family trees'); ?> - </label> + </legend> <div class="col-sm-9"> <?php echo edit_field_yes_no('ALLOW_CHANGE_GEDCOM', WT_Site::getPreference('ALLOW_CHANGE_GEDCOM')); ?> <p class="small text-muted"> <?php /* I18N: Help text for the “Show list of family trees” site configuration setting */ WT_I18N::translate('For sites with more than one family tree, this option will show the list of family trees in the main menu, the search pages, etc.'); ?> </p> </div> - </div> + </fieldset> <!-- SESSION_TIME --> <div class="form-group"> @@ -287,7 +288,7 @@ $controller->pageHeader(); </div> </div> - <h3><?php echo WT_I18N::translate('SMTP mail server'); ?></h3> + <h2><?php echo WT_I18N::translate('SMTP mail server'); ?></h2> <!-- SMTP_HOST --> <div class="form-group"> @@ -316,17 +317,17 @@ $controller->pageHeader(); </div> <!-- SMTP_AUTH --> - <div class="form-group"> - <label for="SMTP_AUTH" class="col-sm-3 control-label"> + <fieldset class="form-group"> + <legend class="col-sm-3 control-label"> <?php echo /* I18N: A site configuration setting */ WT_I18N::translate('Use password'); ?> - </label> + </legend> <div class="col-sm-9"> <?php echo edit_field_yes_no('SMTP_AUTH', WT_Site::getPreference('SMTP_AUTH')); ?> <p class="small text-muted"> <?php echo /* I18N: Help text for the “Use password” site configuration setting */ WT_I18N::translate('Most SMTP servers require a password.'); ?> </p> </div> - </div> + </fieldset> <!-- SMTP_AUTH_USER --> <div class="form-group"> @@ -429,41 +430,41 @@ $controller->pageHeader(); </div> <!-- USE_REGISTRATION_MODULE --> - <div class="form-group"> - <label for="USE_REGISTRATION_MODULE" class="col-sm-3 control-label"> + <fieldset class="form-group"> + <legend class="col-sm-3 control-label"> <?php echo /* I18N: A site configuration setting */ WT_I18N::translate('Allow visitors to request account registration'); ?> - </label> + </legend> <div class="col-sm-9"> <?php echo edit_field_yes_no('USE_REGISTRATION_MODULE', WT_Site::getPreference('USE_REGISTRATION_MODULE')); ?> <p class="small text-muted"> <?php echo /* I18N: Help text for the “Allow visitors to request account registration” site configuration setting */ WT_I18N::translate('Gives visitors the option of registering themselves for an account on the site.<br><br>The visitor will receive an email message with a code to verify his application for an account. After verification, an administrator will have to approve the registration before it becomes active.'); ?> </p> </div> - </div> + </fieldset> <!-- REQUIRE_ADMIN_AUTH_REGISTRATION --> - <div class="form-group"> - <label for="REQUIRE_ADMIN_AUTH_REGISTRATION" class="col-sm-3 control-label"> + <fieldset class="form-group"> + <legend class="col-sm-3 control-label"> <?php echo /* I18N: A site configuration setting */ WT_I18N::translate('Require an administrator to approve new user registrations'); ?> - </label> + </legend> <div class="col-sm-9"> <?php echo edit_field_yes_no('REQUIRE_ADMIN_AUTH_REGISTRATION', WT_Site::getPreference('REQUIRE_ADMIN_AUTH_REGISTRATION')); ?> <p class="small text-muted"> </p> </div> - </div> + </fieldset> - <!-- USE_REGISTRATION_MODULE --> - <div class="form-group"> - <label for="SHOW_REGISTER_CAUTION" class="col-sm-3 control-label"> + <!-- SHOW_REGISTER_CAUTION --> + <fieldset class="form-group"> + <legend class="col-sm-3 control-label"> <?php echo /* I18N: A site configuration setting */ WT_I18N::translate('Show acceptable use agreement on “Request new user account” page'); ?> - </label> + </legend> <div class="col-sm-9"> <?php echo edit_field_yes_no('SHOW_REGISTER_CAUTION', WT_Site::getPreference('SHOW_REGISTER_CAUTION')); ?> <p class="small text-muted"> </p> </div> - </div> + </fieldset> <?php endif; ?> <div class="form-group"> diff --git a/admin_site_info.php b/admin_site_info.php index 4e97e71b96..84b20b6ffd 100644 --- a/admin_site_info.php +++ b/admin_site_info.php @@ -49,15 +49,16 @@ $html = $matches[2]; <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <div class="row"> <div class="col-xs-12"> <div class="panel panel-default"> <div class="panel-heading"> - <h3 class="panel-title"> + <h2 class="panel-title"> <?php echo WT_I18N::translate('PHP information'); ?> - </h3> + </h2> </div> <div class="panel-body"> <style type="text/css" scoped> @@ -75,9 +76,9 @@ $html = $matches[2]; <div class="col-md-12"> <div class="panel panel-default"> <div class="panel-heading"> - <h3 class="panel-title"> + <h2 class="panel-title"> <?php echo WT_I18N::translate('MySQL variables'); ?> - </h3> + </h2> </div> <div class="panel-body"> <dl> @@ -95,9 +96,9 @@ $html = $matches[2]; <div class="col-md-12"> <div class="panel panel-default"> <div class="panel-heading"> - <h3 class="panel-title"> + <h2 class="panel-title"> <?php echo WT_I18N::translate('Time'); ?> - </h3> + </h2> </div> <div class="panel-body"> <?php echo /* I18N: The local time on the server */ WT_I18N::translate('Server time'); ?> — diff --git a/admin_site_logs.php b/admin_site_logs.php index d1fd9b91ad..ff944f7769 100644 --- a/admin_site_logs.php +++ b/admin_site_logs.php @@ -240,7 +240,8 @@ foreach (User::all() as $tmp_user) { <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <form class="form" name="logs"> <input type="hidden" name="action" value="show"> @@ -321,6 +322,9 @@ foreach (User::all() as $tmp_user) { <?php if ($action): ?> <table class="table table-bordered table-condensed table-hover table-site-logs"> + <caption class="sr-only"> + <?php echo $controller->getPageTitle(); ?> + </caption> <thead> <tr> <th><?php echo WT_I18N::translate('Timestamp'); ?></th> @@ -331,7 +335,5 @@ foreach (User::all() as $tmp_user) { <th><?php echo WT_I18N::translate('Family tree'); ?></th> </tr> </thead> - <tbody> - </tbody> </table> <?php endif; ?> diff --git a/admin_site_merge.php b/admin_site_merge.php index 16e20e7089..c94ce07162 100644 --- a/admin_site_merge.php +++ b/admin_site_merge.php @@ -37,6 +37,8 @@ $controller ->addInlineJavascript('autocomplete();') ->pageHeader(); +echo '<h1>', $controller->getPageTitle(), '</h1>'; + $ged = $GEDCOM; $gid1 = WT_Filter::post('gid1', WT_REGEX_XREF); $gid2 = WT_Filter::post('gid2', WT_REGEX_XREF); diff --git a/admin_site_other.php b/admin_site_other.php deleted file mode 100644 index c269c7dbb8..0000000000 --- a/admin_site_other.php +++ /dev/null @@ -1,76 +0,0 @@ -<?php -// Miscellaneous administrative functions -// -// webtrees: Web based Family History software -// Copyright (C) 2014 webtrees development team. -// -// Partly Derived from PhpGedView -// Copyright (C) 2002 to 2010 PGV Development Team. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -use WT\Auth; - -define('WT_SCRIPT_NAME', 'admin_site_other.php'); -require './includes/session.php'; -require WT_ROOT . 'includes/functions/functions_edit.php'; - -$controller = new WT_Controller_Page; -$controller - ->restrictAccess(Auth::isManager()) - ->setPageTitle(WT_I18N::translate('Add unlinked records')) - ->pageHeader(); - -?> -<div id="other"> - <p> - <?php echo WT_I18N::translate('Add unlinked records'); ?> - </p> - <p> - <form method="post" action="?" name="tree"> - <?php echo select_edit_control('ged', WT_Tree::getNameList(), null, WT_GEDCOM, ' onchange="tree.submit();"'); ?> - </form> - </p> - <table id="other"> - <tr> - <td> - <a href="#" onclick="add_unlinked_indi(); return false;"> - <?php echo /* I18N: An individual that is not linked to any other record */ WT_I18N::translate('Create a new individual'); ?> - </a> - </td> - </tr> - <tr> - <td> - <a href="#" onclick="addnewnote(''); return false;"> - <?php echo /* I18N: A note that is not linked to any other record */ WT_I18N::translate('Create a new note'); ?> - </a> - </td> - </tr> - <tr> - <td> - <a href="#" onclick="addnewsource(''); return false;"> - <?php echo /* I18N: A source that is not linked to any other record */ WT_I18N::translate('Create a new source'); ?> - </a> - </td> - </tr> - <tr> - <td> - <a href="#" onclick="window.open('addmedia.php?action=showmediaform', '_blank', edit_window_specs); return false;"> - <?php echo /* I18N: A media object that is not linked to any other record */ WT_I18N::translate('Create a new media object'); ?> - </a> - </td> - </tr> - </table> -</div> diff --git a/admin_site_readme.php b/admin_site_readme.php index 8d6c274c46..4988f6c600 100644 --- a/admin_site_readme.php +++ b/admin_site_readme.php @@ -40,7 +40,8 @@ $readme = preg_replace('/.*(?=# webtrees)/s', '', $readme); <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <div class="markdown" dir="ltr" lang="en"> <?php echo MarkdownExtra::defaultTransform($readme); ?> diff --git a/admin_site_upgrade.php b/admin_site_upgrade.php index 069c54fd6f..87807a7ac5 100644 --- a/admin_site_upgrade.php +++ b/admin_site_upgrade.php @@ -58,7 +58,7 @@ $controller ->setPageTitle(WT_I18N::translate('Upgrade wizard')) ->pageHeader(); -echo '<h2>', $controller->getPageTitle(), '</h2>'; +echo '<h1>', $controller->getPageTitle(), '</h1>'; if ($latest_version == '') { echo '<p>', WT_I18N::translate('No upgrade information is available.'), '</p>'; diff --git a/admin_trees_check.php b/admin_trees_check.php index 1afdd0aa07..d8c2a22d2a 100644 --- a/admin_trees_check.php +++ b/admin_trees_check.php @@ -116,6 +116,7 @@ $RECORD_LINKS = array( $errors = false; +echo '<h1>', $controller->getPageTitle(), '</h1>'; echo '<fieldset><legend>', WT_I18N::translate('Types of error'), '</legend>'; echo '<p class="ui-state-error">', WT_I18N::translate('This may cause a problem for webtrees.'), '</p>'; echo '<p class="ui-state-highlight">', WT_I18N::translate('This may cause a problem for other applications.'), '</p>'; diff --git a/admin_trees_config.php b/admin_trees_config.php index df1d5b4020..e5610872c2 100644 --- a/admin_trees_config.php +++ b/admin_trees_config.php @@ -420,7 +420,8 @@ $controller <li><a href="admin_trees_manage.php"><?php echo WT_I18N::translate('Manage family trees'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <form class="form-horizontal" method="POST"> <?php echo WT_Filter::getCsrf(); ?> diff --git a/admin_trees_download.php b/admin_trees_download.php index eee3d809c0..566a31515e 100644 --- a/admin_trees_download.php +++ b/admin_trees_download.php @@ -29,7 +29,7 @@ require WT_ROOT . 'includes/functions/functions_export.php'; $controller = new WT_Controller_Page; $controller - ->setPageTitle(WT_I18N::translate('Download GEDCOM')) + ->setPageTitle(WT_I18N::translate('Download GEDCOM') . ' — ' . WT_Filter::escapeHtml(WT_GEDCOM)) ->restrictAccess(Auth::isManager()); // Validate user parameters @@ -99,7 +99,14 @@ if ($action === 'download') { $controller->pageHeader(); ?> -<h2><?php echo $controller->getPageTitle(); ?> - <?php echo WT_Filter::escapeHtml(WT_GEDCOM); ?></h2> +<ol class="breadcrumb small"> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> + <li><a href="admin_trees_manage.php"><?php echo WT_I18N::translate('Manage family trees'); ?></a></li> + <li class="active"><?php echo $controller->getPageTitle(); ?></li> +</ol> + +<h1><?php echo $controller->getPageTitle(); ?></h1> + <form name="convertform" method="get"> <input type="hidden" name="action" value="download"> <input type="hidden" name="ged" value="<?php echo WT_GEDCOM; ?>"> diff --git a/admin_trees_export.php b/admin_trees_export.php index 1049df207b..eea3b394de 100644 --- a/admin_trees_export.php +++ b/admin_trees_export.php @@ -23,19 +23,19 @@ use WT\Auth; define('WT_SCRIPT_NAME', 'admin_trees_export.php'); require './includes/session.php'; -$controller = new WT_Controller_Ajax; -$controller - ->pageHeader() - ->restrictAccess(Auth::isManager()); +if (Auth::isManager($WT_TREE) && WT_Filter::checkCsrf()) { + $filename = WT_DATA_DIR . $WT_TREE->tree_name; + // Force a ".ged" suffix + if (strtolower(substr($filename, -4)) != '.ged') { + $filename .= '.ged'; + } -$filename = WT_DATA_DIR . $WT_TREE->tree_name; -// Force a ".ged" suffix -if (strtolower(substr($filename, -4)) != '.ged') { - $filename .= '.ged'; + if ($WT_TREE->exportGedcom($filename)) { + WT_FlashMessages::addMessage(/* I18N: %s is a filename */ WT_I18N::translate('Family tree exported to %s.', '<span dir="ltr">' . $filename . '</span>'), 'success'); + } else { + WT_FlashMessages::addMessage(/* I18N: %s is a filename */ WT_I18N::translate('Unable to create %s. Check the permissions.', $filename), 'danger'); + } } -if ($WT_TREE->exportGedcom($filename)) { - echo '<p>', /* I18N: %s is a filename */ WT_I18N::translate('Family tree exported to %s.', '<span dir="ltr">' . $filename . '</span>'), '</p>'; -} else { - echo '<p class="error">', /* I18N: %s is a filename */ WT_I18N::translate('Unable to create %s. Check the permissions.', $filename), '</p>'; -} +header('Location: ' . WT_SERVER_NAME . WT_SCRIPT_PATH . 'admin_trees_manage.php'); + diff --git a/admin_trees_manage.php b/admin_trees_manage.php index 67398e5b8a..a105c1c7cd 100644 --- a/admin_trees_manage.php +++ b/admin_trees_manage.php @@ -158,7 +158,8 @@ $controller->pageHeader(); <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li class="active"><?php echo WT_I18N::translate('Manage family trees'); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <?php @@ -486,13 +487,14 @@ case 'importform': </li> <!-- EXPORT --> <li> - <i class="fa fa-li fa-file-text"></i> - <a href="#" onclick="return modalDialog('admin_trees_export.php?ged=<?php echo WT_Filter::escapeHtml($tree->tree_name); ?>', '<?php echo WT_I18N::translate('Export'); ?>');"> - <?php echo WT_I18N::translate('Export'); ?> - <span class="sr-only"> - <?php echo WT_Filter::escapeHtml($tree->tree_name); ?> - </span> - </a> + <form action="admin_trees_export.php" method="post"> + <?php echo WT_Filter::getCsrf(); ?> + <input type="hidden" name="ged" value="<?php echo WT_Filter::escapeHtml($tree->tree_name); ?>"> + <i class="fa fa-li fa-file-text"></i> + <a href="#" onclick="jQuery(this).closest('form').submit();"> + <?php echo WT_I18N::translate('Export'); ?> + </a> + </form> </li> <!-- IMPORT --> <li> diff --git a/admin_trees_merge.php b/admin_trees_merge.php index 32bae18a3e..26b1581233 100644 --- a/admin_trees_merge.php +++ b/admin_trees_merge.php @@ -36,7 +36,9 @@ $controller <li><a href="admin_trees_manage.php"><?php echo WT_I18N::translate('Manage family trees'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> + <?php $tree1_id = WT_Filter::post('tree1_id'); diff --git a/admin_trees_places.php b/admin_trees_places.php index 48e2e6e566..13d68090f5 100644 --- a/admin_trees_places.php +++ b/admin_trees_places.php @@ -78,15 +78,17 @@ if ($search && $replace) { $controller = new WT_Controller_Page; $controller ->restrictAccess(Auth::isManager()) - ->setPageTitle(WT_I18N::translate('Administration - place edit')) + ->setPageTitle(WT_I18N::translate('Update all the place names in a family tree') . ' — ' . WT_Filter::escapeHtml($WT_TREE->tree_title)) ->pageHeader(); ?> -<h2> - <?php echo WT_I18N::translate('Update all the place names in a family tree'); ?> - — - <?php echo WT_Filter::escapeHtml($WT_TREE->tree_title); ?> -</h2> +<ol class="breadcrumb small"> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> + <li><a href="admin_trees_manage.php"><?php echo WT_I18N::translate('Manage family trees'); ?></a></li> + <li class="active"><?php echo $controller->getPageTitle(); ?></li> +</ol> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <p> <?php echo WT_I18N::translate('This will update the highest-level part or parts of the place name. For example, “Mexico” will match “Quintana Roo, Mexico”, but not “Santa Fe, New Mexico”.'); ?> @@ -94,8 +96,6 @@ $controller <form method="post"> <dl> - <dt><?php echo WT_I18N::translate('Family tree'); ?></dt> - <dd><?php echo select_edit_control('ged', WT_Tree::getNameList(), null, WT_GEDCOM); ?></dd> <dt><label for="search"><?php echo WT_I18N::translate('Search for'); ?></label></dt> <dd><input name="search" id="search" type="text" size="30" value="<?php echo WT_Filter::escapeHtml($search) ?>" required autofocus></dd> <dt><label for="replace"><?php echo WT_I18N::translate('Replace with'); ?></label></dt> diff --git a/admin_trees_renumber.php b/admin_trees_renumber.php index e1e53d1627..1af51b06d7 100644 --- a/admin_trees_renumber.php +++ b/admin_trees_renumber.php @@ -26,7 +26,7 @@ require './includes/session.php'; $controller = new WT_Controller_Page; $controller ->restrictAccess(Auth::isManager()) - ->setPageTitle(WT_I18N::translate(/* I18N: Renumber the records in a family tree */ 'Renumber family tree')) + ->setPageTitle(WT_I18N::translate(/* I18N: Renumber the records in a family tree */ 'Renumber family tree') . ' — ' . WT_Filter::escapeHtml($WT_TREE->tree_title)) ->pageHeader(); // Every XREF used by this tree and also used by some other tree @@ -59,7 +59,8 @@ $xrefs = WT_DB::prepare( WT_GED_ID, WT_GED_ID, WT_GED_ID, WT_GED_ID, WT_GED_ID, WT_GED_ID ))->fetchAssoc(); -echo '<h2>', $controller->getPageTitle(), ' — ', $WT_TREE->tree_title_html, '</h2>'; +echo '<h1>', $controller->getPageTitle(), '</h1>'; + if (WT_Filter::get('go')) { foreach ($xrefs as $old_xref=>$type) { WT_DB::beginTransaction(); diff --git a/admin_users.php b/admin_users.php index 22b43f5fab..f3682d02cb 100644 --- a/admin_users.php +++ b/admin_users.php @@ -282,7 +282,8 @@ case 'edit': <li><a href="admin_users.php"><?php echo WT_I18N::translate('User administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> - <h2><?php echo $controller->getPageTitle(); ?></h2> + + <h1><?php echo $controller->getPageTitle(); ?></h1> <form class="form-horizontal" name="newform" method="post" role="form" action="?action=edit" autocomplete="off"> <?php echo WT_Filter::getCsrf(); ?> @@ -649,7 +650,7 @@ case 'cleanup': <li><a href="admin_users.php"><?php echo WT_I18N::translate('User administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> - <h2><?php echo $controller->getPageTitle(); ?></h2> + <h1><?php echo $controller->getPageTitle(); ?></h1> <form method="post" action="?action=cleanup2"> <table class="table table-bordered"> @@ -812,7 +813,7 @@ default: <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> - <h2><?php echo $controller->getPageTitle(); ?></h2> + <h1><?php echo $controller->getPageTitle(); ?></h1> <table class="table table-condensed table-bordered table-user-list"> <thead> diff --git a/admin_users_bulk.php b/admin_users_bulk.php index a9366ed156..b743ff5e54 100644 --- a/admin_users_bulk.php +++ b/admin_users_bulk.php @@ -41,7 +41,8 @@ $controller <li><a href="admin_users.php"><?php echo WT_I18N::translate('User administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> -<h2><?php echo $controller->getPageTitle(); ?></h2> + +<h1><?php echo $controller->getPageTitle(); ?></h1> <p> <a href="#" onclick="return message('all', 'messaging2', '');"> diff --git a/includes/session.php b/includes/session.php index 4327903701..9fcb1d8824 100644 --- a/includes/session.php +++ b/includes/session.php @@ -520,7 +520,7 @@ if ($WT_TREE) { define('WT_GEDCOM', $WT_TREE->tree_name); define('WT_GED_ID', $WT_TREE->tree_id); define('WT_GEDURL', $WT_TREE->tree_name_url); - define('WT_TREE_TITLE', $WT_TREE->tree_title_html); + define('WT_TREE_TITLE', WT_Filter::escapeHtml($WT_TREE->tree_title)); define('WT_IMPORTED', $WT_TREE->imported); define('WT_USER_GEDCOM_ADMIN', Auth::isManager($WT_TREE)); define('WT_USER_CAN_ACCEPT', Auth::isModerator($WT_TREE)); diff --git a/library/WT/Theme/BaseTheme.php b/library/WT/Theme/BaseTheme.php index 4e37c85ef8..c0174d7178 100644 --- a/library/WT/Theme/BaseTheme.php +++ b/library/WT/Theme/BaseTheme.php @@ -504,7 +504,7 @@ abstract class BaseTheme { public function htmlAlert($html, $level, $dismissible) { if ($dismissible) { return - '<div class="alert alert-' . $level . ' alert-dismissible role="alert">' . + '<div class="alert alert-' . $level . '" alert-dismissible role="alert">' . '<button type="button" class="close" data-dismiss="alert" aria-label="' . WT_I18N::translate('close') . '">' . '<span aria-hidden="true">×</span>' . '</button>' . @@ -512,13 +512,25 @@ abstract class BaseTheme { '</div>'; } else { return - '<div class="alert alert-' . $level . ' role="alert">' . + '<div class="alert alert-' . $level . '" role="alert">' . $html . '</div>'; } } /** + * Add HTML markup to create a group of radio buttons + * + * @param string $name The form name of the controls + * @param string $legend A description of the group of controls + * + * @return string + */ + public function htmlRadioButtons($name, $legend) { + return '<fieldset><legend>' . $legend . '</legend></fieldset>'; + } + + /** * Display an icon for this fact. * * @param WT_Fact $fact @@ -312,7 +312,7 @@ case 'register': $mail1_body = WT_I18N::translate('Hello administrator…') . WT_Mail::EOL . WT_Mail::EOL . /* I18N: %s is a server name/URL */ - WT_I18N::translate('A prospective user has registered with webtrees at %s.', WT_SERVER_NAME . WT_SCRIPT_PATH . ' ' . $WT_TREE->tree_title_html) . WT_Mail::EOL . WT_Mail::EOL . + WT_I18N::translate('A prospective user has registered with webtrees at %s.', WT_SERVER_NAME . WT_SCRIPT_PATH . ' ' . WT_Filter::escapeHtml($WT_TREE->tree_title)) . WT_Mail::EOL . WT_Mail::EOL . WT_I18N::translate('Username') . ' ' . $user->getUserName() . WT_Mail::EOL . WT_I18N::translate('Real name') . ' ' . $user->getRealName() . WT_Mail::EOL . WT_I18N::translate('Email address:') . ' ' . $user->getEmail() . WT_Mail::EOL . @@ -334,7 +334,7 @@ case 'register': $mail2_body = WT_I18N::translate('Hello %s…', $user->getRealName()) . WT_Mail::EOL . WT_Mail::EOL . /* I18N: %1$s is the site URL and %2$s is an email address */ - WT_I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', WT_SERVER_NAME . WT_SCRIPT_PATH . ' ' . $WT_TREE->tree_title_html, $user->getEmail()) . ' ' . + WT_I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', WT_SERVER_NAME . WT_SCRIPT_PATH . ' ' . WT_Filter::escapeHtml($WT_TREE->tree_title), $user->getEmail()) . ' ' . WT_I18N::translate('Information about the request is shown under the link below.') . WT_Mail::EOL . WT_I18N::translate('Please click on the following link and fill in the requested data to confirm your request and email address.') . WT_Mail::EOL . WT_Mail::EOL . '<a href="' . WT_LOGIN_URL . "?user_name=" . WT_Filter::escapeUrl($user->getUserName()) . "&user_hashcode=" . $user->getPreference('reg_hashcode') . '&action=userverify">' . |