Commit Graph

2702 Commits

Author SHA1 Message Date
james e69c0ea351 CC-2510:Pref screen: able to select promote my stn
- fixed
2011-07-06 11:12:13 -04:00
james daf6f9963f CC-2511:Phone Home Metric: add error display on popup
- refactoring was needed to solve this problem.
- javascript error check is not necessary anymore.
- The form is preloaded to nowplaying page, only when
it's needed, hence ajax call to pull up the form is not
needed anymore.
2011-07-05 15:53:50 -04:00
james dcddec9536 CC-2447:Preview keeps playing if you create a new playlist
- fixed
- preview stops on clicking on any of new, delete, done editing button
2011-07-04 14:49:17 -04:00
james cb72db4a31 CC-2460:Popup shouldn't show after X is pressed
- changed function name to "donotshowpopup"
2011-07-04 13:11:35 -04:00
james 4ca7b3cf16 CC-2501:registration-workding-change
- temp commit. Styling is still broken
2011-07-04 13:07:46 -04:00
james d9a9af9e6d CC-2476:Dragging a playlist, draws a orange grid
- fixed(Thanks to Vladimir)
2011-07-04 11:35:35 -04:00
james 22df189cdc CC-2477:Duration box is too small
-fixed
2011-07-04 11:11:35 -04:00
james 6de8b09184 CC-2460: popup doesn't popup again after press X
- fixed
2011-07-04 09:54:44 -04:00
james 79ea4ead9d CC-2468:Changing host to DJ
- style.css change
2011-07-04 09:31:07 -04:00
james 8475326d96 CC-2475:When Promote is checked promote info section has to be
expanded by default

- fixed
2011-06-30 12:29:35 -04:00
james 48537c3c10 CC-2484:Calendar sholdn't move down
- the fix was fairly easy. so I did complete fix.
2011-06-30 12:15:54 -04:00
james 43c8a28633 CC-2455:Show what i am sending heading
-fixed
2011-06-29 17:28:51 -04:00
james 3f8e61f949 CC-2458:Diabled checkbox do no look diabled
- fixed
2011-06-29 16:55:44 -04:00
james a018466b80 CC-2468:Manage Users Say DJ and add show says host
-fixed
2011-06-29 16:33:20 -04:00
james ae35ef12c2 CC-2457:Confimation before deleting or changing
- done
2011-06-29 14:42:56 -04:00
martin e8c36be242 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-28 12:50:15 -04:00
martin 00910ae346 -clean up imports in MediaMonitor.py 2011-06-28 12:50:05 -04:00
james 2163efc1be CC-2425:Tweaks to phone home metrics
- In order for the user to click the "Yes, Help Airtime" button,
both "send support feedback" AND "privacy policy" should be checked
2011-06-28 12:47:54 -04:00
james 11af81133c CC-2431:Clendar shrinking issue
-fixed
2011-06-27 17:32:54 -04:00
james 33bb5560bf CC-2357: tweak to show date end
- fix on end time.
2011-06-27 16:29:22 -04:00
james 52dc267670 CC-2357:Tweak to show date end
- fixed
2011-06-27 15:59:29 -04:00
james 4eea4f11b0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-27 14:38:16 -04:00
james 6a7f1d3588 CC-2412:Error causes box to float
- fixed
2011-06-27 14:37:31 -04:00
Naomi Aro 363a73af10 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel 2011-06-27 18:31:13 +02:00
Naomi Aro e8265614ba CC-2456 : Multiple storage folders show up on the same line 2011-06-27 18:05:28 +02:00
james 396bfd5f8d CC-2453:Make textarea non resizable
- fixed
2011-06-27 09:55:39 -04:00
Naomi Aro 4a478117c6 CC-2411 : Interface for Music Folders Preferences
applying html/css changes to music folder preference page.
2011-06-27 11:46:23 +02:00
James c5ec6b5a53 CC-2425:Tweak phone home
- privacy check box is uncheck by defalut
- 'Yes' button is disabled on popup form by default
- custom error msg is added for privacy checkbox on preference
form
- promote form is hidden by default
2011-06-26 23:13:49 -04:00
James 59e19fe9d1 CC-2450:Phone home metric
- email is not required anymore.
- Send info box suppose to dispalys filelds only when thev
value is non-empty string. It wasn't diaplyng where the
value was 0(fixed).
2011-06-26 01:01:35 -04:00
James a936212355 Merge branch 'cc-2425-tweak-phone-home' into devel 2011-06-26 00:45:30 -04:00
James 194ad31c9f CC-2425:Tweak phone hom
- done
2011-06-26 00:45:02 -04:00
James cc542797c7 CC-2425:Tweaks to phone home metric
- Done
2011-06-24 17:26:37 -04:00
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
martin 8ffbcc96c7 Merge branch 'cc-2211-changes-to-playlist-not-shown' into devel 2011-04-29 15:32:27 -04:00
martin 50c649dc59 Merge branch 'cc-2211-changes-to-playlist-not-shown' into devel 2011-04-29 15:31:18 -04:00
James Moon afa51c0d56 CC-2211:changes to playlist not show
Move redraw function into callback function when PL gets deleted
from the left window
2011-04-29 12:17:06 -07:00
James Moon 615c6e18f5 cc-2211:changes-to-playlist-not-shown
There was a timing issue
Moved redrawing part into callback function.
2011-04-29 11:08:10 -07:00
martin 3ac7fb01af Merge branch 'cc-2238-deleting-a-playlist-from-right-list' into devel 2011-04-29 13:52:30 -04:00
martin a2f8062404 Merge branch 'cc-2202-start-upload-button-vanishes' into devel 2011-04-29 13:21:51 -04:00
James Moon 676d64bbb6 cc-2202:start upload button vanishes
Fixed.
2011-04-27 15:33:32 -07:00
James Moon d9ecb965bb cc-2211:changes-to-playlist-not-shown
- removing some codes that aren't used.
- it deletes pl from the right list if the 'delete' button on
the left window is clicked.
2011-04-27 14:41:47 -07:00
James Moon c322b8fb7f cc-2238:deleting-a-playlist-from-right-list
fixed.
2011-04-27 14:22:50 -07:00
James Moon 44d599a00b CC-2211:Changes to playlist not shown
Everything works fine except when adding new playlist.
When the new playlist gets created, it doesn't display
the page which contains the playlist.
2011-04-27 12:14:24 -07:00
James Moon d9216eafe5 cc-2230:Overbooked show still palying
Fixed. Assigning it to Martin for a review
2011-04-26 13:36:21 -07:00
James Moon bf34170f29 Temp commit.
It's not done, need to work more later.
2011-04-25 10:11:12 -07:00
James Moon e31a1240f3 CC-2155:Can open the rebroadcast options without the 'Record'checkbox being selected - fixed 2011-04-20 14:10:58 -07:00
James Moon b53c9482c2 CC-2207:Rename 'Schedule Playlist' window to 'Schedule Media' - fixed 2011-04-20 12:42:38 -07:00
martin 6f9926eba2 CC-2195: Remove global php.ini changes from install guide and Airtime
-done
2011-04-18 15:57:32 -04:00
martin fab68dfad1 CC-2203: Search results: "Delete" should be at the bottom of the list and should have a confirmation
-Fixed
2011-04-18 12:43:04 -04:00
Naomi b992801a45 hiding/showing show overflow message properly. 2011-04-15 12:11:06 -04:00
Naomi eb312ae454 fixes to template, javascript to handle error arrays. 2011-04-15 10:51:06 -04:00
Paul Baranowski 03ab7edea0 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-14 18:55:15 -04:00
Paul Baranowski b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00