From 1d699fe0b889bed1e9a15f94f09a141fbe451056 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 17:22:24 -0400 Subject: [PATCH 1/6] CC-4479: Buttons in dialog windows are not styled -done --- .../public/js/airtime/schedule/schedule.js | 24 ++++++++++++++----- .../public/js/serverbrowse/serverbrowser.js | 22 +++++++++++------ 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js index 94ca5702c..5a43f1eb2 100644 --- a/airtime_mvc/public/js/airtime/schedule/schedule.js +++ b/airtime_mvc/public/js/airtime/schedule/schedule.js @@ -164,9 +164,15 @@ function buildScheduleDialog (json) { draggable: true, modal: true, close: closeDialog, - buttons: {"Ok": function() { - $(this).dialog("close"); - }} + buttons: [ + { + text: "Ok", + "class": "btn", + click: function() { + $(this).dialog("close"); + } + } + ] }); //set the start end times so the builder datatables knows its time range. @@ -207,9 +213,15 @@ function buildContentDialog (json){ height: height, modal: true, close: closeDialog, - buttons: {"Ok": function() { - dialog.remove(); - }} + buttons: [ + { + text: "Ok", + "class": "btn", + click: function() { + dialog.remove(); + } + } + ] }); dialog.dialog('open'); diff --git a/airtime_mvc/public/js/serverbrowse/serverbrowser.js b/airtime_mvc/public/js/serverbrowse/serverbrowser.js index a86d3f606..39950bdb6 100644 --- a/airtime_mvc/public/js/serverbrowse/serverbrowser.js +++ b/airtime_mvc/public/js/serverbrowse/serverbrowser.js @@ -63,14 +63,22 @@ $.extend(config, { autoOpen: false, modal: true, - buttons: { - "Cancel": function() { - browserDlg.dialog("close"); + buttons: [ + { + text: "Cancel", + "class": "btn", + click: function() { + browserDlg.dialog("close"); + } }, - "Open": function() { - doneOk(); - }, - }, + { + text: "Open", + "class": "btn", + click: function() { + doneOk(); + } + } + ], resize: function(event, ui) { recalculateSize(event, ui); }, From 2a15269d33d8cfaac2cab14c4d309a4d10550b81 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 17:23:26 -0400 Subject: [PATCH 2/6] redoing last commit --- .../media-monitor2/media/monitor/airtime.py | 5 ++--- .../media-monitor2/media/monitor/exceptions.py | 10 ++++++++++ .../media-monitor2/media/monitor/metadata.py | 16 +++++++++------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/airtime.py b/python_apps/media-monitor2/media/monitor/airtime.py index 23980929e..b920ecd65 100644 --- a/python_apps/media-monitor2/media/monitor/airtime.py +++ b/python_apps/media-monitor2/media/monitor/airtime.py @@ -2,13 +2,12 @@ from kombu.messaging import Exchange, Queue, Consumer from kombu.connection import BrokerConnection from os.path import normpath -from mutagen.easymp4 import EasyMP4KeyError import json import os import copy -from media.monitor.exceptions import BadSongFile +from media.monitor.exceptions import BadSongFile, InvalidMetadataElement from media.monitor.metadata import Metadata from media.monitor.log import Loggable from media.monitor.syncdb import AirtimeDB @@ -118,7 +117,7 @@ class AirtimeMessageReceiver(Loggable): try: Metadata.write_unsafe(path=md_path, md=msg) except BadSongFile as e: self.logger.info("Cannot find metadata file: '%s'" % e.path) - except EasyMP4KeyError as e: + except InvalidMetadataElement as e: self.logger.info("Metadata instance not supported for this file '%s'" \ % e.path) self.logger.info(str(e)) diff --git a/python_apps/media-monitor2/media/monitor/exceptions.py b/python_apps/media-monitor2/media/monitor/exceptions.py index c6b3ec445..b7b834920 100644 --- a/python_apps/media-monitor2/media/monitor/exceptions.py +++ b/python_apps/media-monitor2/media/monitor/exceptions.py @@ -48,3 +48,13 @@ class NoDirectoryInAirtime(Exception): def __str__(self): return "Directory '%s' does not exist in Airtime.\n \ However: %s do exist." % (self.path, self.does_exist) + +class InvalidMetadataElement(Exception): + def __init__(self, parent, key, path): + self.parent = parent + self.key = key + self.path = path + def __str__(self): + return "InvalidMetadataElement: (key,path) = (%s,%s)" \ + % (self.key, self.path) + diff --git a/python_apps/media-monitor2/media/monitor/metadata.py b/python_apps/media-monitor2/media/monitor/metadata.py index 8a56d51e1..ad24d23b9 100644 --- a/python_apps/media-monitor2/media/monitor/metadata.py +++ b/python_apps/media-monitor2/media/monitor/metadata.py @@ -2,10 +2,11 @@ import mutagen import os import copy -from collections import namedtuple -from mutagen.easymp4 import EasyMP4KeyError +from collections import namedtuple +from mutagen.easymp4 import EasyMP4KeyError +from mutagen.easyid3 import EasyID3KeyError -from media.monitor.exceptions import BadSongFile +from media.monitor.exceptions import BadSongFile, InvalidMetadataElement from media.monitor.log import Loggable from media.monitor.pure import format_length import media.monitor.pure as mmp @@ -150,17 +151,18 @@ class Metadata(Loggable): """ if not os.path.exists(path): raise BadSongFile(path) song_file = mutagen.File(path, easy=True) - ex = None + exceptions = [] # for bad keys for airtime_k, airtime_v in md.iteritems(): if airtime_k in airtime2mutagen: # The unicode cast here is mostly for integers that need to be # strings try: song_file[ airtime2mutagen[airtime_k] ] = unicode(airtime_v) - except EasyMP4KeyError as e: - ex = e + except (EasyMP4KeyError, EasyID3KeyError) as e: + exceptions.append(InvalidMetadataElement(e, airtime_k, + path)) + for e in exceptions: raise e song_file.save() - if ex: raise ex def __init__(self, fpath): # Forcing the unicode through From f9778f2da4769e7c8694f5adb1cf1bcc540c88e6 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 17:26:34 -0400 Subject: [PATCH 3/6] -removed windows CRLF --- .../public/js/serverbrowse/serverbrowser.js | 756 +++++++++--------- 1 file changed, 378 insertions(+), 378 deletions(-) diff --git a/airtime_mvc/public/js/serverbrowse/serverbrowser.js b/airtime_mvc/public/js/serverbrowse/serverbrowser.js index 39950bdb6..867e70795 100644 --- a/airtime_mvc/public/js/serverbrowse/serverbrowser.js +++ b/airtime_mvc/public/js/serverbrowse/serverbrowser.js @@ -1,378 +1,378 @@ -/* - author: ApmeM (artem.votincev@gmail.com) - date: 9-June-2010 - version: 1.4 - download: http://code.google.com/p/jq-serverbrowse/ -*/ - -(function($) { - $.fn.serverBrowser = function(settings) { - this.each(function() { - - var config = { -// Event function -// Appear when user click 'Ok' button, or doubleclick on file - onSelect: function(file) { - alert('You select: ' + file); - }, - onLoad: function() { - return config.basePath; - }, - multiselect: false, -// Image parameters -// System images (loading.gif, unknown.png, folder.png and images from knownPaths) will be referenced to systemImageUrl -// if systemImageUrl is empty or not specified - imageUrl will be taken -// All other images (like images for extension) will be taken from imageUrl - imageUrl: 'img/', - systemImageUrl: '', - showUpInList: false, -// Path properties -// Base path, that links should start from. -// If opened path is not under this path, alert will be shown and nothing will be opened -// Path separator, that will be used to split specified paths and join paths to a string - basePath: 'C:', - separatorPath: '/', -// Paths, that will be displayed on the left side of the dialog -// This is a link to specified paths on the server - useKnownPaths: true, - knownPaths: [{text:'Desktop', image:'desktop.png', path:'C:/Users/All Users/Desktop'}, - {text:'Documents', image:'documents.png', path:'C:/Users/All Users/Documents'}], -// Images for known extension (like 'png', 'exe', 'zip'), that will be displayed with its real names -// Images, that is not in this list will be referenced to 'unknown.png' image -// If list is empty - all images is known. - knownExt: [], -// Server path to this plugin handler - handlerUrl: 'browserDlg.txt', -// JQuery-ui dialog settings - title: 'Browse', - width: 300, - height: 300, - position: ['center', 'top'], - -// Administrative parameters used to -// help programmer or system administrator - requestMethod: 'POST', - }; - - if (settings) $.extend(config, settings); -// Required configuration elements -// We need to set some configuration elements without user -// For example there should be 2 buttons on the bottom, -// And dialog should be opened after button is pressed, not when it created -// Also we need to know about dialog resizing - $.extend(config, { - autoOpen: false, - modal: true, - buttons: [ - { - text: "Cancel", - "class": "btn", - click: function() { - browserDlg.dialog("close"); - } - }, - { - text: "Open", - "class": "btn", - click: function() { - doneOk(); - } - } - ], - resize: function(event, ui) { - recalculateSize(event, ui); - }, - }); - - function systemImageUrl() - { - if (config.systemImageUrl.length == 0) { - return config.imageUrl; - } else{ - return config.systemImageUrl; - } - } - - var privateConfig = { -// This stack array will store history navigation data -// When user open new directory, old directory will be added to this list -// If user want, he will be able to move back by this history - browserHistory: [], - -// This array contains all currently selected items -// When user select element, it will add associated path into this array -// When user deselect element - associated path will be removed -// Exception: if 'config.multiselect' is false, only one element will be stored in this array. - selectedItems: [], - } - -// Main dialog div -// It will be converted into jQuery-ui dialog box using my configuration parameters -// It contains 3 divs - var browserDlg = $('
').css({'overflow': 'hidden'}).appendTo(document.body); - browserDlg.dialog(config); - -// First div on the top -// It contains textbox field and buttons -// User can enter any paths he want to open in this textbox and press enter -// There is 3 buttons on the panel: - var enterPathDiv = $('
').addClass('ui-widget-content').appendTo(browserDlg).css({'height': '30px', 'width': '100%', 'padding-top': '7px'}); - - var enterButton = $('
').css({'float': 'left', 'vertical-align': 'middle', 'margin-left': '6px'}).addClass('ui-corner-all').hover( - function() { $(this).addClass('ui-state-hover'); }, - function() { $(this).removeClass('ui-state-hover'); } - ); - - var enterLabel = $('').text('Look in: ').appendTo(enterButton.clone(false).appendTo(enterPathDiv)); - - var enterText = $('').keypress(function(e) { - if (e.keyCode == '13') { - e.preventDefault(); - loadPath(enterText.val()); - } - }).appendTo(enterButton.clone(false).appendTo(enterPathDiv)); - - -// Back button. -// When user click on it, 2 last elements of the history pop from the list, and reload second of them. - var enterBack = $('
').addClass('ui-corner-all ui-icon ui-icon-circle-arrow-w').click(function(){ - privateConfig.browserHistory.pop(); // Remove current element. It is not required now. - var backPath = config.basePath; - if(privateConfig.browserHistory.length > 0){ - backPath = privateConfig.browserHistory.pop(); - } - loadPath(backPath); - }).appendTo(enterButton.clone(true).appendTo(enterPathDiv)); - -// Level Up Button -// When user click on it, last element of the history will be taken, and '..' will be applied to the end of the array. - var enterUp = $('
').addClass('ui-corner-all ui-icon ui-icon-arrowreturnthick-1-n').click(function(){ - backPath = privateConfig.browserHistory[privateConfig.browserHistory.length - 1]; - if(backPath != config.basePath){ - loadPath(backPath + config.separatorPath + '..'); - } - }).appendTo(enterButton.clone(true).appendTo(enterPathDiv)); - -// Second div is on the left -// It contains images and texts for pre-defined paths -// User just click on them and it will open pre-defined path - var knownPathDiv = $('
').addClass('ui-widget-content').css({'text-align':'center', 'overflow': 'auto', 'float': 'left', 'width': '100px'}); - if(config.useKnownPaths){ - knownPathDiv.appendTo(browserDlg); - $.each(config.knownPaths, function(index, path) { - var knownDiv = $('
').css({'margin':'10px'}).hover( - function() { $(this).addClass('ui-state-hover'); }, - function() { $(this).removeClass('ui-state-hover'); } - ).click(function() { - loadPath(path.path); - }).appendTo(knownPathDiv); - - $('').attr({ src: systemImageUrl() + config.separatorPath + path.image }).css({ width: '32px', margin: '5px 10px 5px 5px' }).appendTo(knownDiv); - $('
').appendTo(knownDiv); - $('').text(path.text).appendTo(knownDiv); - }); - } - -// Third div is everywhere :) -// It show files and folders in the current path -// User can click on path to select or deselect it -// Doubleclick on path will open it -// Also doubleclick on file will select this file and close dialog - var browserPathDiv = $('
').addClass('ui-widget-content').css({'float': 'right', 'overflow': 'auto'}).appendTo(browserDlg); - -// Now everything is done -// When user will be ready - he just click on the area you select for this plugin and dialog will appear - $(this).click(function() { - privateConfig.browserHistory = []; - var startpath = removeBackPath(config.onLoad()); - - startpath = startpath.split(config.separatorPath); - startpath.pop(); - startpath = startpath.join(config.separatorPath); - - if(!checkBasePath(startpath)){ - startpath = config.basePath; - } - loadPath(startpath); - browserDlg.dialog('open'); - recalculateSize(); - }); - -// Function check if specified path is a child path of a 'config.basePath' -// If it is not - user should see message, that path invalid, or path should be changed to valid. - function checkBasePath(path){ - if(config.basePath == '') - return true; - var confPath = config.basePath.split(config.separatorPath); - var curPath = path.split(config.separatorPath); - if(confPath.length > curPath.length) - return false; - var result = true; - $.each(confPath, function(index, partConfPath) { - if(partConfPath != curPath[index]){ - result = false; - } - }); - return result; - } - -// Function remove '..' parts of the path -// Process depend on config.separatorPath option -// On the server side you need to check / or \ separators - function removeBackPath(path){ - var confPath = config.basePath.split(config.separatorPath); - var curPath = path.split(config.separatorPath); - var newcurPath = []; - $.each(curPath, function(index, partCurPath) { - if(partCurPath == ".."){ - newcurPath.pop(); - }else{ - newcurPath.push(partCurPath); - } - }); - return newcurPath.join(config.separatorPath); - } - -// This function will be called when user click 'Open' -// It check if any path is selected, and call config.onSelect function with path list - function doneOk(){ - var newCurPath = []; - $.each(privateConfig.selectedItems, function(index, item) { - newCurPath.push($.data(item, 'path')); - }); - if(newCurPath.length == 0) { - newCurPath.push(privateConfig.browserHistory.pop()); - } - - if(config.multiselect) - config.onSelect(newCurPath); - else { - if(newCurPath.length == 1) { - config.onSelect(newCurPath[0]); - } else if(newCurPath.length > 1){ - alert('Plugin work incorrectly. If error repeat, please add issue into http://code.google.com/p/jq-serverbrowse/issues/list with steps to reproduce.'); - return; - } - } - browserDlg.dialog("close"); - } - -// Function recalculate and set new width and height for left and right div elements -// height have '-2' because of the borders -// width have '-4' because of a border an 2 pixels space between divs - function recalculateSize(event, ui){ - knownPathDiv.css({'height' : browserDlg.height() - enterPathDiv.outerHeight(true) - 2}); - browserPathDiv.css({'height' : browserDlg.height() - enterPathDiv.outerHeight(true) - 2, - 'width' : browserDlg.width() - knownPathDiv.outerWidth(true) - 4}); - } - -// Function adds new element into browserPathDiv element depends on file parameters -// If file.isError is set, error message will be displayed instead of clickable area -// Clickable div contain image from extension and text from file parameter - function addElement(file){ - var itemDiv = $('
').css({ margin: '2px' }).appendTo(browserPathDiv); - if(file.isError) - { - itemDiv.addClass('ui-state-error ui-corner-all').css({padding: '0pt 0.7em'}); - var p = $('

').appendTo(itemDiv); - $('').addClass('ui-icon ui-icon-alert').css({'float': 'left', 'margin-right': '0.3em'}).appendTo(p); - $('').text(file.name).appendTo(p); - }else - { - var fullPath = file.path + config.separatorPath + file.name; - itemDiv.hover( - function() { $(this).addClass('ui-state-hover'); }, - function() { $(this).removeClass('ui-state-hover'); } - ); - var itemImage = $('').css({ width: '16px', margin: '0 5px 0 0' }).appendTo(itemDiv); - var itemText = $('').text(file.name).appendTo(itemDiv); - if (file.isFolder) - itemImage.attr({ src: systemImageUrl() + 'folder.png' }); - else { - ext = file.name.split('.').pop(); - var res = ''; - if (ext == '' || ext == file.name || (config.knownExt.length > 0 && $.inArray(ext, config.knownExt) < 0)) - itemImage.attr({ src: systemImageUrl() + 'unknown.png' }); - else - itemImage.attr({ src: config.imageUrl + ext + '.png' }); - } - $.data(itemDiv, 'path', fullPath); - itemDiv.unbind('click').bind('click', function(e) { - if(!$(this).hasClass('ui-state-active')) { - if(!config.multiselect && privateConfig.selectedItems.length > 0) { - $(privateConfig.selectedItems[0]).click(); - } - privateConfig.selectedItems.push(itemDiv); - }else{ - var newCurPath = []; - $.each(privateConfig.selectedItems, function(index, item) { - if($.data(item, 'path') != fullPath) - newCurPath.push(item); - }); - privateConfig.selectedItems = newCurPath; - } - $(this).toggleClass('ui-state-active'); - }); - - itemDiv.unbind('dblclick').bind('dblclick', function(e) { - if (file.isFolder){ - loadPath(fullPath); - } else { - privateConfig.selectedItems = [itemDiv]; - doneOk(); - } - }); - } - } - -// Main plugin function -// When user enter path manually, select it from pre-defined path, or doubleclick in browser this function will call -// It send a request on the server to retrieve child directories and files of the specified path -// If path is not under 'config.basePath', alert will be shown and nothing will be opened - function loadPath(path) { - privateConfig.selectedItems = []; - - // First we need to remove all '..' parts of the path - path = removeBackPath(path); - - // Then we need to check, if path based on 'config.basePath' - if(!checkBasePath(path)) { - alert('Path should be based from ' + config.basePath); - return; - } - - // Then we can put this path into history - privateConfig.browserHistory.push(path); - - // Show it to user - enterText.val(path); - - // And load - $.ajax({ - url: config.handlerUrl, - type: config.requestMethod, - data: { - action: 'browse', - path: path, - time: new Date().getTime() - }, - beforeSend: function() { - browserPathDiv.empty().css({ 'text-align': 'center' }); - $('').attr({ src: systemImageUrl() + 'loading.gif' }).css({ width: '32px' }).appendTo(browserPathDiv); - }, - success: function(files) { - browserPathDiv.empty().css({ 'text-align': 'left' }); - if(path != config.basePath && config.showUpInList){ - addElement({name: '..', isFolder: true, isError: false, path: path}); - } - $.each(files, function(index, file) { - addElement($.extend(file, {path: path})); - }); - }, - dataType: 'json' - }); - } - }); - return this; - }; -})(jQuery); +/* + author: ApmeM (artem.votincev@gmail.com) + date: 9-June-2010 + version: 1.4 + download: http://code.google.com/p/jq-serverbrowse/ +*/ + +(function($) { + $.fn.serverBrowser = function(settings) { + this.each(function() { + + var config = { +// Event function +// Appear when user click 'Ok' button, or doubleclick on file + onSelect: function(file) { + alert('You select: ' + file); + }, + onLoad: function() { + return config.basePath; + }, + multiselect: false, +// Image parameters +// System images (loading.gif, unknown.png, folder.png and images from knownPaths) will be referenced to systemImageUrl +// if systemImageUrl is empty or not specified - imageUrl will be taken +// All other images (like images for extension) will be taken from imageUrl + imageUrl: 'img/', + systemImageUrl: '', + showUpInList: false, +// Path properties +// Base path, that links should start from. +// If opened path is not under this path, alert will be shown and nothing will be opened +// Path separator, that will be used to split specified paths and join paths to a string + basePath: 'C:', + separatorPath: '/', +// Paths, that will be displayed on the left side of the dialog +// This is a link to specified paths on the server + useKnownPaths: true, + knownPaths: [{text:'Desktop', image:'desktop.png', path:'C:/Users/All Users/Desktop'}, + {text:'Documents', image:'documents.png', path:'C:/Users/All Users/Documents'}], +// Images for known extension (like 'png', 'exe', 'zip'), that will be displayed with its real names +// Images, that is not in this list will be referenced to 'unknown.png' image +// If list is empty - all images is known. + knownExt: [], +// Server path to this plugin handler + handlerUrl: 'browserDlg.txt', +// JQuery-ui dialog settings + title: 'Browse', + width: 300, + height: 300, + position: ['center', 'top'], + +// Administrative parameters used to +// help programmer or system administrator + requestMethod: 'POST', + }; + + if (settings) $.extend(config, settings); +// Required configuration elements +// We need to set some configuration elements without user +// For example there should be 2 buttons on the bottom, +// And dialog should be opened after button is pressed, not when it created +// Also we need to know about dialog resizing + $.extend(config, { + autoOpen: false, + modal: true, + buttons: [ + { + text: "Cancel", + "class": "btn", + click: function() { + browserDlg.dialog("close"); + } + }, + { + text: "Open", + "class": "btn", + click: function() { + doneOk(); + } + } + ], + resize: function(event, ui) { + recalculateSize(event, ui); + }, + }); + + function systemImageUrl() + { + if (config.systemImageUrl.length == 0) { + return config.imageUrl; + } else{ + return config.systemImageUrl; + } + } + + var privateConfig = { +// This stack array will store history navigation data +// When user open new directory, old directory will be added to this list +// If user want, he will be able to move back by this history + browserHistory: [], + +// This array contains all currently selected items +// When user select element, it will add associated path into this array +// When user deselect element - associated path will be removed +// Exception: if 'config.multiselect' is false, only one element will be stored in this array. + selectedItems: [], + } + +// Main dialog div +// It will be converted into jQuery-ui dialog box using my configuration parameters +// It contains 3 divs + var browserDlg = $('
').css({'overflow': 'hidden'}).appendTo(document.body); + browserDlg.dialog(config); + +// First div on the top +// It contains textbox field and buttons +// User can enter any paths he want to open in this textbox and press enter +// There is 3 buttons on the panel: + var enterPathDiv = $('
').addClass('ui-widget-content').appendTo(browserDlg).css({'height': '30px', 'width': '100%', 'padding-top': '7px'}); + + var enterButton = $('
').css({'float': 'left', 'vertical-align': 'middle', 'margin-left': '6px'}).addClass('ui-corner-all').hover( + function() { $(this).addClass('ui-state-hover'); }, + function() { $(this).removeClass('ui-state-hover'); } + ); + + var enterLabel = $('').text('Look in: ').appendTo(enterButton.clone(false).appendTo(enterPathDiv)); + + var enterText = $('').keypress(function(e) { + if (e.keyCode == '13') { + e.preventDefault(); + loadPath(enterText.val()); + } + }).appendTo(enterButton.clone(false).appendTo(enterPathDiv)); + + +// Back button. +// When user click on it, 2 last elements of the history pop from the list, and reload second of them. + var enterBack = $('
').addClass('ui-corner-all ui-icon ui-icon-circle-arrow-w').click(function(){ + privateConfig.browserHistory.pop(); // Remove current element. It is not required now. + var backPath = config.basePath; + if(privateConfig.browserHistory.length > 0){ + backPath = privateConfig.browserHistory.pop(); + } + loadPath(backPath); + }).appendTo(enterButton.clone(true).appendTo(enterPathDiv)); + +// Level Up Button +// When user click on it, last element of the history will be taken, and '..' will be applied to the end of the array. + var enterUp = $('
').addClass('ui-corner-all ui-icon ui-icon-arrowreturnthick-1-n').click(function(){ + backPath = privateConfig.browserHistory[privateConfig.browserHistory.length - 1]; + if(backPath != config.basePath){ + loadPath(backPath + config.separatorPath + '..'); + } + }).appendTo(enterButton.clone(true).appendTo(enterPathDiv)); + +// Second div is on the left +// It contains images and texts for pre-defined paths +// User just click on them and it will open pre-defined path + var knownPathDiv = $('
').addClass('ui-widget-content').css({'text-align':'center', 'overflow': 'auto', 'float': 'left', 'width': '100px'}); + if(config.useKnownPaths){ + knownPathDiv.appendTo(browserDlg); + $.each(config.knownPaths, function(index, path) { + var knownDiv = $('
').css({'margin':'10px'}).hover( + function() { $(this).addClass('ui-state-hover'); }, + function() { $(this).removeClass('ui-state-hover'); } + ).click(function() { + loadPath(path.path); + }).appendTo(knownPathDiv); + + $('').attr({ src: systemImageUrl() + config.separatorPath + path.image }).css({ width: '32px', margin: '5px 10px 5px 5px' }).appendTo(knownDiv); + $('
').appendTo(knownDiv); + $('').text(path.text).appendTo(knownDiv); + }); + } + +// Third div is everywhere :) +// It show files and folders in the current path +// User can click on path to select or deselect it +// Doubleclick on path will open it +// Also doubleclick on file will select this file and close dialog + var browserPathDiv = $('
').addClass('ui-widget-content').css({'float': 'right', 'overflow': 'auto'}).appendTo(browserDlg); + +// Now everything is done +// When user will be ready - he just click on the area you select for this plugin and dialog will appear + $(this).click(function() { + privateConfig.browserHistory = []; + var startpath = removeBackPath(config.onLoad()); + + startpath = startpath.split(config.separatorPath); + startpath.pop(); + startpath = startpath.join(config.separatorPath); + + if(!checkBasePath(startpath)){ + startpath = config.basePath; + } + loadPath(startpath); + browserDlg.dialog('open'); + recalculateSize(); + }); + +// Function check if specified path is a child path of a 'config.basePath' +// If it is not - user should see message, that path invalid, or path should be changed to valid. + function checkBasePath(path){ + if(config.basePath == '') + return true; + var confPath = config.basePath.split(config.separatorPath); + var curPath = path.split(config.separatorPath); + if(confPath.length > curPath.length) + return false; + var result = true; + $.each(confPath, function(index, partConfPath) { + if(partConfPath != curPath[index]){ + result = false; + } + }); + return result; + } + +// Function remove '..' parts of the path +// Process depend on config.separatorPath option +// On the server side you need to check / or \ separators + function removeBackPath(path){ + var confPath = config.basePath.split(config.separatorPath); + var curPath = path.split(config.separatorPath); + var newcurPath = []; + $.each(curPath, function(index, partCurPath) { + if(partCurPath == ".."){ + newcurPath.pop(); + }else{ + newcurPath.push(partCurPath); + } + }); + return newcurPath.join(config.separatorPath); + } + +// This function will be called when user click 'Open' +// It check if any path is selected, and call config.onSelect function with path list + function doneOk(){ + var newCurPath = []; + $.each(privateConfig.selectedItems, function(index, item) { + newCurPath.push($.data(item, 'path')); + }); + if(newCurPath.length == 0) { + newCurPath.push(privateConfig.browserHistory.pop()); + } + + if(config.multiselect) + config.onSelect(newCurPath); + else { + if(newCurPath.length == 1) { + config.onSelect(newCurPath[0]); + } else if(newCurPath.length > 1){ + alert('Plugin work incorrectly. If error repeat, please add issue into http://code.google.com/p/jq-serverbrowse/issues/list with steps to reproduce.'); + return; + } + } + browserDlg.dialog("close"); + } + +// Function recalculate and set new width and height for left and right div elements +// height have '-2' because of the borders +// width have '-4' because of a border an 2 pixels space between divs + function recalculateSize(event, ui){ + knownPathDiv.css({'height' : browserDlg.height() - enterPathDiv.outerHeight(true) - 2}); + browserPathDiv.css({'height' : browserDlg.height() - enterPathDiv.outerHeight(true) - 2, + 'width' : browserDlg.width() - knownPathDiv.outerWidth(true) - 4}); + } + +// Function adds new element into browserPathDiv element depends on file parameters +// If file.isError is set, error message will be displayed instead of clickable area +// Clickable div contain image from extension and text from file parameter + function addElement(file){ + var itemDiv = $('
').css({ margin: '2px' }).appendTo(browserPathDiv); + if(file.isError) + { + itemDiv.addClass('ui-state-error ui-corner-all').css({padding: '0pt 0.7em'}); + var p = $('

').appendTo(itemDiv); + $('').addClass('ui-icon ui-icon-alert').css({'float': 'left', 'margin-right': '0.3em'}).appendTo(p); + $('').text(file.name).appendTo(p); + }else + { + var fullPath = file.path + config.separatorPath + file.name; + itemDiv.hover( + function() { $(this).addClass('ui-state-hover'); }, + function() { $(this).removeClass('ui-state-hover'); } + ); + var itemImage = $('').css({ width: '16px', margin: '0 5px 0 0' }).appendTo(itemDiv); + var itemText = $('').text(file.name).appendTo(itemDiv); + if (file.isFolder) + itemImage.attr({ src: systemImageUrl() + 'folder.png' }); + else { + ext = file.name.split('.').pop(); + var res = ''; + if (ext == '' || ext == file.name || (config.knownExt.length > 0 && $.inArray(ext, config.knownExt) < 0)) + itemImage.attr({ src: systemImageUrl() + 'unknown.png' }); + else + itemImage.attr({ src: config.imageUrl + ext + '.png' }); + } + $.data(itemDiv, 'path', fullPath); + itemDiv.unbind('click').bind('click', function(e) { + if(!$(this).hasClass('ui-state-active')) { + if(!config.multiselect && privateConfig.selectedItems.length > 0) { + $(privateConfig.selectedItems[0]).click(); + } + privateConfig.selectedItems.push(itemDiv); + }else{ + var newCurPath = []; + $.each(privateConfig.selectedItems, function(index, item) { + if($.data(item, 'path') != fullPath) + newCurPath.push(item); + }); + privateConfig.selectedItems = newCurPath; + } + $(this).toggleClass('ui-state-active'); + }); + + itemDiv.unbind('dblclick').bind('dblclick', function(e) { + if (file.isFolder){ + loadPath(fullPath); + } else { + privateConfig.selectedItems = [itemDiv]; + doneOk(); + } + }); + } + } + +// Main plugin function +// When user enter path manually, select it from pre-defined path, or doubleclick in browser this function will call +// It send a request on the server to retrieve child directories and files of the specified path +// If path is not under 'config.basePath', alert will be shown and nothing will be opened + function loadPath(path) { + privateConfig.selectedItems = []; + + // First we need to remove all '..' parts of the path + path = removeBackPath(path); + + // Then we need to check, if path based on 'config.basePath' + if(!checkBasePath(path)) { + alert('Path should be based from ' + config.basePath); + return; + } + + // Then we can put this path into history + privateConfig.browserHistory.push(path); + + // Show it to user + enterText.val(path); + + // And load + $.ajax({ + url: config.handlerUrl, + type: config.requestMethod, + data: { + action: 'browse', + path: path, + time: new Date().getTime() + }, + beforeSend: function() { + browserPathDiv.empty().css({ 'text-align': 'center' }); + $('').attr({ src: systemImageUrl() + 'loading.gif' }).css({ width: '32px' }).appendTo(browserPathDiv); + }, + success: function(files) { + browserPathDiv.empty().css({ 'text-align': 'left' }); + if(path != config.basePath && config.showUpInList){ + addElement({name: '..', isFolder: true, isError: false, path: path}); + } + $.each(files, function(index, file) { + addElement($.extend(file, {path: path})); + }); + }, + dataType: 'json' + }); + } + }); + return this; + }; +})(jQuery); From 5003e86eacb1c0d1c91198e0e24dc8419d5a8675 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 17:37:38 -0400 Subject: [PATCH 4/6] - changed smart block qtip text --- .../public/js/airtime/playlist/smart_blockbuilder.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js index ca085fa87..9862eb48e 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js @@ -363,10 +363,10 @@ function setupUI() { $(".playlist_type_help_icon").qtip({ content: { - text: "A static playlist will save the criteria and generate the playlist content immediately." + - "This allows you to edit and view it in the Playlist Builder before adding it to a show.

" + - "A dynamic playlist will only save the criteria. The playlist content will get generated upon " + - "adding it to a show. You will not be able to view and edit it in the Playlist Builder." + text: "A static smart block will save the criteria and generate the block content immediately." + + "This allows you to edit and view it in the Library before adding it to a show.

" + + "A dynamic smart block will only save the criteria. The block content will get generated upon " + + "adding it to a show. You will not be able to view and edit the content in the Library." }, hide: { delay: 500, From 92b40bea0c2502a0ee3d06bf0e7f8ca65525e378 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 17:43:13 -0400 Subject: [PATCH 5/6] CC-4484: Some js files do not have the airtime version appended -fixed --- airtime_mvc/application/controllers/LibraryController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 2d8f06b71..a1d0d245e 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -41,7 +41,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); - $this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_playlistbuilder.js'), 'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/events/library_playlistbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/media_library.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery.contextMenu.css?'.$CC_CONFIG['airtime_version']); From 70192ad7c961a1fa218062166355bf43dabb5c6c Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 18 Sep 2012 18:19:29 -0400 Subject: [PATCH 6/6] update liquidsoap generation scripts --- dev_tools/fabric/fab_liquidsoap_compile.cfg | 2 +- dev_tools/fabric/fab_liquidsoap_compile.py | 90 ++++++++++++--------- 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/dev_tools/fabric/fab_liquidsoap_compile.cfg b/dev_tools/fabric/fab_liquidsoap_compile.cfg index 8b99725c3..81a2dcfa2 100644 --- a/dev_tools/fabric/fab_liquidsoap_compile.cfg +++ b/dev_tools/fabric/fab_liquidsoap_compile.cfg @@ -1,2 +1,2 @@ [main] -liquidsoap_tar_url = http://dl.dropbox.com/u/256410/airtime/liquidsoap-1.0.1-full.tar.gz +liquidsoap_tar_url = http://dl.dropbox.com/u/256410/airtime/savonet.tar.gz diff --git a/dev_tools/fabric/fab_liquidsoap_compile.py b/dev_tools/fabric/fab_liquidsoap_compile.py index 0db5ed501..b21d2de95 100644 --- a/dev_tools/fabric/fab_liquidsoap_compile.py +++ b/dev_tools/fabric/fab_liquidsoap_compile.py @@ -23,7 +23,7 @@ env.host_string env.vm_download_url = "http://host.sourcefabric.org/vms/VirtualBox" -#fab -f fab_setup.py ubuntu_lucid_64 airtime_182_tar airtime_190_tar +#fab -f fab_setup.py ubuntu_lucid_64 airtime_182_tar airtime_190_tar def do_sudo(command): result = sudo(command) @@ -33,7 +33,7 @@ def do_sudo(command): sys.exit(1) else: return result - + def do_run(command): result = run(command) if result.return_code != 0: @@ -42,7 +42,7 @@ def do_run(command): sys.exit(1) else: return result - + def do_local(command, capture=True): result = local(command, capture) if result.return_code != 0: @@ -55,11 +55,11 @@ def do_local(command, capture=True): def shutdown(): do_sudo("poweroff") time.sleep(30) - + def download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file): if not os.path.exists(vdi_dir): os.makedirs(vdi_dir) - + if os.path.exists(os.path.join(vdi_dir, vm_vdi_file)): print "File %s already exists. No need to re-download" % os.path.join(vdi_dir, vm_vdi_file) else: @@ -67,24 +67,24 @@ def download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file): tmpPath = do_local("mktemp", capture=True) do_local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_vdi_file, tmpPath)) os.rename(tmpPath, os.path.join(vdi_dir, vm_vdi_file)) - + if os.path.exists(os.path.join(xml_dir, vm_xml_file)): print "File %s already exists. No need to re-download" % os.path.join(xml_dir, vm_xml_file) else: - do_local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_xml_file, os.path.join(xml_dir, vm_xml_file))) - + do_local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_xml_file, os.path.join(xml_dir, vm_xml_file))) + def create_fresh_os(vm_name, debian=False): - + vm_vdi_file = '%s.vdi'%vm_name vm_xml_file = '%s.xml'%vm_name vdi_dir = os.path.expanduser('~/tmp/vms/%s'%vm_name) vdi_snapshot_dir = os.path.expanduser('~/tmp/vms/%s/Snapshots'%vm_name) xml_dir = os.path.expanduser('~/.VirtualBox') vm_xml_path = os.path.join(xml_dir, vm_xml_file) - + download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file) - + if not os.path.exists("%s/vm_registered"%vdi_dir): do_local("VBoxManage registervm %s"%os.path.join(xml_dir, vm_xml_file), capture=True) @@ -98,7 +98,7 @@ def create_fresh_os(vm_name, debian=False): do_local('VBoxManage modifyvm "%s" --bridgeadapter1 eth0'%vm_name) do_local('VBoxManage startvm %s'%vm_name) print "Please wait while attempting to acquire IP address" - + time.sleep(15) try_again = True @@ -107,16 +107,16 @@ def create_fresh_os(vm_name, debian=False): triple = ret.partition(':') ip_addr = triple[2].strip(' \r\n') print "Address found %s"%ip_addr - + try_again = (len(ip_addr) == 0) time.sleep(1) - + env.hosts.append(ip_addr) env.host_string = ip_addr - + if debian: append('/etc/apt/sources.list', "deb http://www.debian-multimedia.org squeeze main non-free", use_sudo=True) - + def ubuntu_lucid_32(fresh_os=True): if (fresh_os): create_fresh_os('Ubuntu_10.04_32') @@ -124,7 +124,7 @@ def ubuntu_lucid_32(fresh_os=True): def ubuntu_lucid_64(fresh_os=True): if (fresh_os): create_fresh_os('Ubuntu_10.04_64') - + def ubuntu_maverick_32(fresh_os=True): if (fresh_os): create_fresh_os('Ubuntu_10.10_32') @@ -136,44 +136,44 @@ def ubuntu_maverick_64(fresh_os=True): def ubuntu_natty_32(fresh_os=True): if (fresh_os): create_fresh_os('Ubuntu_11.04_32') - + def ubuntu_natty_64(fresh_os=True): if (fresh_os): create_fresh_os('Ubuntu_11.04_64') - + def ubuntu_oneiric_32(fresh_os=True): if (fresh_os): create_fresh_os('Ubuntu_11.10_32') - + def ubuntu_oneiric_64(fresh_os=True): if (fresh_os): create_fresh_os('Ubuntu_11.10_64') - + def ubuntu_precise_64(fresh_os=True): if (fresh_os): create_fresh_os('Ubuntu_12.04_64') - + def ubuntu_precise_32(fresh_os=True): if (fresh_os): create_fresh_os('Ubuntu_12.04_32') - + def debian_squeeze_32(fresh_os=True): if (fresh_os): create_fresh_os('Debian_Squeeze_32', debian=True) - + def debian_squeeze_64(fresh_os=True): if (fresh_os): create_fresh_os('Debian_Squeeze_64', debian=True) def compile_liquidsoap(filename="liquidsoap"): - + config = ConfigParser() config.readfp(open('fab_liquidsoap_compile.cfg')) url = config.get('main', 'liquidsoap_tar_url') - + print "Will get liquidsoap from " + url - + do_sudo('apt-get update') do_sudo('apt-get upgrade -y --force-yes') do_sudo('apt-get install -y --force-yes ocaml-findlib libao-ocaml-dev libportaudio-ocaml-dev ' + \ @@ -181,22 +181,32 @@ def compile_liquidsoap(filename="liquidsoap"): 'libspeex-dev libspeexdsp-dev speex libladspa-ocaml-dev festival festival-dev ' + \ 'libsamplerate-dev libxmlplaylist-ocaml-dev libxmlrpc-light-ocaml-dev libflac-dev ' + \ 'libxml-dom-perl libxml-dom-xpath-perl patch autoconf libmp3lame-dev ' + \ - 'libcamomile-ocaml-dev libcamlimages-ocaml-dev libtool libpulse-dev libjack-dev camlidl') - + 'libcamomile-ocaml-dev libcamlimages-ocaml-dev libtool libpulse-dev libjack-dev camlidl libfaad-dev') + root = '/home/martin/src' do_run('mkdir -p %s' % root) - + tmpPath = do_local("mktemp", capture=True) do_run('wget %s -O %s' % (url, tmpPath)) do_run('mv %s %s/liquidsoap.tar.gz' % (tmpPath, root)) do_run('cd %s && tar xzf liquidsoap.tar.gz' % root) - - do_run('cd %s/liquidsoap-1.0.1-full && cp PACKAGES.minimal PACKAGES' % root) - sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-portaudio', 'ocaml-portaudio') - sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-alsa', 'ocaml-alsa') - sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-pulseaudio', 'ocaml-pulseaudio') - sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-faad', 'ocaml-faad') - do_run('cd %s/liquidsoap-1.0.1-full && ./bootstrap' % root) - do_run('cd %s/liquidsoap-1.0.1-full && ./configure' % root) - do_run('cd %s/liquidsoap-1.0.1-full && make' % root) - get('%s/liquidsoap-1.0.1-full/liquidsoap-1.0.1/src/liquidsoap' % root, filename) + + #do_run('cd %s/liquidsoap-1.0.1-full && cp PACKAGES.minimal PACKAGES' % root) + #sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-portaudio', 'ocaml-portaudio') + #sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-alsa', 'ocaml-alsa') + #sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-pulseaudio', 'ocaml-pulseaudio') + #sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-faad', 'ocaml-faad') + #do_run('cd %s/liquidsoap-1.0.1-full && ./bootstrap' % root) + #do_run('cd %s/liquidsoap-1.0.1-full && ./configure' % root) + #do_run('cd %s/liquidsoap-1.0.1-full && make' % root) + #get('%s/liquidsoap-1.0.1-full/liquidsoap-1.0.1/src/liquidsoap' % root, filename) + + do_run('cd %s/savonet && cp PACKAGES.minimal PACKAGES' % root) + sed('%s/savonet/PACKAGES' % root, '#ocaml-portaudio', 'ocaml-portaudio') + sed('%s/savonet/PACKAGES' % root, '#ocaml-alsa', 'ocaml-alsa') + sed('%s/savonet/PACKAGES' % root, '#ocaml-pulseaudio', 'ocaml-pulseaudio') + sed('%s/savonet/PACKAGES' % root, '#ocaml-faad', 'ocaml-faad') + do_run('cd %s/savonet && ./bootstrap' % root) + do_run('cd %s/savonet && ./configure' % root) + do_run('cd %s/savonet && make' % root) + get('%s/savonet/liquidsoap/src/liquidsoap' % root, filename)