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

151 Commits

Author SHA1 Message Date
Naomi 86d1aafed4 can now change name/description of a playlist. 2011-02-09 16:53:11 -05:00
Naomi 0da5c340b3 typo. 2011-02-09 16:31:12 -05:00
Naomi d15019c168 CC-1883 pressing enter now takes entered data. 2011-02-09 16:29:15 -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 1954fa41f8 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-09 14:09:51 -05:00
Naomi d86577716b CC-1124 filetype incon in search 2011-02-09 13:31:39 -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 036adf17e3 problems with events if items jump around scroll bar. 2011-02-09 11:55:05 -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
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 2988b61bf5 incorrectly hiding span now. 2011-02-08 00:20:17 -05:00
naomiaro b250ff780b to avoid <br> in chrome. 2011-02-08 00:13:58 -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
naomiaro 290059c0ed fixed delete for playlist editor, sortable doesn't effect contenteditable spans now in cue/fade editors. 2011-02-07 22:04:52 -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
naomiaro c0d379e306 cannot schedule anything in a show that overlaps. 2011-02-06 23:58:58 -05:00
naomiaro cb3f4dd31e error messages for show moving/resizing displayed in an alert. 2011-02-05 22:02:45 -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 89b971b67c changes to how shows are created/stored. 2011-02-05 16:00:05 -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 c496546ec0 bug fix for new html in schedule dialog. 2011-02-04 00:40:36 -05:00
naomiaro d81a84ca9a CC-1172 adding qtip tooltips on library files to show metadata. 2011-02-04 00:15:56 -05:00
Naomi 01c1651232 small fix for reducing js files. 2011-02-03 11:51:26 -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 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 3adbbf4163 fix for staying on current view. 2011-02-02 11:55:55 -05:00
Naomi ec9d84fc91 change full calendar default view to month. when changing slot minutes now reinits to view you were last looking at. 2011-02-02 11:46:17 -05:00
Naomi a1dee48759 less re-rendering of full calendar. 2011-02-02 10:50:19 -05:00
naomiaro 75649c8430 added ability to change slot widths on the calendar to see small shows. 2011-02-02 01:02:31 -05:00
Naomi b2f6affee1 needed to add month option for month view 24 hour time. 2011-02-01 18:57:59 -05:00
Naomi 1795547e70 24 hour time 2011-02-01 18:41:32 -05:00
Naomi d0102fa922 changed full calendar to display 24 hour time since shows are added in 24 hour time. 2011-02-01 18:37:33 -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 8d3482b851 fix for calendar rendering problems. 2011-01-31 13:50:37 -05:00
naomiaro 24da57ae4f CC-1811 schedule view/add show screens make calendar height less than one screen size to prevent outer browser scrollbar. 2011-01-31 10:00:26 -05:00
naomiaro dc2b59a634 removing forgotten alert... 2011-01-31 02:10:40 -05:00
naomiaro 275e31cb77 using innerheight property. 2011-01-31 02:09:25 -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
naomiaro ef48687385 CC-1822 top menu bar stays in place. 2011-01-30 23:05:49 -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
Naomi 476cf99019 added timepicker to add show form. 2011-01-28 18:24:52 -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 1183b69149 datatable doens't have auto width 2011-01-27 12:13:41 -05:00
Naomi 8bc2038597 using jqueryUI with datatables 2011-01-27 11:51:02 -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
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
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
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 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
naomiaro e9e7ad187b seeing how to modify a fc event's colour... 2011-01-19 23:55:01 -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 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
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