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

Updated to include show image functionality

This commit is contained in:
Duncan Sommerville 2014-09-17 19:41:17 -04:00
parent 63d1bf08f7
commit b89a764442
3 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
airtime_mvc/public/css/add-show.css
View File

@ -18,8 +18,6 @@
width: 60%;
}
#schedule-add-show .ui-tabs-panel {
padding-top: 8px;
}
@ -127,3 +125,10 @@ label.wrapp-label input[type="checkbox"] {
cursor: default;
width: 65px;
}
#show_logo_current, #show_logo_preview {
width: 50px;
height: 50px;
display: none;
cursor: default;
}

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

@ -8,7 +8,7 @@ function openAddShowForm() {
if($("#add-show-form").length == 1) {
if( ($("#add-show-form").css('display')=='none')) {
$("#add-show-form").show();
/*
var windowWidth = $(window).width();
// margin on showform are 16 px on each side
@ -234,6 +234,21 @@ function setAddShowEvents(form) {
form.find("#schedule-record-rebroadcast > fieldset:not(:first-child)").hide();
}
// If we're adding a new show, hide the "Current Logo" element/label
if ($(".button-bar.bottom").find(".ui-button-text").text() === "Update show") {
$("#show_logo_current-element").show();
$("#show_logo_current-label").show();
// Display the current show logo if it exists
if ($("#show_logo_current").attr("src") !== "") {
$("#show_logo_current").show();
} else {
$("#show_logo_current").hide();
}
} else {
$("#show_logo_current-element").hide();
$("#show_logo_current-label").hide();
}
form.find("#add_show_repeats").click(function(){
$(this).blur();
form.find("#schedule-show-when > fieldset:last").toggle();
@ -592,7 +607,25 @@ function setAddShowEvents(form) {
$(this).ColorPickerSetColor(this.value);
}
});
// when an image is uploaded, we want to show it to the user
form.find("#upload").change(function(event) {
if (this.files && this.files[0]) {
$("#show_logo_preview").show();
var reader = new FileReader(); // browser compatibility?
reader.onload = function (e) {
$("#show_logo_preview")
.attr('src', e.target.result);
};
// read the image data as though it were a data URI
reader.readAsDataURL(this.files[0]);
} else {
$("#show_logo_preview").hide();
}
});
form.find("#add-show-close").click(closeAddShowForm);
form.find(".add-show-submit").click(function(event) {
@ -630,17 +663,21 @@ function setAddShowEvents(form) {
end_date = $("#add_show_end_date").val(),
action = baseUrl+"Schedule/"+String(addShowButton.attr("data-action"));
var image = new FormData();
image.append('file', $('#upload')[0].files[0]);
var image;
if ($('#upload')[0] && $('#upload')[0].files
&& $('#upload')[0].files[0]) {
image = new FormData();
image.append('file', $('#upload')[0].files[0]);
}
$.ajax({
url: action,
data: {format: "json", data: data, hosts: hosts, days: days},
success: function(json) {
if (json.showId) { // Successfully added the show
if (json.showId && image) { // Successfully added the show, and it contains an image to upload
var imageAction = '/rest/show/' + json.showId + '/upload-image';
// perform a second post in order to send the show image
// perform a second xhttprequest in order to send the show image
$.ajax({
url: imageAction,
data: image,

1
airtime_mvc/public/js/airtime/schedule/schedule.js
View File

@ -384,6 +384,7 @@ $(document).ready(function() {
if(oItems.edit.items !== undefined){
var edit = oItems.edit.items;
//edit a single instance
callback = function() {
$.get(edit.instance.url, {format: "json", showId: data.showId, instanceId: data.id, type: "instance"}, function(json){