Commit Graph

458 Commits

Author SHA1 Message Date
mkonecny ce23df43d1 updated navigation menu 2011-02-09 15:25:16 -05:00
mkonecny c4893e9d36 -updated list-view UI 2011-02-09 15:23:32 -05:00
Naomi 108bf65930 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	application/controllers/ScheduleController.php
2011-02-09 14:15:18 -05:00
Naomi be5ec4c45d working on editing shows 2011-02-09 14:12:07 -05:00
mkonecny c0d5cc4809 -list view updated 2011-02-09 14:09:42 -05:00
mkonecny 50054befd6 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	.zfproject.xml
	application/configs/airtime-conf.php
	build/build.properties
	public/css/styles.css
2011-02-09 13:07:36 -05:00
mkonecny 3b4fa1cc1a -added new users management screen 2011-02-09 13:03:46 -05:00
Naomi 918f4ec96d forogt to check a view in, not used though. 2011-02-08 18:47:04 -05:00
Naomi 3d3515812a added monthly show option, bit more javascript to show/hide info when not needed in add show tabs. 2011-02-08 18:22:51 -05:00
Naomi bdad3b34e0 CC-1862 playlist builder playlist fadein/out 2011-02-08 16:10:48 -05:00
Naomi 424c6f0193 CC-1887 shows are now resized properly with delta day. schedule dialog includes end day since shows can be longer than 1 day now, playlist search must look for an interval given the time increase. 2011-02-08 15:06:31 -05:00
mkonecny ee5e8f48ce Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-08 12:22:33 -05:00
naomiaro 0de162aa26 errors finally fully working in display. 2011-02-08 00:29:31 -05:00
naomiaro 9db7f790ef errors displayed under value in playlist editor. 2011-02-07 23:32:36 -05:00
naomiaro 4985524af8 errors are displayed if problem with cues/fades. 2011-02-07 23:18:48 -05:00
mkonecny 16bdfb7611 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	public/css/styles.css
2011-02-07 19:06:06 -05:00
mkonecny bc5b9efb4b -changes to list view. Framework so that we may change selected day
-changes to add-user. Started implementing Vladimirs design.
2011-02-07 19:03:14 -05:00
naomiaro 8f8c4716cc first version of playlist builder with cues/fades. need to do some work to display errors, look to see if I can position the cursor better on the contenteditable spans within the lis because jQuery sortable is interfering with normal operation. don't have a fade in/out for theplaylist overall yet. 2011-02-07 18:44:42 -05:00
mkonecny 6c860dcff5 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-07 12:37:12 -05:00
mkonecny 7c17758721 -implemented new ui design for preferences page. 2011-02-07 12:36:35 -05:00
martin 1631525f98 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-07 00:27:26 -05:00
martin b6d2b0f942 -fixed potential bug for incorrect return value type. 2011-02-07 00:26:16 -05:00
naomiaro c0d379e306 cannot schedule anything in a show that overlaps. 2011-02-06 23:58:58 -05:00
naomiaro 0152514ef3 removed cc_show_schedule table. 2011-02-06 22:07:17 -05:00
martin fae1401568 -further fixes for naomis new layout 2011-02-06 20:12:56 -05:00
martin 8396e12df1 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-06 19:28:49 -05:00
martin 993b302f6b initial patch to fix problems with new tables schema. 2011-02-06 19:28:39 -05:00
naomiaro f04d03aef1 SCHEDULE TABLE ID CHANGE 2011-02-06 18:38:55 -05:00
naomiaro a5e4056555 missing check for shows in the middle. 2011-02-06 17:37:23 -05:00
naomiaro 75eea94641 changed back to old schedule id to test if playback works now. 2011-02-06 15:31:36 -05:00
naomiaro ebb43857f6 modified cc_schedule table, added foreign key to show instance id for easy clean up when show needs to be cleared/deleted. replaced primary key with a standard auto incrementing key for efficiency since the other key had no use. 2011-02-06 01:10:07 -05:00
naomiaro 14c71a3f39 getting tired.... 2011-02-05 23:50:43 -05:00
naomiaro 76b2f6e80b order by didn't work for full calendar 2011-02-05 23:49:27 -05:00
naomiaro aef4654a3f CC-1770 clear the days chosen if the show doesn't repeat. 2011-02-05 23:42:57 -05:00
naomiaro 0d300122b8 forgot to put a label. 2011-02-05 23:23:53 -05:00
naomiaro 13847e738b adding bi-weekly show option. new structure allows for different repeat types to be specified.
new playlist builder css/images.
2011-02-05 23:21:52 -05:00
naomiaro cb3f4dd31e error messages for show moving/resizing displayed in an alert. 2011-02-05 22:02:45 -05:00
naomiaro 55eddb133b fixed schedule content check 2011-02-05 21:54:15 -05:00
naomiaro bb5a2af142 can delete a show instance 2011-02-05 20:39:35 -05:00
naomiaro 5aca6cd8bb incorrectly set starts when not needed. 2011-02-05 20:17:46 -05:00
naomiaro 85a936eb41 can only resize a show if scheduled content allows. 2011-02-05 20:11:45 -05:00
naomiaro 258157d92c reschedules a show's content when it is successfully moved on the schedule. 2011-02-05 20:04:24 -05:00
naomiaro 3bbc84365e listing show contents option works. 2011-02-05 19:47:04 -05:00
naomiaro 12cd80fe13 can schedule/remove playlists from a show instance. 2011-02-05 19:42:03 -05:00
naomiaro 51b6a79f6f everything moved to its new class, now just testing, context menu works. 2011-02-05 19:10:34 -05:00
naomiaro bfc1bccfdf beginning of making a separate ShowInstance vs Show class. 2011-02-05 18:20:51 -05:00
naomiaro bc6dd374f4 can't move a show into the past. 2011-02-05 17:19:54 -05:00
naomiaro c45437633b checks for moving/resizing an instance of a show. 2011-02-05 16:34:58 -05:00
naomiaro 78f83f5f6e Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-05 16:00:11 -05:00
naomiaro 89b971b67c changes to how shows are created/stored. 2011-02-05 16:00:05 -05:00
naomiaro 42284deb58 changes to propel config so that it looks at the proper file. 2011-02-05 15:58:18 -05:00
mkonecny 89ae221f4c -re-enabled Now playing bar 2011-02-04 18:32:57 -05:00
mkonecny 27293c6b8f Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-04 18:22:51 -05:00
mkonecny debdefbc96 -list-view implemented 2011-02-04 18:22:15 -05:00
naomiaro d60e3e5476 documentation seems weird, trying to get content to be rerquested for playlist contents. 2011-02-04 01:28:55 -05:00
naomiaro d81a84ca9a CC-1172 adding qtip tooltips on library files to show metadata. 2011-02-04 00:15:56 -05:00
mkonecny ae6b97f8f1 -small fix for uninitialized title values. 2011-02-03 19:22:17 -05:00
mkonecny 4698e963c1 -title now stored in session variable. 2011-02-03 19:17:52 -05:00
mkonecny df675bd8c6 -added simple configuration page
-implemented CC-1830
-issue CC-1850 closed
2011-02-03 17:51:35 -05:00
mkonecny a99a742bdc -fix http://dev.sourcefabric.org/browse/CC-1838 2011-02-03 13:52:06 -05:00
mkonecny 65cc694a90 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-02 18:25:57 -05:00
mkonecny a5ad30356a -refactoring
-added gaps in Now PLaying DataTable
-show information and song information now sent as separate data in order.
2011-02-02 18:25:42 -05:00
Naomi 2cdaf4b413 CC-1809 added a dialog to display show contents, anyone has access to this dialog. made sure only hosts can access schedule/clear/delete options on the context menu for future shows. 2011-02-02 18:08:22 -05:00
Naomi 567335c72f more info is displayed about the date/time of the show selected in the schedule dialog. 2011-02-02 15:39:25 -05:00
Naomi f71a4420a6 removing js that isn't needed, don't have slot minute option on month view. 2011-02-02 14:57:51 -05:00
Naomi f2b8f1d39d CC-1786 Schedule Show Dialog graphic design has new html/css 2011-02-02 14:29:29 -05:00
Naomi 0bcf69985e working on schedule dialog, reqorked get remaining time function in a show to be better. 2011-02-02 13:39:33 -05:00
Naomi d577483800 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-02 11:38:23 -05:00
Naomi 541c3a0e0e CC-1845 had changed implementation of this and had an incorrect parameter. 2011-02-02 11:38:04 -05:00
mkonecny ca154fc2f0 -changed default php timezone to UTC. 2011-02-02 11:22:13 -05:00
mkonecny 4f055788d4 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-01 20:29:03 -05:00
mkonecny 71023a52b3 -fixed bug CC-1837
-show progress-bar will now update even when an audio item is not playing
2011-02-01 20:28:38 -05:00
Naomi be6722af9f fix for show with no end. 2011-02-01 18:02:35 -05:00
Naomi eaad41ef94 changed schedule page to use better dynamic menu that the playlist builder page is using. 2011-02-01 17:41:19 -05:00
Naomi d829813c0b Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-01 15:57:22 -05:00
Naomi 904a60418c better organizing Library controller since datatables is now used. 2011-02-01 15:57:12 -05:00
martin be79b21c37 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-01 15:31:38 -05:00
Naomi a9f8a2b5d0 moved menu/styles.css to bootstrap, as well as nowplaying javascript since they should be on everypage almost except for the login screen currently. 2011-02-01 11:43:52 -05:00
martin 755c5a8469 -fixed issue with unix pypo user not being assigned to groups
-fixed issue with time being incorrect if server was in different timezone
2011-01-31 16:34:08 -05:00
Naomi 101bdac481 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-31 13:50:57 -05:00
Naomi 8d3482b851 fix for calendar rendering problems. 2011-01-31 13:50:37 -05:00
mkonecny 42490d53aa -timezone now correct on now playing bar 2011-01-31 11:47:52 -05:00
naomiaro 97be2562b5 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-31 01:55:23 -05:00
naomiaro 6f778b5b40 hackyish way of not scrolling in browser, couldn't find a good way to get height of browser's toolbar etc, just made an average number. 2011-01-31 01:54:58 -05:00
martin 0152ad7f44 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-01-31 00:51:06 -05:00
martin 815509eb70 -audio preview now works in firefox!! CC-1707 2011-01-31 00:50:33 -05:00
naomiaro ef48687385 CC-1822 top menu bar stays in place. 2011-01-30 23:05:49 -05:00
naomiaro c87e1fb257 add check for duration 00:00 2011-01-30 21:47:59 -05:00
naomiaro 556292e623 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-30 21:43:07 -05:00
naomiaro 48c1ce77b9 CC-1759
check duration is under 24 hours, colorpicker updates on drag, picker for duration without am/pm.
2011-01-30 21:42:53 -05:00
martin eeaa7da6f5 -all songs of the current show are now highlighted in the now playing datatable. 2011-01-30 20:12:07 -05:00
naomiaro 092b36c346 checks on dates, UI work mostly done 2011-01-30 20:11:18 -05:00
martin dc6fcec0e3 -user name shows in the top right corner.
-fixed bug with development mode not being recognized by Zend.
2011-01-30 18:20:47 -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
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 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 7bd96a7bf4 merge fixes 2011-01-28 11:34:57 -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 7ef4380f25 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-27 18:38:24 -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
martin e52d566b83 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-01-27 15:25:02 -05:00
martin c64df44a58 fix http://dev.sourcefabric.org/browse/CC-1803 2011-01-27 15:24:49 -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 4441001eca -fixed menu 2011-01-27 12:22:38 -05:00
Naomi e2ac8d54db table tag info wanted by vladimir 2011-01-27 12:05:48 -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 ac0dd03d82 -removed dummy data 2011-01-26 21:46:10 -05:00
martin ea14dd44e9 -updated all views to use new menu bar 2011-01-26 21:43:56 -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 c3085c8edf bug fix for deleting repeating shows. 2011-01-26 00:12:13 -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 ac638c2e39 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-25 15:25:37 -05:00
mkonecny e8d7b59127 -datagrid now highlights current song playing 2011-01-25 15:25:24 -05:00
naomiaro 057b1a08a6 fixing up acl plugin 2011-01-25 00:04:40 -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 edc7c03824 color isn't required 2011-01-21 14:58:23 -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
mkonecny 8d5aea0d14 -basic now playing bar 2011-01-20 17:14:14 -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
naomiaro 2ff9765fdf fixed bug when generating shows for calendar. 2011-01-19 16:50:30 -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 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 6376a25463 cue/fade editor done for new playlist builder 2011-01-17 13:55:43 -05:00
naomiaro 70f7cb6edc Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-17 10:40:28 -05:00
mkonecny 0d2314cf32 fixed schedule.php warning 2011-01-17 02:32:51 -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 91e0db7647 forgot to change some names to remove sideplaylist scripts. 2011-01-16 16:00:44 -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 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
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 4d8f28f3fd show content returning info in a useful way 2011-01-12 17:52:57 -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 9c23b86c53 last of changing database name, removing old files 2011-01-10 15:44:13 -05:00
naomiaro 53f49d987d Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-01-10 15:26:47 -05:00
naomiaro aee0b09749 type ahead search in scheduling playlists dialog. 2011-01-10 15:26:11 -05:00
naomiaro 8b2b2d934c database name constant. 2011-01-10 13:26:43 -05:00
naomiaro c1c4c4e598 database changes for name, searching for playlist for a show. 2011-01-10 13:24:21 -05:00
mkonecny ee6235f7f8 -added script that updates various database config files for the frameworks we are using. 2011-01-07 16:32:41 -05:00
mkonecny 8d58f8fddb -update propel database passwords 2011-01-07 12:02:52 -05:00
mkonecny 13c05d35a9 -removed css footer for now... 2011-01-07 11:26:27 -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 c7df3c1039 for new cc_show_schedule columns 2011-01-06 16:24:30 -05:00
Naomi 9854834b26 adding fields to allow for multiple playlists scheduled in a show 2011-01-06 16:20:51 -05:00
naomiaro daf37fa548 quick search string session var 2011-01-06 01:26:48 -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 f6a56c01a9 buttons part of zend form. 2011-01-03 15:15:00 -05:00
naomiaro 58a25186bb moving add button above. 2011-01-03 14:19:38 -05:00
naomiaro cf4e784129 CC-1749 added pagination to media files display. 2011-01-03 13:29:57 -05:00
naomiaro 75cd410ba4 search uses pagination 2011-01-03 11:47:21 -05:00
naomiaro 0cf89713a9 can edit file metadata. 2010-12-30 17:26:44 -05:00
naomiaro 2a37140c4d can edit playlist metadata 2010-12-30 15:10:05 -05:00
naomiaro dc36c972ba close playlist in context menu 2010-12-30 14:29:15 -05:00
naomiaro c4053a1b38 Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-30 13:39:51 -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 1c95a61a2c -renamed some files to better represent their function 2010-12-30 12:02:02 -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
martin 4bdcba83e2 -synchronize 2010-12-29 01:26:57 -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 461df7b61f close from main pl editor. 2010-12-22 12:50:10 -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 414219b1cf Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-21 18:28:55 -05:00
mkonecny 10218aeeb5 Commit so that I may access project from a different computer. Many things do not work/ are incomplete!!!
-Added unfinalized API for getting schedule and currently playing item.
2010-12-21 18:28:17 -05:00
naomiaro 055f541657 side playlist working, need to add to search page as well. 2010-12-21 17:47:51 -05:00
naomiaro 9fd60932bd side playlist almost done, just need to do drag and drop. 2010-12-21 16:45:36 -05:00
Naomi 707bb2b183 put resources for ACL on all nav items. 2010-12-17 18:23:27 -05:00
Naomi 8ce870bb95 prefixed everything in cc_files with Db for Propel to be consistent. 2010-12-17 18:05:59 -05:00
Naomi 1fc21819cc simple form for adding a user to the database, only available for admin users. 2010-12-17 17:56:01 -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 069119857f fixed percent show filled in event display. 2010-12-17 01:18:42 -05:00
naomiaro 69fa737e9c more overnight show checks. 2010-12-17 01:11:02 -05:00
naomiaro a33fb65580 needed for overnight shows. 2010-12-17 00:54:06 -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 28f6675359 Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-16 18:24:58 -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
mkonecny b3a0104191 fixed build/schema.xml conflict
Conflicts:
	build/schema.xml
2010-12-16 16:57:50 -05:00
mkonecny 9bfb6b53b8 fixed problems with not working out of a fresh install. 2010-12-16 16:36:51 -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 1b216c16dd didn't realize these functions were still used in StoredFile... 2010-12-16 01:02:06 -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 74cf312ee9 view 2010-12-13 11:50:10 -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 71735b683d Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-10 15:44:56 -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
paul.baranowski 7ab3fe6a23 Merge branch 'master' of dev.sourcefabric.org:campcaster 2010-12-10 14:11:31 -05:00
paul.baranowski 53d1e62ab1 Forgot to add this file yesterday as part of the API conversion to Zend Framework. 2010-12-10 14:11:04 -05:00
naomiaro cc1715426f added case for non ending shows 2010-12-10 12:51:36 -05:00
naomiaro def79d7679 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	.zfproject.xml
2010-12-10 12:18:51 -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
paul.baranowski 84c2a3bceb Converted API functions to Zend Framework. Converted pypo to use
the new Zendified URLs.  Fixed bugs in the daemontool scripts.

The installed scheduler is still not working at this point, but
getting close.
2010-12-09 18:44:47 -05:00
naomiaro b10c2cfe2a can find overlapping shows now for moving. 2010-12-09 17:02:37 -05:00
naomiaro 7b22099f12 end dates for shows stored in database are non inclusive. 2010-12-09 14:54:12 -05:00