Commit Graph

295 Commits

Author SHA1 Message Date
denise eb38503d6e CC-4946: Now Playing -> Apache error when empty show starts
-we were trying to update the is_scheduled flag on a non-schedule item
2013-02-13 11:51:25 -05:00
denise 4ff1e8e78a CC-4932: Library -> Update Scheduled column on 'Cancel current show' action
-fixed
2013-02-13 11:29:43 -05:00
denise 525b2dcb33 CC-4895: Remove all json die() statements from code
- removed json_encode
2013-02-07 15:41:47 -05:00
denise 0ed5d18e95 CC-4920: Now Playling js error
-fixed
2013-02-06 13:25:48 -05:00
denise 8309593a0f CC-4904: Library -> Sort by status doesn't work
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
denise e1c69ebca2 CC-4902: Library -> Status column does not update when you add a file to a show
-fixed
2013-01-31 11:28:54 -05:00
Martin Konecny fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead
-Make '/' the default root
2013-01-14 16:00:38 -05:00
Martin Konecny 3a70a371be CC-4751: Calendar: Add/Remove contents won't trig status update of shows
-fix problem when baseurl changed
2013-01-14 14:07:32 -05:00
Martin Konecny 2bbdb01495 CC-4751: Calendar: Add/Remove contents won't trig status update of shows
-fixed
2013-01-11 15:37:58 -05:00
denise dffe932223 Added missing base directory to urls 2013-01-10 13:58:11 -05:00
denise 22bfc45497 CC-1960: Internationalize Airtime / Support translations
-defined translations for show builder datatable
2012-11-27 15:51:50 -05:00
denise b677130a3f CC-1960Internationalize Airtime / Support translations
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -05:00
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
denise 10cd31fa56 CC-1960: Internationalize Airtime / Support translations
- channged all js strings with embedded variables to use sprintf
2012-11-20 17:42:26 -05:00
denise 57fdab0ddf CC-1960: Internationalize Airtime / Support translations
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:33:37 -05:00
denise a201d6f2da CC-4666: Showbuilder page is dead
-fixed. result of a bad merge
2012-11-05 11:15:26 -05:00
denise 135aadf16b Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
James 575400b4c2 CC-4623: Library: Preview button for Flac does not work
- fixed
2012-11-01 16:44:37 -04:00
denise 00947f9d7e CC-4640: Automatically jump to current song when loading the Now Playing page.
-small fix
2012-10-30 15:34:38 -04:00
denise b08f5091b5 CC-4609: Calendar -> Add/Remove contents: Please remove useless buttons: 'Jump to current playing song' and 'Cancel current show'
-done
2012-10-30 11:18:11 -04:00
denise d97afabaea CC-4640: Automatically jump to current song when loading the Now Playing page.
-added check to see if a show is currently playing
2012-10-29 15:40:58 -04:00
denise 332f9993c0 CC-4640: Automatically jump to current song when loading the Now Playing page.
-done
2012-10-29 15:20:16 -04:00
denise fdd889d7a8 - fixed formatting 2012-10-29 12:09:11 -04:00
denise f30d636b17 CC-4581: Confirmation dialog for removing an item from a show refers to deletion 2012-10-19 16:19:32 -04:00
Martin Konecny d5c2c37a3e Revert "CC-4605: Some AJAX calls are cached"
This reverts commit ffca5b42a8.
2012-10-19 11:16:42 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
Martin Konecny ffca5b42a8 CC-4605: Some AJAX calls are cached 2012-10-19 11:07:37 -04:00
Daniel James a103c76378 CC-4558: Make button in Now Playing consistent with same action in Calendar 2012-10-15 12:27:16 +01:00
Martin Konecny 5a8510b909 remove gap on right side of show builder: part 3 2012-09-19 17:22:04 -04:00
Martin Konecny 84ed03ffac remove gap on right side of show builder: part 2 2012-09-19 16:55:44 -04:00
Martin Konecny a3b53ee3d3 remove gap on right side of show builder 2012-09-19 16:19:02 -04:00
denise 9c721f202f -small UI improvement 2012-09-18 11:05:13 -04:00
denise 1698aae251 CC-4466: Buttons on Now Playing page are clickable even though they are disabled
-fixed
2012-09-18 10:53:19 -04:00
Naomi Aro bb3ffce071 CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled 2012-09-17 16:28:28 -07:00
denise f840a9b24a CC-4451: (Firefox) Now Playing -> Can't cancel Current Show
-fixed
2012-09-17 12:30:43 -04:00
denise f02bf04a25 CC-4449: (Firefox) Now Playing -> Cancel currently playing track does not work
-fixed
2012-09-17 12:27:17 -04:00
denise b8b3bfb495 CC-4450: Now Playing -> Can't remove overbooked tracks
-fixed
2012-09-17 12:23:49 -04:00
denise e30d3b770c -removed unused code 2012-09-17 12:19:02 -04:00
denise 3c3b39796d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
-fixed
2012-09-17 12:10:23 -04:00
denise 99969ff19d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled
-fixed
2012-09-17 11:58:05 -04:00
denise 8f48544bb7 -implemented UI changes for Now Playing page 2012-09-13 17:10:38 -04:00
Martin Konecny eb4c23b0b6 CC-1665: Scheduled stream rebroadcasting and recording
-Fix scheduled streams mixed with scheduled files
2012-07-26 14:49:32 -04:00
James 78acd4f805 CC-4093: Timeline -> Alert for deleting track(s) appears twice by clicking
context menu

- fixed
2012-07-10 13:08:36 -04:00
denise 87afea63bf CC-4065: Timeline -> Cursor will disappear after a track is finished sometimes
-fixed
2012-07-03 18:22:48 -04:00
denise f6d79b1f54 CC-4063: Timeline -> Add a track to a show will cause another show's cursor to be selected
-fixed
2012-07-03 14:52:27 -04:00
denise e11fe8a2b8 CC-4058: Timeline -> Cannot add song twice if last cursor is selected
-fixed
2012-07-03 12:42:53 -04:00
denise bc569462ee CC-4057: Calendar -> Add/Remove contents: Lost cursor after add contents to a show
-fixed
2012-07-03 11:48:57 -04:00
denise 46604fdf59 CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty"
-fixed
2012-06-29 16:59:03 -04:00
denise 68420a898f CC-4044: Timeline -> Cursor keeps highlight even if the song is played
-fixed
2012-06-29 15:49:22 -04:00
denise 38cb439f53 CC-4036: Timeline -> A new Cursor will be selected when there are 2 shows and we add/delete items in timeline view
-fixed
2012-06-28 17:55:17 -04:00
denise 79513de1ba CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
-also added this functionality for the 'All my shows' checkbox
2012-06-28 17:07:01 -04:00
denise 61fc269b13 CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
-done
2012-06-28 16:55:43 -04:00
denise 9fb9fb3219 CC-4021: Media Library -> "+" button wont take effect if uncheck one and check another
-fixed
2012-06-27 17:19:55 -04:00
denise 12bf42d2f1 CC-4031: Timeline cursor vanishes when every once in a while
-fixed
2012-06-27 15:50:56 -04:00
Martin Konecny 0a0e873ef9 CC-4019: Library: When "Add content" is clicked, "Proccessing" image …
-fix small comment typo
2012-06-27 11:50:31 -04:00
James 31d643cee1 CC-3997: Now Playing -> Time Line: different behaviour between 'delete'
button and 'delete' menu items

- added confirm box on clicking delete button on now playing table
- also added confirm box on library delete button as well
2012-06-26 17:43:15 -04:00
James 576c13963d CC-3998: Now Playing -> Time Line: confirm message for user 'delete'
track by context menu is misleading

- fixed
2012-06-26 17:35:07 -04:00
James c2cc4253b3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-26 16:56:01 -04:00
James 9a14051f0b CC-4019: Library: When "Add content" is clicked, "Proccessing" image is keep
flickering

- fixed
2012-06-26 16:55:43 -04:00
denise d892a4b5ae CC-4009: Calendar icon cannot be clicked twice without clicking another icon first
-fixed
2012-06-26 16:43:36 -04:00
denise ca3d554c07 CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
-empty cursorId array after every callback
2012-06-26 15:49:17 -04:00
denise 05fa673e42 CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
-done
2012-06-26 15:36:45 -04:00
James 3a32e7240a CC-3984: Now Playing scissor and trashcan buttons are incorrectly labelled in
tooltips

- fixed
2012-06-20 16:49:41 -04:00
denise 8a63478c73 CC-3972: it is not possible to select tracks in Now Playing tab
-fixed
2012-06-12 14:58:33 -04:00
denise 8fae454db6 CC-3901: DJ not assigned to Show, Guest: selection dialog populated upon clicking on "Select All" button in Now Playing
-fixed
2012-06-07 17:04:31 -04:00
denise 9c89d263db CC-3880: NowPlaying-> there is no tooltip for the removed files available
-done
2012-06-05 11:20:00 -04:00
denise c554190faf -fixed indentation 2012-06-05 11:20:00 -04:00
Naomi Aro 1a49173d2f CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected 2012-05-30 17:46:24 +02:00
Naomi Aro d91850b1ca CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show 2012-05-24 18:10:36 +02:00
Naomi Aro 1b115178d3 CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show 2012-05-24 15:50:29 +02:00
Naomi Aro 0c233c3346 CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected 2012-05-23 17:06:04 +02:00
Naomi Aro 0b84dec86f CC-3862 : Now playing -> Time Line: Left clicking and "Select cursor" won't enable to add current selected track from Media Library 2012-05-23 12:18:51 +02:00
Naomi Aro 4fe80194b6 CC-3845 : General UI cleanup 2012-05-21 17:07:34 +02:00
Naomi Aro ff1327881a CC-3845 : General UI cleanup 2012-05-18 15:40:22 +02:00
Naomi Aro 07d029b8cc CC-3777 : Decide on what should happen with canceling recorded show 2012-05-15 14:56:31 +02:00
Naomi Aro ff5aebfd6b CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2012-05-14 15:06:56 +02:00
Naomi Aro 4e2aee83fd CC-3806 : "n" of Add n items increases unexpectly 2012-05-11 11:04:16 +02:00
Naomi Aro e61924de37 CC-3799 : Dragging and dropping a track from the library causes the track in the library to be selected 2012-05-10 14:19:36 +02:00
Naomi Aro a79514c8ee CC-3687 : Remove context menus from recorded shows since they are blank. 2012-05-07 15:24:06 +02:00
Naomi Aro a4b949cc2f CC-3753 : Cannot cancel record show on Timeline view 2012-05-07 14:28:21 +02:00
Naomi Aro 96d2f657f7 CC-3741 : Timeline's cursors looks a little bit far from timeline 2012-05-04 15:49:05 +02:00
Naomi Aro edaec54a5d CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file
using jquery.blockUI.js on timeline/playlist builder pages.
2012-05-04 15:00:18 +02:00
Naomi Aro 0a17b34885 CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours 2012-05-03 18:00:10 +02:00
Naomi Aro c2c6e1b114 CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours
updating datatables to stable 1.9.1 release.

optimizing javascript, using jquery to add/remove nodes to avoid JQuery.cache issues.
2012-05-03 15:04:23 +02:00
Naomi Aro c5f9288aab Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-02 11:15:20 +02:00
Naomi Aro b5b24ae8f1 CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours 2012-05-02 11:14:53 +02:00
denise 4477ac02e7 CC-3677: Tooltips improvements
-done
2012-04-30 16:20:23 -04:00
Naomi Aro f6ff289506 CC-3677 : Tooltips improvements 2012-04-27 15:53:37 +02:00
Naomi Aro e6b724c45a CC-3729 : Create same UI for timeline to select checkboxes. 2012-04-27 15:44:40 +02:00
Naomi Aro b9e13d3b08 CC-3715 : Library- carry over selected state between pages, be like gmail include select all/none 2012-04-27 11:22:44 +02:00
Naomi Aro b5863d3d7a CC-3522 : Now Playing Screen-> Periodical message pops up 2012-04-26 12:14:41 +02:00
Naomi Aro 7e0e631740 CC-3616 : ShowBuilder-> A tooltip remains in the Showbuilder frame permanently 2012-04-25 15:52:11 +02:00
Naomi Aro 8020ae0a29 CC-3688 : Make sure timeline knows to refresh itself when a rebroadcast file has been scheduled
forgot I commented out the check when fixing something in the past....
2012-04-24 17:21:59 +02:00
Naomi Aro 6b4fd7d3bb CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline 2012-04-20 13:03:50 +02:00
Naomi Aro c96c60dc5a CC-3620 : Calendar -> Unresponsive script warning when trying to add 300 ogg files
improving speed of js rendering,
datatables config is loaded from localstorage,
removed aggregate propel behaviour on cc_show_instances time_filled.
2012-04-16 16:33:32 +02:00
Naomi Aro 079862d2f2 CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date" 2012-04-03 16:11:53 +02:00
Naomi Aro db1287d6ec CC-3508 : Double Scrollbar in Show Builder menu 2012-04-03 15:19:38 +02:00
Naomi Aro 6c5eb384a5 CC-3508 : Double Scrollbar in Show Builder menu 2012-04-03 14:58:10 +02:00
Naomi Aro cf4704ad89 CC-3174 : timeline 2012-04-03 12:30:53 +02:00
Naomi Aro 0c2066a90e CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible 2012-04-03 12:12:50 +02:00
Naomi Aro 09bebaa68b CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible 2012-04-03 12:07:51 +02:00
Naomi Aro 6c25423f4e CC-3545 : Calendar->AddRemove (Now Playing Tab->Add Files to Show) -> changing order of tracks is not correct
removing table tools.
replacing with something simpler that will preserve order on screen.
2012-04-02 19:03:11 +02:00
Naomi Aro eeb7273909 CC-3542 : When you delete the current show it takes all songs from that show out of the playout history 2012-04-02 15:20:13 +02:00
Naomi Aro 9f0741a684 CC-3174 : timeline
don't highlight empty timeline.
2012-04-02 11:07:28 +02:00
Naomi Aro b5a8db6720 CC-3174 : timeline 2012-03-30 18:15:27 +02:00
Naomi Aro fcbf547456 CC-3174 : timeline 2012-03-30 18:03:45 +02:00
Naomi Aro 6dc9193682 CC-3553 : Now Playing screen-> Tooltip change for "jump to current item" button 2012-03-30 17:26:20 +02:00
Naomi Aro 5242ac45a9 CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized 2012-03-30 17:13:17 +02:00
Naomi Aro 2ab6ea98a6 CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized 2012-03-30 16:33:43 +02:00
Naomi Aro 6ddc8288be CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized 2012-03-30 16:04:00 +02:00
Naomi Aro bb1f94c796 CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized
fixing now playing screen.
2012-03-30 15:33:52 +02:00
Naomi Aro b39db57d0c CC-3501 : Calendar->Show->Add media files from Library better usability may be proposed 2012-03-30 14:45:30 +02:00
Naomi Aro f48c5ff575 CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 15:34:58 +02:00
Naomi Aro 1b8a967cc0 CC-3174 : timeline
register js getting in way of toggling.
2012-03-29 11:32:27 +02:00
Naomi Aro 1e9348f27f CC-3509: "Add Files" button (make it look better) 2012-03-28 17:50:14 +02:00
Naomi Aro aca6e995dd CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not 2012-03-28 17:29:34 +02:00
Naomi Aro fe21abf16d CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not 2012-03-28 16:14:02 +02:00
Naomi Aro 03c5daa9e7 CC-3534 : Check Scheduling Edge Cases 2012-03-28 14:26:38 +02:00
Naomi Aro c1bdc6ff0f CC-3463 : Usability improvements for timeline
working on timeline context menu.
cursor/play functions.
2012-03-27 18:27:58 +02:00
Naomi Aro d9a42c4e40 CC-3463 : Usability improvements for timeline 2012-03-27 17:47:21 +02:00
Naomi Aro 9c52b2ee1f CC-3174 : showbuilder
fixing jplayer preview
2012-03-27 16:27:43 +02:00
Naomi Aro dfc6ae6273 CC-3463 : Usability improvements for timeline
started to add cursor options to context menu.
2012-03-27 15:46:25 +02:00
Naomi Aro 296a5c583a CC-3407 : Timeline: Display if tracks are missing on disk 2012-03-27 15:16:07 +02:00
Naomi Aro 10e4ae781f CC-3451 : Ability to delete the currently playing clip 2012-03-27 12:44:48 +02:00
Naomi Aro 275faa1881 CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time 2012-03-26 19:08:52 +02:00
Naomi Aro 5facac4cd6 CC-3174 : timeline 2012-03-26 12:31:35 +02:00
Naomi Aro 91d44847cb CC-3506 : Timeline: smaller columns for time values 2012-03-26 12:24:16 +02:00
Naomi Aro ac9fc9f665 CC-3436 : timeline usability 2012-03-23 18:54:03 +01:00
Naomi Aro 95f97ccc55 CC-3463 : Usability improvements for timeline 2012-03-23 18:27:47 +01:00
Naomi Aro a77ac56621 CC-3463 : timeline usability
removing auto scrolling to now playing item, bad idea.
2012-03-23 16:46:08 +01:00
Naomi Aro 711d1f202a CC-3463 : Usability of timeline
changing buttons to be jquery ui icons.

adding button to trim overbooked
adding button toscroll current item to top.
2012-03-23 16:42:08 +01:00
Naomi Aro 13bbdc327e CC-3360 : timeline css
mistyped selector.
2012-03-23 01:56:56 +01:00
Naomi Aro 8af4f052e0 CC-3360 : timeline css 2012-03-23 01:46:45 +01:00
Naomi Aro da02bb7076 CC-3360 : Timeline Css 2012-03-22 19:15:39 +01:00
Naomi Aro 1fdb3cf163 CC-3360 : Timeline Css
adding Css to timeline.
2012-03-22 18:04:22 +01:00
Naomi Aro e76cffd8b0 CC-3463 : timeline usability
moving multiple files within the timeline.
2012-03-20 17:55:35 +01:00
Naomi Aro 8105c6571c CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added
if something is added after a footer, it will be added to the end of whatever is before the footer.
2012-03-19 14:48:11 +01:00
Daniel 5b953443c6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/public/js/airtime/showbuilder/builder.js
2012-03-15 18:12:15 -04:00
Daniel ae0d3c560c CC-3394: Add play button to timeline table.
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
2012-03-15 17:56:51 -04:00
Naomi Aro 7a8398bd32 CC-3174 : showbuilder
including context menu to delete items from timeline.
2012-03-15 16:11:29 +01:00
Naomi Aro 68a4443c36 CC-3174 : showbuilder
changing get to post.
2012-03-14 20:10:10 +01:00
Naomi Aro f28f6659dc CC-3403 : Replace Now Playing with the new Timeline screen 2012-03-12 14:23:03 +01:00
Naomi Aro 3b32a16813 CC-3174 : showbuilder
setting a timeout to refresh when the first item on the timeline starts incse there is no "current" item.
2012-03-12 13:25:03 +01:00
Naomi Aro 20db8d6fdf CC-733 : broadcast logs
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
Naomi Aro fe3c340a90 CC-3174 : showbuilder
making library table only scroll on the table part.
2012-03-07 18:27:32 +01:00
Naomi Aro e9627bca07 CC-3174 : showbuilder
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
Naomi Aro 6c5f710329 CC-3174 : showbuilder
making each separate widget scrollable (playlist, library, timeline)
2012-03-06 13:19:20 +01:00
Naomi Aro 59b7f4ab56 CC-3174 : showbuilder
adding timeout for the now playing song, as well as polling every 20 seconds.
2012-03-02 18:16:44 +01:00
Naomi Aro f4fac98221 CC-3174 : showbuilder
adding back polling.
2012-03-02 17:25:44 +01:00
Naomi Aro 29b03c1181 CC-3174 : showbuilder
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +01:00