diff options
author | Morris Jobke <hey@morrisjobke.de> | 2015-03-24 12:07:26 +0100 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2015-03-24 12:07:26 +0100 |
commit | e07a2fd8a254e60758e847356c45f41334d79aaf (patch) | |
tree | aeeb9d68d99d9136fa962018f10b06c2f7384e5b /core/templates | |
parent | ce5d2ab7dbe9e4ca67c12ba1f5506619b639ddb7 (diff) | |
parent | 599ee5ce4eb537e2becfe72949b250094411493b (diff) | |
download | nextcloud-server-e07a2fd8a254e60758e847356c45f41334d79aaf.tar.gz nextcloud-server-e07a2fd8a254e60758e847356c45f41334d79aaf.zip |
Merge pull request #15012 from Volker-E/master
fixing #15011 by adding ARIA roles where distinct
Diffstat (limited to 'core/templates')
-rw-r--r-- | core/templates/exception.php | 2 | ||||
-rw-r--r-- | core/templates/installation.php | 2 | ||||
-rw-r--r-- | core/templates/layout.guest.php | 8 | ||||
-rw-r--r-- | core/templates/layout.user.php | 25 | ||||
-rw-r--r-- | core/templates/message.html | 2 |
5 files changed, 20 insertions, 19 deletions
diff --git a/core/templates/exception.php b/core/templates/exception.php index 9ddc0f94d65..899ea29456c 100644 --- a/core/templates/exception.php +++ b/core/templates/exception.php @@ -9,7 +9,7 @@ style('core', ['styles', 'header']); <p><?php p($l->t('The server encountered an internal error and was unable to complete your request.')) ?></p> <p><?php p($l->t('Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.')) ?></p> <p><?php p($l->t('More details can be found in the server log.')) ?></p> - <br /> + <br> <h2><strong><?php p($l->t('Technical details')) ?></strong></h2> <ul> diff --git a/core/templates/installation.php b/core/templates/installation.php index 54c490c544e..96e6119cad3 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -10,7 +10,7 @@ script('core', [ <input type='hidden' id='hasOracle' value='<?php p($_['hasOracle']) ?>'> <input type='hidden' id='hasMSSQL' value='<?php p($_['hasMSSQL']) ?>'> <form action="index.php" method="post"> -<input type="hidden" name="install" value="true" /> +<input type="hidden" name="install" value="true"> <?php if(count($_['errors']) > 0): ?> <fieldset class="warning"> <legend><strong><?php p($l->t('Error'));?></strong></legend> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index c494e32a7fc..0557e89ce71 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -22,10 +22,10 @@ </head> <body id="<?php p($_['bodyid']);?>"> <?php include('layout.noscript.warning.php'); ?> - <div class="wrapper"><!-- for sticky footer --> - <div class="v-align"><!-- vertically centred box --> + <div class="wrapper"> + <div class="v-align"> <?php if ($_['bodyid'] === 'body-login' ): ?> - <header> + <header role="banner"> <div id="header"> <div class="logo svg"> <h1 class="hidden-visually"> @@ -40,7 +40,7 @@ <div class="push"></div><!-- for sticky footer --> </div> </div> - <footer> + <footer role="contentinfo"> <p class="info"> <?php print_unescaped($theme->getLongFooter()); ?> </p> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 9667aa72ddb..138545f2ccc 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -35,7 +35,7 @@ <div id="update-notification" style="display: inline;"><a href="<?php print_unescaped($_['updateLink']); ?>"><?php p($l->t('%s is available. Get more information on how to update.', array($_['updateVersion']))); ?></a></div> <?php endif; ?> </div> - <header><div id="header"> + <header role="banner"><div id="header"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud" tabindex="-1"> <div class="logo-icon svg"> @@ -65,12 +65,12 @@ <div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown"'); } else { print_unescaped('" style="display: none"'); } ?>> <?php if ($_['userAvatarSet']): ?> <img src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32]));?>?requesttoken=<?php p(urlencode($_['requesttoken'])); ?>" - alt="" /> + alt=""> <?php endif; ?> </div> <?php endif; ?> <span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> - <img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /> + <img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>"> </div> <div id="expanddiv"> <ul> @@ -93,24 +93,24 @@ </div> </div> - <form class="searchbox" action="#" method="post"> + <form class="searchbox" action="#" method="post" role="search"> <label for="searchbox" class="hidden-visually"> <?php p($l->t('Search'));?> </label> <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])) {p($_POST['query']);};?>" - autocomplete="off" tabindex="3" /> + autocomplete="off" tabindex="3"> </form> </div></header> - <nav><div id="navigation"> + <nav role="navigation"><div id="navigation"> <div id="apps" class="svg"> <ul> <?php foreach($_['navigation'] as $entry): ?> <li data-id="<?php p($entry['id']); ?>"> <a href="<?php print_unescaped($entry['href']); ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> - <img class="app-icon svg" alt="" src="<?php print_unescaped($entry['icon']); ?>"/> + <img class="app-icon svg" alt="" src="<?php print_unescaped($entry['icon']); ?>"> <div class="icon-loading-dark" style="display:none;"></div> <span> <?php p($entry['name']); ?> @@ -118,13 +118,14 @@ </a> </li> <?php endforeach; ?> - - <!-- show "More apps" link to app administration directly in app navigation, as last entry --> - <?php if(OC_User::isAdminUser(OC_User::getUser())): ?> + <?php + /* show "More apps" link to app administration directly in app navigation, as last entry */ + if(OC_User::isAdminUser(OC_User::getUser())): + ?> <li id="apps-management"> <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps')); ?>" title="" <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> - <img class="app-icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/> + <img class="app-icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"> <div class="icon-loading-dark" style="display:none;"></div> <span> <?php p($l->t('Apps')); ?> @@ -138,7 +139,7 @@ </div></nav> <div id="content-wrapper"> - <div id="content" class="app-<?php p($_['appid']) ?>"> + <div id="content" class="app-<?php p($_['appid']) ?>" role="main"> <?php print_unescaped($_['content']); ?> </div> </div> diff --git a/core/templates/message.html b/core/templates/message.html index cd642231a9e..a98fd31a7fe 100644 --- a/core/templates/message.html +++ b/core/templates/message.html @@ -1,3 +1,3 @@ -<div id="{dialog_name}" title="{title} "><!-- the ' ' after {title} fixes ie8, see http://stackoverflow.com/a/5313137/828717 --> +<div id="{dialog_name}" title="{title} "><?php /* the ' ' after {title} fixes ie8, see http://stackoverflow.com/a/5313137/828717 */ ?> <p><span class="ui-icon ui-icon-{type}"></span>{message}</p> </div> |