Skip to content

Commit

Permalink
Merge pull request #229 from anvc/refactor-header
Browse files Browse the repository at this point in the history 
Refactor header
  • Loading branch information
@eloyer
eloyer authored Feb 21, 2024
2 parents 2a4e163 + 3cb8631 commit 4349f69
Show file tree
Hide file tree
Showing 14 changed files with 2,587 additions and 2,196 deletions.
32 changes: 16 additions & 16 deletions system/application/views/arbors/html5_RDFa/wrapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function print_rdf($rdf, $tabs=0, $ns=array(), $hide=array(), $aria=false, $forc
if (in_array($p, $hide)) continue;
foreach ($values as $value) {
if (isURL($value['value']) && !in_array(toNS($p,$ns), $force_literal)) {
$str = '<a class="metadata" aria-hidden="'.(($aria)?'false':'true').'" rel="'.toNS($p,$ns).'" href="'.htmlspecialchars($value['value']).'"></a>'."\n";
$str = '<a class="metadata" tabindex="-1" aria-hidden="'.(($aria)?'false':'true').'" rel="'.toNS($p,$ns).'" href="'.htmlspecialchars($value['value']).'"></a>'."\n";
} else {
$str = '<span class="metadata" aria-hidden="'.(($aria)?'false':'true').'" property="'.toNS($p,$ns).'">'.$value['value'].'</span>'."\n";
}
Expand Down Expand Up @@ -203,41 +203,41 @@ function print_rdf($rdf, $tabs=0, $ns=array(), $hide=array(), $aria=false, $forc
<!-- Book -->
<span resource="<?=rtrim($base_uri,'/')?>" typeof="scalar:Book">
<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>
<? if (isset($page->slug)) echo ' <a class="metadata" aria-hidden="true" rel="dcterms:hasPart" href="'.$base_uri.$page->slug.'"></a>'."\n"; ?>
<a class="metadata" aria-hidden="true" rel="dcterms:tableOfContents" href="<?=$base_uri?>toc"></a>
<? if (isset($page->slug)) echo ' <a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:hasPart" href="'.$base_uri.$page->slug.'"></a>'."\n"; ?>
<a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:tableOfContents" href="<?=$base_uri?>toc"></a>
<?
foreach ($book->contributors as $contrib):
if (empty($contrib->list_in_index)) continue;
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";
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";
endforeach;
?>
<? echo (($publisher||$publisher_thumbnail) ? ' <a class="metadata" aria-hidden="true" rel="dcterms:publisher" href="'.$base_uri.'publisher"></a>'."\n" : '')?>
<? echo (($publisher||$publisher_thumbnail) ? ' <a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:publisher" href="'.$base_uri.'publisher"></a>'."\n" : '')?>
<?
if (!empty($book->editions)):
for ($j = count($book->editions)-1; $j >= 0; $j--):
echo ' <a class="metadata" aria-hidden="true" rel="scalar:hasEdition" href="'.base_url().$book->slug.'.'.($j+1).'"></a>'."\n";
echo ' <a class="metadata" tabindex="-1" aria-hidden="true" rel="scalar:hasEdition" href="'.base_url().$book->slug.'.'.($j+1).'"></a>'."\n";
endfor;
endif;
?>
</span>
<span aria-hidden="true" resource="<?=$base_uri?>toc" typeof="scalar:Page">
<span class="metadata" property="dcterms:title">Main Menu</span>
<? for ($j = 0; $j < count($book->versions); $j++): ?>
<a class="metadata" rel="dcterms:references" href="<?=$base_uri.$book->versions[$j]->slug?>#index=<?=($j+1)?>"></a>
<a class="metadata" tabindex="-1" rel="dcterms:references" href="<?=$base_uri.$book->versions[$j]->slug?>#index=<?=($j+1)?>"></a>
<? endfor;?>
</span>
<? for ($j = 0; $j < count($book->versions); $j++):
if (empty($book->versions[$j]->content_id)) continue;
if ($book->versions[$j]->content_id == @$page->content_id) continue;
?>
<span aria-hidden="true" resource="<?=$base_uri.$book->versions[$j]->slug?>" typeof="scalar:<?=('media'==$book->versions[$j]->type)?'Media':'Composite'?>">
<a class="metadata" rel="dcterms:hasVersion" href="<?=$base_uri.$book->versions[$j]->slug.'.'.$book->versions[$j]->versions[0]->version_num?>"></a>
<a class="metadata" rel="dcterms:isPartOf" href="<?=rtrim($base_uri,'/')?>"></a>
<a class="metadata" tabindex="-1" rel="dcterms:hasVersion" href="<?=$base_uri.$book->versions[$j]->slug.'.'.$book->versions[$j]->versions[0]->version_num?>"></a>
<a class="metadata" tabindex="-1" rel="dcterms:isPartOf" href="<?=rtrim($base_uri,'/')?>"></a>
</span>
<span aria-hidden="true" resource="<?=$base_uri.$book->versions[$j]->slug.'.'.$book->versions[$j]->versions[0]->version_num?>" typeof="scalar:Version">
<span class="metadata" property="dcterms:title"><?=$book->versions[$j]->versions[0]->title?></span>
<span class="metadata" property="dcterms:description"><?=$book->versions[$j]->versions[0]->description?></span>
<a class="metadata" rel="dcterms:isVersionOf" href="<?=$base_uri.$book->versions[$j]->slug?>"></a>
<a class="metadata" tabindex="-1" rel="dcterms:isVersionOf" href="<?=$base_uri.$book->versions[$j]->slug?>"></a>
</span>
<?
endfor;
Expand All @@ -251,7 +251,7 @@ function print_rdf($rdf, $tabs=0, $ns=array(), $hide=array(), $aria=false, $forc
?>
<span aria-hidden="true" resource="<?=$base_uri?>publisher" typeof="scalar:Page">
<span class="metadata" property="dcterms:title"><?=$publisher?></span>
<? if ($publisher_thumbnail): echo ' <a class="metadata" rel="art:thumbnail" href="'.abs_url($publisher_thumbnail, base_url().$book->slug).'"></a>'."\n"; endif; ?>
<? if ($publisher_thumbnail): echo ' <a class="metadata" tabindex="-1" rel="art:thumbnail" href="'.abs_url($publisher_thumbnail, base_url().$book->slug).'"></a>'."\n"; endif; ?>
</span>
<? endif; ?>
<?
Expand All @@ -277,15 +277,15 @@ function print_rdf($rdf, $tabs=0, $ns=array(), $hide=array(), $aria=false, $forc
?>
<h1 property="dcterms:title"><?=$title?></h1>
<span resource="<?=$base_uri.$page->slug?>" typeof="scalar:<?=('media'==$page->type)?'Media':'Composite'?>">
<a class="metadata" aria-hidden="true" rel="dcterms:hasVersion" href="<?=$base_uri.$page->slug.'.'.$page->versions[$page->version_index]->version_num?>"></a>
<a class="metadata" aria-hidden="true" rel="dcterms:isPartOf" href="<?=rtrim($base_uri,'/')?>"></a>
<a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:hasVersion" href="<?=$base_uri.$page->slug.'.'.$page->versions[$page->version_index]->version_num?>"></a>
<a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:isPartOf" href="<?=rtrim($base_uri,'/')?>"></a>
<? print_rdf($this->pages->rdf($page, $base_uri), 3, $ns); ?>
</span>
<span resource="<?=$page->user->uri?>" typeof="foaf:Person">
<? print_rdf($this->users->rdf($page->user, $base_uri), 3, $ns); ?>
</span>
<span class="metadata" aria-hidden="true" id="book-id"><?=$book->book_id?></span>
<a class="metadata" aria-hidden="true" rel="dcterms:isVersionOf" href="<?=$base_uri.$page->slug?>"></a>
<a class="metadata" tabindex="-1" aria-hidden="true" rel="dcterms:isVersionOf" href="<?=$base_uri.$page->slug?>"></a>
<?
print_rdf($this->versions->rdf($page->versions[$page->version_index], $base_uri), 2, $ns, array('sioc:content'));
?>
Expand All @@ -298,14 +298,14 @@ function print_rdf($rdf, $tabs=0, $ns=array(), $hide=array(), $aria=false, $forc
?>
<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'?>">
<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>
<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>
<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>
</span>
<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">
<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)?>">
<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>
</span>
<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>
<a class="metadata" rel="dcterms:isVersionOf" href="<?=$base_uri.$page->versions[$page->version_index]->continue_to[0]->slug?>"></a>
<a class="metadata" tabindex="-1" rel="dcterms:isVersionOf" href="<?=$base_uri.$page->versions[$page->version_index]->continue_to[0]->slug?>"></a>
</span>
<?
endif;
Expand Down
2 changes: 1 addition & 1 deletion system/application/views/melons/cantaloupe/css/bootstrap-accessibility.css
100755 → 100644
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions system/application/views/melons/cantaloupe/css/common.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,10 @@ label {
button, .btn, input, optgroup, select, textarea {
font-family: Lato, Arial, sans-serif;
}
.search .form-horizontal .form-group {
margin-right: 0;
margin-left: 0;
}

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

Expand Down
30 changes: 27 additions & 3 deletions system/application/views/melons/cantaloupe/css/header.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,9 @@ span.navbar-text.navbar-left.pull-left.title_wrapper.visible-xs{
margin-bottom: 1rem;
font-weight: bold;
}
.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 {
margin-bottom: 0;
}
.navbar ul.dropdown-menu .relationships>ul>li{
margin-bottom: 4.4rem;
}
Expand Down Expand Up @@ -527,6 +530,7 @@ span.navbar-text.navbar-left.pull-left.title_wrapper.visible-xs{
padding-left: 3.5rem;
margin-left: 3rem;
right: 2.2rem;
outline-color: #fff;
}
.tocMenu .expandedPage .relationships ol>li>a{
margin-right: 3.5rem;
Expand Down Expand Up @@ -606,12 +610,15 @@ span.navbar-text.navbar-left.pull-left.title_wrapper.visible-xs{
color: #fff;
text-decoration: none;
}
.navbar ul.dropdown-menu li>a:focus-visible, #mobileMainMenuSubmenus li>a:focus-visible{
outline-color: #fff;
}
.navbar li.mainMenu ul.dropdown-menu>li:hover,
.navbar li.mainMenu ul.dropdown-menu>li:focus{
background-color: transparent;
}
.navbar li.mainMenu>.mainMenuDropdown>#mainMenuInside>li.static{
padding: 0 3rem;
padding: 1.5rem 3rem 0 3rem;
}
.navbar li.mainMenu>.mainMenuDropdown>#mainMenuInside>li.top{
margin-bottom: 1rem;
Expand All @@ -638,7 +645,7 @@ span.navbar-text.navbar-left.pull-left.title_wrapper.visible-xs{
.navbar li.mainMenu>.mainMenuDropdown>#mainMenuInside>li>ol>li.is_parent>a.expand, .tocMenu .expandedPage .relationships ol>li.is_parent>a.expand{
background-color: #4c4c4c;
}
.navbar li.mainMenu>.mainMenuDropdown>#mainMenuInside>li>ol>li>a.expand:hover, .tocMenu .expandedPage .relationships ol>li>a.expand:hover,
.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,
.tocMenu .expandedPage .relationships ol>li>a.expand:focus{
background-color: #006793;
}
Expand All @@ -651,7 +658,7 @@ span.navbar-text.navbar-left.pull-left.title_wrapper.visible-xs{
.navbar ul.dropdown-menu li{
max-width: 38rem;
}
.navbar ul.dropdown-menu li.vis_link{
#vis_menu li{
max-width: inherit;
}
.navbar .dropdown-menu li:hover, .navbar .dropdown-menu li:active{
Expand Down Expand Up @@ -960,6 +967,7 @@ i.loader{
}

#ScalarHeaderMenu{
position: relative;
-webkit-transition: -webkit-transform .5s;
-moz-transition: -moz-transform .5s;
transition: transform .5s;
Expand Down Expand Up @@ -1144,3 +1152,19 @@ i.loader{
width: 100%;
}
}
#skip {
position:absolute;
left:0;
top:-100px;
text-transform: none;
background-color: black;
padding: 5px 10px;
z-index: 100;
transition: top .25s;
text-decoration: none;
}

#skip:focus {
left: 0;
top: 0;
}
5 changes: 3 additions & 2 deletions system/application/views/melons/cantaloupe/css/vis.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ div.jqcloud > span:hover {}

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

0 comments on commit 4349f69

Please sign in to comment.