Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
2a8185ab
Commit
2a8185ab
authored
Sep 28, 2015
by
Robert Lyon
Committed by
Gerrit Code Review
Sep 28, 2015
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Use <main> element so that it becomes an ARIA landmark (Bug #1482456)"
parents
496c2502
7e20e814
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
13 deletions
+12
-13
htdocs/theme/default/templates/footer.tpl
htdocs/theme/default/templates/footer.tpl
+9
-10
htdocs/theme/default/templates/header.tpl
htdocs/theme/default/templates/header.tpl
+1
-1
htdocs/theme/raw/templates/footer.tpl
htdocs/theme/raw/templates/footer.tpl
+1
-1
htdocs/theme/raw/templates/header.tpl
htdocs/theme/raw/templates/header.tpl
+1
-1
No files found.
htdocs/theme/default/templates/footer.tpl
View file @
2a8185ab
</div>
<!-- end main-column -->
</div>
<!-- mainmiddle -->
</
div
>
</
main
>
{
if
$SIDEBARS
&&
$SIDEBLOCKS.right
}
<div
class=
"col-md-3 sidebar"
>
{
include
file
=
"sidebar.tpl"
blocks
=
$SIDEBLOCKS.right
}
</div>
{/
if
}
{
if
$SIDEBARS
&&
$SIDEBLOCKS.left
}
<div
class=
"col-md-3 col-md-pull-9 sidebar"
>
{
include
file
=
"sidebar.tpl"
blocks
=
$SIDEBLOCKS.left
}
</div>
{/
if
}
</div>
<!-- row -->
</div>
<!-- container -->
</div>
<!-- middle-container-wrap -->
<footer
class=
"
{
if
$editing
==
true
}
editcontent
{/
if
}
footer container"
>
...
...
htdocs/theme/default/templates/header.tpl
View file @
2a8185ab
...
...
@@ -72,7 +72,7 @@
<div
class=
"middle-container-wrap"
>
<!-- this div is to give middle section a background colour so that the body can inherit footer background colour and not stop abruptly -->
<div
class=
"container main-content"
>
<div
class=
"row"
>
<
div
id=
"main"
class=
"
{
if
$SIDEBARS
}{
if
$SIDEBLOCKS.right
}
col-md-9
{
else
}
col-md-9 col-md-push-3
{/
if
}{
else
}
col-md-12
{/
if
}
main"
>
<
main
id=
"main"
class=
"
{
if
$SIDEBARS
}{
if
$SIDEBLOCKS.right
}
col-md-9
{
else
}
col-md-9 col-md-push-3
{/
if
}{
else
}
col-md-12
{/
if
}
main"
>
<div
id=
"content"
class=
"main-column
{
if
$selected
==
'content'
}
editcontent
{/
if
}
"
>
<div
id=
"main-column-container"
>
...
...
htdocs/theme/raw/templates/footer.tpl
View file @
2a8185ab
...
...
@@ -3,7 +3,7 @@
</div>
<!-- mainmiddle -->
</
div
>
</
main
>
{
if
$SIDEBARS
&&
$SIDEBLOCKS.right
}
<div
class=
"col-md-3 sidebar"
>
...
...
htdocs/theme/raw/templates/header.tpl
View file @
2a8185ab
...
...
@@ -75,7 +75,7 @@
<div
class=
"container main-content"
>
<div
class=
"row"
>
<
div
id=
"main"
class=
"
{
if
$SIDEBARS
}{
if
$SIDEBLOCKS.right
}
col-md-9
{
else
}
col-md-9 col-md-push-3
{/
if
}{
else
}
col-md-12
{/
if
}
main"
>
<
main
id=
"main"
class=
"
{
if
$SIDEBARS
}{
if
$SIDEBLOCKS.right
}
col-md-9
{
else
}
col-md-9 col-md-push-3
{/
if
}{
else
}
col-md-12
{/
if
}
main"
>
<div
id=
"content"
class=
"main-column
{
if
$selected
==
'content'
}
editcontent
{/
if
}
"
>
<div
id=
"main-column-container"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment