Commit Graph

70 Commits

Author SHA1 Message Date
James Moon 52e41555bd CC-2426:Time boxes are too big
- fixed
2011-06-23 00:05:57 -04:00
James Moon 3c3850db29 CC-2305:Create playlist out of range
- HTML is fixed as Valdimir requested.
- CSS is fixed.
2011-06-22 23:37:26 -04:00
martin 50cde2f8b0 CC-2418: Show add: end time shown in display is not the time committed to DB 2011-06-22 11:21:26 -04:00
Naomi Aro 6adce1ba45 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
adding ability to move stor directory.
2011-06-21 14:58:38 +02:00
Naomi Aro f1893cebe6 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
making separate js file for music dirs page.
2011-06-21 11:57:56 +02:00
Naomi Aro 253eb811c7 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
2011-06-21 11:20:35 +02:00
Naomi Aro b6888489e0 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
adding music dirs concept to Airtime. New cc_music_dirs table/class.
2011-06-21 10:24:02 +02:00
james 05dc48fa71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
2011-06-20 18:09:37 -04:00
james e762633405 CC-1724:Phone home statistics
- Final commit for client side.
2011-06-20 17:58:38 -04:00
martin fd1c202de9 CC-2381: Songs library search speed performance
-removed javascript alert popup
2011-06-17 15:18:09 -04:00
martin b802ba9a42 cc-2381: slow library searching speed
-implemented 350ms keystroke delay before searching
2011-06-17 14:41:57 -04:00
james 1fbaa7d5fb CC-1724:Phone home statistics
- Popup form validation is added( javascript )
2011-06-16 14:26:24 -04:00
james 5adfb79981 CC-1724:Phone home statistics
Temp commit
2011-06-15 17:51:44 -04:00
james 0263278bc2 CC-1724-phone-home-statistics
add js for register
2011-06-15 12:07:35 -04:00
james cf654f1a45 CC-1724:phone-home-statistics
Rebase from devel into this branch
2011-06-15 12:06:50 -04:00
james 11b601308e CC-1724:Phone home statistics
Temp commit
2011-06-15 11:17:03 -04:00
james 7cc1f5c2e7 CC-2289:Differentiate between time and duration
- css has been modified (from Vlad)
- new image were added (from Vlad)
2011-06-13 12:59:44 -04:00
james 6a15f51aac CC-2289:differentiate-between-time-and-duration
- some change in date populating rules
- change on start date/time triggers change in end date/time
- change on end date/time will triggers background turning into
red color to notify user that end date/time is earlier than
start date/time.
- need to do more work once I get img file from Vladmir
2011-06-13 12:59:43 -04:00
james 1dabbacca2 CC-2289:Differentiate between time and duration
- End date and time is added
- duration field is readonly now and is autocalculated
- now playing duration field format is changed( 0h 0m 0s )
- removed millisecond from start and end time in now playing
2011-06-13 12:59:43 -04:00
james ad3ef3ec30 CC-2255: Separate user types admin and program manager
- New user type 'Program Manager' added
- 'Program Manager' gets same previlage as Admin but doesn't
have access to Configure menu
- Changed user type name 'Host' to 'DJ'
2011-06-07 14:31:39 -04:00
james 570e7ec9c6 CC-2230:Alignment of text in new playlist description box
fixed
2011-06-01 10:04:17 -04:00
james 070641293e Merge branch 'cc-2290-clicking-on-another-tab-whilst-uploading-track-kills-upload' into devel 2011-05-31 16:55:47 -04:00
james 033eb193de CC-2290:Clicking on another tab whilst uploading track
- Changed msg as requested
2011-05-31 16:55:28 -04:00
james 75ffe91325 CC-1919:Playlist builder show time offset
Fixed.

- I wasn't sure if I had to wait for html/css code from Vladmir.
I just did what I could do.
2011-05-31 16:49:01 -04:00
james 1e62a7be9c Merge branch 'cc-2290-clicking-on-another-tab-whilst-uploading-track-kills-upload' into devel 2011-05-31 12:26:51 -04:00
james 551ed289ca CC-2290:Clicking on another tab whilst uplaoding track kills
additional fix
- when user adds file and removes file, and the list is empty,
there is no more alert.
2011-05-31 12:26:30 -04:00
james 7c55f38f36 CC-2291:Remove + button in a circle
Done
2011-05-31 11:32:11 -04:00
james 1f02ba813d CC-2290:Clicking on another tab whilst uploading track kills
- note that change in queue will trigger the alert(on unload),
not the actual upload process
2011-05-31 11:23:48 -04:00
james e25e9d4d56 CC-2253:Gap until show ends format
removed string 'seconds' at the end
2011-05-30 16:10:20 -04:00
james f7d37adfc6 CC-2253:Gap until show ends should display in HH:MM:SS 2011-05-30 14:57:37 -04:00
james 6e7ad79ff0 CC-2064:Drag and drop should have a hand cursor
Fixed
2011-05-30 14:12:32 -04:00
Naomi 8d59c18bef CC-2326 Can't edit a show more than once (End Date problems)
show editing assumed inclusive end dates while show creating assumed non inclusive.
2011-05-26 15:41:47 -04:00
Martin Konecny 6fd2985fe0 CC-2319: update plupload to 1.4.3.2 from 1.4.2
-done
2011-05-24 16:43:28 -04:00
martin 7b50ef7bd4 CC-2312: Change max_upload_size in .htaccess file
-done
2011-05-20 14:31:28 -04:00
martin fc51a6c835 CC-2155: Can open the rebroadcast options without the
"Record" checkbox being selected

-fixed
2011-05-19 17:16:41 -04:00
martin d6616004a6 CC-2283: Now playing bar only shows the first word of the show name
-fixed
2011-05-18 18:37:13 -04:00
Naomi 62806fa7ef CC-1939 Ability to edit name & description of a playlist, display the description somewhere
focusing on name input by default.
2011-05-18 14:33:41 -04:00
Naomi d4a4c4be2a CC-1939 Ability to edit name & description of a playlist, display the description somewhere
now can edit title/description of a playlist without leaving the main playlist builder screen
2011-05-18 14:33:41 -04:00
martin 167a55591b -top panel js regression fix. (Error when recording show
finished)
2011-05-17 14:55:37 -04:00
martin b87e661f96 Merge branch 'devel' of dev.sourcefabric.org:airtime 2011-05-16 11:45:23 -04:00
James Moon 06f51aa78a CC-2251: Show content window pop up is too big
The show content window size is detemined dynamically based on
browsers viewport size.

I'm not sure what the size should be. So I set width and height
as like following:

width = viewport width * 4/5
height = viewport height * 2/3

Ratio can be easily changed.
2011-05-10 19:13:14 -04:00
martin bc640d38f2 cc-2167-top-panel-doesn't-list-recording-shows 2011-05-10 19:06:35 -04:00
mkonecny 359c4a4eb8 cc-2126: user shouldnt be able to delete himself
-changed it so that the "x" is still visible, but when clicking,
an error message shows. Did this because the columns were resizing
when the x wasnt visible. Also the empty column looked weird with only
one user.
2011-05-05 23:42:14 -04:00
James Moon 2a5df8bed9 CC-2126: User should not be delete himself
Done.
2011-05-05 23:42:14 -04:00
James Moon 6bbbdd5404 CC-2238: Deleting a playlist from right list
Fixed.

1. It only clears the left window form if 'delete' action is
clickced on the opened playlist.
2. similar functionality was implemented when 'edit meatadata'
form is opened in the left window.
2011-05-05 16:52:38 -04:00
mkonecny 9638f6dd3e cc-2167: now playing view with recording shows a gap
-implemented
2011-05-05 16:45:13 -04:00
mkonecny 038f2e1c69 cc-2229-refactor-now-playing-code
-bug fixes
2011-05-05 14:55:45 -04:00
mkonecny 7010f2156e cc-2229-refactor-now-playing-code
-further refactoring...
2011-05-05 14:08:52 -04:00
James Moon e5969ab4be CC-2232:Automatically fill in show name
Notes:
1. Not sure if "Untitled Show 1" would be the best name.
 What if "Untilted Show 1" already exist? There is no easy way
of keeping track of the numbers. So wouldn't it be better to just use
"Untitled Show"?
2. There is no easy way to figure out if the current form is
opened for "update" or "add".( We can check the text on the button
if it says "add" or "update" button, but it's always bad to rely on
 any UI text. So the new code will focus and higlight name text on both
update and create new case for now.
2011-05-04 20:52:03 -04:00
James Moon 95613f40f1 cc-2188: Download action for all media file.
Download action were added in two placese.

1. Playlist Builder. jjmenu now showing 'Download'.
2. Calendar-> Show Content. Click on the file, you will see
Downlaod menu.

Limitation:

File name is set to original file name.
On the ticket it said, file format should be like
"show_name-12012011-2130.mp3". However, in my opinion,
this is only possible, if a user downloads it from
calender->show content. We know what the show names and etc,
but, if the user downloads it from Playlist Builder, we cannot
retrive such information. To be consistent in both area, I just
set the file name to original file name. This can be easily
modified in the future.
2011-05-04 19:05:14 -04:00