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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
martin 2011-07-06 13:55:04 -04:00
parent 3d52db5211 947647ed89
commit eaba145d6d
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
View File

@ -6,7 +6,7 @@
</dt> </dt>
<dd id="storageFolder-element" class="block-display"> <dd id="storageFolder-element" class="block-display">
<?php echo $this->element->getElement('storageFolder') ?> <?php echo $this->element->getElement('storageFolder') ?>
<input id="storageFolder-selection" type="button" value="choose folder"></input> <input id="storageFolder-selection" type="button" value="Choose folder"></input>
<input id="storageFolder-ok" type="button" value="Set"></input> <input id="storageFolder-ok" type="button" value="Set"></input>
<?php if($this->element->getElement('storageFolder')->hasErrors()) : ?> <?php if($this->element->getElement('storageFolder')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>
@ -23,7 +23,7 @@
</dt> </dt>
<dd id="watchedFolder-element" class="block-display"> <dd id="watchedFolder-element" class="block-display">
<?php echo $this->element->getElement('watchedFolder') ?> <?php echo $this->element->getElement('watchedFolder') ?>
<input id="watchedFolder-selection" type="button" value="choose folder"></input> <input id="watchedFolder-selection" type="button" value="Choose folder"></input>
<input id="watchedFolder-ok" type="button" value="Add"></input> <input id="watchedFolder-ok" type="button" value="Add"></input>
<?php if($this->element->getElement('watchedFolder')->hasErrors()) : ?> <?php if($this->element->getElement('watchedFolder')->hasErrors()) : ?>
<ul class='errors'> <ul class='errors'>

4
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -405,8 +405,8 @@ function deleteSPL() {
url = '/Playlist/delete-active/format/json'; url = '/Playlist/delete-active/format/json';
$.post(url, function(){ $.post(url, function(json){
noOpenPL; noOpenPL(json);
//redraw the library list //redraw the library list
redrawDataTablePage(); redrawDataTablePage();
}); });

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

@ -426,10 +426,12 @@ $(document).ready(function() {
$(window).resize(function(){ $(window).resize(function(){
var windowWidth = $(this).width(); var windowWidth = $(this).width();
// margin on showform are 16 px on each side // margin on showform are 16 px on each side
var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 6))/windowWidth*100); if(!$("#schedule-add-show").is(':hidden')){
var widthPercent = parseInt(calendarWidth)+"%"; var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 4))/windowWidth*100);
$("#schedule_calendar").css("width", widthPercent); var widthPercent = parseInt(calendarWidth)+"%";
$("#schedule_calendar").fullCalendar('render'); $("#schedule_calendar").css("width", widthPercent);
$("#schedule_calendar").fullCalendar('render');
}
}); });
$(window).load(function() { $(window).load(function() {

2
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View File

@ -15,7 +15,7 @@ function openAddShowForm() {
$("#add-show-form").show(); $("#add-show-form").show();
var windowWidth = $(window).width(); var windowWidth = $(window).width();
// margin on showform are 16 px on each side // margin on showform are 16 px on each side
var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 6))/windowWidth*100); var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 4))/windowWidth*100);
var widthPercent = parseInt(calendarWidth)+"%"; var widthPercent = parseInt(calendarWidth)+"%";
$("#schedule_calendar").css("width", widthPercent); $("#schedule_calendar").css("width", widthPercent);
$("#schedule_calendar").fullCalendar('render'); $("#schedule_calendar").fullCalendar('render');