Skip to content

Commit 4349f69

Browse files
eloyereloyer
authored
Merge pull request #229 from anvc/refactor-header
Refactor header
2 parents 2a4e163 + 3cb8631 commit 4349f69

14 files changed

+2587
-2196
lines changed

‎system/application/views/arbors/html5_RDFa/wrapper.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function print_rdf($rdf, $tabs=0, $ns=array(), $hide=array(), $aria=false, $forc
5757
if (in_array($p, $hide)) continue;
5858
foreach ($values as $value) {
5959
if (isURL($value['value']) && !in_array(toNS($p,$ns), $force_literal)) {
60-
$str = '<a class="metadata" aria-hidden="'.(($aria)?'false':'true').'" rel="'.toNS($p,$ns).'" href="'.htmlspecialchars($value['value']).'"></a>'."\n";
60+
$str = '<a class="metadata" tabindex="-1" aria-hidden="'.(($aria)?'false':'true').'" rel="'.toNS($p,$ns).'" href="'.htmlspecialchars($value['value']).'"></a>'."\n";
6161
} else {
6262
$str = '<span class="metadata" aria-hidden="'.(($aria)?'false':'true').'" property="'.toNS($p,$ns).'">'.$value['value'].'</span>'."\n";
6363
}
@@ -203,41 +203,41 @@ function print_rdf($rdf, $tabs=0, $ns=array(), $hide=array(), $aria=false, $forc
203203
<!-- Book -->
204204
<span resource="<?=rtrim($base_uri,'/')?>" typeof="scalar:Book">
205205
<span property="dcterms:title" content="<?=htmlspecialchars(strip_tags($book->title))?>"><a id="book-title" href="<?=$base_uri?>index"><?=$book->title?><?=(isset($book->subtitle)&&!empty($book->subtitle))?'<span class="subtitle">: '.$book->subtitle.'</span>':''?></a></span>
206-
<? if (isset($page->slug)) echo ' <a class="metadata" aria-hidden="true" rel="dcterms:hasPart" href="'.$base_uri.$page->slug.'"></a>'."\n"; ?>
207-
<a class="metadata" aria-hidden="true" rel="dcterms:tableOfContents" href="<?=$base_uri?>toc"></a>
206+
<? if (isset($page->slug)) echo ' <a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:hasPart" href="'.$base_uri.$page->slug.'"></a>'."\n"; ?>
207+
<a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:tableOfContents" href="<?=$base_uri?>toc"></a>
208208
<?
209209
foreach ($book->contributors as $contrib):
210210
if (empty($contrib->list_in_index)) continue;
211-
echo ' <a class="metadata" aria-hidden="true" rel="sioc:has_owner" href="'.$base_uri.'users/'.$contrib->user_id.$this->rdf_object->annotation_append($contrib).'"></a>'."\n";
211+
echo ' <a class="metadata" tabindex="-1" aria-hidden="true" rel="sioc:has_owner" href="'.$base_uri.'users/'.$contrib->user_id.$this->rdf_object->annotation_append($contrib).'"></a>'."\n";
212212
endforeach;
213213
?>
214-
<? echo (($publisher||$publisher_thumbnail) ? ' <a class="metadata" aria-hidden="true" rel="dcterms:publisher" href="'.$base_uri.'publisher"></a>'."\n" : '')?>
214+
<? echo (($publisher||$publisher_thumbnail) ? ' <a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:publisher" href="'.$base_uri.'publisher"></a>'."\n" : '')?>
215215
<?
216216
if (!empty($book->editions)):
217217
for ($j = count($book->editions)-1; $j >= 0; $j--):
218-
echo ' <a class="metadata" aria-hidden="true" rel="scalar:hasEdition" href="'.base_url().$book->slug.'.'.($j+1).'"></a>'."\n";
218+
echo ' <a class="metadata" tabindex="-1" aria-hidden="true" rel="scalar:hasEdition" href="'.base_url().$book->slug.'.'.($j+1).'"></a>'."\n";
219219
endfor;
220220
endif;
221221
?>
222222
</span>
223223
<span aria-hidden="true" resource="<?=$base_uri?>toc" typeof="scalar:Page">
224224
<span class="metadata" property="dcterms:title">Main Menu</span>
225225
<? for ($j = 0; $j < count($book->versions); $j++): ?>
226-
<a class="metadata" rel="dcterms:references" href="<?=$base_uri.$book->versions[$j]->slug?>#index=<?=($j+1)?>"></a>
226+
<a class="metadata" tabindex="-1" rel="dcterms:references" href="<?=$base_uri.$book->versions[$j]->slug?>#index=<?=($j+1)?>"></a>
227227
<? endfor;?>
228228
</span>
229229
<? for ($j = 0; $j < count($book->versions); $j++):
230230
if (empty($book->versions[$j]->content_id)) continue;
231231
if ($book->versions[$j]->content_id == @$page->content_id) continue;
232232
?>
233233
<span aria-hidden="true" resource="<?=$base_uri.$book->versions[$j]->slug?>" typeof="scalar:<?=('media'==$book->versions[$j]->type)?'Media':'Composite'?>">
234-
<a class="metadata" rel="dcterms:hasVersion" href="<?=$base_uri.$book->versions[$j]->slug.'.'.$book->versions[$j]->versions[0]->version_num?>"></a>
235-
<a class="metadata" rel="dcterms:isPartOf" href="<?=rtrim($base_uri,'/')?>"></a>
234+
<a class="metadata" tabindex="-1" rel="dcterms:hasVersion" href="<?=$base_uri.$book->versions[$j]->slug.'.'.$book->versions[$j]->versions[0]->version_num?>"></a>
235+
<a class="metadata" tabindex="-1" rel="dcterms:isPartOf" href="<?=rtrim($base_uri,'/')?>"></a>
236236
</span>
237237
<span aria-hidden="true" resource="<?=$base_uri.$book->versions[$j]->slug.'.'.$book->versions[$j]->versions[0]->version_num?>" typeof="scalar:Version">
238238
<span class="metadata" property="dcterms:title"><?=$book->versions[$j]->versions[0]->title?></span>
239239
<span class="metadata" property="dcterms:description"><?=$book->versions[$j]->versions[0]->description?></span>
240-
<a class="metadata" rel="dcterms:isVersionOf" href="<?=$base_uri.$book->versions[$j]->slug?>"></a>
240+
<a class="metadata" tabindex="-1" rel="dcterms:isVersionOf" href="<?=$base_uri.$book->versions[$j]->slug?>"></a>
241241
</span>
242242
<?
243243
endfor;
@@ -251,7 +251,7 @@ function print_rdf($rdf, $tabs=0, $ns=array(), $hide=array(), $aria=false, $forc
251251
?>
252252
<span aria-hidden="true" resource="<?=$base_uri?>publisher" typeof="scalar:Page">
253253
<span class="metadata" property="dcterms:title"><?=$publisher?></span>
254-
<? if ($publisher_thumbnail): echo ' <a class="metadata" rel="art:thumbnail" href="'.abs_url($publisher_thumbnail, base_url().$book->slug).'"></a>'."\n"; endif; ?>
254+
<? if ($publisher_thumbnail): echo ' <a class="metadata" tabindex="-1" rel="art:thumbnail" href="'.abs_url($publisher_thumbnail, base_url().$book->slug).'"></a>'."\n"; endif; ?>
255255
</span>
256256
<? endif; ?>
257257
<?
@@ -277,15 +277,15 @@ function print_rdf($rdf, $tabs=0, $ns=array(), $hide=array(), $aria=false, $forc
277277
?>
278278
<h1 property="dcterms:title"><?=$title?></h1>
279279
<span resource="<?=$base_uri.$page->slug?>" typeof="scalar:<?=('media'==$page->type)?'Media':'Composite'?>">
280-
<a class="metadata" aria-hidden="true" rel="dcterms:hasVersion" href="<?=$base_uri.$page->slug.'.'.$page->versions[$page->version_index]->version_num?>"></a>
281-
<a class="metadata" aria-hidden="true" rel="dcterms:isPartOf" href="<?=rtrim($base_uri,'/')?>"></a>
280+
<a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:hasVersion" href="<?=$base_uri.$page->slug.'.'.$page->versions[$page->version_index]->version_num?>"></a>
281+
<a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:isPartOf" href="<?=rtrim($base_uri,'/')?>"></a>
282282
<? print_rdf($this->pages->rdf($page, $base_uri), 3, $ns); ?>
283283
</span>
284284
<span resource="<?=$page->user->uri?>" typeof="foaf:Person">
285285
<? print_rdf($this->users->rdf($page->user, $base_uri), 3, $ns); ?>
286286
</span>
287287
<span class="metadata" aria-hidden="true" id="book-id"><?=$book->book_id?></span>
288-
<a class="metadata" aria-hidden="true" rel="dcterms:isVersionOf" href="<?=$base_uri.$page->slug?>"></a>
288+
<a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:isVersionOf" href="<?=$base_uri.$page->slug?>"></a>
289289
<?
290290
print_rdf($this->versions->rdf($page->versions[$page->version_index], $base_uri), 2, $ns, array('sioc:content'));
291291
?>
@@ -298,14 +298,14 @@ function print_rdf($rdf, $tabs=0, $ns=array(), $hide=array(), $aria=false, $forc
298298
?>
299299
<span aria-hidden="true" resource="<?=$base_uri.$page->versions[$page->version_index]->continue_to[0]->slug?>" typeof="scalar:<?=('media'==$base_uri.$page->versions[$page->version_index]->continue_to[0]->type)?'Media':'Composite'?>">
300300
<span class="metadata" class="color" style="background-color:<?=$page->versions[$page->version_index]->continue_to[0]->color?>" property="scalar:color" content="<?=$page->versions[$page->version_index]->continue_to[0]->color?>"></span>
301-
<a class="metadata" rel="dcterms:hasVersion" href="<?=$base_uri.$page->versions[$page->version_index]->continue_to[0]->slug.'.'.$page->versions[$page->version_index]->continue_to[0]->versions[$page->versions[$page->version_index]->continue_to[0]->version_index]->version_num?>"></a>
301+
<a class="metadata" tabindex="-1" rel="dcterms:hasVersion" href="<?=$base_uri.$page->versions[$page->version_index]->continue_to[0]->slug.'.'.$page->versions[$page->version_index]->continue_to[0]->versions[$page->versions[$page->version_index]->continue_to[0]->version_index]->version_num?>"></a>
302302
</span>
303303
<span aria-hidden="true" resource="<?=$base_uri.$page->versions[$page->version_index]->continue_to[0]->slug.'.'.$page->versions[$page->version_index]->continue_to[0]->versions[$page->versions[$page->version_index]->continue_to[0]->version_index]->version_num?>" typeof="scalar:Version">
304304
<span property="dcterms:title" content="<?=htmlspecialchars($page->versions[$page->version_index]->continue_to[0]->versions[$page->versions[$page->version_index]->continue_to[0]->version_index]->title)?>">
305305
<a href="<?=$base_uri.$page->versions[$page->version_index]->continue_to[0]->slug?>"><?=$page->versions[$page->version_index]->continue_to[0]->versions[$page->versions[$page->version_index]->continue_to[0]->version_index]->title?></a>
306306
</span>
307307
<span class="metadata" property="dcterms:description"><?=$page->versions[$page->version_index]->continue_to[0]->versions[$page->versions[$page->version_index]->continue_to[0]->version_index]->description?></span>
308-
<a class="metadata" rel="dcterms:isVersionOf" href="<?=$base_uri.$page->versions[$page->version_index]->continue_to[0]->slug?>"></a>
308+
<a class="metadata" tabindex="-1" rel="dcterms:isVersionOf" href="<?=$base_uri.$page->versions[$page->version_index]->continue_to[0]->slug?>"></a>
309309
</span>
310310
<?
311311
endif;

‎system/application/views/melons/cantaloupe/css/bootstrap-accessibility.css

100755100644
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎system/application/views/melons/cantaloupe/css/common.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,10 @@ label {
11751175
button, .btn, input, optgroup, select, textarea {
11761176
font-family: Lato, Arial, sans-serif;
11771177
}
1178+
.search .form-horizontal .form-group {
1179+
margin-right: 0;
1180+
margin-left: 0;
1181+
}
11781182

11791183
.btn-primary { background-color: #026697; border-color: #026697; }
11801184

‎system/application/views/melons/cantaloupe/css/header.css

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,9 @@ span.navbar-text.navbar-left.pull-left.title_wrapper.visible-xs{
395395
margin-bottom: 1rem;
396396
font-weight: bold;
397397
}
398+
.navbar ul.dropdown-menu>li:last-child, .navbar ul.dropdown-menu .body>ol>li:last-child, .navbar ul.dropdown-menu li.static:last-child, .navbar ul.dropdown-menu .relationships li:last-child {
399+
margin-bottom: 0;
400+
}
398401
.navbar ul.dropdown-menu .relationships>ul>li{
399402
margin-bottom: 4.4rem;
400403
}
@@ -527,6 +530,7 @@ span.navbar-text.navbar-left.pull-left.title_wrapper.visible-xs{
527530
padding-left: 3.5rem;
528531
margin-left: 3rem;
529532
right: 2.2rem;
533+
outline-color: #fff;
530534
}
531535
.tocMenu .expandedPage .relationships ol>li>a{
532536
margin-right: 3.5rem;
@@ -606,12 +610,15 @@ span.navbar-text.navbar-left.pull-left.title_wrapper.visible-xs{
606610
color: #fff;
607611
text-decoration: none;
608612
}
613+
.navbar ul.dropdown-menu li>a:focus-visible, #mobileMainMenuSubmenus li>a:focus-visible{
614+
outline-color: #fff;
615+
}
609616
.navbar li.mainMenu ul.dropdown-menu>li:hover,
610617
.navbar li.mainMenu ul.dropdown-menu>li:focus{
611618
background-color: transparent;
612619
}
613620
.navbar li.mainMenu>.mainMenuDropdown>#mainMenuInside>li.static{
614-
padding: 0 3rem;
621+
padding: 1.5rem 3rem 0 3rem;
615622
}
616623
.navbar li.mainMenu>.mainMenuDropdown>#mainMenuInside>li.top{
617624
margin-bottom: 1rem;
@@ -638,7 +645,7 @@ span.navbar-text.navbar-left.pull-left.title_wrapper.visible-xs{
638645
.navbar li.mainMenu>.mainMenuDropdown>#mainMenuInside>li>ol>li.is_parent>a.expand, .tocMenu .expandedPage .relationships ol>li.is_parent>a.expand{
639646
background-color: #4c4c4c;
640647
}
641-
.navbar li.mainMenu>.mainMenuDropdown>#mainMenuInside>li>ol>li>a.expand:hover, .tocMenu .expandedPage .relationships ol>li>a.expand:hover,
648+
.navbar li.mainMenu>.mainMenuDropdown>#mainMenuInside>li>ol>li>a.expand:hover, .navbar li.mainMenu>.mainMenuDropdown>#mainMenuInside>li>ol>li>a.expand:focus, .tocMenu .expandedPage .relationships ol>li>a.expand:hover,
642649
.tocMenu .expandedPage .relationships ol>li>a.expand:focus{
643650
background-color: #006793;
644651
}
@@ -651,7 +658,7 @@ span.navbar-text.navbar-left.pull-left.title_wrapper.visible-xs{
651658
.navbar ul.dropdown-menu li{
652659
max-width: 38rem;
653660
}
654-
.navbar ul.dropdown-menu li.vis_link{
661+
#vis_menu li{
655662
max-width: inherit;
656663
}
657664
.navbar .dropdown-menu li:hover, .navbar .dropdown-menu li:active{
@@ -960,6 +967,7 @@ i.loader{
960967
}
961968

962969
#ScalarHeaderMenu{
970+
position: relative;
963971
-webkit-transition: -webkit-transform .5s;
964972
-moz-transition: -moz-transform .5s;
965973
transition: transform .5s;
@@ -1144,3 +1152,19 @@ i.loader{
11441152
width: 100%;
11451153
}
11461154
}
1155+
#skip {
1156+
position:absolute;
1157+
left:0;
1158+
top:-100px;
1159+
text-transform: none;
1160+
background-color: black;
1161+
padding: 5px 10px;
1162+
z-index: 100;
1163+
transition: top .25s;
1164+
text-decoration: none;
1165+
}
1166+
1167+
#skip:focus {
1168+
left: 0;
1169+
top: 0;
1170+
}

‎system/application/views/melons/cantaloupe/css/vis.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ div.jqcloud > span:hover {}
1616

1717
.visList {width:100%;}
1818
.visList .header > td {border-top:solid 1px #aaaaaa; border-bottom:solid 1px #aaaaaa; white-space:nowrap; padding:6px 4px 6px 4px; font-size:13px;}
19-
.visListRow > td {border-bottom:solid 1px #aaaaaa; padding:8px 4px 8px 4px; font-size:13px; line-height:125%;}
19+
.visListRow > td {border-bottom:solid 1px #aaaaaa; padding:8px 4px 8px 4px; font-size:13px; line-height:125%; vertical-align:top;}
2020
.visListRow:hover {background-color:#d9edf7; cursor:pointer;}
21-
.visListRow.selected {background-color:#c7e6f6 !important;}
21+
.visListRow.selected {background-color:#c7e6f6 !important;}
22+
.visList .thumb { width:76px; max-width:76px; }

0 commit comments

Comments
 (0)