Skip to content

Commit bb807df

Browse files
atutorlangsatutorlangs
committed
Merge branch 'master' of https://github.com/atutor/ATutor 
2 parents bfa1eaa + c83017f commit bb807df

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

‎jscripts/ATutor_js.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@
226226
if(code == 13 || code == 32) {
227227
ATutor.switchView($('#admin_switch').val());
228228
}
229+
return false;
229230
});
230231
<?php } ?>
231232

‎themes/atspaces/include/header.tmpl.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
echo '<div class="site-name">&nbsp;</div>';
132132
endif; ?>
133133

134-
<div id="top-links" role="navigation">
134+
<div id="top-links" role="navigation" aria-label="<?php echo _AT('user'); ?>">
135135
<!-- top help/search/login links -->
136136
<?php if (isset($_SESSION['member_id']) && $_SESSION['member_id']): ?>
137137
<?php if(!$this->just_social): ?>
@@ -215,7 +215,7 @@
215215
</div>
216216
<!-- the main navigation. in our case, tabs -->
217217
<div id="lrg_topnav">
218-
<div id="topnavlistcontainer" role="navigation">
218+
<div id="topnavlistcontainer" role="navigation" aria-label="<?php echo _AT('main'); ?>">
219219
<a name="main-nav"></a>
220220
<ul id="topnavlist">
221221
<?php $accesscounter = 0; //initialize ?>
@@ -257,7 +257,7 @@
257257
<br />
258258
<div id="navigation-column">
259259
<?php if ($this->current_sub_level_page): ?>
260-
<ul id="topnavlist_sm" class="fl-list-menu" role="menu">
260+
<ul id="topnavlist_sm" class="fl-list-menu" role="menu" aria-label="<?php echo _AT('left_side'); ?>">
261261
<?php $accesscounter = 0; //initialize ?>
262262
<?php foreach ($this->top_level_pages as $page): ?>
263263
<?php ++$accesscounter; $accesscounter = ($accesscounter == 10 ? 0 : $accesscounter); ?>
@@ -282,7 +282,7 @@
282282
</div>
283283
<?php if (isset($_SESSION["prefs"]["PREF_SHOW_BREAD_CRUMBS"]) && $_SESSION["prefs"]["PREF_SHOW_BREAD_CRUMBS"] || $_SESSION['course_id'] = -1) { ?>
284284
<!-- the bread crumbs -->
285-
<div class="crumbcontainer" role="navigation">
285+
<div class="crumbcontainer" role="navigation" aria-label="<?php echo _AT('breadcrumb_links'); ?>">
286286
<div id="breadcrumbs" tabindex="0" aria-label="<?php echo _AT('breadcrumb_links'); ?>">
287287
<?php foreach ($this->path as $page): ?>
288288
<a href="<?php echo $page['url']; ?>"><?php echo htmlspecialchars($page['title'], ENT_COMPAT, "UTF-8"); ?></a> >
@@ -325,7 +325,7 @@
325325
</div>
326326
</div>
327327
<div id="lrg_content">
328-
<div id="leftcolumn" role="complementary">
328+
<div id="leftcolumn" role="navigation" aria-label="<?php echo _AT('left_side'); ?>">
329329
<a id="menu"></a>
330330
<div id="side-menu">
331331
<?php require(AT_INCLUDE_PATH.'side_menu.inc.php'); ?>
@@ -337,7 +337,7 @@
337337
<?php endif; ?>
338338

339339

340-
<div id="contentcolumn" role="main">
340+
<div id="contentcolumn" role="main" aria-label="<?php echo _AT('content'); ?>">
341341
<?php admin_switch(); ?>
342342
<?php if (isset($this->course_id) && $this->course_id > 0 && $system_courses[$this->course_id]['side_menu']): ?>
343343
<div id="menutoggle">
@@ -373,7 +373,7 @@
373373

374374
<?php if (count($this->sub_level_pages) > 1 || $this->sub_level_pages_i > 0): ?>
375375
<div id="lrg_subnav">
376-
<div id="subnavlistcontainer" role="navigation">
376+
<div id="subnavlistcontainer" role="navigation" aria-label="<?php echo _AT('sub'); ?>">
377377
<a name="admin_tools" id="admin_tools" title="<?php echo _AT("course_admin_tools"); ?>"></a>
378378
<div id="subnavbacktopage">
379379
<?php if (isset($this->back_to_page)): ?>

‎themes/default/include/header.tmpl.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
echo '<div class="site-name">&nbsp;</div>';
129129
endif; ?>
130130

131-
<div id="top-links" role="navigation">
131+
<div id="top-links" role="navigation" aria-label="<?php echo _AT('user'); ?>">
132132
<!-- top help/search/login links -->
133133
<?php if (isset($_SESSION['member_id']) && $_SESSION['member_id']): ?>
134134
<?php if(!$this->just_social): ?>
@@ -212,7 +212,7 @@
212212
</div>
213213
<!-- the main navigation. in our case, tabs -->
214214
<div id="lrg_topnav">
215-
<div id="topnavlistcontainer" role="navigation">
215+
<div id="topnavlistcontainer" role="navigation" aria-label="<?php echo _AT('main'); ?>">
216216
<a name="main-nav" id="main-nav"></a>
217217
<ul id="topnavlist">
218218
<?php $accesscounter = 0; //initialize ?>
@@ -251,11 +251,11 @@
251251
<div id="sm_topnav">
252252
<?php if ($this->current_sub_level_page): ?>
253253
<div id="topnavlistcontainer_sm" role="navigation" aria-live="assertive" class="topnavlistcontainer fl-container" style="height:auto;">
254-
<a class="navigation-bar-button topnavlist-link active" id="topnavlist-link" href="javascript:void(0);" title="Toggle to open and close main navigation."><?php echo _AT('navigation'); ?><span title="Toggle to open and close main navigation">&nbsp;</span></a>
254+
<a class="navigation-bar-button topnavlist-link active" id="topnavlist-link" href="javascript:void(0);" title="<?php echo _AT('toggle_main'); ?>"><?php echo _AT('navigation'); ?><span title="<?php echo _AT('toggle_main'); ?>">&nbsp;</span></a>
255255
<br />
256256
<div id="navigation-column">
257257
<?php if ($this->current_sub_level_page): ?>
258-
<ul id="topnavlist_sm" class="fl-list-menu" role="menu">
258+
<ul id="topnavlist_sm" class="fl-list-menu" role="menu" aria-label="<?php echo _AT('left_side'); ?>">
259259
<?php $accesscounter = 0; //initialize ?>
260260
<?php foreach ($this->top_level_pages as $page): ?>
261261
<?php ++$accesscounter; $accesscounter = ($accesscounter == 10 ? 0 : $accesscounter); ?>
@@ -280,7 +280,7 @@
280280
</div>
281281
<?php if (isset($_SESSION["prefs"]["PREF_SHOW_BREAD_CRUMBS"]) && $_SESSION["prefs"]["PREF_SHOW_BREAD_CRUMBS"] || $_SESSION['course_id'] = -1) { ?>
282282
<!-- the bread crumbs -->
283-
<div class="crumbcontainer" role="navigation">
283+
<div class="crumbcontainer" role="navigation" aria-label="<?php echo _AT('breadcrumbs_links'); ?>">
284284
<div id="breadcrumbs" tabindex="0" aria-label="<?php echo _AT('breadcrumb_links'); ?>">
285285
<?php foreach ($this->path as $page): ?>
286286
<a href="<?php echo $page['url']; ?>"><?php echo htmlspecialchars($page['title'], ENT_COMPAT, "UTF-8"); ?></a> >
@@ -318,12 +318,12 @@
318318

319319

320320
<div id="sm_content">
321-
<div id="content_link" role="navigation" aria-live="assertive" class="flc-screenNavigator-navbar ">
321+
<div id="content_link" aria-live="assertive" class="flc-screenNavigator-navbar " aria-label="<?php echo _AT('left_side'); ?>">
322322
<a class="content_link_tablet content_link" href="javascript:void(0);"><?php echo _AT("content"); ?></a>
323323
</div>
324324
</div>
325325
<div id="lrg_content">
326-
<div id="leftcolumn" role="complementary">
326+
<div id="leftcolumn" role="navigation" aria-label="<?php echo _AT('left_side'); ?>">
327327
<a id="menu"></a>
328328
<div id="side-menu">
329329
<?php require(AT_INCLUDE_PATH.'side_menu.inc.php'); ?>
@@ -335,7 +335,7 @@
335335
<?php endif; ?>
336336

337337

338-
<div id="contentcolumn" role="main">
338+
<div id="contentcolumn" role="main" aria-label="<?php echo _AT('content'); ?>">
339339
<?php if (isset($this->course_id) && $this->course_id > 0 && $system_courses[$this->course_id]['side_menu']): ?>
340340
<div id="menutoggle">
341341
<a href="javascript:void(0)" accesskey="n"><img src="" title="" alt="" class="img1616"/></a>
@@ -369,7 +369,7 @@
369369

370370
<?php if (count($this->sub_level_pages) > 1 || $this->sub_level_pages_i > 0): ?>
371371
<div id="lrg_subnav">
372-
<div id="subnavlistcontainer" role="navigation">
372+
<div id="subnavlistcontainer" role="navigation" aria-label="<?php echo _AT('sub'); ?>">
373373
<a name="admin_tools" id="admin_tools" title="<?php echo _AT("course_admin_tools"); ?>"></a>
374374
<div id="subnavbacktopage">
375375
<?php if (isset($this->back_to_page)): ?>

0 commit comments

Comments
 (0)