Skip to content

Commit

Permalink
Fix #1112 - various changes to improve the accessibility of the login…
Browse files Browse the repository at this point in the history 
… screen
  • Loading branch information
@FayCross
FayCross committed Jun 10, 2022
1 parent 2c8fc25 commit 5e637bb
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 25 deletions.
16 changes: 13 additions & 3 deletions languages/en-GB/index.inc
View file
Expand Up @@ -28,11 +28,21 @@ define("INDEX_USERNAME", "Username");

define("INDEX_PASSWORD", "Password");

define("INDEX_LOGO_ALT", "Site logo");

define("INDEX_WCAG_LOGO_ALT", "W3C logo");

define("INDEX_OSI_LOGO_ALT", "Open Source Initiative logo");

define("INDEX_APEREO_LOGO_ALT", "Apereo logo");

define("INDEX_XERTE_LOGO_ALT", "Xerte logo");

define("INDEX_HELP_TITLE", "Getting Started");

define("INDEX_HELP_INTRODUCTION", "We've produced a short introduction to the Toolkits website.");
define("INDEX_HELP_INTRODUCTION", "See the <a href='https://xerte.org.uk' target='_blank'>Xerte Project website</a> for <a href='https://xot.xerte.org.uk/play.php?template_id=150#page2' target='_blank'>guides</a>, examples and community forums.");

define("INDEX_HELP_INTRO_LINK_TEXT","Show me!");
define("INDEX_HELP_INTRO_LINK_TEXT","Quick start video");

define("INDEX_NO_LDAP","PHP's LDAP library needs to be installed to use LDAP authentication. If you read the install guide other options are available");

Expand Down Expand Up @@ -62,7 +72,7 @@ define("INDEX_LOG_OUT","Log out");

define("INDEX_LOGGED_IN_AS","Logged in as");

define("INDEX_BUTTON_LOGIN","Login");
define("INDEX_BUTTON_LOGIN","Log in");

define("INDEX_BUTTON_LOGOUT","Logout");

Expand Down
45 changes: 26 additions & 19 deletions website_code/php/login_library.php
View file
Expand Up @@ -230,7 +230,7 @@ function login_form($messages, $xerte_toolkits_site)

<body>

<div class="topbar">
<header class="topbar">
<?php
if (file_exists($xerte_toolkits_site->root_file_path . "branding/logo_right.png"))
{
Expand All @@ -250,30 +250,30 @@ function login_form($messages, $xerte_toolkits_site)
if (file_exists($xerte_toolkits_site->root_file_path . "branding/logo_left.png"))
{
?>
<img src="branding/logo_left.png" style="margin-left:10px; float:left"/>
<img src="branding/logo_left.png" style="margin-left:10px; float:left" alt="<?php echo INDEX_LOGO_ALT; ?>"/>
<?php
}
else {
?>
<img src="website_code/images/logo.png" style="margin-left:10px; float:left"/>
<img src="website_code/images/logo.png" style="margin-left:10px; float:left" alt="<?php echo INDEX_LOGO_ALT; ?>"/>
<?php
}
?>
</div>
</header>

<div class="mainbody">
<main class="mainbody">
<div class="title_holder">
<div class="title_welcome">
<h1 class="title_welcome">
<?PHP echo $xerte_toolkits_site->welcome_message; ?>
</div>
</h1>
<div class="mainbody_holder">
<div style="margin:0 7px 4px 0"><?php display_language_selectionform("");?></div>
<form method="post" enctype="application/x-www-form-urlencoded" >
<p style="margin:4px"><?php echo INDEX_USERNAME; ?>:
<p style="margin:4px"><label for="login_box"><?php echo INDEX_USERNAME; ?>:</label>
<input class="xerte_input_box" type="text" size="20" maxlength="100" name="login" id="login_box"/></p>
<p style="margin:4px"><?PHP echo INDEX_PASSWORD; ?>:
<input class="xerte_input_box" type="password" size="20" maxlength="100" name="password" /></p>
<button type="submit" class="xerte_button_c" style="margin:0 3px 0 0"><i class="fa fa-sign-in"></i> <?php echo INDEX_BUTTON_LOGIN; ?></button>
<p style="margin:4px"><label for="password"><?PHP echo INDEX_PASSWORD; ?>:</label>
<input class="xerte_input_box" type="password" size="20" maxlength="100" name="password" id="password" /></p>
<button type="submit" class="xerte_button" style="margin:0 3px 0 0"><i class="fa fa-sign-in"></i> <?php echo INDEX_BUTTON_LOGIN; ?></button>
</form>
<script>document.getElementById("login_box").focus(); </script>
</div>
Expand All @@ -285,20 +285,27 @@ function login_form($messages, $xerte_toolkits_site)
echo "</div>";
} ?>

</div>
</main>
<div class="bottompart">
<p class="news_title">
<section>
<h1 class="news_title">
<?PHP echo INDEX_HELP_TITLE; ?>
</p>
</h1>
<p class="news_story">
<?php echo INDEX_HELP_INTRODUCTION; ?>
<button type="button" class="xerte_button_c" onClick="window.open('<?php echo $xerte_toolkits_site->demonstration_page; ?>','_blank');"><?php echo INDEX_HELP_INTRO_LINK_TEXT; ?></button>
<?php echo INDEX_HELP_INTRODUCTION; ?><br/><br/>
<button type="button" class="xerte_button" onClick="window.open('<?php echo $xerte_toolkits_site->demonstration_page; ?>','_blank');"><?php echo INDEX_HELP_INTRO_LINK_TEXT; ?></button>
</p>
</section>
<div class="border">
</div>
<p class="copyright">
<?php echo $xerte_toolkits_site->copyright; ?> <i class="fa fa-info-circle" aria-hidden="true" style="color:#f86718; cursor: help;" title="<?PHP $vtext = "version.txt";$lines = file($vtext);echo $lines[0];?>"></i>
</p><div class="footerlogos"><a href="https://xot.xerte.org.uk/play.php?template_id=214#home" target="_blank" title="Xerte accessibility statement https://xot.xerte.org.uk/play.php?template_id=214"><img src="website_code/images/wcag2.1AA-blue-v.png" border="0"></a> <a href="https://opensource.org/" target="_blank" title="Open Source Initiative: https://opensource.org/"><img src="website_code/images/osiFooterLogo.png" border="0"></a> <a href="https://www.apereo.org" target="_blank" title="Apereo: https://www.apereo.org"><img src="website_code/images/apereoFooterLogo.png" border="0"></a> <a href="https://xerte.org.uk" target="_blank" title="Xerte: https://xerte.org.uk"><img src="website_code/images/xerteFooterLogo.png" border="0"></a></div>
<footer>
<p class="copyright">
<?php echo $xerte_toolkits_site->copyright; ?> <i class="fa fa-info-circle" aria-hidden="true" style="color:#f86718; cursor: help;" title="<?PHP $vtext = "version.txt";$lines = file($vtext);echo $lines[0];?>"></i>
</p>
<div class="footerlogos">
<a href="https://xot.xerte.org.uk/play.php?template_id=214#home" target="_blank" title="Xerte accessibility statement https://xot.xerte.org.uk/play.php?template_id=214"><img src="website_code/images/wcag2.1AA-blue-v.png" border="0" alt="<?php echo INDEX_WCAG_LOGO_ALT; ?>"></a><a href="https://opensource.org/" target="_blank" title="Open Source Initiative: https://opensource.org/"><img src="website_code/images/osiFooterLogo.png" border="0" alt="<?php echo INDEX_OSI_LOGO_ALT; ?>"></a><a href="https://www.apereo.org" target="_blank" title="Apereo: https://www.apereo.org"><img src="website_code/images/apereoFooterLogo.png" border="0" alt="<?php echo INDEX_APEREO_LOGO_ALT; ?>"></a><a href="https://xerte.org.uk" target="_blank" title="Xerte: https://xerte.org.uk"><img src="website_code/images/xerteFooterLogo.png" border="0" alt="<?php echo INDEX_XERTE_LOGO_ALT; ?>"></a>
</div>
</footer>
</div>
</body>
</html>
Expand Down
10 changes: 7 additions & 3 deletions website_code/styles/frontpage.css
View file
Expand Up @@ -67,6 +67,9 @@ body{
font-family:"Open Sans", sans-serif;;
line-height:98%
}
h1.title_welcome {
font-weight: normal;
}
.title{
border-bottom:#f3eee2 1px dotted;
color:#aa9d71;
Expand Down Expand Up @@ -232,6 +235,10 @@ body{
margin:0px;
font-size:150%;
}
h1.news_title {
font-weight: normal;
}


.news_story{
padding:0 0 10px 10px;
Expand Down Expand Up @@ -713,10 +720,7 @@ div#workspace{
}

#language-selector {
background-color:#f86718;
color:#fff;
border-radius:4px;
border:#fff 1px solid;
padding:2px;
margin:0;
}
Expand Down

0 comments on commit 5e637bb

Please sign in to comment.