diff --git a/website/agenda/planung/css/admin.css b/website/agenda/planung/css/admin.css index 737a721..e1f2984 100644 --- a/website/agenda/planung/css/admin.css +++ b/website/agenda/planung/css/admin.css @@ -10,11 +10,16 @@ body{ body #content{ margin:0; - padding:1em; - max-width:1200px; color:#000; background:#fff; text-align:left; + max-width:1200px; + margin-left:auto; + margin-right:auto; +} + +div{ + transition: background-color 0.5s linead; } #selectImage #content{ @@ -30,7 +35,7 @@ body, #content option, #content li{ font-size:0.75rem; - font-family:Roboto,sans-serif; + font-family:Roboto,sans-serif; } #content textarea{ @@ -67,19 +72,12 @@ body, #calcms_admin_menu div, #calcms_admin_menu input, #calcms_admin_menu select, -#calcms_admin_menu option, -#calcms_admin_menu img -{ +#calcms_admin_menu option{ margin:0; padding:0; color:#fff; } -#calcms_admin_menu img{ - border:0; - vertical-align:middle; -} - #calcms_admin_menu, #calcms_admin_menu select{ background:#444; @@ -151,7 +149,7 @@ a{ #content div{ - padding:6px; + padding:1rem; } #content div.header{ @@ -239,10 +237,22 @@ li.ui-menu-item{ #content div.warn, #content div.error{ font-weight:bold; - margin:0.5rem; + margin:0; padding:1rem; } +#content span.ok, +#content span.warn, +#content span.error{ + font-weight:bold; + padding:1px; +} + +#content span.ok, +#content span.error{ + color:white; +} + div.ok{ color:white; background:#0c0; @@ -354,7 +364,7 @@ tr.tablesorter-filter-row input{ padding:8px; margin-top:0px; margin-bottom:0px; - margin-left:6px; + margin-left:0.5rem; text-align: center; text-decoration: none; font-size: 12px; @@ -375,7 +385,7 @@ tr.tablesorter-filter-row input{ #content input[type="file"]:hover, #content button:focus{ outline:0; - transition:all 0.5s cubic-bezier(.64,.09,.08,1) + transition:background 0.5s cubic-bezier(.64,.09,.08,1) } #content input[type="submit"]:hover, @@ -392,7 +402,7 @@ tr.tablesorter-filter-row input{ padding:8px; margin-top:0px; margin-bottom:0px; - margin-left:6px; + margin-left:0.5rem; text-decoration: none; } @@ -416,7 +426,7 @@ tr.tablesorter-filter-row input{ border:none; border-bottom:solid 1px #9e9e9e; cursor:pointer; - margin-left:6px; + margin-left:0.5rem; } #content select, @@ -425,7 +435,7 @@ input[type='checkbox']{ } #content div.buttons button{ - margin-bottom:6px; + margin-bottom:1rem; } #content div.formField div.label{ @@ -493,3 +503,7 @@ body, opacity:0.5; } +#content div.buttons{ + margin-top:-1rem; + margin-bottom:-1rem; +} diff --git a/website/agenda/planung/css/calendar.css b/website/agenda/planung/css/calendar.css index 36db7dd..e0beb70 100644 --- a/website/agenda/planung/css/calendar.css +++ b/website/agenda/planung/css/calendar.css @@ -120,11 +120,6 @@ button:hover{ background:#ccf; } -#calendar div.grid{ - overflow:hidden; - position:absolute; - background:white; -} #calendar_weekdays td.week, #calendar td.week{ @@ -139,8 +134,7 @@ button:hover{ padding:0; min-width:1px; height:100%; - background:#666; - background-image:url(../image/chess.gif); + background:repeating-linear-gradient(to right, #fff, #fff 1px, #999 1px, #999 2px); } #calendar td.week div{ @@ -154,14 +148,12 @@ button:hover{ #calendar div.schedule, #calendar div.work, #calendar div.play{ - overflow:hidden; - font-size:12px; - border-right:0; position:absolute; - margin-left:0px; + overflow:hidden; + margin-left:0; border:0; - border-bottom:1px solid #666; - border-top:1px solid #666; + border-bottom:1px solid #fff; + border-top:1px solid #fff; } #calendar div.time, @@ -171,7 +163,7 @@ button:hover{ #calendar div.time, #calendar_weekdays div.time{ - border-top:1px solid #666; + border-top:1px solid #fff; } /* calendar list*/ @@ -204,8 +196,11 @@ button:hover{ #content div.grid{ z-index:1; - margin-left:0px; background:white; + overflow:hidden; + position:absolute; + background: repeating-linear-gradient( 45deg, #fff, #fff 1rem ,#eee 1rem, #eee 2rem); + cursor:pointer; } #event_list tr th:hover{ @@ -359,12 +354,12 @@ div#toolbar{ padding:0; width:100%; background:#ddd; - display: flex; flex-wrap: wrap; align-items: center; vertical-align:middle; z-index:99; + left:0; } div#toolbar div{ @@ -422,11 +417,6 @@ div#toolbar input.search{ padding:6px; } -#calendar div { - transition: all 0.1s; - transition-delay: 0s; -} - #calendar td div.play:hover { min-height: 180px!important; min-width: 420px!important; @@ -461,18 +451,6 @@ div#toolbar input.search{ background:#fcc; } -#calendar div.event.error, -#calendar div.event.schedule{ -/* width:50%; */ -} - -#calendar div.event.error.x2, -#calendar div.event.schedule.x2{ - /* - margin-left:50%; - */ -} - div.rms_detail{ width:100% } @@ -510,4 +488,11 @@ div.play .error{ background:#f44336; } +#content div.event, +#content div.scheduled, +#content div.grid, +#content div.playout{ + padding-top:0.4rem; + padding-bottom:1rem; +} diff --git a/website/agenda/planung/css/event.css b/website/agenda/planung/css/event.css index 3fc4c5f..2e6dd34 100644 --- a/website/agenda/planung/css/event.css +++ b/website/agenda/planung/css/event.css @@ -27,7 +27,6 @@ pre{ height:24px; } - #content .edit_event input, #content .edit_event select, #content .edit_event textarea{ @@ -36,15 +35,18 @@ pre{ #content .excerpt{ width:100%; + max-width:40rem; height:3em; } #content textarea{ width:100%; + max-width:40rem; } #content .edit_event input.url{ width:100%; + max-width:40rem; } #content .panel{ @@ -64,3 +66,4 @@ pre{ width:3em; } + diff --git a/website/agenda/planung/css/show-playout.css b/website/agenda/planung/css/show-playout.css index 369e379..cf276bb 100644 --- a/website/agenda/planung/css/show-playout.css +++ b/website/agenda/planung/css/show-playout.css @@ -24,6 +24,10 @@ table{ border-top:1px solid #666; } +#content tr.past{ + background:#ccc; +} + #content td{ padding:3px; diff --git a/website/agenda/planung/js/calendar.js b/website/agenda/planung/js/calendar.js index c28b777..95d87a3 100644 --- a/website/agenda/planung/js/calendar.js +++ b/website/agenda/planung/js/calendar.js @@ -557,17 +557,6 @@ function initCalendarMenu(){ resizeCalendarMenu(); } -$(document).ready(function(){ - // $('#calendar').hide(); - initCalendarMenu(); - - if(calendarTable==1){ - loadCalendar(); - }else{ - loadCalendarList(); - } -}); - function createId(prefix) { function s4() { return Math.floor((1 + Math.random()) * 0x10000) @@ -694,6 +683,7 @@ function loadCalendar(url, mouseButton){ $('#current_date').html(current_date); updateUrls(url); initRmsPlot(); + adjustColors(); }); } @@ -1047,3 +1037,35 @@ function handleWorktime(id, event){ } } + +function hexToRgbA(hex){ + var c; + if(/^#([A-Fa-f0-9]{3}){1,2}$/.test(hex)){ + c= hex.substring(1).split(''); + if(c.length== 3){ + c= [c[0], c[0], c[1], c[1], c[2], c[2]]; + } + c= '0x'+c.join(''); + return 'rgba('+[(c>>16)&255, (c>>8)&255, c&255].join(',')+',1)'; + } + throw new Error('Bad Hex'); +} + +function adjustColors(){ + var elem = $('.schedule').get(0); + var color1=window.getComputedStyle(elem).backgroundColor; + var color2=color1.replace('rgb','rgba').replace(')',', 0.4)') + $('.schedule').css('background', 'repeating-linear-gradient(to right, '+color1+', '+color1+' 1px, '+color2+' 1px, '+color2+' 2px) '); +} + +$(document).ready(function(){ + // $('#calendar').hide(); + initCalendarMenu(); + + if(calendarTable==1){ + loadCalendar(); + }else{ + loadCalendarList(); + } + }); + diff --git a/website/agenda/planung/templates/default.html b/website/agenda/planung/templates/default.html index 33a7197..bd14353 100644 --- a/website/agenda/planung/templates/default.html +++ b/website/agenda/planung/templates/default.html @@ -1,6 +1,5 @@ -
diff --git a/website/agenda/planung/templates/show_playout.html b/website/agenda/planung/templates/show_playout.html index 60cd6f4..423a027 100644 --- a/website/agenda/planung/templates/show_playout.html +++ b/website/agenda/planung/templates/show_playout.html @@ -12,6 +12,7 @@ + @@ -22,11 +23,12 @@ - + + - + diff --git a/website/agenda/planung/templates/user_settings.html b/website/agenda/planung/templates/user_settings.html index 266f8e2..dbc6fbb 100644 --- a/website/agenda/planung/templates/user_settings.html +++ b/website/agenda/planung/templates/user_settings.html @@ -1,183 +1,201 @@ -

+

+ +

-
- - + + + -
startimage bytes modified at
- - - - - - - - - - - - - - -
- -
- -
:
+ + + + + + + + + + + + + + + + + + + +
:
- - - + -
- - - - -
+
+ + + + +
+ +
+ + + + +
-

- -
- - - - - - -
- -
+

+ +

+ +
+ + + + + + + + + + + + +
+ +
- + \ No newline at end of file