-
-
-
-
diff --git a/application/views/scripts/schedule/edit-show.phtml b/application/views/scripts/schedule/edit-show.phtml
new file mode 100644
index 000000000..bce09e6c8
--- /dev/null
+++ b/application/views/scripts/schedule/edit-show.phtml
@@ -0,0 +1,11 @@
+
+
diff --git a/application/views/scripts/schedule/show-overlap.phtml b/application/views/scripts/schedule/show-overlap.phtml
deleted file mode 100644
index 8b365fff8..000000000
--- a/application/views/scripts/schedule/show-overlap.phtml
+++ /dev/null
@@ -1,4 +0,0 @@
-
+ what ?>
+
+
+ who ?>
+
+
+ style ?>
+
+
- name ?>
- start_time ?>-end_time ?>
-
diff --git a/application/views/scripts/user/add-user.phtml b/application/views/scripts/user/add-user.phtml
index 161c48f78..5760e28ae 100644
--- a/application/views/scripts/user/add-user.phtml
+++ b/application/views/scripts/user/add-user.phtml
@@ -1,3 +1,33 @@
-form;
+
+
diff --git a/application/views/scripts/user/get-user-data-table-info.phtml b/application/views/scripts/user/get-user-data-table-info.phtml
new file mode 100644
index 000000000..64b099bc2
--- /dev/null
+++ b/application/views/scripts/user/get-user-data-table-info.phtml
@@ -0,0 +1 @@
++ Manage users +
+
+
+
+
+
+
+
+
+
+
+ | id | +Name | +Role | +Delete | +
|---|
+
+
+ 
' );
+ }
+ else if(type == "pl") {
+ $('td:eq(5)', nRow).html( '
' );
+ }
+
$(nRow).attr("id", type+'_'+id);
$(nRow).qtip({
diff --git a/public/js/airtime/library/spl.js b/public/js/airtime/library/spl.js
index e6db5a7ff..1885329a8 100644
--- a/public/js/airtime/library/spl.js
+++ b/public/js/airtime/library/spl.js
@@ -146,21 +146,21 @@ function submitOnEnter(event) {
}
}
-function setCueEvents() {
+function setCueEvents(el) {
- $(".spl_cue_in span:last").blur(changeCueIn);
- $(".spl_cue_out span:last").blur(changeCueOut);
+ $(el).find(".spl_cue_in span:last").blur(changeCueIn);
+ $(el).find(".spl_cue_out span:last").blur(changeCueOut);
- $(".spl_cue_in span:first, .spl_cue_out span:first")
+ $(el).find(".spl_cue_in span:first, .spl_cue_out span:first")
.keydown(submitOnEnter);
}
-function setFadeEvents() {
+function setFadeEvents(el) {
- $(".spl_fade_in span:first").blur(changeFadeIn);
- $(".spl_fade_out span:first").blur(changeFadeOut);
+ $(el).find(".spl_fade_in span:first").blur(changeFadeIn);
+ $(el).find(".spl_fade_out span:first").blur(changeFadeOut);
- $(".spl_fade_in span:first, .spl_fade_out span:first")
+ $(el).find(".spl_fade_in span:first, .spl_fade_out span:first")
.keydown(submitOnEnter);
}
@@ -198,7 +198,7 @@ function openFadeEditor(event) {
.append(json.html)
.show();
- setFadeEvents();
+ setFadeEvents(li);
});
}
@@ -231,7 +231,7 @@ function openCueEditor(event) {
.append(json.html)
.show();
- setCueEvents();
+ setCueEvents(li);
});
}
@@ -328,36 +328,49 @@ function closeSPL() {
$.post(url, noOpenPL);
}
+function createPlaylistMetaForm(json) {
+ var submit, form;
+
+ submit = $('')
+ .button()
+ .click(function(){
+ var url, data;
+
+ url = '/Playlist/metadata/format/json';
+ data = $("#side_playlist form").serialize();
+
+ $.post(url, data, function(json){
+ if(json.form){
+
+ }
+
+ openDiffSPL(json);
+ })
+ });
+
+ form = $(json.form);
+
+ form.find("input, textarea")
+ .keydown(function(event){
+ //enter was pressed
+ if(event.keyCode === 13) {
+ event.preventDefault();
+ $("#new_playlist_submit").click();
+ }
+ })
+
+ $("#side_playlist")
+ .empty()
+ .append(form)
+ .append(submit);
+}
+
function newSPL() {
var url;
url = '/Playlist/new/format/json';
- $.post(url, function(json){
- var submit;
-
- submit = $('')
- .button()
- .click(function(){
- var url, data;
-
- url = '/Playlist/metadata/format/json';
- data = $("#side_playlist form").serialize();
-
- $.post(url, data, function(json){
- if(json.form){
-
- }
-
- openDiffSPL(json);
- })
- });
-
- $("#side_playlist")
- .empty()
- .append(json.form)
- .append(submit);
- });
+ $.post(url, createPlaylistMetaForm);
}
function deleteSPL() {
diff --git a/public/js/airtime/schedule/add-show.js b/public/js/airtime/schedule/add-show.js
index e06090265..68ea9a2a3 100644
--- a/public/js/airtime/schedule/add-show.js
+++ b/public/js/airtime/schedule/add-show.js
@@ -60,7 +60,9 @@ function findHosts(request, callback) {
function setAddShowEvents() {
var start, end;
- $(".tabs").tabs();
+ $("h3").click(function(){
+ $(this).next().toggle();
+ });
if(!$("#add_show_repeats").attr('checked')) {
$("#schedule-show-when > fieldset:last").hide();
@@ -114,6 +116,15 @@ function setAddShowEvents() {
}
});
+
+ $("#add-show-close")
+ .button()
+ .click(function(event){
+ event.stopPropagation();
+ event.preventDefault();
+ $("#add-show-form").hide();
+ });
+
$("#add-show-submit")
.button()
.click(function(){
diff --git a/public/js/airtime/schedule/full-calendar-functions.js b/public/js/airtime/schedule/full-calendar-functions.js
index 74f5cb61a..d877cca7a 100644
--- a/public/js/airtime/schedule/full-calendar-functions.js
+++ b/public/js/airtime/schedule/full-calendar-functions.js
@@ -23,13 +23,15 @@ function dayClick(date, allDay, jsEvent, view) {
function viewDisplay( view ) {
- $('.schedule_change_slots').remove();
+ var td = $('.schedule_change_slots').parent();
+ td.prev().remove();
+ td.remove();
if(view.name === 'agendaDay' || view.name === 'agendaWeek') {
var calendarEl = this;
- var select = $('')
+ var select = $('')
.append('')
.append('')
.append('')
diff --git a/public/js/airtime/schedule/schedule.js b/public/js/airtime/schedule/schedule.js
index 40b9865a9..99e5fadf1 100644
--- a/public/js/airtime/schedule/schedule.js
+++ b/public/js/airtime/schedule/schedule.js
@@ -191,6 +191,10 @@ function buildScheduleDialog(json){
dialog.dialog('open');
}
+function buildEditDialog(json){
+
+}
+
function scheduleRefetchEvents() {
$("#schedule_calendar").fullCalendar( 'refetchEvents' );
}
diff --git a/public/js/airtime/user/user.js b/public/js/airtime/user/user.js
new file mode 100644
index 000000000..03edafc8a
--- /dev/null
+++ b/public/js/airtime/user/user.js
@@ -0,0 +1,72 @@
+function populateForm(entries){
+ //$('#user_details').show();
+
+ $('.errors').remove();
+
+ $('#user_id').val(entries.id);
+ $('#login').val(entries.login);
+ $('#first_name').val(entries.first_name);
+ $('#last_name').val(entries.last_name);
+ $('#type').val(entries.type);
+
+ if (entries.id.length != 0){
+ $('#login').attr('readonly', 'readonly');
+ $('#password').val("xxxxxx");
+ } else {
+ $('#login').removeAttr('readonly');
+ $('#password').val("");
+ }
+}
+
+function rowClickCallback(row_id){
+ $.ajax({ url: '/User/get-user-data/id/'+ row_id +'/format/json', dataType:"json", success:function(data){
+ populateForm(data.entries);
+ }});
+}
+
+function removeUserCallback(row_id, nRow){
+ $.ajax({ url: '/User/remove-user/id/'+ row_id +'/format/json', dataType:"text", success:function(data){
+ var o = $('#users_datatable').dataTable().fnDeleteRow(nRow);
+ }});
+}
+
+function rowCallback( nRow, aData, iDisplayIndex ){
+ $(nRow).click(function(){rowClickCallback(aData[0])});
+ $('td:eq(2)', nRow).append( '').children('span').click(function(e){e.stopPropagation(); removeUserCallback(aData[0], nRow)});
+
+ return nRow;
+}
+
+$(document).ready(function() {
+ $('#users_datatable').dataTable( {
+ "bProcessing": true,
+ "bServerSide": true,
+ "sAjaxSource": "/User/get-user-data-table-info/format/json",
+ "fnServerData": function ( sSource, aoData, fnCallback ) {
+ $.ajax( {
+ "dataType": 'json',
+ "type": "POST",
+ "url": sSource,
+ "data": aoData,
+ "success": fnCallback
+ } );
+ },
+ "fnRowCallback": rowCallback,
+ "aoColumns": [
+ /* Id */ { "sName": "id", "bSearchable": false, "bVisible": false },
+ /* user name */ { "sName": "login" },
+ /* user type */ { "sName": "type", "bSearchable": false },
+ /* del button */ { "sName": "null as delete", "bSearchable": false, "bSortable": false}
+ ],
+ "bJQueryUI": true,
+ "bAutoWidth": false,
+ "bLengthChange": false
+ });
+
+ //$('#user_details').hide();
+
+ var newUser = {login:"", first_name:"", last_name:"", type:"G", id:""};
+
+ $('#add_user_button').click(function(){populateForm(newUser)});
+
+});
diff --git a/public/js/playlist/dayview.js b/public/js/playlist/dayview.js
new file mode 100644
index 000000000..7deba409e
--- /dev/null
+++ b/public/js/playlist/dayview.js
@@ -0,0 +1 @@
+var viewType = "day";
diff --git a/public/js/playlist/nowplayingdatagrid.js b/public/js/playlist/nowplayingdatagrid.js
index 6dbe741a6..da8fb5472 100644
--- a/public/js/playlist/nowplayingdatagrid.js
+++ b/public/js/playlist/nowplayingdatagrid.js
@@ -3,17 +3,17 @@ var datagridData;
function getDateText(obj){
var str = obj.aData[ obj.iDataColumn ].toString();
- if (str.indexOf(" ") != -1){
- return changeTimePrecision(str.substring(0, str.indexOf(" ")));
- }
+ datetime = str.split(" ");
+ if (datetime.length == 2)
+ return datetime[0];
return str;
}
function getTimeText(obj){
var str = obj.aData[ obj.iDataColumn ].toString();
- if (str.indexOf(" ") != -1){
- return changeTimePrecision(str.substring(str.indexOf(" ")+1));
- }
+ datetime = str.split(" ");
+ if (datetime.length == 2)
+ return changeTimePrecision(datetime[1]);
return str;
}
@@ -23,16 +23,16 @@ function changeTimePrecisionInit(obj){
}
function changeTimePrecision(str){
- if (str.indexOf(".") != -1){
- if (str.length - str.indexOf(".") > 2)
- var extraLength = str.length - str.indexOf(".") -3;
- return str.substring(0, str.length - extraLength);
- }
- return str;
+
+ var temp = str.split(".")
+ if (temp.length == 2){
+ if (temp[1].length > 2)
+ return temp[0]+"."+temp[1].substr(0, 2);
+ }
+ return str;
}
function notifySongEnd(){
- //alert("length " + datagridData.rows.length);
for (var i=0; i