Skip to content

Commit

Permalink
Merge pull request #21 from DARIAH-DE/globalmenu
Browse files Browse the repository at this point in the history 
Globalmenu
  • Loading branch information
@maltevogl
maltevogl authored Aug 23, 2018
2 parents 121847c + c92a168 commit ed4bcab
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 479 deletions.
5 changes: 2 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ For bugs, feature requests etc. please use the [github issue tracker](https://gi

## Global Menu

WORK IN PROGRESS

To ensure the global navigation menu remains consistent accross all services, make sure to use a minimal `ul` with `id="home_dropdown_menu"` as in the template and to include
To ensure the global navigation menu remains consistent across all services, make sure to use a minimal `ul` with `id="home_dropdown_menu"` as in the template and to include
```html
<script type="text/javascript" src="assets/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="assets/globalmenu.js"></script>
```
which will load the central version.
2 changes: 0 additions & 2 deletions docs/.bundle/config
View file

This file was deleted.

14 changes: 8 additions & 6 deletions docs/assets/globalmenu_test.js → docs/assets/globalmenu.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
$.getJSON("https://res.de.dariah.eu/globalmenu/menu.json", function( data ) {

$( 'div#replace' ).replaceWith( "<div id='replace' class='nav_menu -portal'></div>" );
var ul_main = $("<ul id='home_dropdown_menu' class='nav_list -level-2 -portal'></ul>");

var ul_main = $("<ul class='nav_list -level-2 -portal'></ul>");
$.each(data['menu'], function (key, val) {
if (typeof val.title !== "undefined") {
var li = $("<li class='nav_item -level-2'>", { id: 'li' + key, text : val.title });
var a = $("<a class='nav_link' href='" + val.link + "'>" + val.title + "</a></li>");

a.appendTo(li);

$.each(data.menu, function (key, val) {
if (val.title) {
var li = $("<li class='nav_item -level-2'>", { id: 'li' + key, text : val.title + 'test' });
if (val.submenu != null) {

var ul = $("<ul>", { class: 'nav_list -level-3' });
Expand All @@ -26,7 +28,7 @@ $.each(data.menu, function (key, val) {
li.appendTo(ul_main);
}});

$("<div id='replace' class='nav_menu -portal'></div>").append(ul_main).appendTo('#nav');
$( 'ul#home_dropdown_menu' ).replaceWith(ul_main);

}).fail(function() {
console.log( 'Error loading menu JSON!' );
Expand Down
2 changes: 2 additions & 0 deletions docs/assets/jquery-3.3.1.min.js
View file

Large diffs are not rendered by default.

60 changes: 3 additions & 57 deletions docs/front-page-app.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<script src="assets/script.js" defer></script>
<script type="text/javascript" src="assets/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="assets/globalmenu.js"></script>
<title>DARIAH TOOL</title>
</head>

Expand Down Expand Up @@ -156,63 +158,7 @@
</button>

<div class="nav_menu -portal">
<ul class="nav_list -level-2 -portal">
<li class="nav_item -level-2">
<a class="nav_link" href="https://de.dariah.eu/">DARIAH-DE</a>
<ul class="nav_list -level-3">
<li class="nav_item -level-3">
<a class="nav_link" href="https://wiki.de.dariah.eu/">DARIAH Wiki</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://etherpad.de.dariah.eu/">DARIAH Etherpad</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://textgrid.de/">TextGrid</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://search.de.dariah.eu/">Generic Search</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://colreg.de.dariah.eu/">Collection Registry</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://schereg.de.dariah.eu">Schema &amp; Mapping Registry</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="http://meise.de.dariah.eu/">MEI Score Editor</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://geobrowser.de.dariah.eu/">Geo-Browser</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://geobrowser.de.dariah.eu/edit/">Datasheet Editor</a>
</li>
</ul>
</li>
<li class="nav_item -level-2">
<a class="nav_link" href="http://dariah.eu">DARIAH-EU</a>
<ul class="nav_list -level-3">
<li class="nav_item -level-3">
<a class="nav_link" href="http://has.dariah.eu">Humanities at Scale</a>
</li>
</ul>
</li>
<li class="nav_item -level-2">
<a class="nav_link" href="http://dhd-blog.org/">DHd-Blog</a>
</li>
</ul>
<ul id="home_dropdown_menu" class="nav_list -level-2 -portal"></ul>
</div>
</nav>
</div>
Expand Down
63 changes: 5 additions & 58 deletions docs/front-page-en.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<script src="assets/script.js" defer></script>
<script type="text/javascript" src="assets/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="assets/globalmenu.js"></script>

<title>DARIAH-DE</title>
</head>

Expand All @@ -26,7 +29,7 @@
<div class="nav_menu -main">
<ul class="nav_list -level-1">
<li class="nav_item -level-1 -home">
<a class="nav_link" href="index.php" title="Home">
<a class="nav_link" href="index.html" title="Home">
<svg class="icon">
<use xlink:href="#icon-home"></use>
</svg>
Expand Down Expand Up @@ -178,63 +181,7 @@
</button>

<div class="nav_menu -portal">
<ul class="nav_list -level-2 -portal">
<li class="nav_item -level-2">
<a class="nav_link" href="https://de.dariah.eu/">DARIAH-DE</a>
<ul class="nav_list -level-3">
<li class="nav_item -level-3">
<a class="nav_link" href="https://wiki.de.dariah.eu/">DARIAH Wiki</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://etherpad.de.dariah.eu/">DARIAH Etherpad</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://textgrid.de/">TextGrid</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://search.de.dariah.eu/">Generic Search</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://colreg.de.dariah.eu/">Collection Registry</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://schereg.de.dariah.eu">Schema &amp; Mapping Registry</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="http://meise.de.dariah.eu/">MEI Score Editor</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://geobrowser.de.dariah.eu/">Geo-Browser</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://geobrowser.de.dariah.eu/edit/">Datasheet Editor</a>
</li>
</ul>
</li>
<li class="nav_item -level-2">
<a class="nav_link" href="http://dariah.eu">DARIAH-EU</a>
<ul class="nav_list -level-3">
<li class="nav_item -level-3">
<a class="nav_link" href="http://has.dariah.eu">Humanities at Scale</a>
</li>
</ul>
</li>
<li class="nav_item -level-2">
<a class="nav_link" href="http://dhd-blog.org/">DHd-Blog</a>
</li>
</ul>
<ul id="home_dropdown_menu" class="nav_list -level-2 -portal"></ul>
</div>
</nav>
</div>
Expand Down
63 changes: 5 additions & 58 deletions docs/front-page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
<html lang="de">

<head>
<link rel="icon" type="image/x-icon" href="assets/favicon.ico">
<link rel="favicon.ico" type="image/x-icon" href="assets/favicon.ico">
<link rel="stylesheet" href="assets/styles.css">
<meta charset="utf-8">
<meta name="description" content="">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<script src="assets/script.js" defer></script>
<script type="text/javascript" src="assets/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="assets/globalmenu.js"></script>

<title>DARIAH-DE</title>
</head>

Expand Down Expand Up @@ -177,63 +180,7 @@
</button>

<div class="nav_menu -portal">
<ul class="nav_list -level-2 -portal">
<li class="nav_item -level-2">
<a class="nav_link" href="https://de.dariah.eu/">DARIAH-DE</a>
<ul class="nav_list -level-3">
<li class="nav_item -level-3">
<a class="nav_link" href="https://wiki.de.dariah.eu/">DARIAH Wiki</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://etherpad.de.dariah.eu/">DARIAH Etherpad</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://textgrid.de/">TextGrid</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://search.de.dariah.eu/">Generic Search</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://colreg.de.dariah.eu/">Collection Registry</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://schereg.de.dariah.eu">Schema &amp; Mapping Registry</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="http://meise.de.dariah.eu/">MEI Score Editor</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://geobrowser.de.dariah.eu/">Geo-Browser</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://geobrowser.de.dariah.eu/edit/">Datasheet Editor</a>
</li>
</ul>
</li>
<li class="nav_item -level-2">
<a class="nav_link" href="http://dariah.eu">DARIAH-EU</a>
<ul class="nav_list -level-3">
<li class="nav_item -level-3">
<a class="nav_link" href="http://has.dariah.eu">Humanities at Scale</a>
</li>
</ul>
</li>
<li class="nav_item -level-2">
<a class="nav_link" href="http://dhd-blog.org/">DHd-Blog</a>
</li>
</ul>
<ul id="home_dropdown_menu" class="nav_list -level-2 -portal"></ul>
</div>
</nav>
</div>
Expand Down
61 changes: 4 additions & 57 deletions docs/full-width.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<script src="assets/script.js" defer></script>
<script type="text/javascript" src="assets/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="assets/globalmenu.js"></script>

<title>Full Width | DARIAH-DE</title>
</head>

Expand Down Expand Up @@ -177,63 +180,7 @@
</button>

<div class="nav_menu -portal">
<ul class="nav_list -level-2 -portal">
<li class="nav_item -level-2">
<a class="nav_link" href="https://de.dariah.eu/">DARIAH-DE</a>
<ul class="nav_list -level-3">
<li class="nav_item -level-3">
<a class="nav_link" href="https://wiki.de.dariah.eu/">DARIAH Wiki</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://etherpad.de.dariah.eu/">DARIAH Etherpad</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://textgrid.de/">TextGrid</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://search.de.dariah.eu/">Generic Search</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://colreg.de.dariah.eu/">Collection Registry</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://schereg.de.dariah.eu">Schema &amp; Mapping Registry</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="http://meise.de.dariah.eu/">MEI Score Editor</a>
</li>
<li class="nav_item -level-3">
<hr>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://geobrowser.de.dariah.eu/">Geo-Browser</a>
</li>
<li class="nav_item -level-3">
<a class="nav_link" href="https://geobrowser.de.dariah.eu/edit/">Datasheet Editor</a>
</li>
</ul>
</li>
<li class="nav_item -level-2">
<a class="nav_link" href="http://dariah.eu">DARIAH-EU</a>
<ul class="nav_list -level-3">
<li class="nav_item -level-3">
<a class="nav_link" href="http://has.dariah.eu">Humanities at Scale</a>
</li>
</ul>
</li>
<li class="nav_item -level-2">
<a class="nav_link" href="http://dhd-blog.org/">DHd-Blog</a>
</li>
</ul>
<ul id="home_dropdown_menu" class="nav_list -level-2 -portal"></ul>
</div>
</nav>
</div>
Expand Down
Loading

0 comments on commit ed4bcab

Please sign in to comment.