diff --git a/website/agenda/css/calcms.css b/website/agenda/css/calcms.css index 59f85f8..7bed1a4 100644 --- a/website/agenda/css/calcms.css +++ b/website/agenda/css/calcms.css @@ -130,14 +130,16 @@ a{ margin:6px; } +#content li{ + margin-left:1.7rem; +} + #calcms_list .date{ - margin-left:1em; font-weight:bold; - margin-top:1em; } #calcms_list .excerpt{ - margin-left:3.1rem; + margin-left:3rem; margin-top:6px; max-height:5em; overflow: hidden; @@ -507,7 +509,7 @@ a#calcms_search_show_details #plus{ padding:0; margin:0; background:#fff; - border:1px solid #ddd; + border:0px solid #ddd; border-collapse:collapse; text-align:center; } @@ -521,11 +523,6 @@ a#calcms_search_show_details #plus{ font-weight:normal; } -#calcms_calendar table thead th{ - padding-top:0px; - padding-bottom:2px; -} - #calcms_calendar table tbody a:hover, #calcms_calendar table tbody a:link, #calcms_calendar table tbody a:visited{ @@ -546,6 +543,8 @@ a#calcms_search_show_details #plus{ font-weight:normal; border-bottom:1px solid #ddd; transition: all .1s ease-in-out; + padding-top:2%; + padding-bottom:2%; } #calcms_calendar table thead td:hover, diff --git a/website/agenda/js/calcms.cust.js b/website/agenda/js/calcms.cust.js index 82ef962..9ed1a33 100644 --- a/website/agenda/js/calcms.cust.js +++ b/website/agenda/js/calcms.cust.js @@ -157,6 +157,7 @@ var calcms_settings = new Array(); return false; } + /* function insertDeskDetails() { var pattern = new RegExp(/redaktion\/(.*)$/); var matchs = pattern.exec(document.location.href); @@ -173,7 +174,9 @@ var calcms_settings = new Array(); + '
' + '
'); } } + */ + /* function fixBlogEntries() { if (document.location.href.match('/redaktionen/') || document.location.href.match('/redaktionen?') @@ -199,7 +202,9 @@ var calcms_settings = new Array(); } } + */ + /* function setImageSize() { var image = '#calcms_list div.content img'; var size = $(window).width(); @@ -225,6 +230,7 @@ var calcms_settings = new Array(); }); } } + */ function setThumbs() { $('#calcms_playlist img').each(function(index) { @@ -236,6 +242,7 @@ var calcms_settings = new Array(); }); } + /* function addCommentsOnAgendaPages() { if (calcms.contains(window.location.href, '/programm/') || calcms.contains(window.location.href, '/agenda/')) { @@ -246,6 +253,7 @@ var calcms_settings = new Array(); + ''); } } + */ function scrollNextEvent() { if ($('#calcms_running_event').length == 0) @@ -379,9 +387,33 @@ var calcms_settings = new Array(); } } + var isCalcms=false; + function initWordpress(){ + $('header.entry-header').each( function(){ + var elem=$(this); + $(this).find("h1").each( function(){ + if ( $(this).text() == "calcms" ){ + isCalcms=true; + $(this).text("Programm"); + } + }); + }); + + $('div.site-info').remove(); + + if (isCalcms==false){ + $('#calcms_calendar').parent().parent().remove(); + $('#calcms_menu').parent().parent().remove(); + $('#calcms_search').parent().parent().remove(); + $('#calcms_playlist').parent().parent().remove(); + $('#calcms_newest_comments').parent().parent().remove(); + } + } + function initAll() { initCalcms(); - addCommentsOnAgendaPages(); + //initWordpress(); + //addCommentsOnAgendaPages(); calcms.showPlaylist(); calcms.showNewestComments(); // insertDeskDetails(); @@ -390,6 +422,7 @@ var calcms_settings = new Array(); // setImageSize(); // setThumbs(); // scrollNextEvent(); + /initSlider(); // mobilise(); initSearch(); console.log("calcms inited") diff --git a/website/agenda/planung/css/calendar.css b/website/agenda/planung/css/calendar.css index c26aa43..a3e21d8 100644 --- a/website/agenda/planung/css/calendar.css +++ b/website/agenda/planung/css/calendar.css @@ -291,6 +291,15 @@ input.tablesorter-filter{ text-align:center; } +#event_list tr th.draft, +#event_list tr td.draft{ + background:none; +} + +#event_list tr th{ + border-right:1px solid #ccc; +} + #event_list td:nth-child(9), #event_list th:nth-child(9), #event_list td:nth-child(9) .tablesorter-filter{ @@ -458,12 +467,14 @@ div#toolbar input.search{ #calendar div.event.error, #calendar div.event.schedule{ - width:50%; +/* width:50%; */ } #calendar div.event.error.x2, #calendar div.event.schedule.x2{ + /* margin-left:50%; + */ } div.rms_detail{ diff --git a/website/agenda/planung/js/edit_event.js b/website/agenda/planung/js/edit_event.js index 4697212..a3d6564 100644 --- a/website/agenda/planung/js/edit_event.js +++ b/website/agenda/planung/js/edit_event.js @@ -116,6 +116,7 @@ function loadEvent(projectId,studioId,seriesId,eventId, callback){ updateCheckBox( "#edit_event input[name='archived']", event.archived); updateCheckBox( "#edit_event input[name='rerun']", event.rerun); updateCheckBox( "#edit_event input[name='playout']", event.playout); + updateCheckBox( "#edit_event input[name='draft']", event.draft); $("#edit_event textarea[name='excerpt'").html(event.excerpt); $("#edit_event textarea[name='user_excerpt'").html(event.user_excerpt); @@ -299,6 +300,16 @@ $(document).ready( checkFields(); $('textarea').autosize(); + + // unset published on setting draft + $("#edit_event input[name='draft']").change( + function(){ + if ($(this).val()==1){ + console.log( 'unset published' ); + updateCheckBox("#edit_event input[name='published']", 0); + } + } + ) console.log("done") } ); diff --git a/website/agenda/planung/pot/de/calendar.po b/website/agenda/planung/pot/de/calendar.po index f7ae9af..542c370 100644 --- a/website/agenda/planung/pot/de/calendar.po +++ b/website/agenda/planung/pot/de/calendar.po @@ -109,6 +109,9 @@ msgstr "Folge" msgid "label_rerun" msgstr "Wiederholung" +msgid "label_draft" +msgstr "Entwurf" + msgid "button_cancel" msgstr "Abbrechen" diff --git a/website/agenda/planung/pot/de/event.po b/website/agenda/planung/pot/de/event.po index 1e58d48..413c65a 100644 --- a/website/agenda/planung/pot/de/event.po +++ b/website/agenda/planung/pot/de/event.po @@ -97,6 +97,9 @@ msgstr "Folge" msgid "label_live" msgstr "Live-Sendung" +msgid "label_draft" +msgstr "Entwurf" + msgid "label_published" msgstr "veröffentlicht" diff --git a/website/agenda/planung/pot/de/roles.po b/website/agenda/planung/pot/de/roles.po index 95ce9ef..81d65ce 100644 --- a/website/agenda/planung/pot/de/roles.po +++ b/website/agenda/planung/pot/de/roles.po @@ -97,6 +97,9 @@ msgstr "Sendung veröffentlichen" msgid "label_update_event_status_rerun" msgstr "Wiederholung-Sende Status ändern " +msgid "label_update_event_status_draft" +msgstr "Sendungsentwurf-Status ändern" + msgid "label_update_event_status_disable_event_sync" msgstr "Google-Import blockieren" diff --git a/website/agenda/planung/pot/de/user_settings.po b/website/agenda/planung/pot/de/user_settings.po index 4be5224..bb154fe 100644 --- a/website/agenda/planung/pot/de/user_settings.po +++ b/website/agenda/planung/pot/de/user_settings.po @@ -22,6 +22,9 @@ msgstr "Sendung" msgid "color_schedule" msgstr "Planung" +msgid "color_draft" +msgstr "Entwurf" + msgid "color_no_series" msgstr "Sendung gehört zu keiner Sendereihe" diff --git a/website/agenda/planung/pot/en/calendar.po b/website/agenda/planung/pot/en/calendar.po index 3fd4c14..feb3632 100644 --- a/website/agenda/planung/pot/en/calendar.po +++ b/website/agenda/planung/pot/en/calendar.po @@ -43,6 +43,9 @@ msgstr "conflicts" msgid "label_rerun" msgstr "rerun" +msgid "label_draft" +msgstr "draft" + msgid "label_archived" msgstr "archived" diff --git a/website/agenda/planung/pot/en/event.po b/website/agenda/planung/pot/en/event.po index 55bd081..997c12d 100644 --- a/website/agenda/planung/pot/en/event.po +++ b/website/agenda/planung/pot/en/event.po @@ -97,6 +97,9 @@ msgstr "episode" msgid "label_live" msgstr "live" +msgid "label_draft" +msgstr "draft" + msgid "label_published" msgstr "published" diff --git a/website/agenda/planung/pot/en/roles.po b/website/agenda/planung/pot/en/roles.po index b4532a7..d5fcded 100644 --- a/website/agenda/planung/pot/en/roles.po +++ b/website/agenda/planung/pot/en/roles.po @@ -100,6 +100,9 @@ msgstr "publish events" msgid "label_update_event_status_rerun" msgstr "set event for rerun" +msgid "label_update_event_status_draft" +msgstr "set event to draft" + msgid "label_update_event_status_disable_event_sync" msgstr "prevent events to be overridden (by calendar synchronization)" diff --git a/website/agenda/planung/pot/en/user_settings.po b/website/agenda/planung/pot/en/user_settings.po index 6f8624a..07e9e42 100644 --- a/website/agenda/planung/pot/en/user_settings.po +++ b/website/agenda/planung/pot/en/user_settings.po @@ -22,6 +22,9 @@ msgstr "event" msgid "color_schedule" msgstr "schedule" +msgid "color_draft" +msgstr "draft" + msgid "color_no_series" msgstr "no series assigned to event" diff --git a/website/agenda/planung/templates/edit_event.html b/website/agenda/planung/templates/edit_event.html index 2e1bcb4..d659007 100644 --- a/website/agenda/planung/templates/edit_event.html +++ b/website/agenda/planung/templates/edit_event.html @@ -352,6 +352,12 @@ + + checked="checked" value="1"value="0" > + + + +