Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

This commit is contained in:
Naomi Aro 2013-05-28 14:28:28 -04:00
parent 4d1a15b7ca 8f418fb34c
commit c5550d31fd
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/public/css/styles.css
View File

@ -125,7 +125,7 @@ select {
.airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_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;
position: relative;
display:inline-block; zoom:1;

24
airtime_mvc/public/js/airtime/schedule/add-show.js
View File

@ -192,7 +192,8 @@ function setAddShowEvents() {
$(this).parent().after("<ul id='show-link-warning' class='errors'><li>"+$.i18n._("Warning: Shows cannot be re-linked")+"</li></ul>");
}
});
form.find("#add_show_linked-label").before("<span class='show_linking_help_icon'></span>");
form.find("#add_show_record").click(function(){
$(this).blur();
@ -315,7 +316,26 @@ function setAddShowEvents() {
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(){
if(form.find("#add_show_no_end").is(':checked')){
form.find("#add_show_end_date").hide();