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

821 Commits

Author SHA1 Message Date
drigato ad5121f2ca Radio Page improvements 2015-06-15 14:42:37 -04:00
Albert Santoni f4ff00355d Added Radio Page link 2015-06-12 17:21:46 -04:00
drigato 1cdeddc3b3 Changed radio page background image 2015-06-12 14:50:22 -04:00
drigato ba2aeae7b4 Radio page changes 
Moved login button to top right corner.
Changed background image.
 2015-06-12 13:07:47 -04:00
Albert Santoni 980e2ad767 Unbreak the design from my last commit 2015-06-11 15:09:44 -04:00
Albert Santoni 505d6fbc57 Fixed some issues with embedded schedule widget style 2015-06-11 15:04:59 -04:00
Albert Santoni 1efc47beb9 Tweaked layout of the embed widgets page 2015-06-11 14:30:52 -04:00
Albert Santoni 6007daf601 Adapted the default schedule widget skin to be more like the player skin 2015-06-11 14:21:56 -04:00
drigato 255bbf74b7 CC-6057: Empty show schedule should show message in Schedule Widget 2015-06-11 09:16:59 -04:00
Albert Santoni 890f30590c Reduced size of placeholder background PNG for Radio Page 2015-06-10 16:03:12 -04:00
Albert Santoni c18e728583 Merge branch 'saas-installer-albert' into saas-dev 2015-06-10 15:03:11 -04:00
drigato 816e620399 CSS fix on premium player 2015-06-10 13:04:51 -04:00
drigato d181a931b8 Fix schedule widget layout by removing table structure 2015-06-09 10:30:47 -04:00
drigato 1b0d69f3d7 SAAS-851: Embed schedule widget loses format with long show names 
Applied fix for premium style sheet
 2015-06-08 11:14:05 -04:00
drigato 1974774e0c SAAS-851: Embed schedule widget loses format with long show names 2015-06-05 14:35:27 -04:00
drigato 8386145cb9 SAAS-836: Create a new schedule widget skin 2015-06-04 16:09:19 -04:00
drigato 6528a9b0a3 SAAS-843: Create Embeddable Schedule Widget View 
Replaced player controller with embeddablewidgets controller.
Replaced 'Player' page with 'Widgets' page.
Added schedule widget to the widgets page.
 2015-06-04 12:00:23 -04:00
drigato 3bf6619696 SAAS-833: Radio page UI improvements/fixes 
Undo some previous css changes
 2015-06-03 09:38:07 -04:00
drigato 9a42c4bf36 SAAS-833: Radio page UI improvements/fixes 
Added width and height to schedule widget iframe tag
 2015-06-03 09:18:38 -04:00
drigato 1add10c657 SAAS-833: Radio page UI improvements/fixes 
Fixed schedule widget scrolling
Inserted default station description
 2015-06-03 08:29:03 -04:00
drigato 2cf6cb549e SAAS-833: Radio page UI improvements/fixes 
Moved player bar buttons to float right
 2015-06-02 16:27:37 -04:00
drigato 43815510dc SAAS-833: Radio page UI improvements/fixes 
Fix spacing between schedule widget and logo
 2015-06-02 16:16:39 -04:00
drigato fad88cb5ab SAAS-833: Radio page UI improvements/fixes 
Removed scrolling on entire page and added it only to schedule widget
 2015-06-02 15:39:56 -04:00
drigato db17112432 SAAS-833: Radio page UI improvements/fixes 
Fix schedule widget responsiveness
 2015-06-02 12:59:59 -04:00
drigato 6682f7907d SAAS-833: Radio page UI improvements/fixes 
Removed unnecessary/duplicate css classes from radio page css file
 2015-06-01 15:07:04 -04:00
drigato 7e4d6995b5 SAAS-833: Radio page UI improvements/fixes 
Removed unnecessary css classes from premium player css file
 2015-06-01 15:02:12 -04:00
drigato 77e518eec0 SAAS-821: Wire up new player bar with muses 
Got metadata displaying
 2015-05-29 09:40:50 -04:00
drigato 8f8b0b7f4d Merge branch 'saas-dev' into saas-landing-page 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/views/scripts/embed/player.phtml
 2015-05-28 13:25:18 -04:00
drigato 27868fbfe5 SAAS-813: Wire up schedule widget on Radio Page 2015-05-27 13:50:25 -04:00
Albert Santoni 11c6818e61 Merge branch '2.5.x-installer' into saas-installer-albert 
Conflicts:
	.gitignore
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/SystemstatusController.php
	airtime_mvc/application/controllers/UpgradeController.php
	airtime_mvc/application/upgrade/Upgrades.php
	airtime_mvc/application/views/scripts/systemstatus/index.phtml
	airtime_mvc/build/airtime.conf
	airtime_mvc/build/sql/defaultdata.sql
	airtime_mvc/public/index.php
	airtime_mvc/tests/application/helpers/AirtimeInstall.php
	install_minimal/airtime-install
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-copy-files.sh
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-initialize.sh
	install_minimal/include/airtime-install.php
	install_minimal/include/airtime-installed-check.php
	install_minimal/include/airtime-remove-files.sh
	install_minimal/include/airtime-upgrade.php
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/monit/monit-airtime-generic.cfg
	python_apps/pypo/airtime-playout
	python_apps/pypo/install/pypo-copy-files.py
	python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
	python_apps/pypo/liquidsoap/ls_script.liq
	python_apps/pypo/pypo/__main__.py
	python_apps/pypo/pypo/media/update/replaygain.py
	python_apps/pypo/pypo/media/update/replaygainupdater.py
	python_apps/pypo/pypo/media/update/silananalyzer.py
	python_apps/python-virtualenv/airtime_virtual_env.pybundle
	python_apps/python-virtualenv/requirements
	utils/airtime-check-system.php
 2015-05-22 16:05:29 -04:00
drigato a2a9e54553 Merge branch 'saas-dev' into saas-tunein 
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
 2015-05-19 15:50:16 -04:00
drigato e91b520b42 SAAS-786: Implement Landing Page Design 
- Separated embed player css from radio page css because I had to change
the responsive design a bit.
- Trying to embed the iframe on the radio page but there are some
conflicting styles
 2015-05-15 16:19:18 -04:00
drigato 479dbc5525 SAAS-786: Implement Landing Page Design 
Implemented logo, station name and description
 2015-05-15 09:01:20 -04:00
drigato b023f191e3 SAAS-772: Send metadata to Tunein 
Added form validation by making a test request to the TuneIn API with
the user-entered values
 2015-05-14 13:13:33 -04:00
Duncan Sommerville 15bebc6267 Dangerous options subform on Preferences page and Delete all tracks button 2015-05-13 15:56:08 -04:00
drigato 10ca987a51 SAAS-762: Implement schedule widget design 2015-05-12 11:56:35 -04:00
drigato 4941ae1a6d Separated weekly schedule widget css into separate file 2015-05-07 14:27:59 -04:00
drigato f375115825 Merge branch 'saas' into saas-landing-page 2015-05-04 09:40:26 -04:00
Albert Santoni d1dfa9d3be Fixed add/remove content dialog being too low 2015-04-30 10:50:23 -04:00
Albert Santoni be614415de SAAS-757: metadata edit window goes under the header menu 2015-04-30 10:29:43 -04:00
Duncan Sommerville 950dd22697 Fix for add remove media popup layout 2015-04-29 14:45:14 -04:00
Albert Santoni c1af91bb9a Suspension notice layout fix 2015-04-29 13:58:50 -04:00
Albert Santoni 49456318ff Fix layout being too narrow sometimes 2015-04-29 13:22:22 -04:00
Duncan Sommerville 574fdf4b27 Merged 2.5.x into saas 2015-04-27 14:01:28 -04:00
Duncan Sommerville 4b307d6b47 Fix for vertical scrollbar issue 2015-04-27 13:52:55 -04:00
drigato 7d1b112db9 Stopped redirecting to /login if no valid session 2015-04-21 11:26:48 -04:00
drigato 9cee7bcc86 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-04-20 10:05:55 -04:00
drigato 926d1704bf SAAS-723: Add compatibility chart to player page 2015-04-20 09:59:17 -04:00
Albert Santoni 5d25fcea2d Style tweaks to the suspension notice. 2015-04-17 12:58:05 -04:00
Albert Santoni 1964cbb75e Merge branch 'saas' into saas-suspend 2015-04-17 12:18:56 -04:00
Albert Santoni 3695049a6c Added Admin_Only decorator and greyed out read-only text-areas 2015-04-14 14:35:37 -04:00
Albert Santoni 088ada1d2c Reformatted Bootstrap, added Station Suspended notice 2015-04-10 17:14:56 -04:00
drigato caa591bd5e Player - set fixed height for metadata area 2015-04-10 11:07:42 -04:00
drigato 4d7d48d6fb Player - fix height 2015-04-10 10:55:39 -04:00
drigato f238faa937 SAAS-712: UI Improvements 2015-04-09 14:22:50 -04:00
drigato 4429117f6a SAAS-712: UI Improvements 2015-04-09 09:43:15 -04:00
drigato 23bf866211 SAAS-712: UI Improvements 2015-04-08 14:01:57 -04:00
drigato 4ab4fe5cb9 Fixed player css so long artist and track names don't overflow 2015-04-02 15:00:46 -04:00
drigato fdd8cdfaea Fixed Airtime badge spacing 2015-04-02 14:35:13 -04:00
drigato 06f43ef2d7 CSS modifications 
Added fixed width and height to player.
Floated Airtime badge to the right
 2015-04-02 12:45:05 -04:00
drigato 0bffa07ed9 SAAS-669: Long station names overlap with link to airtime.pro 2015-04-01 12:59:31 -04:00
drigato eaeed9be77 SAAS-669: Long station names overlap with link to airtime.pro 2015-04-01 12:50:49 -04:00
drigato c1038cd92f SAAS-706: Remove volume bar from player 2015-04-01 11:25:58 -04:00
drigato 220f21ab22 Merge branch 'saas' into saas-embed-player 
Conflicts:
	airtime_mvc/application/configs/ACL.php
 2015-03-31 17:44:14 -04:00
duncan 3fe1a46c41 Fixed dropdown menus not behaving correctly 2015-03-26 12:50:53 -04:00
Duncan Sommerville 040eb1443d CSS fixes to make page header more responsive 2015-03-25 17:29:28 -04:00
drigato 17358a761f SAAS-663: Integrate player design 2015-03-25 11:44:28 -04:00
Albert Santoni 3d03f837d2 Trial->Paid conversion tracking with GTM 
* Added trial to paid conversion tracking with GTM
* Removed WHMCS roundtrip from Showbuilder
* Moved all Analytics code into common/GoogleAnalytics.php
* Added a new Thank You page after plan changes to capture conversions
* Added a ConversionTracking plugin to facilitate that
* Also backported some minor staticBaseDir compatibility changes
* Fixed a logic error in creating the baseDir
 2015-03-24 10:11:25 -04:00
drigato 5a373ac604 Merge branch 'saas' into saas-embed-player 2015-03-23 15:46:03 -04:00
Albert Santoni 32aa962138 Fixed error logging and refactored ErrorController to get invoked 
correctly when using API key authentication

* Along with the bugfixes, backported improved ErrorController from upstream branch,
  including style improvements.
 2015-03-20 17:20:34 -04:00
drigato ed891fb145 Committing lots of trial and error embed player code changes 2015-03-18 14:23:38 -04:00
Duncan Sommerville 936d11b367 Merge branch '2.5.x-albertenhancements' into saas 2015-02-27 17:21:20 -05:00
Duncan Sommerville 78c7170c4e Reformatted logo remove button to use Zend 2015-02-27 17:19:37 -05:00
Albert Santoni e13e4413ea Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas 2015-02-24 15:03:06 -05:00
Duncan Sommerville 5e256df061 Added remove button for station logo on preferences page 2015-02-24 12:12:30 -05:00
Duncan Sommerville 69d588d2f6 Merge branch '2.5.x' into 2.5.x-albertenhancements 2015-02-24 10:45:52 -05:00
Albert Santoni d46f4a52eb Installer tweaks and a pypo bugfix 
* Moved all the remaining DEB requirements into the requirements files
* The installer should now be distro agnostic (unless you ask it to
  install third-party deps for you)
* Fixed pypo not being able to find replaygainupdater
* Tweaked a bunch of styling for the installer
 2015-02-10 18:06:46 -05:00
Albert Santoni fd42c67b0b Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-01-21 18:08:05 -05:00
Duncan Sommerville 345b2b5d26 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-01-21 15:14:34 -05:00
drigato 2fadc8f8f1 Merge branch '2.5.x' into saas 
Conflicts:
	CREDITS
 2015-01-20 11:44:53 -05:00
Albert Santoni c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
 2015-01-16 17:27:52 -05:00
Duncan Sommerville 44018b2cbf Changed status page to use config-check (tentative) and removed time-intensive check in index routing 2015-01-16 16:15:16 -05:00
Albert Santoni 620029c04e Stop Chrome from flashing white between page loads 2015-01-15 16:45:14 -05:00
Albert Santoni 7c28b66ce9 Merge branch '2.5.x-albertenhancements' into saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-15 16:32:29 -05:00
Albert Santoni f9bf71a349 Moved the Station Logo field to GeneralPreferences, and stopped using 
AJAX on the general prefs form
 2015-01-15 16:28:18 -05:00
Duncan Sommerville a5cc529c4a Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-01-15 11:24:16 -05:00
Duncan Sommerville 5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Albert Santoni d5b969f94f Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-13 21:31:57 -05:00
Albert Santoni c4d3a8fa62 Massive simplification of the GeneralPreferences dialog 
* The purpose of this was so that we can use Zend_Form_Element
  decorators, which I need.
 2015-01-13 20:51:46 -05:00
Duncan Sommerville f4c5cf1353 Added virtualenv back into install process 2015-01-05 16:41:03 -05:00
Duncan Sommerville 4dfd49d12c Initial work on monitless installation 2014-12-16 12:24:41 -05:00
Duncan Sommerville f5b4928538 More work on web installer 2014-12-09 17:48:16 -05:00
Duncan Sommerville 9fed113f74 More work on setup/installation process 2014-12-03 18:04:47 -05:00
Duncan Sommerville 8f46b4dca7 More work on new installer 2014-11-28 15:30:11 -05:00
Duncan Sommerville 6b8163748d Updated styles for csrf elements 2014-11-13 09:46:44 -05:00
Duncan Sommerville 4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
Duncan Sommerville 534b56351e Added styles to completely hide csrf elements on the page; changed tabs to spaces 2014-11-05 17:26:05 -05:00
Duncan Sommerville 3a1efa39eb Added instance description field 2014-09-19 12:55:02 -04:00
Duncan Sommerville ee92f41a8d Updated look and feel and added front-end validation for image elements in add-show 2014-09-18 16:28:52 -04:00
Duncan Sommerville b89a764442 Updated to include show image functionality 2014-09-17 19:41:17 -04:00
Albert Santoni f1610485c3 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 
Conflicts:
	airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
 2014-06-26 17:45:48 -04:00
Albert Santoni 18c828defd Finished up VAT validation for Plans page 2014-06-26 17:31:34 -04:00
Albert Santoni 51b7fe9adf Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-25 20:33:10 -04:00
Albert Santoni b36967a690 Nicer auto-styling for the Billing Details form 2014-06-25 20:32:41 -04:00
Albert Santoni fce6116d60 Made the invoices view nice! 2014-06-25 20:01:14 -04:00
Albert Santoni 338fd06f81 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 
Conflicts:
	airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
 2014-06-25 19:03:13 -04:00
Albert Santoni d92e5197e1 Design and overhaul of Account Plans screen 
* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
 2014-06-25 18:58:54 -04:00
Albert Santoni 8c20592423 Start of form customization for billing 2014-06-24 15:52:43 -04:00
Albert Santoni 51d930cd84 Make Live Chat not block the Add Media pagination buttons 2014-06-04 13:47:27 -04:00
Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
 2014-04-23 15:58:39 -04:00
drigato edcf8844e3 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 11:25:02 -04:00
drigato 4add0f0b7b CC-5786: Quota Enforcement in the File Upload API 2014-04-14 11:24:39 -04:00
Albert Santoni afc7df8469 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-01 16:41:25 -04:00
Albert Santoni 19f231bd11 CC-5709: Airtime Analyzer 
* Add Media page CSS file that I forgot to commit ages ago
 2014-04-01 16:40:54 -04:00
Naomi b209108604 CC-5732 : History -> Playout History: live chat banner blocks navigator buttons 
avoid livechat problems
 2014-03-13 12:37:56 -04:00
Naomi 8d2926aeed CC-5727 : History search range using incorrect timezone offset (also Nowplaying) 
sending the timestamp string back for nowplaying as well.
added error class to history page if end is < start.
 2014-03-10 18:33:07 -04:00
Albert Santoni 653f0e02a4 CC-5648: Events are shifted down in the month view 
* Fixed it.
 2013-12-17 15:25:43 -05:00
Albert Santoni f16d8ca2ea Fixed a bunch of annoying/major graphical issues with the calendar 
* Fixed a bug where the calendar would keep shrinking smaller and
  smaller as you resized the window.
* Fixed the size and alignment of the time span combobox in the corner,
  which fixes a bug where the text was cut off.
* Fixed a bug where the schedule header would grow as you flipped
  to the next or previous week.
* Dropped javascript from the resizing of the calendar (for the most
  part).
 2013-12-14 00:05:13 -05:00
Naomi e6d28b250e CC-5629 : Smart Block timestamps aren't saved in UTC time 2013-12-11 17:35:31 -05:00
denise 55254e88a5 UI text improvements for setting the station/user timezones 
Added info icon in the add-show form for timezone setting
 2013-10-07 14:49:52 -04:00
denise 3d9bc85fa0 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-01 08:49:10 -04:00
Albert Santoni 52b7dbb226 Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-09-26 08:36:11 -04:00
denise a8a02704f3 Merge branch '2.5.x' into cc-5232-show-timezone 2013-09-25 17:24:44 -04:00
Albert Santoni 99669c78a0 Fixed CC-5045 and Now Playing time remaining style improvements 2013-09-25 16:40:20 -04:00
denise 107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
Daniel James 8dc100126a Alert icon for missing file in Now Playing should be orange, to match Media Builder 2013-09-25 17:36:50 +01:00
Naomi 4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Naomi Aro 53c326b320 pagination buttons look better if they can fit on the same line. 2013-08-30 01:23:35 -04:00
Naomi Aro 7b54d3b6ce fixing colour to go back to default theme 2013-08-30 01:08:49 -04:00
Naomi Aro 2c88d1e0a0 formating the date start/end of each show in the accordian. 2013-08-30 01:06:59 -04:00
Naomi 91d4d1224e redoing accordian properly. 2013-08-29 15:52:24 -04:00
Naomi ec31fd50c9 deleteing items from the show table. 2013-08-29 15:34:34 -04:00
Naomi e6b09308a5 IM-932 : File Metadata Distinction/Template Design 2013-08-28 15:40:10 -04:00
Naomi 3769f5e5db IM-933 : datepicker switch/design 2013-08-28 14:54:44 -04:00
Naomi 05054fa823 IM-931 : Icon Overlap 2013-08-28 14:48:35 -04:00
cliff.wang 12a62a3827 CC-5309:Calendar-> Recording Show: Fail to open context menu 
Better error msg, also add more information in show-record.log
 2013-08-23 14:23:47 -04:00
Naomi f1b1352077 matching selected row colours to the library table. 2013-08-23 13:31:37 -04:00
Naomi Aro 01370c2124 reverting back to the bootstrap datetime picker since it's nicer to use. 2013-08-22 20:23:17 -04:00
Naomi f7531d5da2 remove sizing of history content div in JS. CSS to fix width and containing box problems. 2013-08-22 14:50:58 -04:00
Naomi Aro 3ea2b920a6 crlf 2013-08-19 23:20:26 -04:00
Naomi Aro 09693ef174 changing to context menu single edit/delete. 2013-08-19 23:19:13 -04:00
Naomi Aro 9b45b9dc72 converting to a jquery UI based datepicker. 2013-08-16 15:12:00 -04:00
Naomi 333ee7453e downgrading full calendar (too much to do the necessary updates at the moment) but still an upgrade from 2.4.x 2013-08-09 15:52:22 -04:00
Naomi Aro 7183396da5 needed to update jquery, fullcalendar needed updating for the new JS. 
working on configuring a template.
 2013-07-29 08:57:31 -04:00
Naomi 46ecdf393d dynamic form rendering for template 
bootstrap datetime widget.

jquery update is needed, testing with hosted jquery first.
 2013-07-26 17:33:17 -04:00
denise 9545d8aacb Removed dropping and recreating cc_schedule table index before inserting into this table. 
We thought it would be a significant performance booster but it isn't
 2013-05-28 16:19:17 -04:00
denise 950cc6d6b7 CC-5177: Create "?" icon beside linked show check box 2013-05-28 14:18:26 -04:00
Naomi 408ecc530d CC-3822 : NowPlaying-> Time filter is allowing Start_Time be greater than the End_Time 2013-05-27 14:37:16 -04:00
Naomi 75e6f21ce0 CC-5108 : Waveform Editor UI 
putting on the timescale for time reference.

fade editor now has cursor playback info.
 2013-05-23 18:33:40 -04:00
Daniel James 7ec664823d Fixes whitespace to the left of 'Open Media Builder' button (CC-5166) 2013-05-22 10:23:42 +01:00
denise 5bf91d513d CC-5127: Library -> Scheduled and Playlist columns needs better icon 
Changed icon
Renamed Playlist to Playlist / Block
 2013-05-17 11:42:48 -04:00
Naomi 7d5177d77d CC-5096 : Add "i" (info) icon to stream output type 2013-05-14 18:14:38 -04:00
Naomi 809d5a35b9 CC-5108 : Waveform Editor UI 
changing colour to be less dark. can better see highlights/drawn fades.
 2013-05-14 15:49:13 -04:00
Naomi 872f68505b CC-5108 Waveform Editor UI 2013-05-13 16:01:06 -04:00
denise fedf564090 CC-5081: Calendar -> Add a linked show icon 2013-05-09 12:14:49 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
Naomi 956bcccd24 CC-2301 : creating different states for the fade editor: 
cursor, fadein, fadeout.
 2013-04-23 16:36:35 -04:00
Naomi 13c8e5f146 CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box. 2013-04-16 14:37:08 -04:00
Martin Konecny 0da0e798c6 make password input width same as text input width. Also make everything a little wider. 2013-04-10 18:19:46 -04:00
Martin Konecny 943538ed9d Revert "CC-4980: Create graphic with 4 switches for Airtime Dashboard" 
This reverts commit baf693d1a9.
 2013-02-27 14:35:35 -05:00
Vladimir baf693d1a9 CC-4980: Create graphic with 4 switches for Airtime Dashboard 2013-02-27 17:36:43 +01:00
denise cf2ed25bfb CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist 
-done
 2013-01-30 16:53:59 -05:00
denise a3477106cf CC-4734: French - UI breaks in several places 
-fixed
 2013-01-18 10:39:06 -05:00
denise 67706bede9 CC-4834: Problem about "Share" button in the "Listen" Panel 
-fixed
 2013-01-14 11:56:46 -05:00
denise a129b0b081 CC-4472: User password verify or clear text display. 
-done with password verify
 2013-01-10 17:51:25 -05:00
denise b2d709052e Modified show is partially filled icon 2013-01-10 14:26:39 -05:00
Martin Konecny 0e217dfb38 CC-4798: Need a 'show is partially filled' icon 2013-01-10 14:24:43 -05:00
denise 1572955d07 CC-4810: Add language setting to login page 
-done
 2013-01-09 18:03:23 -05:00
denise 7866b8a0cb Small fix to select box sizes 2013-01-09 15:11:22 -05:00
denise 3b2b275c30 CC-4809: Listen popup UI breaks with localization 
-fixed
 2013-01-08 17:51:42 -05:00
denise 3de33bc3e3 CC-4811: Move the edit user form to its own page 
-done
 2013-01-08 15:09:35 -05:00
denise 82da4dcfe8 CC-4599: Calendar: Add an icon to indicate show is not fully booked 
-done but a new icon is needed
 2013-01-07 12:41:28 -05:00
denise 02a1199386 CC-4734: French - UI breaks in several places 2013-01-04 17:27:58 -05:00
denise 495fd7da1a CC-4734: French - UI breaks in several places 
-fixed
 2013-01-04 17:19:09 -05:00
denise 7e1efe5d96 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-04 11:00:36 -05:00
denise 596e103d96 CC-4763: Alignment error for User settings UI in Firefox 
-fixed
 2013-01-04 11:00:21 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -05:00
denise 59f3826055 CC-4725: Have a "share" button on the popup player 
-done
 2013-01-03 13:13:27 -05:00
denise bd18039785 CC-4744: Edit user form needs styling 
-done
 2012-12-17 14:12:27 -05:00
denise 076a1c56cb CC-2258: Describe rights for each user type on the user page 2012-12-13 12:29:02 -05:00
denise 2bebe7f025 Modified jquery tipsy css 2012-12-11 18:08:37 -05:00
denise 854eccfb76 CC-4736: Let non-admin users update their user info 
Adding jquery tipsy plugin
 2012-12-11 11:30:59 -05:00
denise dd5882984e CC-4736: Let non-admin users update their user info 
-done but needs design
 2012-12-10 16:55:44 -05:00
James 8acc8fce76 CC-1960: Internationalize Airtime / Support translations 
- fixed close button on show add form
 2012-11-27 15:55:32 -05:00
James 7cc4c88f2f CC-1960: Internationalize Airtime / Support translations 
- css change for close icon
 2012-11-27 13:34:54 -05:00
denise 135aadf16b Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 12:28:21 -04:00
denise cc208da2fb CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference 
-added labels
 2012-11-02 10:48:08 -04:00
James 9d495ebc03 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit. 
- done
 2012-10-30 17:57:58 -04:00
James 3e60ac4393 remove \r line endings 2012-10-30 13:23:09 -04:00
Rudi Grinberg dc00528cd5 Merged baseUrl related conflicts 2012-10-29 11:56:20 -04:00
denise c51fb8a040 CC-4549: Tooltip for source username cannot be shared between input and output settings 
-fixed
 2012-10-22 16:37:06 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
 2012-10-19 12:50:36 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
Daniel James dc7b609115 CC-4593: Widen container in CSS so label is not truncated 2012-10-18 16:12:51 +01:00
denise 4b2b5ada6e CC-4548: Calendar -> Add/Remove contents -> Advanced search: Green check is pushed to different line under 1400 screen width 
-fixed
 2012-10-11 12:23:24 -04:00
denise 5c0bdfa2db CC-4544: Playlist/Smart Blocks: Add cue format helper 
-done
 2012-10-11 12:11:53 -04:00
Daniel James fa8c561dab CC-4543 Adjusted CSS for wider colour code label 2012-10-10 11:44:38 +01:00
denise 279737751b CC-4540: Smart Block: Error messages are too long 
-fixed
 2012-10-09 12:12:52 -04:00
Daniel James c6dc5a818f CC-4172: Fix alignment of 'is in the range' boxes 2012-10-09 16:24:03 +01:00
Daniel James 456d9ba99a CC-4172: Shrink width of table to fit 1280 pixel wide display 2012-10-08 15:33:57 +01:00
Daniel James 44a3f85636 CC-4507: Tweak CSS to make more room for metadata in Master Panel 2012-10-08 12:49:54 +01:00
denise 968c719fa1 CC-4172: Smart Playlist creator requires full HD monitor to avoid buttons being hidden 
-done
 2012-10-02 14:12:22 -04:00
Daniel James 7d00631150 Set min-width value for source info block in Master Panel (CC-4510) 2012-10-01 12:11:36 +01:00
denise 29347527cf CC-4471: Library -> Remove extra top margin in playlist builder 
-done
 2012-09-19 17:14:22 -04:00
denise 182bdd0cf6 -added border to smart block expansion 2012-09-17 15:57:41 -04:00
denise 43c336eb6d CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents 
-implemented css changes
-formatted playlist_builder.css
 2012-09-17 15:41:22 -04:00
denise 3329c36d0c - changed smart block range text boxes to align with new UI 2012-09-17 15:23:47 -04:00
James d089d3fbf3 - putting scroll bar on library left pane 2012-09-17 12:28:46 -04:00
Vladimir c19030e8fb CC-4155: additional styling 2012-09-17 17:39:40 +02:00
Vladimir 207fe29560 CC-4155: Style static/dynamic expansion blocks in playlist contents 2012-09-17 16:50:34 +02:00
Vladimir f6d8e4b957 CC-4078: Calendar -> Need better 'now-playing' icon 2012-09-17 16:17:05 +02:00
Vladimir 465de07ae0 Minor cosmetic change of the liquidsoap status 2012-09-17 15:32:33 +02:00
Vladimir d888d1cb1c CC-4443: Context menu is not displayed correctly 2012-09-17 15:27:13 +02:00
Vladimir 9776da8bf4 Fixed playlist item width 2012-09-17 14:39:57 +02:00
denise a75a12a198 -smart block criteria UI change for small screen resolution 2012-09-14 18:02:40 -04:00
denise 84deda99c5 CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible 
-fixed
 2012-09-14 17:35:14 -04:00
denise 8f48544bb7 -implemented UI changes for Now Playing page 2012-09-13 17:10:38 -04:00
Martin Konecny a396136600 bootstrap.css file 2012-09-13 10:42:53 -04:00
Martin Konecny 54d7f496d9 add bootstrap.js to bootstrap.php 2012-09-12 23:06:05 -04:00
Vladimir 8938eaa637 Added missind Bootstrap CSS (bootstrap_custom.css) 2012-09-12 23:18:37 +02:00
Martin Konecny 20f5fe6480 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Block.php
	airtime_mvc/public/css/styles.css
 2012-09-12 15:55:43 -04:00
Martin Konecny a418f5777c CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track 
-initial commit
 2012-09-12 15:43:50 -04:00
Vladimir 77824afdd3 Added Bootstrap CSS, images and JS for new buttons and dropdown menues 2012-09-12 21:23:25 +02:00
denise 8e40137b7d CC-4316: Missing image file 
-fixed
 2012-09-04 11:58:54 -04:00
denise ef5427d0bc CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view 
-fixed
 2012-08-22 14:18:48 -04:00
James a24da9e324 CC-4256: Smart Playlist: change name to smart block and etc 
- done
 2012-08-20 17:17:48 -04:00
denise fa87393ba9 CC-4216: Playlist: 'Close' button for fade in/out is out of the border when it's empty 
-fixed
 2012-08-13 14:53:21 -04:00
denise 5e1d8eabb3 Smart Playlists: moved Save button from right side to left side 2012-08-10 12:34:45 -04:00
denise c774e3b9bd Smart Playlists: got rid of horitzontal scrolling 2012-08-10 10:42:01 -04:00
denise e6ee29f57c Smart Playlist Options: changed width of fieldset 2012-08-09 17:28:35 -04:00
denise 677d523ef4 CC-4187: Media Library -> Regular Playlist : Use legend instead of label for different elements in context view 
-done
 2012-08-09 11:20:49 -04:00
denise 50f9582b95 CC-4179: Media Library -> In brief view of Dynamic Smart Playlist, 'does not contain' will be broken to 2 lines 
-fixed
 2012-08-08 13:24:53 -04:00
Martin Konecny f33485f8ea Merge branch '2.1.x' into devel 2012-08-08 00:09:13 -04:00
denise f6dffc95c8 CC-4158: Playlist Builder -> Smart Playlist: Warning msg field is a little bit longer 
-fixed
 2012-08-07 15:22:32 -04:00
denise 550c97a2dc CC-4154L: Indicate whether a show has scheduled content on the calendar page 
-done
 2012-08-07 14:57:04 -04:00
denise 8e67ecff0a CC-84: Smart Playlists 
- added a no-wrap class to qtip
 2012-08-02 17:17:13 -04:00
denise ef994aa449 CC-84: Smart Playlists 
- block options scroll for small screens
 2012-08-02 16:40:32 -04:00
denise 9479aeb3dd CC-84: Smart Playlists 
- fixed db column mapping for radio station name and track title
 2012-08-01 17:10:56 -04:00
denise ddd6016b28 CC-84: Smart Playlists 
- qtip cleanup
 2012-08-01 16:36:12 -04:00
denise 13bb036bad CC-84: Smart Playlists 
-on criteria qtip limit was displaying more than once
-fixed
 2012-08-01 15:00:41 -04:00
denise 7d788c51b2 CC-84: Smart Playlists 
- added scrolling on qtip
 2012-08-01 14:43:52 -04:00
denise c9afac239a CC-84: Smart Playlists 
- add qtip for smart playlists
- modified qtip content for regular playlists that contain smart playlists
 2012-08-01 12:04:48 -04:00
denise 1b1b7e11d0 CC-84: Smart Playlists 
-fixed spacing of modifier '+' button
 2012-07-31 10:05:38 -04:00
James b9739b022d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 17:55:39 -04:00
James 019d13b4c9 CC-84: Smart Playlists 
- backend implementation
- UI for blocks within playlist
 2012-07-30 17:55:22 -04:00
denise d169f4aa31 CC-84: Smart Playlists 
- improved validation to not allow multiple criteria fields
 2012-07-30 17:03:01 -04:00
denise f91be9468f CC-84: Smart Playlists 
-UI cleanup
 2012-07-30 16:42:37 -04:00
Martin Konecny a16a1f5033 CC-1665: Scheduled stream rebroadcasting and recording 
-Webstreams now appearing in the library
 2012-07-26 14:49:31 -04:00
denise 64185dac95 CC-84: Smart Playlists 
- subforms now open and close on the click event
- fixed add and remove criteria to work with new subforms
 2012-07-23 12:42:00 -04:00
denise 9bdb4a40e0 CC-84: Smart Playlists 
-fixed playlist type spacing on UI
 2012-07-20 12:32:18 -04:00
denise 9fcc851523 CC-84: Smart Playlists 
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
 2012-07-19 14:52:39 -04:00
denise 7c5291fe0c CC-84: Smart Playlists 
- ui cleanup
 2012-07-18 11:55:29 -04:00
denise e0a674a96c CC-84: Smart Playlists 
-added save button for static playlists
 2012-07-16 18:24:46 -04:00
denise 1bb97c8603 CC-84: Smart Playlists 
- ui clean-up
 2012-07-16 14:44:50 -04:00
denise 2dae5f30f7 CC-84: Smart Playlists 
- code cleanup
- adds 'Add' button to last row, always
 2012-07-16 11:01:34 -04:00
denise d81253cccc CC-84: Smart Playlists 
- send playlist id on generate/save action
- fixed some small UI bugs
 2012-07-12 17:19:53 -04:00
denise e4fb42cbd0 CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show. 
-done
 2012-07-06 15:26:51 -04:00
denise 335dd1516b Merge branch '2.1.x' into devel 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
 2012-06-29 10:57:14 -04:00
James c669d3cb47 CC-3969: Reset Password: specifying wrong e-mail keeps you on the same page 
without possibility to navigate back gracefully

- done
 2012-06-20 18:02:46 -04:00
denise d02607ed94 CC-3561: Add button to automatically rescan watched folders. 
-done
 2012-06-15 12:16:19 -04:00
denise 295a8ea5fe CC-3561: Add button to automatically rescan watched folders. 
-done
 2012-06-14 13:44:56 -04:00
denise 16b6f09420 CC-3959: Make default username "source" for master and show inputs 
-done (just added tooltip)
 2012-06-11 14:55:26 -04:00
denise 532b2710f0 CC-3932: Master/Source Source Connection URL should be in non-editable box 
-done
 2012-06-06 13:10:57 -04:00
denise a3754be31a CC-3850: Use qTip instead of custom tooltips 
-done
 2012-06-05 11:24:40 -04:00
denise 5e894f7351 CC-3893: Add Media: Red underline appears on the bottom 
-fixed
 2012-06-05 11:19:59 -04:00
denise 33e97e7b40 - changed trial-end-date box to have a fixed position 2012-05-30 14:12:18 -04:00
denise 925f98e3d0 SAAS-242: Livechat window obscures trial end date graphic 
-fixed
 2012-05-25 15:48:27 -04:00
Naomi Aro 6b8adff769 CC-3876 : "open the library to schedule files" button should be disabled for 'guest' users and DJ's not assigned to this show 2012-05-24 15:08:54 +02:00
Vladimir 6d88b21a8f CC-3846: changed CSS for info icon, it should fix the positioning issue 2012-05-22 17:53:51 +02:00
Martin Konecny 8720aabc27 CC-3857: Chmod fixes for files which should not be executable 
-fixed
 2012-05-22 11:22:43 -04:00
Naomi Aro d47514c4db CC-3845 : General UI cleanup 2012-05-21 18:28:19 +02:00
Naomi Aro 4fe80194b6 CC-3845 : General UI cleanup 2012-05-21 17:07:34 +02:00
Naomi Aro 766f897dfe CC-3845 : General UI cleanup 2012-05-18 16:20:33 +02:00
Naomi Aro 560b9da239 CC-3845 : General UI cleanup 2012-05-18 16:01:24 +02:00
Naomi Aro ff1327881a CC-3845 : General UI cleanup 2012-05-18 15:40:22 +02:00
Paul Baranowski 6d75b4fc06 The fix for long connection strings in "Add Show" form caused the tooltips to 
be displayed incorrectly (hidden).  Reverted that change.

Fixed display of "Stream URL" in the stream settings.
 2012-05-17 18:07:41 -04:00
Paul Baranowski 869eb77ca4 CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place 
Fixed both of these issues.

Fixed issue with connection URLs in "Add Show" and in "Stream Prefs" where
the text was unstyled.

Fixed issue with long connection URLS causing display problems
in "Add Show" and in "Stream Prefs".  Now a scrollbar will appear if the
connection URL is too long.

Fixed bug in Stream Prefs where zooming out caused the page to be formatted
differently.

Fixed bug in Stream Prefs where the labels "Master Source Connection URL" and
"Show Source Connection URL" wrapped on multiple lines.

Fixed help text for Add Show -> Live Stream authication settings, the
instructions were wrong and there were misspelled words.
 2012-05-17 17:33:50 -04:00
Naomi Aro 803c44611a CC-3819 : Add View on Soundcloud context menu option on calendar page 2012-05-14 15:48:09 +02:00
Naomi Aro 97ce006130 CC-3816 : Automatic uploading of recorded shows, View on Soundcloud choice in menu doesn't work 2012-05-14 12:36:57 +02:00
Naomi Aro 1cc84c1c85 CC-3761 : Calendar->Update Show:Try to input wrong number of Colour, Browser hangs 2012-05-07 14:48:33 +02:00
Naomi Aro edaec54a5d CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file 
using jquery.blockUI.js on timeline/playlist builder pages.
 2012-05-04 15:00:18 +02:00
James c9df8e8b15 CC-3722: Create loading indicator for AJAX call when calculating Show length 
- done
 2012-04-26 11:56:14 -04:00
James 2cb17a3b08 CC-3660: Cannot click Airtime Manual link on override info popup 
- replaced the popup with qtip
 2012-04-24 11:26:22 -04:00
Martin Konecny b9ab11ce28 CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor 
-fixed
 2012-04-23 17:18:34 -04:00
Vladimir b0ac86ba43 CC-3416, style changes 2012-04-12 22:33:54 +02:00
Vladimir 37250d9508 CC-3250 , new warning icon 2012-04-11 20:43:38 +02:00
Vladimir 29b8e0f682 CC-3424 , CSS and icon changes for the new context menu. Added icons for all actions 
Signed-off-by: Vladimir <vladimir.stefanovic@sourcefabric.org>
 2012-04-11 18:35:47 +02:00
Naomi Aro 079862d2f2 CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date" 2012-04-03 16:11:53 +02:00
Naomi Aro 6c5eb384a5 CC-3508 : Double Scrollbar in Show Builder menu 2012-04-03 14:58:10 +02:00
Naomi Aro d27470da99 Merge branch 'CC-3174' into devel 2012-04-03 10:58:39 +02:00
Vladimir 416b9d1dc2 CC-3482 2012-04-02 17:28:05 -04:00
Naomi Aro 6c25423f4e CC-3545 : Calendar->AddRemove (Now Playing Tab->Add Files to Show) -> changing order of tracks is not correct 
removing table tools.
replacing with something simpler that will preserve order on screen.
 2012-04-02 19:03:11 +02:00
Naomi Aro eeb7273909 CC-3542 : When you delete the current show it takes all songs from that show out of the playout history 2012-04-02 15:20:13 +02:00
Vladimir 206a8f111c CC-3482 and CC-3455 2012-03-30 00:35:49 +02:00
Naomi Aro d12ef1c7a2 CC-3536 : Work out ACL with library on NowPlaying when it's a guest User 2012-03-28 18:43:44 +02:00
Naomi Aro 1e9348f27f CC-3509: "Add Files" button (make it look better) 2012-03-28 17:50:14 +02:00
Naomi Aro 451b573c52 Merge branch 'CC-3174' into devel 2012-03-27 14:14:58 +02:00
James 7e92b96a67 CC-3507: Live Stream status: naming 
- fixed css width
 2012-03-26 18:39:10 -04:00
Naomi Aro 275faa1881 CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time 2012-03-26 19:08:52 +02:00
Naomi Aro 91d44847cb CC-3506 : Timeline: smaller columns for time values 2012-03-26 12:24:16 +02:00
Naomi Aro 711d1f202a CC-3463 : Usability of timeline 
changing buttons to be jquery ui icons.

adding button to trim overbooked
adding button toscroll current item to top.
 2012-03-23 16:42:08 +01:00
Naomi Aro 8af4f052e0 CC-3360 : timeline css 2012-03-23 01:46:45 +01:00
Naomi Aro f1d76443ab CC-3360 : timeline css 2012-03-23 00:11:49 +01:00
Naomi Aro da02bb7076 CC-3360 : Timeline Css 2012-03-22 19:15:39 +01:00
Naomi Aro 1fdb3cf163 CC-3360 : Timeline Css 
adding Css to timeline.
 2012-03-22 18:04:22 +01:00
James b7634098d3 CC-3471: Stream setting page looks much worse in Chrome than in Firefox 
- fixed
 2012-03-19 15:02:29 -04:00
Naomi Aro fa1f03ed58 CC-3174 : showbuilder 
improving look of playlist when files are not on disk.
 2012-03-15 12:08:29 +01:00
Naomi Aro 3019cb9c42 CC-3434 : playlist 
changing image to be smaller.
 2012-03-15 11:37:20 +01:00
Naomi Aro ae646545c4 CC-3201 : file import more visible 2012-03-15 11:36:32 +01:00
James 16c0756d76 CC-3224: "On-the-fly" stream rebroadcasting 
- css fix
 2012-03-14 15:26:07 -04:00
James c5c9fd7ba8 CC-3430: Live Stream: Admin should be able to kick out the source connection 
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
 2012-03-14 14:43:11 -04:00
James 4eefc05366 CC-3427: Live Stream: Ability to switch off Scheduled Play 
- done
 2012-03-14 14:43:10 -04:00
James e31ac81e74 CC-3418: Live Stream: Merge current "On-Air" indicator and "Listen" 
button with new stream source indicator

- Initial commit
 2012-03-14 14:43:10 -04:00
James f193047a1c CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream 
are connected and give user the ability to block those streams

- added stream source switch interface
- backend code
 2012-03-14 14:43:10 -04:00
James 30901aa0d6 CC-3224: "On-the-fly" stream rebroadcasting 
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
 2012-03-14 14:41:00 -04:00
James 48bb19d758 CC-3224: "On-the-fly" stream rebroadcasting 
- web interface
- auth script for liquidsoap
- DB changes
 2012-03-14 14:41:00 -04:00
Naomi Aro 309c6da83d CC-3440 : Calendar time picker is hidden for day and week views 2012-03-14 18:05:50 +01:00
Naomi Aro eb389d99d2 CC-3434 : Playlist Builder fast deleting 2012-03-14 17:50:48 +01:00
Naomi Aro c66b55ec17 CC-733 : playout history 
translating mDataProp values to be able to search table on backend
 2012-03-09 11:13:32 +01:00
Naomi Aro fe3c340a90 CC-3174 : showbuilder 
making library table only scroll on the table part.
 2012-03-07 18:27:32 +01:00
Naomi Aro 157078b963 Merge branch 'CC-3174' into devel 
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
 2012-03-06 13:51:37 +01:00
Naomi Aro 6c5f710329 CC-3174 : showbuilder 
making each separate widget scrollable (playlist, library, timeline)
 2012-03-06 13:19:20 +01:00
Daniel a09b63b8d0 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
 2012-03-05 19:00:14 -05:00
Naomi Aro a832a40c75 CC-3174 : showbuilder 
making the library a separate scrollable from playlist
 2012-03-05 18:14:10 +01:00
Naomi Aro b8ca0ef740 CC-3174 : showbuidler 
fixing width of search input so it will work on smaller screens.
 2012-03-05 15:39:18 +01:00
Naomi Aro 62c07107c1 CC-3174 : showbuilder 
dialog improvements, can scroll library, builder independently.
 2012-03-05 14:43:34 +01:00
Naomi Aro 98d50ae4a7 CC-3174 : showbuilder 
different width added for dialog builder.
 2012-03-02 15:47:50 +01:00
Naomi Aro b358c90cfb CC-3174 : showbuilder 
making the library toggle in when pressing the edit button
 2012-03-02 15:28:04 +01:00
Naomi Aro 1c43edb40b CC-3174 : showbuilder 2012-03-01 17:05:50 +01:00
Naomi Aro 99b490129c CC-3174 : showbuilder 
making a dialog on the calendar page.
 2012-03-01 00:19:59 +01:00
Naomi Aro a8f53d169b CC-3174 : showbuilder 
sizing bit rate/sample rate in library, text right aligned.
 2012-02-29 17:47:26 +01:00
Naomi Aro 7c74023ef0 CC-3174 : showbuilder 
removing ugly dsahed border, keeping height for the library dragging helper.
 2012-02-29 16:09:39 +01:00
Naomi Aro 997782c73c CC-3354 : playlist drag and drop 
improving apperance of playlist drag and drop.
 2012-02-28 13:13:40 +01:00
Naomi Aro 3cc1506086 CC-3358 : Metadata Qtip 2012-02-27 12:23:22 +01:00
Naomi Aro 19d13889af CC-3351 : Track length should only show to tenths of a second in the library 
created a length formatter to use in multiple places.
 2012-02-24 15:07:04 +01:00
Naomi Aro 28bb97acfa CC-3174 : showbuilder 
allow user to filter library by

files/playlists or all.
 2012-02-24 00:55:20 +01:00
Naomi Aro e0134ed6d1 CC-3174 : showbuilder 
made width not inline.
 2012-02-23 22:54:13 +01:00
Naomi Aro c665a3fa03 CC-3333 : showbuilder track colouring 
tracks coloured if boundry/over.

needs better colour selection.
 2012-02-23 22:23:21 +01:00
Naomi Aro 753c05ce5b CC-3335 : Timeline: Drag and drop usability improvements 
cursor must be used to add tracks to timeline, not check boxes.
 2012-02-23 17:46:07 +01:00
Naomi Aro b357b80054 CC-3174 : showbuilder 
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.

starting to use new cursor arrows.
 2012-02-23 12:13:00 +01:00
Naomi Aro 9b5a0fc565 CC-3174 : showbuilder 
working on trying to save/load state serialized into the db for datatables.
 2012-02-21 17:31:54 +01:00
Naomi Aro b1fbeeb448 CC-3174 : showbuilder 
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
 2012-02-15 00:39:27 +01:00
Naomi Aro 3728ffaddc CC-3174 : showbuilder 
upgraded full calendar to 1.5.3 so that it works with jquery 1.7.1

need to replace context menu on the page, old one doesn't work anymore anyways.
 2012-02-07 23:58:36 +01:00
Naomi Aro 42452b8ea9 Merge branch 'CC-3174' into devel 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/airtime/library/spl.js
 2012-02-06 11:07:10 +01:00
Naomi Aro da5e1ac302 CC-3174 : showbuilder/library 
adding new context menu, link to view on soundcloud doesn't seem to work.
 2012-02-05 13:56:07 +01:00
Naomi Aro 38f3d6bfb0 CC-3174: showbuilder/library refactoring 
adding new context menu files, playlist is working except for editing fades.
 2012-02-04 19:27:26 +01:00
Naomi Aro 6da4397a96 CC-3174 : show builder 
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
 2012-02-02 23:15:39 +01:00
Naomi Aro 3aab811a3e CC-3174 : showbuilder 
fixing some css/js for display.
 2012-02-01 23:33:20 +01:00
Naomi Aro fbda0e733b CC-3174 : showbuilder 
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
 2012-01-31 18:59:27 +01:00
Naomi Aro b0c3bace1c CC-3174 : show builder 
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
 2012-01-26 15:21:04 +01:00
James 5026da56cb SAAS-178: Demo instance should prevent changing of admin password 
- Error msg is returned when try to update admin account
 2012-01-25 14:14:27 -05:00
Naomi Aro ecaebbeb67 CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones. 2012-01-23 19:07:07 +01:00
James ff428d2c4f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-17 11:35:48 -05:00
James dae7e73a84 CC-3250: UI design for mount monitor for media monitor 
( Manage Media Folder and Playlist Builder screen)

- initial commit
 2012-01-17 11:35:31 -05:00
Martin Konecny 54ee177f7d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-16 13:58:45 -05:00
Yuchen Wang b215d816ac CC-3186: Design tweaks for tooltip 
Updated the icon to make it stand out more
 2012-01-13 10:28:42 -05:00
Yuchen Wang 7d9aa3ca5d CC-2299: Better column options in playlist/file list on playlist builder 
- allow columns to be re-ordered; note that the 1st two columns are fixed in-place to avoid some
problem with the ColVis plugin
 2012-01-10 09:52:32 -05:00
Yuchen Wang a1ccb9c42a CC-1986: Configurable columns for media search 
- Upgraded ColVis plugin to 1.7, as this one contains some bug-fix that we need
- Added CSS file for ColVis plugin, so that we don't have to modify the plugin code
- Added the Configure Columns UI code
 2012-01-08 10:33:11 -05:00
Yuchen Wang 8833f4462e CC-1977: Allow multiple files to be selected and acted upon in the library and playlist 
- Added checkbox column to playlist builder
- Added the ability to add multiple songs to playlist by using checkboxes and "Add" button
- Added the ability to delete multiple songs/playlists by using checkboxes and "Delete" button
- Make them look nice by adjusting CSS and datatable
 2012-01-07 23:37:37 -05:00
James 5fa92f3d17 - temp commit on group action 2012-01-04 12:47:27 -05:00
lukabazuka 9f25155246 CC-3162 
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
 2011-12-12 21:27:58 +01:00
Yuchen Wang c3b6203628 CC-3168: Stream Settings: "Vorbis Metadata" confusing string 
Done
 2011-12-09 13:42:03 -05:00
lukabazuka 07d77f0957 CC-3138 
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
 2011-12-05 17:00:15 +01:00
lukabazuka c81228147f CC-3090 
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
 2011-11-29 16:55:36 +01:00
James a886b53d74 CC-3077: Preference/stream-setting page has no Vorbis metadata option 
- done
 2011-11-23 17:03:30 -05:00
James e5ac2b75d4 CC-3059: Record and Rebroadcast: not able to set rebroadcast too close to 
recorded show

- fixed.
- extra fix: layout was broken when error is displayed
 2011-11-18 11:36:20 -05:00
James 6229ca46d5 CC-2959: Stream Setting: Status box design for each stream 
- integrated new status boxes
 2011-11-15 16:27:23 -05:00
Yuchen Wang af1b376cdf CC-3029: Graphic design for the version notification feature 
- use classes in VersionNotify.php for displaying icons instead of inline styling
- change underscore to hyphen so that naming convention is consistent with the
  rest in style.css
 2011-11-15 16:08:05 -05:00
lukabazuka ace68bd363 CC-3029 
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
 2011-11-15 21:00:14 +01:00
lukabazuka 4c26cb868b CC-2959 
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
 2011-11-15 20:29:37 +01:00
Yuchen Wang 1a1db1892f CC-2950: Tell users if they are running an out-of-date version or not 
Initial implementation.
- added some code in phone_home_stat to retrieve latest version from stat server
  and store result in db

- created new view helper VersionNotify.php, which queries and calculates version
  difference, then returns the necessary information in html to the view files

- created new javascript file versiontooltip.js, which sets up the qtip stuff so that
  when the version notification icon is clicked, a tooltip is displayed
 2011-11-14 00:34:53 -05:00
lukabazuka 18f21e480a CC-2438 
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
 2011-11-10 02:17:58 +01:00
lukabazuka d174b39d5b CC-2836 
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
 2011-11-10 02:03:02 +01:00
lukabazuka 1a585e3680 CC-2959 Status box design for each stream 
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
 2011-11-10 00:57:24 +01:00
Yuchen Wang 5d741d84ee CC-3001: Preferences->"Submit" button renamed to "Save", and should be at the top and the bottom of the screen 
Changed all other buttons that says "Submit" to "Save.
Also added some CSS stuff so that the "Save" button at the top of Preference page
have some space between itself and the form below.
 2011-11-09 16:03:32 -05:00
Yuchen Wang c2af2c5da8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-31 17:14:10 -04:00
Yuchen Wang caa4eb5e44 CC-2988: Long metadata strings can break Playlist Builder layout 
Fixed by adding "word-wrap: break-word" to the library datatable
 2011-10-31 17:10:21 -04:00
Yuchen Wang 0989a1c13f CC-2073: Select Days checkboxes are confusing 
Increased the space between a checkbox and the label to its right.
Should make it better to tell which checkbox belongs to which label.
 2011-10-18 10:24:01 -04:00
Yuchen Wang 36c36d2a97 CC-1976: Auto-expand the playlist box as the list grows 
Fixing issue introduced by my last commit, which made the click and drop area very small.
Also removed the wasted space at the bottom of the click and drop area.
 2011-10-12 17:14:03 -04:00
Yuchen Wang bae33b3e20 CC-1976: Auto-expand the playlist box as the list grows 
Fixed.
 2011-10-12 15:18:35 -04:00
lukabazuka 1b1e389cf6 fixed issues CC-2836 and CC-2916 2011-10-10 23:38:51 +02:00
James 79519e25c2 CC-2875: Soundcloud error icon 
- fixed
 2011-10-03 15:48:43 -04:00
martin fef0392e43 CC-2724: Play Stream Icon + jPlayer popup styling -upgraded to jplayer 2.1 2011-09-27 14:02:12 -04:00
James ac13bba2db CC-2874: adding error icon 
- done
 2011-09-22 17:06:33 -04:00
James 6d23ea4b49 CC-2308: 404 page 
- done
 2011-09-22 13:40:16 -04:00
James b3654c62bc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-22 11:48:07 -04:00
James 73dc4b851d CC-2591: Allow upload of any audio clip to Soundcloud 
- done
- need more styling
- note there were changes in style.css
 2011-09-22 11:47:24 -04:00
martin 5a5430f468 CC-2363: Diagnostic screen in Web UI 
-add vladimirs design
 2011-09-19 15:45:23 -04:00
James ee7bb8babe CC-2835: styles.css file merge 
- done
 2011-09-16 14:13:01 -04:00
James 1e4bcdf831 CC-2814: Login error messages need to be highlighted 
- done
- Recaptcha box and submit button is moved to center
 2011-09-14 17:50:00 -04:00
James f60a4439be CC-2775: layout fix 
- fixed
 2011-09-14 16:43:16 -04:00
james f1c311acb6 CC-2775: Better layout for Stream Settings page 
- layout is done
- need to implement status update part
 2011-09-07 09:48:02 -04:00
James 1a8214fccc CC-2755: Ability to set trial ending date 
- codes for front end.
- design needs to be integrated.
 2011-09-02 12:02:02 -04:00
James cf55e92aa3 CC-2607: Ability to adjust stream bitrate, type, etc from UI 
- removed debug code from NowPlayingController
- New Form for streamsetting
- Action created in PreferenceController
 2011-08-18 13:53:12 -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 79ea4ead9d CC-2468:Changing host to DJ 
- style.css change
 2011-07-04 09:31:07 -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 52dc267670 CC-2357:Tweak to show date end 
- fixed
 2011-06-27 15:59:29 -04:00
james 6a7f1d3588 CC-2412:Error causes box to float 
- fixed
 2011-06-27 14:37:31 -04: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 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
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 e762633405 CC-1724:Phone home statistics 
- Final commit for client side.
 2011-06-20 17:58:38 -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 570e7ec9c6 CC-2230:Alignment of text in new playlist description box 
fixed
 2011-06-01 10:04:17 -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 7c55f38f36 CC-2291:Remove + button in a circle 
Done
 2011-05-31 11:32:11 -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
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
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