Commit Graph

374 Commits

Author SHA1 Message Date
paul.baranowski 15153727c1 CC-1971
Remove "?>" from the end of pure-PHP files to prevent "HEADERS ALREADY SENT"
2011-02-22 18:22:31 +01:00
Naomi 92545b53a6 CC-1955 2011-02-22 11:59:55 -05:00
Naomi 2d95a90049 CC-1952 cannot delete a file that is scheduled in the future. 2011-02-22 11:44:23 -05:00
Naomi 93cf608741 advanced search tab does not appear. 2011-02-14 11:52:50 -05:00
paul.baranowski 2fbabd82eb CC-1930 Improve right-click menu on the schedule so the most common actions are first 2011-02-14 13:30:52 +01:00
paul.baranowski b6d117d456 Fixed merge conflicts 2011-02-14 13:16:57 +01:00
paul.baranowski 6c273739b4 CC-1930 Improve user interface design and wording for show/playlist workflow 2011-02-14 13:05:22 +01:00
martin dcc3d57647 -removed <a> tags in favour of <span> tags 2011-02-13 17:51:28 -05:00
martin 8626499554 -updated help page. 2011-02-13 17:42:15 -05:00
martin 8c3bd5dc6e -re-ordered menu for more logical workflow 2011-02-13 16:42:10 -05:00
martin 416c6ceb10 -fixed bug where a song would appear as current song and next song simultaneously.
-show background color switching on the list-view should now be instant.
2011-02-13 15:35:41 -05:00
martin 1d30c208f8 -fixed regression in day-view 2011-02-13 14:04:38 -05:00
martin a5fd68c252 -fixed UI freeze on some very special occasions
-fixed some php errors related to php shipped with debian
-playlist.js no longer active on login page
2011-02-13 13:29:16 -05:00
martin b9e1078e10 -small fixes to now playing 2011-02-13 11:49:28 -05:00
naomiaro 7093ebd23f modified to avoid sql error when searching. 2011-02-12 23:07:28 -05:00
naomiaro bd2d560c1b ordering by login 2011-02-12 23:02:44 -05:00
naomiaro ddddcc9375 can make show as many hours long in duration as wanted. 2011-02-12 18:40:17 -05:00
naomiaro 54398b8c32 playlists with no content will be filtered in the schedule show dialog. 2011-02-12 17:26:02 -05:00
naomiaro a83a4b6bae show cancelling available (needed for repeating shows) 2011-02-12 17:21:37 -05:00
naomiaro 9a7dda49fe CC-1917 file meta data screen 2011-02-12 14:44:55 -05:00
naomiaro 2f796f3d9c default fade shows in preferences "00:00:00.000000" 2011-02-12 14:04:09 -05:00
Naomi d9118fe2d0 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	public/css/styles.css
2011-02-11 18:59:27 -05:00
Naomi 89267748d4 CC-1916 playlist metadata page looks better. 2011-02-11 18:55:08 -05:00
martin 6cf4310c24 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-11 18:13:38 -05:00
martin 43f7f8e103 -added help page
-added additional user info
2011-02-11 18:13:26 -05:00
Naomi f8d3a38b2e default fade setting for songs. 2011-02-11 17:46:55 -05:00
Naomi 12dbdf8f4c CC-1915 playlist name no longer required in form, defaults to "Untitled Playlist" 2011-02-11 15:59:16 -05:00
mkonecny b43db577dd Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-11 11:56:29 -05:00
mkonecny 14ee1f553e -fixed up about tool-tip
-ui tweaks to manage users screen
2011-02-11 11:56:14 -05:00
Naomi e38d825896 check if is an array for hosts. 2011-02-11 11:52:11 -05:00
Naomi da175e0702 admin users are hosts by default, host selection is no longer required, any admin user can schedule/maniuplate all shows. 2011-02-11 11:43:03 -05:00
Naomi 9634a0735a Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-11 11:12:33 -05:00
Naomi 3b9f87f6f1 what tab isn't default open for space reason. 2011-02-11 11:12:08 -05:00
naomiaro 5468db39e8 admin can do anything a host of a show can 2011-02-11 00:10:56 -05:00
mkonecny e28a1421c5 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-10 20:48:36 -05:00
mkonecny cf004abb44 -small fixes
-about popup without styling added
2011-02-10 20:48:26 -05:00
Naomi 44c830066b CC-1880 show content is styled 2011-02-10 20:27:25 -05:00
Naomi 8dbb79d9e2 CC-1902 default duration is 1:00 2011-02-10 19:53:41 -05:00
Naomi 85ab11dc56 CC-1897 defaults to day of the week of start date. 2011-02-10 19:36:39 -05:00
Naomi f3efc9edaa add classes to day check in jQuery or else zend doesn't populate the form properly. 2011-02-10 19:19:55 -05:00
Naomi 81d66ebbb6 day selection change 2011-02-10 18:40:30 -05:00
Naomi ea9127b1d0 CC-1910
new close button for add show
2011-02-10 18:24:29 -05:00
Naomi 36193d2948 airtime menu now uses ACL with the custom viewscript. 2011-02-10 18:03:41 -05:00
Naomi 27b462d638 new acl permissions, add show form is done by ajax request now. 2011-02-10 17:12:05 -05:00
Naomi 2b5927bf33 add show form sent via ajax request, opens sections with errors if not completed properly. 2011-02-10 15:00:55 -05:00
Naomi a32550d625 add show button removed/readded properly. 2011-02-10 11:34:55 -05:00
Naomi ac86fc50e8 add show button only appears for admin users 2011-02-10 11:25:28 -05:00
martin 718a039bcc Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	public/css/styles.css
2011-02-10 00:37:07 -05:00
martin b9ed526e25 -new improved day view date picker look. 2011-02-10 00:35:32 -05:00
naomiaro aa7dfd8072 forgot to include contextmenu.css 2011-02-10 00:20:03 -05:00
naomiaro 675f1ae86a add show/schedule now on one page. 2011-02-10 00:17:07 -05:00
naomiaro b61f2af59b placed add show button in full calendar header, placed time resolution on side of calendar. 2011-02-09 23:26:00 -05:00
naomiaro d5efcac452 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-09 22:37:26 -05:00
naomiaro 59ef9ee6a0 starting advanced search 2011-02-09 22:37:18 -05:00
Naomi 2c66c1801e close button hides add show box. 2011-02-09 19:08:27 -05:00
Naomi 8d311a7cc3 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-09 18:48:05 -05:00
Naomi e95b877960 adding class input_select, changing problem with min resolution select html. 2011-02-09 18:47:49 -05:00
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 28f3a77246 -day view now highlights current show 2011-02-09 15:45:45 -05:00
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