Commit Graph

332 Commits

Author SHA1 Message Date
martin 2310c24f26 CC-1823 definitely fixed now. 2011-01-30 17:27:58 -05:00
martin 0ba5a1f520 -bug CC-1823 should be fixed. 2011-01-30 16:47:11 -05:00
martin 7c70385528 -added new login screen 2011-01-29 13:47:06 -05:00
martin 43c66825b4 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	public/css/styles.css
2011-01-28 18:37:45 -05:00
martin d15a18992e -added new css files 2011-01-28 18:35:13 -05:00
Naomi 476cf99019 added timepicker to add show form. 2011-01-28 18:24:52 -05:00
Naomi 38b01ea43f Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-28 17:37:55 -05:00
Naomi 10d9d13993 some basic form work, need to lear more about custom form validation/rendering. 2011-01-28 17:37:31 -05:00
martin 726849539f -fixed Now Playing datatable font size 2011-01-28 17:33:51 -05:00
martin 86efed5793 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-01-28 16:32:58 -05:00
martin 6651688940 -added support to preview mp3+ogg audio (chrome only so far). 2011-01-28 16:32:38 -05:00
Naomi 381cdc11a9 CC-1791 favicon added to public folder. 2011-01-28 16:32:09 -05:00
martin c673b12046 -began adding basic foundation for show list-view. 2011-01-28 11:18:12 -05:00
martin 844baeeae6 -started adding show list-view 2011-01-28 00:23:39 -05:00
Naomi f18f500e1e everything is implemented backend wise for schedule dialog, just need to add html/css changes 2011-01-27 18:38:02 -05:00
Naomi be4d3f5466 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-27 15:11:31 -05:00
Naomi a41c6475f4 can drag song to a certain point in the playlist. 2011-01-27 15:11:19 -05:00
martin 619fad9e4b -formatting 2011-01-27 14:18:11 -05:00
martin 14e049631e -should fix delay in rendering the now playing bar when song starts. 2011-01-27 14:17:35 -05:00
martin 4441001eca -fixed menu 2011-01-27 12:22:38 -05:00
Naomi 1183b69149 datatable doens't have auto width 2011-01-27 12:13:41 -05:00
Naomi 83c22891af Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-27 11:51:27 -05:00
Naomi 8bc2038597 using jqueryUI with datatables 2011-01-27 11:51:02 -05:00
martin 881bb042a3 -made pypo not schedule playlists more than 5 seconds old.
-fixed up some time formatting on the now playing bar
-now-playing datagrid should switch much faster between songs
-updated menu
2011-01-27 10:07:30 -05:00
martin b5a1f0fa81 -a lot of code cleanup 2011-01-26 23:32:43 -05:00
martin 8151ec6429 -added now-playing bar with new design! 2011-01-26 20:59:56 -05:00
Naomi 9e20e935ca Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-26 18:32:27 -05:00
Naomi 293575a457 vladimir's changes on the playlist builder screen so far. need some changes to cue/fade editor and css for datatables 2011-01-26 18:31:59 -05:00
martin 0f786c5290 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-01-26 17:09:39 -05:00
martin 5b11025b31 -added listen to icecast stream through browser option. Fixed various bugs in now playing screen. added fade support to liquidsoap script 2011-01-26 17:08:30 -05:00
Naomi de3c95bd36 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-26 14:18:18 -05:00
Naomi f6d270616a full functionality of media library now available using datatables, advanced search is not done. 2011-01-26 14:17:52 -05:00
naomiaro bbe09164ae changed old ids of datepickers so that min/max dates available work. 2011-01-25 23:18:05 -05:00
naomiaro a607951ed9 adding autocomplete from backend source into add show page. 2011-01-25 23:14:35 -05:00
Naomi a0ecbecf3b datatable supports offset/limit server side fetching of table data. js events are added onto each row. need to fix ordering, searching. 2011-01-25 18:41:59 -05:00
mkonecny c109fb5f01 -improved now-playing page 2011-01-25 18:41:59 -05:00
mkonecny e8d7b59127 -datagrid now highlights current song playing 2011-01-25 15:25:24 -05:00
mkonecny 51f77dba50 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-24 19:20:06 -05:00
mkonecny c8b7cffdc6 -changes to now playing bar 2011-01-24 19:19:51 -05:00
Naomi 1e6f25f148 adding autocomplete from backend source to add shows. 2011-01-24 18:44:28 -05:00
Naomi 3cd5444f49 add show ability is now presented as a screen rather than in a dialog. 2011-01-24 17:26:43 -05:00
mkonecny 5173674714 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-21 18:15:13 -05:00
mkonecny 6553663051 -begin adding datagrids 2011-01-21 18:14:59 -05:00
Naomi 49cbee9db7 fix to add show dialog if error. 2011-01-21 14:56:04 -05:00
Naomi b3ccd6ab1c can change the colors of shows if set in add show dialog, otherwise takes default from css style sheet. 2011-01-21 14:43:38 -05:00
Naomi 7bdfd60ea9 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-21 13:25:34 -05:00
Naomi c83244fb3a add show form is broken up into tabs. 2011-01-21 13:25:12 -05:00
Naomi 42e2e0d407 working on add show screen, using subforms and jqueryUI tabs to separate adding show decisions. 2011-01-20 18:30:53 -05:00
Naomi dc2208d9ee adding colorpicker plugin to project 2011-01-20 18:29:59 -05:00
mkonecny 8d5aea0d14 -basic now playing bar 2011-01-20 17:14:14 -05:00
naomiaro ee3a1139bb Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-19 23:55:38 -05:00
naomiaro e9e7ad187b seeing how to modify a fc event's colour... 2011-01-19 23:55:01 -05:00
mkonecny 7bed63e675 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-19 18:38:13 -05:00
mkonecny 7450195854 -basic now-playing toolbar. Some data still needs to be populated. 2011-01-19 18:32:20 -05:00
Naomi e27c42fef6 deleting repeating shows only deletes shows in the future, but having problems with full calendar caching results or something so display on calendar can be incorrect. 2011-01-19 15:21:11 -05:00
Naomi 84111d23a3 content editable spans will send their value on enter. 2011-01-18 14:57:54 -05:00
Naomi 193bb87879 removed useless handlers which caused problems from my beta release rush. 2011-01-18 14:42:29 -05:00
Naomi d770125206 cues/fades now in content editable span. 2011-01-18 13:34:36 -05:00
Naomi e335d6d89f small fixes to media library, artist now says creator. 2011-01-17 14:11:56 -05:00
Naomi 2adae84447 clears eidtor error when you choose to edit something else. 2011-01-17 13:59:16 -05:00
Naomi 6376a25463 cue/fade editor done for new playlist builder 2011-01-17 13:55:43 -05:00
naomiaro 7cf55e0201 side playlist looks good. 2011-01-16 23:43:12 -05:00
naomiaro 9b4f9c8aa4 changed cue in edit to happen when cliplength clicked to avoid event problems with moving playlist items. 2011-01-16 20:40:34 -05:00
naomiaro 8887ce24d1 can get cues/fades to display in new playlist builder.
cannot change them yet.
2011-01-16 19:31:10 -05:00
naomiaro 3674989461 set up fade buttons with some style. simple javascript to highlight the active choice for either editing fades or cues. 2011-01-16 18:37:02 -05:00
naomiaro ccb36c8106 changed to better looking theme with newer version of jquery UI. Can create new playlists on the side. 2011-01-16 17:12:02 -05:00
naomiaro 01df8d8d6b CC-1708 added x instead of input to remove items. Merging side playlist and playlist into one. 2011-01-16 15:35:00 -05:00
naomiaro da85a5ad26 better javascript for schedule dialog events 2011-01-16 00:16:23 -05:00
naomiaro e269b74e25 show contents mostly styled, playlist choices needs work. 2011-01-16 00:11:16 -05:00
naomiaro e3cf552a22 arrows switch properly for scheduled description. 2011-01-15 20:53:31 -05:00
naomiaro 86a4998e0a shows time filled in show, with progress bar and time. 2011-01-15 18:23:15 -05:00
naomiaro 25c7d4cb90 backend mostly done for show, can remove a scheduled group from a show. 2011-01-15 14:59:41 -05:00
naomiaro f2560a6aa6 when deleting a group following groups in show update their times. 2011-01-15 13:10:10 -05:00
naomiaro 2de6944a20 dialogs are modal on schedule screen. 2011-01-14 16:23:16 -05:00
Naomi 61c826f8ed Ui for show scheduling 2011-01-14 15:35:24 -05:00
naomiaro a4fb54cd01 show and hide file content of scheduled items. 2011-01-13 23:44:36 -05:00
naomiaro f312ea0d60 show will open dialog properly showing scheduled content if there is any 2011-01-13 18:27:44 -05:00
naomiaro a8f24952bd updates the playlists that can be chosen for the show. 2011-01-13 18:01:15 -05:00
naomiaro 0ffa232b6d schedule show finds playlists available and returns show content better 2011-01-13 16:24:10 -05:00
naomiaro ad869e0f7f will display in the UI what is scheduled in a show when you add things. 2011-01-12 19:40:05 -05:00
naomiaro 1f8ac9719f can add multiple playlists to a show, doesn't check length or update playlists based on time left. GUI is bad. 2011-01-12 15:47:44 -05:00
naomiaro aee0b09749 type ahead search in scheduling playlists dialog. 2011-01-10 15:26:11 -05:00
naomiaro c1c4c4e598 database changes for name, searching for playlist for a show. 2011-01-10 13:24:21 -05:00
mkonecny 745e4977f4 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-06 17:13:11 -05:00
mkonecny fb7b56b2c3 -synchronize 2011-01-06 17:07:45 -05:00
Naomi 9854834b26 adding fields to allow for multiple playlists scheduled in a show 2011-01-06 16:20:51 -05:00
naomiaro 7aac80ed58 renaming for airtime 2011-01-06 01:12:24 -05:00
naomiaro d9e8e1641a Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	application/controllers/LibraryController.php
	application/controllers/SearchController.php
2011-01-06 01:05:34 -05:00
naomiaro ee0a8310de small problem with order, quicksearch working, code could be better. 2011-01-06 01:00:33 -05:00
naomiaro ff02a42514 quick search is working, with small paginator ajax url hack 2011-01-06 00:23:22 -05:00
mkonecny 7e96572aee -updated to use new database name, login and passwd (all 3 are "airtime"). You may delete old database by typing "dropdb -U campcaster -h localhost campcaster" 2011-01-05 19:05:57 -05:00
mkonecny 20c392343b -changed some references from campcaster to airtime in the documentation / comments 2011-01-05 12:19:58 -05:00
naomiaro 101b6fafa6 searching includes groups for and/or 2011-01-04 19:18:44 -05:00
naomiaro 5836548075 CC-1750 hours needed floor for 5min show. 2011-01-03 14:19:09 -05:00
naomiaro 75cd410ba4 search uses pagination 2011-01-03 11:47:21 -05:00
naomiaro 41c76e2c7d fix search to remain consistent with library. 2010-12-30 14:38:48 -05:00
naomiaro c4053a1b38 Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-30 13:39:51 -05:00
naomiaro 6293eb73c4 back to right click 2010-12-30 13:38:58 -05:00
naomiaro fc2e407ad0 still old context menus for schedule, wondering why they aren't popping up. 2010-12-30 13:32:59 -05:00
mkonecny 4ac347cb65 -currently playing + playlist now available (as a Jquery plugin!). Next step is to improve UI. 2010-12-30 11:42:31 -05:00
martin ffa508de34 -synchronize 2010-12-30 09:41:52 -05:00
naomiaro d2b1bf0622 new jjmenu for dynamic context menus. playlists in library.
need to work on javascript callback
2010-12-29 18:43:17 -05:00
mkonecny 8404fa4145 -synchronize - broken 2010-12-29 17:01:28 -05:00
naomiaro e768539ea8 search maintains state 2010-12-22 15:08:38 -05:00
naomiaro b1a4cb5bd4 delete active pl done for side playlist 2010-12-22 13:05:32 -05:00
naomiaro 8f088abaea close working on side playlist 2010-12-22 12:42:46 -05:00
naomiaro 498a8c6823 set new link on side playlist. 2010-12-22 10:27:05 -05:00
naomiaro 4e7b3ce86b minor fixes 2010-12-21 23:56:14 -05:00
naomiaro 5795871bcc layout has more widget-like setup now. side playlist reused in search. 2010-12-21 23:33:58 -05:00
naomiaro 565d789baa Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-21 17:48:08 -05:00
mkonecny c437d2f671 -added some required files. 2010-12-21 18:30:30 -05:00
naomiaro 055f541657 side playlist working, need to add to search page as well. 2010-12-21 17:47:51 -05:00
naomiaro 83d8975110 can drag to side playlist 2010-12-21 17:08:29 -05:00
naomiaro 9fd60932bd side playlist almost done, just need to do drag and drop. 2010-12-21 16:45:36 -05:00
Naomi 3d952eb1bd auto complete box for hosts. 2010-12-17 15:52:44 -05:00
Naomi ace30e9766 more show overlap checks, still testing. 2010-12-17 11:49:18 -05:00
naomiaro cda8467124 slight fix for overnight shows, need to improve for shows longer than 24 hours. 2010-12-16 23:45:11 -05:00
Naomi 06a8e65366 working on jqueryUI progress bar for show, don't like how the progress bar displays 0% 2010-12-16 18:24:37 -05:00
Naomi 28bd92d073 added visual icon to event to show if a show has content scheduled. 2010-12-16 16:24:16 -05:00
Naomi d95c4ab0fc can schedule in a show (just one playlist currently), schedule table is cleared of shows contents when a show is deleted, can clear a show of contents. 2010-12-16 15:15:43 -05:00
naomiaro f9813ca823 maketimestamp function 2010-12-16 00:47:32 -05:00
naomiaro ce6a3f0278 clear a show, schedule a playlist during a show. 2010-12-15 22:33:45 -05:00
Naomi 1d9aa778a6 can add a playlist to the schedule table in a show. basic, need to make better. 2010-12-15 18:53:47 -05:00
naomiaro f1a59f305b tests with qtip,small changes 2010-12-14 14:58:34 -05:00
naomiaro e8965fd30a show hosts have option to schedule, (not implemented yet, just context menu) 2010-12-13 11:49:45 -05:00
naomiaro 4e2c791bd3 putting in context menu for shows, simple delete. 2010-12-10 17:59:57 -05:00
naomiaro 52c8bc3a01 tells you what shows overlap on add, re adds datepickers to newly displayed form. 2010-12-10 15:44:36 -05:00
naomiaro d94063fbe4 changed how shows saved in database to make keeping track of host permissions easier. 2010-12-10 12:15:17 -05:00
naomiaro 6ff92ee7b3 can put in multiple days for end show, checks show_end epoch.
working on moving shows
2010-12-09 14:33:34 -05:00
naomiaro 8dbc07e352 using zend form for validation of adding shows, still needs some UI tweaks for showing/hiding options 2010-12-08 15:40:53 -05:00
naomiaro ac27a2f79c can add a show repeating or non repeating. need a better dialog though with more validation. Also added additional sql files to build directory. 2010-12-08 00:47:51 -05:00
naomiaro 7ef0c18b26 adding zend project folders into old campcaster. 2010-12-07 14:19:27 -05:00