Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
This commit is contained in:
commit
c5550d31fd
|
@ -125,7 +125,7 @@ select {
|
||||||
|
|
||||||
.airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon,
|
.airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon,
|
||||||
.playlist_type_help_icon, .master_username_help_icon, .repeat_tracks_help_icon,
|
.playlist_type_help_icon, .master_username_help_icon, .repeat_tracks_help_icon,
|
||||||
.admin_username_help_icon, .stream_type_help_icon {
|
.admin_username_help_icon, .stream_type_help_icon, .show_linking_help_icon {
|
||||||
cursor: help;
|
cursor: help;
|
||||||
position: relative;
|
position: relative;
|
||||||
display:inline-block; zoom:1;
|
display:inline-block; zoom:1;
|
||||||
|
|
|
@ -193,6 +193,7 @@ function setAddShowEvents() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
form.find("#add_show_linked-label").before("<span class='show_linking_help_icon'></span>");
|
||||||
|
|
||||||
form.find("#add_show_record").click(function(){
|
form.find("#add_show_record").click(function(){
|
||||||
$(this).blur();
|
$(this).blur();
|
||||||
|
@ -315,7 +316,26 @@ function setAddShowEvents() {
|
||||||
at: "right center"
|
at: "right center"
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
form.find(".show_linking_help_icon").qtip({
|
||||||
|
content: {
|
||||||
|
text: $.i18n._("By linking your repeating shows any media items scheduled in any repeat show will also get scheduled in the other repeat shows")
|
||||||
|
},
|
||||||
|
hide: {
|
||||||
|
delay: 500,
|
||||||
|
fixed: true
|
||||||
|
},
|
||||||
|
style: {
|
||||||
|
border: {
|
||||||
|
width: 0,
|
||||||
|
radius: 4
|
||||||
|
},
|
||||||
|
classes: "ui-tooltip-dark ui-tooltip-rounded"
|
||||||
|
},
|
||||||
|
position: {
|
||||||
|
my: "left bottom",
|
||||||
|
at: "right center"
|
||||||
|
}
|
||||||
|
});
|
||||||
function endDateVisibility(){
|
function endDateVisibility(){
|
||||||
if(form.find("#add_show_no_end").is(':checked')){
|
if(form.find("#add_show_no_end").is(':checked')){
|
||||||
form.find("#add_show_end_date").hide();
|
form.find("#add_show_end_date").hide();
|
||||||
|
|
Loading…
Reference in New Issue