Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,769 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

192 Commits

Author SHA1 Message Date
mkonecny 313252f93a Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-09 18:28:42 -05:00
mkonecny 40be54e82f -completed CC-1808 2011-02-09 18:25:33 -05:00
Naomi d210a36358 new add show html. 2011-02-09 18:10:46 -05:00
mkonecny eab3675c74 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-09 17:02:44 -05:00
mkonecny a447839745 -UI changes. 
-Blank row now displays start and end time
-Changed default playlist name
 2011-02-09 17:02:32 -05:00
Naomi 86d1aafed4 can now change name/description of a playlist. 2011-02-09 16:53:11 -05:00
Naomi 86d60dda9e Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-09 16:29:27 -05:00
mkonecny a43da4e887 -fix gap between buttons 2011-02-09 15:54:57 -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 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 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 7c17758721 -implemented new ui design for preferences page. 2011-02-07 12:36:35 -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 d81a84ca9a CC-1172 adding qtip tooltips on library files to show metadata. 2011-02-04 00:15:56 -05:00
mkonecny df675bd8c6 -added simple configuration page 
-implemented CC-1830
-issue CC-1850 closed
 2011-02-03 17:51:35 -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 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
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 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 904a60418c better organizing Library controller since datatables is now used. 2011-02-01 15:57:12 -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
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 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
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 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 6651688940 -added support to preview mp3+ogg audio (chrome only so far). 2011-01-28 16:32:38 -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 a41c6475f4 can drag song to a certain point in the playlist. 2011-01-27 15:11:19 -05:00
Naomi e2ac8d54db table tag info wanted by vladimir 2011-01-27 12:05:48 -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 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 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 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 7450195854 -basic now-playing toolbar. Some data still needs to be populated. 2011-01-19 18:32:20 -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 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 ad869e0f7f will display in the UI what is scheduled in a show when you add things. 2011-01-12 19:40:05 -05:00