Commit graph

145 commits

Author SHA1 Message Date
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
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