Skip to content

Commit

Permalink
fix: global menu
Browse files Browse the repository at this point in the history
  • Loading branch information
severinsimmler committed Oct 31, 2018
1 parent 2fa32e5 commit a6f053a
Show file tree
Hide file tree
Showing 10 changed files with 149 additions and 3,561 deletions.
2 changes: 1 addition & 1 deletion application/schema.sql
Expand Up @@ -3,7 +3,7 @@ DROP TABLE IF EXISTS model;

CREATE TABLE textfiles (
id INTEGER PRIMARY KEY,
title TEXT UNIQUE,
title TEXT,
content TEXT
);

Expand Down
@@ -1,3 +1,4 @@
/*! Using parts of normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
html {
-webkit-box-sizing: border-box;
box-sizing: border-box;
Expand Down Expand Up @@ -1002,7 +1003,7 @@ th {
}

.footer {
background: #f7f7f7 url(../img/grain.png);
background: #f7f7f7 url(grain.png);
color: #1a1a1a;
font-size: 14px;
padding: 12px 24px;
Expand Down Expand Up @@ -1157,7 +1158,7 @@ th {
}

.highlight {
background: #f7f7f7 url(../img/grain.png);
background: #f7f7f7 url(grain.png);
color: #1a1a1a;
margin: 0 -24px;
padding: 12px;
Expand Down Expand Up @@ -2822,48 +2823,4 @@ th {
.site.-full-width .wrap,
.site.-full-width .wrap.-narrow {
max-width: none
}

.topic {
text-align: left;
}

@keyframes expand {
from {
width: 0%;
}

to {
width: 100%;
}
}

.chart {
width: 0%;
animation: expand 1.5s ease forwards;
}

.block {
height: 50px;
float: left;
background-color: #213365;
border-left: solid 1px white;
opacity: 1;
transition: opacity, .3s ease;
}

.block:hover {
opacity: .9;
}

.value {
display: none;
}

.dariah-flower {
display: block;
margin-left: auto;
margin-right: auto;
margin-bottom: 10px;
width: 50px;
}
85 changes: 0 additions & 85 deletions application/static/js/dariah.js

This file was deleted.

55 changes: 25 additions & 30 deletions application/static/js/globalmenu.js
@@ -1,40 +1,35 @@
$.getJSON("https://res.de.dariah.eu/globalmenu/menu.json", function (data) {
$.getJSON("https://res.de.dariah.eu/globalmenu/menu.json", function( data ) {

var ul_main = $("<ul id='home_dropdown_menu' class='nav_list -level-2 -portal'></ul>");
var ul_main = $("<ul id='home_dropdown_menu' 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>");
$.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);
a.appendTo(li);

if (val.submenu != null) {
if (val.submenu != null) {

var ul = $("<ul>", {
class: 'nav_list -level-3'
});
var ul = $("<ul>", { class: 'nav_list -level-3' });

$.each(val.submenu, function (key, sub) {
if (sub.title) {
ul.append("<li class='nav_item -level-3'><a class='nav_link' href='" + sub.link + "'>" + sub.title + "</a></li>")
} else {
ul.append("<li class='nav_item -level-3'><hr></li>")
}
$.each(val.submenu, function (key, sub) {
if (sub.title) {
ul.append("<li class='nav_item -level-3'><a class='nav_link' href='" + sub.link + "'>" + sub.title + "</a></li>")
}
else {
ul.append("<li class='nav_item -level-3'><hr></li>")
}

});
});

ul.appendTo(li);
}
li.appendTo(ul_main);
}
});
ul.appendTo(li);
}
li.appendTo(ul_main);
}});

$('ul#home_dropdown_menu').replaceWith(ul_main);
$( 'ul#home_dropdown_menu' ).replaceWith(ul_main);

}).fail(function () {
console.log('Error loading menu JSON!');
});
}).fail(function() {
console.log( 'Error loading menu JSON!' );
});
2 changes: 2 additions & 0 deletions application/static/js/jquery-3.3.1.min.js

Large diffs are not rendered by default.

0 comments on commit a6f053a

Please sign in to comment.