Commit Graph

205 Commits

Author SHA1 Message Date
Naomi Aro 2f712535ad CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible 2012-04-03 11:57:53 +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 7a6cdeaf10 CC-3174 : timeline 2012-03-26 12:36:06 +02: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 8af4f052e0 CC-3360 : timeline css 2012-03-23 01:46:45 +01:00
Naomi Aro f1d76443ab CC-3360 : timeline css 2012-03-23 00:11:49 +01:00
Naomi Aro 7ab0289d12 CC-3360 : timeline css
changed library search width calculation to be in library.js
2012-03-22 23:31:18 +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 8925d44252 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-16 11:26:08 +01:00
Naomi Aro d03e565861 CC-3174 : showbuilder
adding more length options to library, these ones should still fit without scrolling the page.
2012-03-16 11:26:03 +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
Daniel 927e5033c8 CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
- Updated detection of ogg or mp3 files
2012-03-13 14:12:14 -04:00
Daniel 09b5d9003b CC-3395 Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
- Updated library.js because I lost my changes during merge
2012-03-12 11:57:30 -04:00
Daniel c0b0e8079b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-12 11:33:28 -04:00
Naomi Aro 3145c24ba2 CC-3174 : showbuilder
changing queries for datatables to use the Datatables model class.
2012-03-12 15:32:24 +01:00
Daniel d713f830cd CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/public/js/airtime/library/library.js
2012-03-12 10:23:50 -04:00
Daniel 48aeaaf05a CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
- merging with devel
2012-03-12 10:20:58 -04:00
Daniel 470cf0dbf8 CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
- Updated jplayer so it now shows a list view under the player which shows details of the track being played, and for playlists the entire playlist list.
- Also enabled playing playlists from the library.
2012-03-09 18:47:08 -05: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 a4d07b3060 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
2012-03-07 10:33:00 +01:00
Daniel 709e117f41 CC-3391: Audio Preview cannot play tracks with commas in their filename
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
2012-03-06 13:50:07 -05:00
Naomi Aro 157078b963 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
2012-03-06 13:51:37 +01:00
Naomi Aro 64fe303b20 CC-3174 : showbuilder
fixing indentation.
2012-03-06 13:35:21 +01:00
Daniel a09b63b8d0 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
2012-03-05 19:00:14 -05:00
Daniel a246f85a5b CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- Merged with devel, removed js from StoredFile.php
2012-03-05 19:00:14 -05:00
Daniel dd3b7afff2 Updated library so I can play a song. 2012-03-05 19:00:14 -05:00
Daniel 6ff24bd1fd Updated Library logic so I can play a song in the library.
Still need to be able to get the song file from the element and
update the playlist builder so its player respects cuein/cueout and fadein/fadeout
2012-03-05 19:00:14 -05:00
Naomi Aro a832a40c75 CC-3174 : showbuilder
making the library a separate scrollable from playlist
2012-03-05 18:14:10 +01:00
Naomi Aro 99b490129c CC-3174 : showbuilder
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
Naomi Aro a8f53d169b CC-3174 : showbuilder
sizing bit rate/sample rate in library, text right aligned.
2012-02-29 17:47:26 +01:00
Naomi Aro bc1d519408 CC-3174 : showbuilder
showing message if some files could not be deleted since they were scheduled.
2012-02-29 16:02:41 +01:00
Naomi Aro 0f91f91c41 CC-3174 : showbuilder
adding checks to enable/disable buttons for playlist & timeline.
2012-02-29 15:47:11 +01:00
Naomi Aro 9b639a9b6d CC-3356 : Library & Timeline : remove zero prefixes from numbers 2012-02-28 15:38:57 +01:00
Naomi Aro 66ff3c61c3 CC-3330 : library behaviour. 2012-02-24 21:21:53 +01:00
Naomi Aro 19d13889af CC-3351 : Track length should only show to tenths of a second in the library
created a length formatter to use in multiple places.
2012-02-24 15:07:04 +01:00
Naomi Aro 28bb97acfa CC-3174 : showbuilder
allow user to filter library by

files/playlists or all.
2012-02-24 00:55:20 +01:00
Naomi Aro b357b80054 CC-3174 : showbuilder
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.

starting to use new cursor arrows.
2012-02-23 12:13:00 +01:00
Naomi Aro c89451f880 CC-3340 : Remove "Search" tab from library view 2012-02-22 21:56:55 +01:00
Naomi Aro d4c7b832c9 CC-3174 : showbuilder
fixing up library table to include all interesting columns if a user would like to choose to see them.
query is done with propel.
2012-02-22 18:38:33 +01:00
Naomi Aro 0ba3049528 CC-3174 : showbuilder
removing old scheduling method code to avoid confusion.
2012-02-22 13:19:49 +01:00
Naomi Aro 5703508beb CC-3174 : showbuilder
col reorder resize isn't new enough to work with the new save/load callbacks.
switched to just the col reorder plugin written by Allan( datatables author)
2012-02-22 11:43:37 +01:00
Naomi Aro 5f89975c64 CC-3174 : showbuilder
datatables state restore needs real booleans not strings.
2012-02-22 00:02:35 +01:00
Naomi Aro 9b5a0fc565 CC-3174 : showbuilder
working on trying to save/load state serialized into the db for datatables.
2012-02-21 17:31:54 +01:00
Naomi Aro 17c3cdcfb2 CC-3174 : showbuilder
fix ordering problem with track column.
2012-02-20 11:41:44 +01:00
Daniel 190490d6f4 CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0)
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
2012-02-15 11:21:21 -05:00
Naomi Aro 776d1b65e8 CC-3174 : showbuilder
fixing merge, testing that affected functionality still works.
2012-02-06 11:23:10 +01:00
Naomi Aro 8212624c4a CC-3174 : showbuilder
fixed moving an item to an earlier position in a show,
timeline needs a width or connected list doesn't work.
place holder still has problems with floats.
2012-02-06 01:51:22 +01:00
Naomi Aro 16863ee95e CC-3174 : showbuilder/library
playlist fades are working again, still need more error checking to be done.
2012-02-05 23:38:12 +01:00
Naomi Aro fbec92cb0d CC-3174 : showbuilder/library
soundcloud icon stuff is back.
2012-02-05 19:48:23 +01:00
Naomi Aro 072e13a943 CC-3174 : showbuilder
add/delete buttons functions
still not displaying enable/disable when needed.
2012-02-05 19:11:48 +01:00
Naomi Aro 226a3ffbea CC-3174 : showbuilder/lib refact
add button now functional for playlist,
still need to enable/disable when appropriate.
2012-02-05 18:46:52 +01:00
Naomi Aro 6c2475bf1f CC-3174 : showbuilder
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
2012-02-05 18:19:22 +01:00
Naomi Aro da5e1ac302 CC-3174 : showbuilder/library
adding new context menu, link to view on soundcloud doesn't seem to work.
2012-02-05 13:56:07 +01:00
Naomi Aro 3b172f9c0c CC-3174 : showbuilder
reset button is working.
2012-02-03 00:56:14 +01:00
Naomi Aro 6da4397a96 CC-3174 : show builder
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
2012-02-02 23:15:39 +01:00
Naomi Aro 0199f572bd CC-3174 : showbuilder
dragging into timeline is working
need to replace jjmenus
2012-02-02 15:51:15 +01:00
Naomi Aro 8b93b98e24 CC-3174 : show builder
removing widths where unneeded.
2012-02-02 01:33:53 +01:00
Naomi Aro 942cfaac25 CC-3174 : show builder
moving columns around in library to look better.
2012-02-02 01:29:50 +01:00
Naomi Aro 3aab811a3e CC-3174 : showbuilder
fixing some css/js for display.
2012-02-01 23:33:20 +01:00
Naomi Aro f5b2a23eb1 CC-3174 : showbuilder
group add/delete is working
2012-02-01 18:47:08 +01:00
Naomi Aro fbda0e733b CC-3174 : showbuilder
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
2012-01-31 18:59:27 +01:00
Naomi Aro 3f3117cf0e CC-3174 : Show builder
creating a scheduling system to work with the new timeline in mind using propel.
2012-01-27 21:06:04 +01:00
Naomi Aro b0c3bace1c CC-3174 : show builder
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
2012-01-26 15:21:04 +01:00
Naomi Aro ecaebbeb67 CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones. 2012-01-23 19:07:07 +01:00
Naomi Aro 424206b9a9 CC-3174 : Show Builder
data tables column resizing, starting separating out events.
2012-01-17 11:18:17 +01:00
Naomi Aro 859213b760 CC-3174 Show Builder
experimenting
2012-01-16 09:56:57 +01:00
Yuchen Wang 09df61d027 CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
Fixed the bug where checkbox change events get handled multiple times
2012-01-11 15:36:45 -05:00
Yuchen Wang cf045652ec CC-1986: Configurable columns for media search
- Fixed some hardcoded array access
- Fix js error in ColReorder
2012-01-11 10:41:58 -05:00
Yuchen Wang d1d01e55ce CC-1986: Configurable columns for media search
- added column 'utime' (upload time) and 'lptime' (last played time) in the tables cc_files and cc_playlist
2012-01-10 14:45:43 -05:00
Yuchen Wang 7d9aa3ca5d CC-2299: Better column options in playlist/file list on playlist builder
- allow columns to be re-ordered; note that the 1st two columns are fixed in-place to avoid some
problem with the ColVis plugin
2012-01-10 09:52:32 -05:00
Yuchen Wang 7a27be878b CC-1986: Configurable columns for media search
- Added "Year" column
- Added "Upload Time" column
- Fixed some formatting issue
2012-01-08 22:31:18 -05:00
Yuchen Wang a1ccb9c42a CC-1986: Configurable columns for media search
- Upgraded ColVis plugin to 1.7, as this one contains some bug-fix that we need
- Added CSS file for ColVis plugin, so that we don't have to modify the plugin code
- Added the Configure Columns UI code
2012-01-08 10:33:11 -05:00
Yuchen Wang 8833f4462e CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
- Added checkbox column to playlist builder
- Added the ability to add multiple songs to playlist by using checkboxes and "Add" button
- Added the ability to delete multiple songs/playlists by using checkboxes and "Delete" button
- Make them look nice by adjusting CSS and datatable
2012-01-07 23:37:37 -05:00
James 5fa92f3d17 - temp commit on group action 2012-01-04 12:47:27 -05:00
James ac50c279f7 CC-3215: When you click on Playlist Builder, for a brief instant you see the
library table headings with different columns

- fixed
2011-12-20 15:00:20 -05:00
Naomi Aro f15429c8d6 CC-3144 : Search box shows Track, Show Contents box shows Genre
replaces track number with genre.
2011-12-01 11:16:29 +01:00
Yuchen Wang 1fd29def27 CC-2436: Save pulldown settings
Move the code that updates the database for the "show entries" dropdown to
a more appropriate place.
2011-11-16 16:12:58 -05:00
Yuchen Wang a363a53166 CC-2990: Library: Remember search string
Fixed by telling datatable to save the states
2011-11-07 15:07:56 -05:00
James fb8735588d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-22 11:34:43 -04:00
James f160ded6bc CC-2993: Playlist Builder: add "View on SoundCloud" option on the menu
- fixed
- extra fix: handles the case when username or password is empty
2011-10-22 11:34:04 -04:00
Yuchen Wang d2fe46baf0 CC-2436: Save pulldown settings
For week and day views under Calendar page, save the change to pref db table when
user updates the interval dropdown. Same thing goes for the "show XXX entries"
dropdown found under Playlist Builder page.

When visiting these pages, we retrieves the entry from database for current user
and use those values. Defaults to 30m for interval and 10 entries for "show xxx entries"
if values were never set.
2011-10-18 10:10:35 -04:00
James 1d2a9709a8 CC-2872: Playlist builder: Metadata tooltip displays in upper left
hand corner when changing number of rows to display on the screen

- The metadata is now displayed on right click
2011-10-12 16:38:07 -04:00
James 03a339bfeb CC-2937: Remove the word "Metadata" from metadata popup window
- done
2011-10-06 12:39:10 -04:00
James e2ff0a6a94 CC-2920: Playlist: soundcloud icon appears multiple time when
click on reupload to soundcloud

- fixed
2011-10-03 16:50:50 -04:00
James 4f11428b60 CC-2920: Playlist: soundcloud icon appears multiple time when
click on reupload to soundcloud

- fixed
2011-10-03 14:13:02 -04:00
James 965a649d0e CC-2591: Change function name
- done
- extra fix: fix was needed due to class name change
2011-09-22 14:01:05 -04:00
James 43ba92a535 CC-2866: progress icon not showing
- fixed
2011-09-22 12:15:03 -04:00
James 73dc4b851d CC-2591: Allow upload of any audio clip to Soundcloud
- done
- need more styling
- note there were changes in style.css
2011-09-22 11:47:24 -04:00
James 8239588a95 CC-2798: Delete a song from the playlist builder doesn't refesh
the list

- fixed
2011-09-09 11:35:30 -04:00
James 968c0f96a2 CC-2651: import idicator
- Threshold is 10 seconds
- record timestamp once every 5 seconds
- "File import inprogress..." displays above search box
- pyinotify read_freq changed to 0.1 from 1
2011-08-09 10:40:10 -04:00
James 05b2a9679b CC-2651: Prevent chaning the storage dir while import is happening
- done
2011-08-08 17:07:52 -04:00
James 9ff5bdaf0f CC-2652: display info about import
- temp commit
2011-08-08 14:44:05 -04:00
Naomi Aro c7279f74ca CC-2558 : Only delete files from disk that are in stor directory and not scheduled etc. 2011-07-18 19:48:20 +02:00
James 24891604d3 CC-2507:Deleting a playing during editing does not refresh page
- fixed
2011-07-14 16:57:40 -04:00
martin b802ba9a42 cc-2381: slow library searching speed
-implemented 350ms keystroke delay before searching
2011-06-17 14:41:57 -04:00
james 6e7ad79ff0 CC-2064:Drag and drop should have a hand cursor
Fixed
2011-05-30 14:12:32 -04:00
James Moon 6bbbdd5404 CC-2238: Deleting a playlist from right list
Fixed.

1. It only clears the left window form if 'delete' action is
clickced on the opened playlist.
2. similar functionality was implemented when 'edit meatadata'
form is opened in the left window.
2011-05-05 16:52:38 -04:00
martin 50c649dc59 Merge branch 'cc-2211-changes-to-playlist-not-shown' into devel 2011-04-29 15:31:18 -04:00
James Moon c322b8fb7f cc-2238:deleting-a-playlist-from-right-list
fixed.
2011-04-27 14:22:50 -07:00
James Moon bf34170f29 Temp commit.
It's not done, need to work more later.
2011-04-25 10:11:12 -07:00
martin fab68dfad1 CC-2203: Search results: "Delete" should be at the bottom of the list and should have a confirmation
-Fixed
2011-04-18 12:43:04 -04:00
Paul Baranowski b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00