diff --git a/website/agenda/planung/calendar.cgi b/website/agenda/planung/calendar.cgi index 2d05cb0..975978b 100755 --- a/website/agenda/planung/calendar.cgi +++ b/website/agenda/planung/calendar.cgi @@ -925,6 +925,7 @@ sub showEventList { var label_schedule='} . $params->{loc}->{label_schedule} . q{'; var label_worktime='} . $params->{loc}->{label_worktime} . q{'; var label_playout='} . $params->{loc}->{label_playout} . q{'; + var label_print='} . $params->{loc}->{label_print} . q{'; @@ -1792,6 +1793,10 @@ sub printToolbar { } if $params->{list} == 1; + $toolbar .= qq{ + + } unless $params->{list}; + $toolbar .= qq{ }; diff --git a/website/agenda/planung/css/calendar.css b/website/agenda/planung/css/calendar.css index 7e74005..4c094b0 100644 --- a/website/agenda/planung/css/calendar.css +++ b/website/agenda/planung/css/calendar.css @@ -44,6 +44,12 @@ button:hover { overflow-x: hidden; overflow-y: scroll; } + + #content #calendar.pin { + overflow-x: initial; + overflow-y: initial; + } + } #calendar_weekdays table, @@ -142,12 +148,14 @@ button:hover { #calendar td.week div { padding: 0; min-width: 1px; - height: 100%; background: #ccc; } +#calendar td.week{ + height:100hv; +} #calendar td.week div { - height: 180em; + height:100hv; } #calendar div.time, @@ -438,6 +446,13 @@ div#toolbar input.search { display: none; } +#toolbar button.pressed{ + transition: all 0.1s linear; + box-shadow: inset 0px 0px 5px #c1c1c1; + background: #105a91 +} + + #series td { padding: 6px; } @@ -539,3 +554,5 @@ div.play .error { #content tr.event.predecessor:hover{ #background:#fdcccc } + + diff --git a/website/agenda/planung/js/calendar.js b/website/agenda/planung/js/calendar.js index 1e216c0..24035ea 100644 --- a/website/agenda/planung/js/calendar.js +++ b/website/agenda/planung/js/calendar.js @@ -105,6 +105,10 @@ function resizeCalendarMenu(){ var with_param='width'; var cw=cell_width.toFixed(); + menuHeight = setupMenuHeight(); + + //var theight=$('#calendar table tr').last().find('td').first().find('div').last().css("top") + //$('td.week').css("height",theight) $('#calendar').show(); $('#calendar_weekdays').css("visibility","visible"); @@ -726,6 +730,19 @@ function updateTable(){ } ); + $('button#pin').off(); + $('button#pin').on( "click", function(){ + var button = $(this); + var elem = $('#content #calendar').first(); + if ( button.hasClass("pressed") ){ + button.removeClass("pressed"); + elem.removeClass("pin"); + } else { + button.addClass("pressed"); + elem.addClass("pin"); + } + }); + //set checkboxes from url parameters and update all urls $('#calendar').show(); diff --git a/website/agenda/planung/pot/de/calendar.po b/website/agenda/planung/pot/de/calendar.po index 542c370..594eee4 100644 --- a/website/agenda/planung/pot/de/calendar.po +++ b/website/agenda/planung/pot/de/calendar.po @@ -10,6 +10,9 @@ msgstr "Heute" msgid "button_search" msgstr "Suche" +msgid "button_pin" +msgstr "Anpinnen" + msgid "label_month" msgstr "Monat" diff --git a/website/agenda/planung/pot/en/calendar.po b/website/agenda/planung/pot/en/calendar.po index feb3632..2e31a69 100644 --- a/website/agenda/planung/pot/en/calendar.po +++ b/website/agenda/planung/pot/en/calendar.po @@ -7,6 +7,9 @@ msgstr "today" msgid "button_search" msgstr "search" +msgid "button_pin" +msgstr "pin" + msgid "label_month" msgstr "month"