kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add draft status to events

Browse Source
This commit is contained in:
Milan
2018-01-25 21:25:13 +01:00
parent 6222e2a63f
commit 4bbaa23c27
15 changed files with 104 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
website/agenda/css/calcms.css
View File

@@ -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,

35
website/agenda/js/calcms.cust.js
View File

@@ -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();
+ '<div id="showDesk" />' + '</div>');
}
}
*/
/*
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();
+ '</div></div>');
}
}
*/
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")

13
website/agenda/planung/css/calendar.css
View File

@@ -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{

11
website/agenda/planung/js/edit_event.js
View File

@@ -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")
}
);

3
website/agenda/planung/pot/de/calendar.po
View File

@@ -109,6 +109,9 @@ msgstr "Folge"
msgid "label_rerun"
msgstr "Wiederholung"
msgid "label_draft"
msgstr "Entwurf"
msgid "button_cancel"
msgstr "Abbrechen"

3
website/agenda/planung/pot/de/event.po
View File

@@ -97,6 +97,9 @@ msgstr "Folge"
msgid "label_live"
msgstr "Live-Sendung"
msgid "label_draft"
msgstr "Entwurf"
msgid "label_published"
msgstr "veröffentlicht"

3
website/agenda/planung/pot/de/roles.po
View File

@@ -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"

3
website/agenda/planung/pot/de/user_settings.po
View File

@@ -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"

3
website/agenda/planung/pot/en/calendar.po
View File

@@ -43,6 +43,9 @@ msgstr "conflicts"
msgid "label_rerun"
msgstr "rerun"
msgid "label_draft"
msgstr "draft"
msgid "label_archived"
msgstr "archived"

3
website/agenda/planung/pot/en/event.po
View File

@@ -97,6 +97,9 @@ msgstr "episode"
msgid "label_live"
msgstr "live"
msgid "label_draft"
msgstr "draft"
msgid "label_published"
msgstr "published"

3
website/agenda/planung/pot/en/roles.po
View File

@@ -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)"

3
website/agenda/planung/pot/en/user_settings.po
View File

@@ -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"

6
website/agenda/planung/templates/edit_event.html
View File

@@ -352,6 +352,12 @@
<TMPL_IF rerun><TMPL_VAR .loc.label_rerun></TMPL_IF>
</TMPL_IF>
<TMPL_IF .allow.update_event_status_draft>
<input type="checkbox" name="draft" <TMPL_IF draft>checked="checked" value="1"<TMPL_ELSE>value="0"</TMPL_IF> > <TMPL_VAR .loc.label_draft>
<TMPL_ELSE>
<TMPL_IF draft><TMPL_VAR .loc.label_draft></TMPL_IF>
</TMPL_IF>
<TMPL_IF .allow.update_event_status_disable_event_sync>
<input type="hidden" name="disable_event_sync" value="1">
<!--

35
website/agenda/templates/event_details.html
View File

@@ -21,40 +21,21 @@
<div class="date<TMPL_IF is_running> running</TMPL_IF>">
<TMPL_IF is_running> ... Diese Sendung l&auml;uft gerade ...<p></TMPL_IF>
<table>
<tr>
<td>
<TMPL_VAR weekday_name>, <TMPL_VAR start_date_name>
</td>
<td>
<TMPL_VAR project_title>
<TMPL_IF location_label_studiorebootfm>
- Studio reboot.fm
<TMPL_ELSIF location_label_dt64>
- DT 64 Festival
<TMPL_ELSE>
- <TMPL_VAR location_mapped>
</TMPL_IF>
</td>
</tr>
<tr>
<td>
<TMPL_VAR start_time_name> bis <TMPL_VAR end_time_name> Uhr
</td>
<td>
<TMPL_IF program>(<TMPL_VAR program>)</TMPL_IF>
</td>
</tr>
</table>
<p>
<h1 class="summary title">
<TMPL_IF series_name>
<a href="#" onclick="calcms.showPrevSeriesEvent(<TMPL_VAR event_id>)" title="vorherige Sendung">&laquo;</a><TMPL_VAR series_name><a href="#" onclick="calcms.showNextSeriesEvent(<TMPL_VAR event_id>)" title="n&auml;chste Sendung">&raquo;</a>
</TMPL_IF>
<TMPL_VAR full_title_no_series>
<div style="font-size:1rem">
<TMPL_VAR weekday_name>, <TMPL_VAR start_date_name>,
<span style="font-size:1.5rem"><TMPL_VAR start_time_name></span> bis <TMPL_VAR end_time_name> Uhr
</div>
</h1>
</p>
<TMPL_IF program> (<TMPL_VAR program>)</TMPL_IF>
</div>
<div class="content" >
<TMPL_VAR excerpt > <TMPL_VAR user_excerpt >

3
website/agenda/templates/event_list.html
View File

@@ -26,11 +26,10 @@
onclick="window.location.href='<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>'"
>
<span class="summary title" title="Mehr Infos zur Sendung">
<TMPL_VAR start_time_name><TMPL_IF name="__last__"> - <TMPL_VAR end_time_name></TMPL_IF> |
<a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>"
><TMPL_VAR full_title></a>
<TMPL_IF location_mapped>(<TMPL_VAR location_mapped>)</TMPL_IF>
<span style="float:right;font-weight:100"><TMPL_IF location_mapped><TMPL_VAR location_mapped></TMPL_IF></span>
</span>
<div class="excerpt"><TMPL_VAR excerpt> <TMPL_VAR user_excerpt></div>