diff --git a/website/agenda/planung/css/admin.css b/website/agenda/planung/css/admin.css index 8157ea6..127f30d 100644 --- a/website/agenda/planung/css/admin.css +++ b/website/agenda/planung/css/admin.css @@ -94,13 +94,13 @@ body, padding:16px; } - #calcms_admin_menu{ + #calcms_nav{ min-width:640px; max-width:800px; } } -#calcms_admin_menu{ +#calcms_nav{ display: flex; flex-wrap: wrap; align-items: center; @@ -109,42 +109,42 @@ body, z-index:99; } -#calcms_admin_menu, -#calcms_admin_menu a, -#calcms_admin_menu div, -#calcms_admin_menu input, -#calcms_admin_menu select, -#calcms_admin_menu option{ +#calcms_nav, +#calcms_nav a, +#calcms_nav div, +#calcms_nav input, +#calcms_nav select, +#calcms_nav option{ margin:0; padding:0; color:#fff; } -#calcms_admin_menu, -#calcms_admin_menu select{ +#calcms_nav, +#calcms_nav select{ background:#004f9b; } -#calcms_admin_menu a:hover, -#calcms_admin_menu select:hover{ +#calcms_nav a:hover, +#calcms_nav select:hover{ background:#007acc; transition: all 0.5s linear; } -#calcms_admin_menu div a, -#calcms_admin_menu select{ +#calcms_nav div a, +#calcms_nav select{ padding:6px; padding-top:1rem; padding-bottom:1rem; line-height:3em; } -#calcms_admin_menu div { +#calcms_nav div { transition: background 0.2s; } -#calcms_admin_menu select, -#calcms_admin_menu option{ +#calcms_nav select, +#calcms_nav option{ max-width:8em; border:0; padding-left:0; @@ -152,7 +152,7 @@ body, border-left:1px solid #666; } -#calcms_admin_menu a#logout{ +#calcms_nav a#logout{ color:#ff4444; } @@ -534,21 +534,21 @@ input[type='checkbox']{ /* new */ -#calcms_admin_menu{ +#calcms_nav{ position:fixed; top:0; left:0; right:0; } -#calcms_admin_menu div a, -#calcms_admin_menu select, -#calcms_admin_menu option{ +#calcms_nav div a, +#calcms_nav select, +#calcms_nav option{ font-size:0.9375rem; } -#calcms_admin_menu select, -#calcms_admin_menu option{ +#calcms_nav select, +#calcms_nav option{ border:0; text-align:left; -moz-appearance: none; @@ -557,9 +557,9 @@ input[type='checkbox']{ border: none; } -#calcms_admin_menu .fa, -#calcms_admin_menu .far, -#calcms_admin_menu .fas{ +#calcms_nav .fa, +#calcms_nav .far, +#calcms_nav .fas{ opacity:0.4; } @@ -592,25 +592,25 @@ input.image{ overflow-y:scroll } -#calcms_admin_menu #bars{ +#calcms_nav #bars{ cursor:pointer; } -#calcms_admin_menu.mobile{ +#calcms_nav.mobile{ flex-direction:column; position:absolute; } -#calcms_admin_menu.mobile div{ +#calcms_nav.mobile div{ text-align:left; } -#calcms_admin_menu .dropdown { +#calcms_nav .dropdown { position: relative; display: inline-block; } -#calcms_admin_menu .dropdown-content { +#calcms_nav .dropdown-content { display: none; position: absolute; z-index: 100; @@ -619,11 +619,11 @@ input.image{ min-width:10rem; } -#calcms_admin_menu .dropdown-content a{ +#calcms_nav .dropdown-content a{ width:20rem; } -#calcms_admin_menu .dropdown:hover .dropdown-content { +#calcms_nav .dropdown:hover .dropdown-content { display: block; transition: all 1s linear; } diff --git a/website/agenda/planung/css/calendar.css b/website/agenda/planung/css/calendar.css index 93c3a1c..fcb6892 100644 --- a/website/agenda/planung/css/calendar.css +++ b/website/agenda/planung/css/calendar.css @@ -7,7 +7,7 @@ button:hover{ } @media print{ - #calcms_admin_menu{ + #calcms_nav{ display:none; } #toolbar{ diff --git a/website/agenda/planung/js/admin.js b/website/agenda/planung/js/admin.js index ed9293b..c3bef76 100644 --- a/website/agenda/planung/js/admin.js +++ b/website/agenda/planung/js/admin.js @@ -206,10 +206,10 @@ function getUrlParameter(name){ } function handleBars(){ - var menu=$('#calcms_admin_menu'); + var menu=$('#calcms_nav'); menu.toggleClass('mobile'); if (menu.hasClass('mobile')){ - $('#calcms_admin_menu>div').show(); + $('#calcms_nav>div').show(); $('#content').hide(); }else{ $('#content').show(); @@ -221,7 +221,7 @@ var oldWidth=0; function setupMenu(update){ var xmax=960; - var menu = $('#calcms_admin_menu'); + var menu = $('#calcms_nav'); var width = menu.width(); if ( (width < xmax) && (oldWidth >= xmax) ) update=1; @@ -230,11 +230,11 @@ function setupMenu(update){ if (update == 1){ if (menu.width() < 960){ - $('#calcms_admin_menu>div').hide(); - $('#calcms_admin_menu>div.mobile').show(); + $('#calcms_nav>div').hide(); + $('#calcms_nav>div.mobile').show(); }else{ - $('#calcms_admin_menu>div').show(); - $('#calcms_admin_menu #bars').hide(); + $('#calcms_nav>div').show(); + $('#calcms_nav #bars').hide(); menu.removeClass('mobile'); } } @@ -248,7 +248,7 @@ function setupMenuHeight(){ var content=$('#content'); content.css("position", "relative"); - var menu=$('#calcms_admin_menu'); + var menu=$('#calcms_nav'); var top = menu.height(); content.css("top", top); diff --git a/website/agenda/planung/js/calendar.js b/website/agenda/planung/js/calendar.js index d47e17f..f3dde08 100644 --- a/website/agenda/planung/js/calendar.js +++ b/website/agenda/planung/js/calendar.js @@ -39,7 +39,7 @@ function setupMenuHeight(){ if ($('#calendar').length>0){ // calendar table console.log('setupMenuHeight') - var top=$('#calcms_admin_menu').height(); + var top=$('#calcms_nav').height(); $('#toolbar').css("top", top); $('#toolbar').css("position", "absolute"); @@ -65,10 +65,10 @@ function setupMenuHeight(){ // calendar list //console.log('found calendar list') - var top = $('#calcms_admin_menu').height(); + var top = $('#calcms_nav').height(); $('#content').css("top", top); - top = $('#calcms_admin_menu').height(); + top = $('#calcms_nav').height(); $('#content').css("top", top); return top; diff --git a/website/agenda/planung/js/history.js b/website/agenda/planung/js/history.js index f5e22ca..898a022 100644 --- a/website/agenda/planung/js/history.js +++ b/website/agenda/planung/js/history.js @@ -138,7 +138,7 @@ function addBackButton(){ var history=getHistory(); //console.log(history.length); if (history.length>1){ - $('#calcms_admin_menu').first().prepend( + $('#calcms_nav').first().prepend( '
' +'' +' ' diff --git a/website/agenda/planung/templates/default.html b/website/agenda/planung/templates/default.html index bf65b0c..27d1c2a 100644 --- a/website/agenda/planung/templates/default.html +++ b/website/agenda/planung/templates/default.html @@ -1,6 +1,6 @@ -