diff options
32 files changed, 63 insertions, 34 deletions
@@ -33,7 +33,7 @@ $controller ->addInlineJavascript('jQuery("#tree_stats").accordion();') ->addInlineJavascript('jQuery("#changes").accordion();') ->addInlineJavascript('jQuery("#content_container").css("visibility", "visible");') - ->setPageTitle(WT_I18N::translate('Administration')) + ->setPageTitle(WT_I18N::translate('Control panel')) ->pageHeader(); // Check for updates diff --git a/admin_media.php b/admin_media.php index abeb2f61cd..49d9fe50b7 100644 --- a/admin_media.php +++ b/admin_media.php @@ -598,7 +598,7 @@ $controller ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_media_upload.php b/admin_media_upload.php index dacca81523..03ea2312e5 100644 --- a/admin_media_upload.php +++ b/admin_media_upload.php @@ -175,7 +175,7 @@ if (empty($filesize)) { ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_module_blocks.php b/admin_module_blocks.php index 20bd0e9db4..c2725e804d 100644 --- a/admin_module_blocks.php +++ b/admin_module_blocks.php @@ -52,7 +52,7 @@ $controller ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> diff --git a/admin_module_menus.php b/admin_module_menus.php index ebfe9d31fe..97339a1d50 100644 --- a/admin_module_menus.php +++ b/admin_module_menus.php @@ -73,7 +73,7 @@ $controller ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> diff --git a/admin_module_reports.php b/admin_module_reports.php index f53eff17bb..e029ac01a5 100644 --- a/admin_module_reports.php +++ b/admin_module_reports.php @@ -52,7 +52,7 @@ $controller ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> diff --git a/admin_module_sidebar.php b/admin_module_sidebar.php index 7a2a99b17c..43686c94b1 100644 --- a/admin_module_sidebar.php +++ b/admin_module_sidebar.php @@ -73,7 +73,7 @@ $controller ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> diff --git a/admin_module_tabs.php b/admin_module_tabs.php index 26d8da9857..ec7dac2595 100644 --- a/admin_module_tabs.php +++ b/admin_module_tabs.php @@ -73,7 +73,7 @@ $controller ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> diff --git a/admin_modules.php b/admin_modules.php index 8ffd89de61..efbd36f905 100644 --- a/admin_modules.php +++ b/admin_modules.php @@ -128,7 +128,7 @@ $controller ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_pgv_to_wt.php b/admin_pgv_to_wt.php index 27b7012526..33a456907a 100644 --- a/admin_pgv_to_wt.php +++ b/admin_pgv_to_wt.php @@ -122,7 +122,7 @@ $controller->pageHeader(); ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_site_access.php b/admin_site_access.php index a2efd1c700..2383a38896 100644 --- a/admin_site_access.php +++ b/admin_site_access.php @@ -259,7 +259,7 @@ WT_DB::exec( ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_site_change.php b/admin_site_change.php index e510cb6ccd..9b75be27f5 100644 --- a/admin_site_change.php +++ b/admin_site_change.php @@ -277,7 +277,7 @@ foreach (User::all() as $tmp_user) { ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_site_clean.php b/admin_site_clean.php index 19c9cb3979..2ed737254d 100644 --- a/admin_site_clean.php +++ b/admin_site_clean.php @@ -83,7 +83,7 @@ sort($entries); ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_site_config.php b/admin_site_config.php index 93b44a49f8..a73b23cc29 100644 --- a/admin_site_config.php +++ b/admin_site_config.php @@ -119,7 +119,7 @@ $controller->pageHeader(); ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_site_info.php b/admin_site_info.php index 8d62f29262..4e97e71b96 100644 --- a/admin_site_info.php +++ b/admin_site_info.php @@ -38,7 +38,7 @@ $variables = WT_DB::prepare("SHOW VARIABLES")->fetchAssoc(); array_walk($variables, function(&$x) { $x = str_replace(',', ', ', $x); }); ob_start(); -phpinfo(); +phpinfo(INFO_ALL & ~INFO_CREDITS & ~INFO_LICENSE); preg_match('%<style type="text/css">(.*?)</style>.*?(<body>.*</body>)%s', ob_get_clean(), $matches); $style = $matches[1]; $html = $matches[2]; @@ -46,7 +46,7 @@ $html = $matches[2]; ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_site_logs.php b/admin_site_logs.php index 06d3df94af..d1fd9b91ad 100644 --- a/admin_site_logs.php +++ b/admin_site_logs.php @@ -237,7 +237,7 @@ foreach (User::all() as $tmp_user) { ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_site_readme.php b/admin_site_readme.php index 4aaf85530b..8d6c274c46 100644 --- a/admin_site_readme.php +++ b/admin_site_readme.php @@ -37,7 +37,7 @@ $readme = preg_replace('/.*(?=# webtrees)/s', '', $readme); ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_trees_config.php b/admin_trees_config.php index 93edcbf404..df1d5b4020 100644 --- a/admin_trees_config.php +++ b/admin_trees_config.php @@ -416,7 +416,7 @@ $controller ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_trees_manage.php b/admin_trees_manage.php index 1d308d98e6..1e67e7eda4 100644 --- a/admin_trees_manage.php +++ b/admin_trees_manage.php @@ -154,7 +154,7 @@ $controller->pageHeader(); ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_trees_merge.php b/admin_trees_merge.php index 9e65bb9604..32bae18a3e 100644 --- a/admin_trees_merge.php +++ b/admin_trees_merge.php @@ -32,7 +32,7 @@ $controller ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_users.php b/admin_users.php index cb43dc0a73..22b43f5fab 100644 --- a/admin_users.php +++ b/admin_users.php @@ -278,7 +278,7 @@ case 'edit': ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_users.php"><?php echo WT_I18N::translate('User administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> @@ -645,7 +645,7 @@ case 'cleanup': ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_users.php"><?php echo WT_I18N::translate('User administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> @@ -809,7 +809,7 @@ default: ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <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> diff --git a/admin_users_bulk.php b/admin_users_bulk.php index 82c86d4a2e..a9366ed156 100644 --- a/admin_users_bulk.php +++ b/admin_users_bulk.php @@ -37,7 +37,7 @@ $controller ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_users.php"><?php echo WT_I18N::translate('User administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> diff --git a/library/WT/Theme/Administration.php b/library/WT/Theme/Administration.php index 47fc4078ed..851a615999 100644 --- a/library/WT/Theme/Administration.php +++ b/library/WT/Theme/Administration.php @@ -49,7 +49,9 @@ class Administration extends BaseTheme { /** {@inheritdoc} */ protected function headerContent() { - return $this->secondaryMenuContainer($this->secondaryMenu()); + return + $this->accessibilityLinks() . + $this->secondaryMenuContainer($this->secondaryMenu()); } /** {@inheritdoc} */ @@ -62,7 +64,7 @@ class Administration extends BaseTheme { * @return WT_Menu */ protected function menuAdminSite() { - return new WT_Menu(/* I18N: Menu entry*/ WT_I18N::translate('webtrees'), '#', '', '', array( + return new WT_Menu(/* I18N: Menu entry*/ WT_I18N::translate('Server'), '#', '', '', array( new WT_Menu(/* I18N: Menu entry */ WT_I18N::translate('Site preferences'), 'admin_site_config.php?action=site'), new WT_Menu(/* I18N: Menu entry */ WT_I18N::translate('Sending email'), 'admin_site_config.php?action=email'), new WT_Menu(/* I18N: Menu entry */ WT_I18N::translate('Login and registration'), 'admin_site_config.php?action=login'), @@ -154,7 +156,7 @@ class Administration extends BaseTheme { '<span class="icon-bar"></span>' . '<span class="icon-bar"></span>' . '</button>' . - //'<a class="navbar-brand" href="index.php">' . WT_WEBTREES . '</a>' . + '<a class="navbar-brand" href="admin.php">' . WT_I18N::translate('Control panel') . '</a>' . '</div>' . '<div class="collapse navbar-collapse" id="primary-navbar-collapse">' . '<ul class="nav navbar-nav">' . diff --git a/library/WT/Theme/BaseTheme.php b/library/WT/Theme/BaseTheme.php index 7bf386222e..132b17a7b5 100644 --- a/library/WT/Theme/BaseTheme.php +++ b/library/WT/Theme/BaseTheme.php @@ -62,6 +62,23 @@ abstract class BaseTheme { } /** + * Create accessibility links for the header. + * + * "Skip to content" allows keyboard only users to navigate over the headers without + * pressing TAB many times. + * + * @return string + */ + public function accessibilityLinks() { + return + '<div class="accessibility-links">' . + '<a class="sr-only sr-only-focusable btn btn-info btn-sm" href="#content">' . + /* I18N: Skip over the headers and menus, to the main content of the page */ WT_I18N::translate('Skip to content') . + '</a>' . + '</div>'; + } + + /** * Create the top of the <body>. * * @return string @@ -426,6 +443,7 @@ abstract class BaseTheme { */ protected function headerContent() { return + //$this->accessibilityLinks() . $this->logoHeader() . $this->secondaryMenuContainer($this->secondaryMenu()) . $this->formatTreeTitle() . @@ -1294,7 +1312,7 @@ abstract class BaseTheme { } if (WT_USER_GEDCOM_ADMIN) { - $menu->addSubmenu(new WT_Menu(WT_I18N::translate('Administration'), 'admin.php', 'menu-admin')); + $menu->addSubmenu(new WT_Menu(WT_I18N::translate('Control panel'), 'admin.php', 'menu-admin')); } return $menu; diff --git a/library/WT/Theme/Colors.php b/library/WT/Theme/Colors.php index de7d683a35..883c444e70 100644 --- a/library/WT/Theme/Colors.php +++ b/library/WT/Theme/Colors.php @@ -53,6 +53,7 @@ class Colors extends Clouds { /** {@inheritdoc} */ protected function headerContent() { return + //$this->accessibilityLinks() . $this->formatTreeTitle() . $this->formatSecondaryMenu(); } diff --git a/library/WT/Theme/Fab.php b/library/WT/Theme/Fab.php index 07e19763e5..281e484dcd 100644 --- a/library/WT/Theme/Fab.php +++ b/library/WT/Theme/Fab.php @@ -54,6 +54,7 @@ class Fab extends BaseTheme { /** {@inheritdoc} */ protected function headerContent() { return + //$this->accessibilityLinks() . $this->formatTreeTitle() . $this->formatSecondaryMenu(); } diff --git a/library/WT/Theme/Minimal.php b/library/WT/Theme/Minimal.php index b1beddf8c4..1fa5467da0 100644 --- a/library/WT/Theme/Minimal.php +++ b/library/WT/Theme/Minimal.php @@ -59,6 +59,7 @@ class Minimal extends BaseTheme { /** {@inheritdoc} */ protected function headerContent() { return + //$this->accessibilityLinks() . $this->formatTreeTitle() . $this->formatSecondaryMenu(); } diff --git a/library/WT/Theme/Xenea.php b/library/WT/Theme/Xenea.php index f15e4eb522..3fe31252a2 100644 --- a/library/WT/Theme/Xenea.php +++ b/library/WT/Theme/Xenea.php @@ -50,6 +50,7 @@ class Xenea extends BaseTheme { /** {@inheritdoc} */ protected function headerContent() { return + //$this->accessibilityLinks() . '<div class="header-upper">' . $this->formatTreeTitle() . $this->formQuickSearch() . diff --git a/modules_v3/faq/module.php b/modules_v3/faq/module.php index 789e57a7ed..69230219a9 100644 --- a/modules_v3/faq/module.php +++ b/modules_v3/faq/module.php @@ -128,7 +128,7 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li><a href="module.php?mod=<?php echo $this->getName(); ?>&mod_action=admin_config"><?php echo WT_I18N::translate('Frequently asked questions'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> @@ -364,7 +364,7 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> diff --git a/modules_v3/sitemap/module.php b/modules_v3/sitemap/module.php index 619fa1d585..f1bdb68fe5 100644 --- a/modules_v3/sitemap/module.php +++ b/modules_v3/sitemap/module.php @@ -278,7 +278,7 @@ class sitemap_WT_Module extends WT_Module implements WT_Module_Config { ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> diff --git a/modules_v3/stories/module.php b/modules_v3/stories/module.php index 3b813fcea7..60fd748538 100644 --- a/modules_v3/stories/module.php +++ b/modules_v3/stories/module.php @@ -194,7 +194,7 @@ class stories_WT_Module extends WT_Module implements WT_Module_Tab, WT_Module_Co ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li><a href="module.php?mod=<?php echo $this->getName(); ?>&mod_action=admin_config"><?php echo $this->getTitle(); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> @@ -307,7 +307,7 @@ class stories_WT_Module extends WT_Module implements WT_Module_Tab, WT_Module_Co ?> <ol class="breadcrumb small"> - <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin.php"><?php echo WT_I18N::translate('Control panel'); ?></a></li> <li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li> <li class="active"><?php echo $controller->getPageTitle(); ?></li> </ol> diff --git a/themes/_administration/css-1.7.0/style.css b/themes/_administration/css-1.7.0/style.css index 4e665c9bb4..561d0c9e37 100644 --- a/themes/_administration/css-1.7.0/style.css +++ b/themes/_administration/css-1.7.0/style.css @@ -58,6 +58,11 @@ body { } } +/* Do not let the focused accessibility links change the layout */ +.accessibility-links { + position: fixed; +} + /* Make <fieldset class="form-group"> look like <div class="form-group"> so we can use semantic/accessible markup */ fieldset { margin-bottom: inherit; |