Commit Graph

827 Commits

Author SHA1 Message Date
Duncan Sommerville 39b2bd6a86 Actually move library search bar out of header; add angular.js to libs 2015-09-16 17:58:16 -04:00
Duncan Sommerville 8dcea06077 * Move tab functionality to a separate module
* Fix broken library placeholders
* Restrict tab width and add text panning to tab name
* General bugfixing and cleanup of tab functionality
2015-09-15 18:53:25 -04:00
Duncan Sommerville 893d60ed44 Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
This reverts commit 0fcf6a8dac.
2015-09-14 18:29:43 -04:00
Duncan Sommerville 8c65ba8f66 SAAS-1061 - implement podcast list view skeleton; small bugfixes
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
2015-09-14 18:29:13 -04:00
Duncan Sommerville 0fcf6a8dac SAAS-1061 - implement podcast list view skeleton; small bugfixes 2015-09-14 18:26:28 -04:00
Duncan Sommerville 2d2ed25fcc CC-6137 - datatables is the devil 2015-09-10 16:47:36 -04:00
Duncan Sommerville b26d4833fe Merge branch 'saas' into saas-dev 2015-09-09 18:47:53 -04:00
Duncan Sommerville fb1ee2e284 Fix some issues with the users page 2015-09-09 17:25:40 -04:00
Albert Santoni 1f319f84a4 Two small radio page tweaks
* SAAS-1055: Radio Page About tab scales poorly with small viewport
heights
* Also fixed misaligned of currently playing track with mobile view
2015-09-09 16:03:25 -04:00
Duncan Sommerville 03e23daba0 Apply highlight to active submenu item 2015-09-08 17:42:52 -04:00
Duncan Sommerville 17c2ec2fd4 Fix responsiveness bugs 2015-09-08 15:25:28 -04:00
Albert Santoni 84a1f9071b Merge branch 'saas-showbuilder-fade-editor-restyling' into saas-dev 2015-09-04 18:36:26 -04:00
Albert Santoni de322171df CC-6118: Playlist crossfade panel needs restyling
* Fixed it as much as possible. Unfortunately, the milliseconds are dropped
  by Propel so we should probably restrict the fade time to whole
  seconds....
2015-09-04 18:35:11 -04:00
Duncan Sommerville ba26adc904 CC-6130 - fix empty placeholders appearing when search returns no results 2015-09-04 15:37:04 -04:00
Albert Santoni 1db1af3f2e Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling 2015-09-04 11:21:00 -04:00
Duncan Sommerville 53b835715a Fix responsiveness of upload page 2015-09-03 15:51:09 -04:00
Duncan Sommerville f396bb4390 CSS tweaks 2015-09-03 14:51:58 -04:00
Duncan Sommerville c928627d8b CC-6131 - add div to show when search is active; css tweaks 2015-09-03 13:41:29 -04:00
Albert Santoni 65fd40bd6e CC-6115: Redesign the navbar upload button 2015-09-02 17:39:00 -04:00
Duncan Sommerville 80d78e9fc5 SAAS-1043 - fix flexbox settings for editors to work in firefox 2015-09-02 13:08:16 -04:00
Duncan Sommerville 0722225211 Front end tweaks and fixes 2015-09-02 12:45:37 -04:00
Duncan Sommerville c45f1ddd1c SAAS-1039 - add processing overlay to listener stats screen 2015-09-02 11:52:43 -04:00
Duncan Sommerville 1fd7f0ea36 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-02 11:22:32 -04:00
Duncan Sommerville 63f563f06d Fix calendar context menu word wrapping 2015-09-02 11:22:24 -04:00
Albert Santoni a17001a90a Merge branch 'saas' into saas-dev
Conflicts:
	airtime_mvc/application/views/scripts/billing/upgrade.phtml
	airtime_mvc/public/css/billing.css
2015-09-02 10:47:37 -04:00
Duncan Sommerville 92f722452a Adjust user settings form widths to be consistent 2015-09-01 16:05:59 -04:00
Duncan Sommerville f283d69481 Add vertical scrollbar to recent uploads table 2015-09-01 14:27:54 -04:00
Duncan Sommerville 46e126145e CC-6122 - change library behaviour for guest users 2015-09-01 13:53:59 -04:00
drigato 34e7c09ab7 CC-6118: Playlist crossfade panel needs restyling
Started re-styling the playlist fade editor
2015-09-01 12:05:08 -04:00
Duncan Sommerville f7a7d4c042 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-31 15:25:27 -04:00
Duncan Sommerville f21e53b12e CC-6121 - Fix up user settings page 2015-08-31 15:25:17 -04:00
Albert Santoni b0e9b41b0c Nudge the Airtime logo over a bit to center it better 2015-08-31 15:07:13 -04:00
Albert Santoni e0cb33b89c Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-31 15:03:25 -04:00
Duncan Sommerville 7c9f0a09ae Fix button styling bugs 2015-08-31 14:21:35 -04:00
Duncan Sommerville cd7d07e5f5 CC-6119 - Fix New button styling 2015-08-31 14:01:31 -04:00
Duncan Sommerville c1e2daaac4 CC-6114 - Remove New button from nav bar 2015-08-31 13:48:22 -04:00
drigato fa340c3e30 SAAS-976: September 1st: Undo the billing page changes for the August promotion 2015-08-31 13:37:20 -04:00
Duncan Sommerville e06f88cd49 CC-6116 - Library new buttons keep colour when disabled 2015-08-31 13:30:00 -04:00
Duncan Sommerville e633bc8899 CC-6112 - Remove button labels at small screen resolutions 2015-08-31 13:25:29 -04:00
Duncan Sommerville 5e024023eb CC-6110 - Change header to be more responsive 2015-08-31 13:10:16 -04:00
Duncan Sommerville d7d27d3c36 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-31 12:35:27 -04:00
Duncan Sommerville 2611766498 CC-6109 - Fix display of long usernames in header panel 2015-08-31 12:35:20 -04:00
drigato 2748f223de CC-6092: Calendar add show form style issues 2015-08-31 12:32:07 -04:00
drigato 582bc292aa CC-6108: Manage User table layout is messed up 2015-08-31 09:26:22 -04:00
Albert Santoni e1d5126e8b Pick default colors for the calendar based on start time 2015-08-28 18:16:55 -04:00
Albert Santoni 13f62cc118 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-28 16:21:53 -04:00
Albert Santoni 311956eb74 CC-6069: Pick consistent design for New buttons
* First shot at blue New buttons
2015-08-28 16:21:20 -04:00
Duncan Sommerville 005eec5aa5 CC-6095 - better styling for learn about x links 2015-08-28 16:09:18 -04:00
Duncan Sommerville 901ca54fd6 CC-6095 - placeholder div for empty library views; placeholder icons 2015-08-28 15:40:32 -04:00
Albert Santoni e743c3589e More smart block and playlist editor improvements
* Fixed smart block/playlist form validation error messages not showing up.
* Improved styling of all save/error messages across the application.
* Removed broken fade editors
2015-08-28 14:27:18 -04:00
drigato 4307e326f1 CC-6104: Playout History layouts need help 2015-08-28 11:31:08 -04:00
Duncan Sommerville 88a9594aca CC-6090 - restyle editor processing divs 2015-08-28 10:50:10 -04:00
Duncan Sommerville bc4822d8e4 bugfix 2015-08-28 10:36:18 -04:00
Duncan Sommerville ec9b98c48c CC-6090 - restyle datatables processing divs 2015-08-28 10:34:49 -04:00
Albert Santoni 8c90fbe4eb Added metadata editor title and ellipsis 2015-08-27 20:23:53 -04:00
Albert Santoni a08d5b71cf Calendar colour adjustments
* CC-6099: Improve default show colour
* CC-6100: Choose show background colours randomly from a predefined  palette
2015-08-27 20:02:32 -04:00
Albert Santoni 099fc0107e Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-27 19:04:18 -04:00
Albert Santoni b6f33f6083 Completed smart block, playlist, and webstream editor form overhauls
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
* CC-6103: Cannot create webstreams
* Reworked a big chunk of the smart block editor flow to send only the
  playlist contents back rather than the entire HTML fragment for the
  editor.
* Keep more of the playlist/smartblock editor view persistent across
  saves, generates, and shuffles.
2015-08-27 19:00:23 -04:00
Duncan Sommerville acc4ef0054 CC-6085, CC-6101 - uploader styling 2015-08-27 15:44:59 -04:00
Duncan Sommerville 0ebe7a85e1 CC-6066 - Add/Remove content screen update 2015-08-26 17:56:17 -04:00
Duncan Sommerville 7d8c6dc90d Fix upload page styling 2015-08-26 16:11:49 -04:00
drigato c728be38ab CC-6078: Help page updates
Small text changes
Removed about page
2015-08-26 14:37:32 -04:00
Albert Santoni 98ac8fd851 Major layout work on the smartblock and playlist editors
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
2015-08-26 13:10:51 -04:00
drigato 706caa8458 SAAS-1025: Restyle the billing page
Fix header padding
Change current plan font
2015-08-26 11:27:00 -04:00
drigato 7e1fe030fe SAAS-1025: Restyle the billing page
Changed pricing grid header
Added paypal and 2checkout badges
2015-08-26 10:26:03 -04:00
drigato 6ecb208962 SAAS-1021: Billing page restyle 2015-08-26 09:11:25 -04:00
Duncan Sommerville afa3b47e42 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-25 17:09:17 -04:00
Duncan Sommerville 84baef1996 CC-6097, CC-6091, CC-6080, CC-6066 - css fixes and more work on add/remove content screen 2015-08-25 17:09:05 -04:00
Albert Santoni 0752e78b2c Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-25 13:27:48 -04:00
Albert Santoni 700c3c4005 Merge branch 'saas-dev' into saas-showbuilder 2015-08-25 13:27:40 -04:00
drigato c921aabfd4 Small css fix on recent uploads table 2015-08-25 13:19:18 -04:00
drigato 0c50247909 SAAS-1022: Re-implement disk quota status on side nav bar
Small css fix
2015-08-25 13:09:07 -04:00
drigato bb2757127d SAAS-1022: Re-implement disk quota status on side nav bar
Small css tweak
2015-08-25 12:56:02 -04:00
drigato 2da431895f SAAS-1022: Re-implement disk quota status on side nav bar
Changed "upload" page layout - panels are side by side and storage
status  is at bottom of left panel
2015-08-25 12:43:08 -04:00
Duncan Sommerville e6761b54da CC-6066 - more work on add/remove content screen 2015-08-24 12:05:57 -04:00
Duncan Sommerville b15160d0fb Fix more selection bugs 2015-08-21 14:39:30 -04:00
Duncan Sommerville 812dca9409 CC-6066 - initial work on add/remove content dialog; some selection fixes 2015-08-21 14:19:28 -04:00
Albert Santoni f7733757f6 Fixed select menu styling and eliminated ColVis fade time 2015-08-21 13:14:20 -04:00
Duncan Sommerville 604b81071c CC-6084 - fix calendar drag and drop 2015-08-21 11:09:45 -04:00
Duncan Sommerville 48f1c5b9a4 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
Conflicts:
	airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-21 11:09:07 -04:00
Duncan Sommerville 277a066534 Layout and styling fixes for sub-menu layout pages 2015-08-21 10:43:20 -04:00
drigato 6f0b7f6d32 SAAS-1022: Re-implement disk quota status on side nav bar
Layout tweak
2015-08-21 10:06:40 -04:00
drigato 38d9963a8d SAAS-1024: Merge layout.phtml and page-sub-menu.phtml 2015-08-21 09:25:01 -04:00
drigato f48c7186ca SAAS-1022: Re-implement disk quota status on side nav bar 2015-08-21 09:08:36 -04:00
drigato d9455f86ea Change menu item order and change trial box position 2015-08-20 10:56:11 -04:00
Albert Santoni b718171729 Fixed aspect ratio of logo 2015-08-19 18:26:05 -04:00
Duncan Sommerville beb0eed1c8 Make muses 'pixel' invisible, remove scrollbar from player widget page 2015-08-19 17:33:55 -04:00
Duncan Sommerville a8955e2ea1 Fix side-menu position 2015-08-19 17:18:42 -04:00
Albert Santoni cfa543e835 Small adjustment to logo 2015-08-19 16:59:04 -04:00
Albert Santoni a71752f5c4 Lightened up sidebar icons and fixed context menu arrow alignment 2015-08-19 16:21:10 -04:00
Albert Santoni 93d2d8ad67 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
Conflicts:
	airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-19 15:00:35 -04:00
Albert Santoni f82558a5c0 Navigation sidebar finalization 2015-08-19 14:59:33 -04:00
Duncan Sommerville 8dab79da1c Restyle top panel to account for larger nav panel width 2015-08-19 14:29:54 -04:00
Duncan Sommerville 42bbfc3834 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-19 13:02:16 -04:00
Duncan Sommerville ae66b2272b Fix editor styling and layout issues 2015-08-19 13:02:14 -04:00
drigato f9cc8b41df Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder 2015-08-19 12:58:49 -04:00
drigato 8dcd0a2595 CC-6071: Icons for navigation bar 2015-08-19 12:58:31 -04:00
Albert Santoni a3e9a7355c Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-19 11:47:20 -04:00
Albert Santoni 0471d4bbdb Tweaked text shadow on usability hints 2015-08-19 11:47:13 -04:00
Duncan Sommerville ff930549db Fix broken sortable placeholders 2015-08-19 11:32:41 -04:00
drigato 59a9862ba3 CC-6072: Wrapper has weird positioning during page load 2015-08-19 10:56:41 -04:00
Albert Santoni 8afc652ff1 Submenu and body background color tweaks 2015-08-18 18:40:09 -04:00
Albert Santoni 504a720ff2 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-18 17:52:26 -04:00
Albert Santoni 2c443bd27a Some navbar and page title fixes 2015-08-18 17:52:23 -04:00
Duncan Sommerville 0ad51dae09 Fix add/remove content dialog, try to increase speed of selection/deselection 2015-08-18 17:46:16 -04:00
Albert Santoni a04f5afcbd More navbar and submenu layout fixes 2015-08-18 17:13:17 -04:00
Albert Santoni 20a810fc52 Fixed one more navbar highlight inconsistency 2015-08-18 15:50:10 -04:00
Albert Santoni 5a4bf6bb80 Fixed main navigation sidebar highlight inconsistencies 2015-08-18 15:48:33 -04:00
Albert Santoni a271b53c2e CC-6077: Implement actions menu for library view 2015-08-18 14:55:32 -04:00
Duncan Sommerville cee2fe5a63 CC-6082 - add y-scrollbar to file metadata editor at small resolutions 2015-08-18 12:58:34 -04:00
Duncan Sommerville 4bfb8fa0cb CC-6067 - deselect when adding library items 2015-08-18 12:01:23 -04:00
drigato d30e32c2d3 Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder 2015-08-18 07:46:39 -04:00
Duncan Sommerville 4adb9cc55a CC-6070 - standardize editor buttons 2015-08-17 18:34:39 -04:00
drigato e5f5ff4c88 SAAS-1019: Re-work Navigation Menu
Created Widget sub menu and moved widgets into separate controller
actions
2015-08-17 16:15:26 -04:00
Albert Santoni 74a1e0929d Fixed styling on Listener Stats page 2015-08-17 16:08:58 -04:00
drigato 3aee9a49bc SAAS-1019: Re-work Navigation Menu 2015-08-17 12:46:32 -04:00
Albert Santoni 31982a7238 Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder 2015-08-14 20:00:17 -04:00
Albert Santoni 8aa39ae28d Moved datatables translation stuff to PHP for consistency 2015-08-14 20:00:05 -04:00
Duncan Sommerville cb2d0bd444 SAAS-948 - js fixes for dashboard nav, change logo image in master panel 2015-08-14 16:42:39 -04:00
Duncan Sommerville 7ce9dfa1b3 SAAS-948 - add title to library pane 2015-08-14 15:33:45 -04:00
Duncan Sommerville 536bbfb678 SAAS-948 - css tweaks to top panel 2015-08-14 15:11:46 -04:00
Duncan Sommerville fb1f22b913 SAAS-948 - css tweaks 2015-08-14 13:29:26 -04:00
Duncan Sommerville 12c4e4a374 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
Conflicts:
	airtime_mvc/public/js/airtime/common/common.js
2015-08-14 10:54:53 -04:00
Duncan Sommerville 809b743785 SAAS-948 - Add livechat event listeners 2015-08-14 10:24:49 -04:00
drigato e90fe728a2 SAAS-1017: Move top nav bar to side 2015-08-14 08:30:52 -04:00
Albert Santoni 6c7a6aaad3 Expand user management height 2015-08-13 10:11:25 -04:00
Albert Santoni 8dd580e623 Applied context menu restyling globally 2015-08-12 17:47:55 -04:00
Albert Santoni 0c83b62545 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-12 17:37:01 -04:00
Albert Santoni 9d30a26968 Text for show schedule toolbar buttons, Embedded Widgets page styling 2015-08-12 17:36:54 -04:00
Duncan Sommerville 32100e2d9b SAAS-948 - frontend tweaks 2015-08-12 16:54:45 -04:00
Albert Santoni 61d1e6bb50 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-12 16:45:07 -04:00
Albert Santoni 409e9e2a78 Stream settings, Add Show form CSS revamp, etc. 2015-08-12 16:44:45 -04:00
Duncan Sommerville c931b81b35 SAAS-948 - library datatable header tweaks 2015-08-12 15:10:56 -04:00
Duncan Sommerville 1957c7827f SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes 2015-08-12 14:35:27 -04:00
Albert Santoni 21250e91c4 More calendar tweaks 2015-08-12 14:33:34 -04:00
Albert Santoni 0cfc55116d Colour tweaks 2015-08-12 13:50:42 -04:00
Albert Santoni 2a1d09bc08 Factor out default show background colour and fix some style issues 2015-08-12 12:55:39 -04:00
Albert Santoni f63ce23c9f Flatten datatable headers and restyled Manage Users screen 2015-08-12 10:53:14 -04:00
Duncan Sommerville c9f9bed2d6 SAAS-948 - fix smartblock save and tab close functionality, implement 'super' checkbox 2015-08-10 18:46:12 -04:00
Albert Santoni 849b8038ce Mostly new graphics for the calendar page 2015-08-10 17:11:40 -04:00
Albert Santoni a28df91c56 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-10 14:17:24 -04:00
Albert Santoni 2af5eb3314 Add Media page visual refresh, and use dropzone 2015-08-10 14:17:16 -04:00
Duncan Sommerville 641486e852 SAAS-948 - Showbuilder fixes 2015-08-10 13:44:57 -04:00
Duncan Sommerville c2d1556cfd Showbuilder css changes 2015-08-10 12:37:21 -04:00
Albert Santoni 3bb1dccd65 Ditched hiding overflow, more styling changes 2015-08-10 12:32:39 -04:00
Albert Santoni 974f979bef Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-10 12:23:30 -04:00
Albert Santoni fc7a700654 Consolidated some CSS 2015-08-10 12:23:22 -04:00
Albert Santoni 75914b791c Merge branch 'saas-dev' into saas
Conflicts:
	airtime_mvc/application/common/FileDataHelper.php
2015-08-10 09:00:54 -04:00
Duncan Sommerville bf6244c835 SAAS-948 2015-08-07 19:20:29 -04:00
Albert Santoni cdc9f88c1c Big style update for the new show builder screen
* Restyled the tables
* Blue currently playing track
* Labels for library view buttons
2015-08-07 19:08:17 -04:00
Duncan Sommerville 133db1c6a6 Merge branch 'saas-dev' into saas-showbuilder 2015-08-07 16:50:28 -04:00
Duncan Sommerville e6609896a5 SAAS-948 - showbuilder styling 2015-08-07 16:49:05 -04:00
Albert Santoni ea2a6b3f68 Clean up and bugfixes for password reset (SAAS-1009) 2015-08-07 13:57:42 -04:00
Duncan Sommerville 02d96d7bd0 SAAS-991 - initial playlist editor redesign 2015-08-06 19:16:04 -04:00
Duncan Sommerville cc36fcd37b Showbuilder checkboxes and style fixes 2015-08-06 16:01:44 -04:00
Duncan Sommerville 4cbc49391b Reintroduce checkboxes 2015-08-05 18:14:56 -04:00
Duncan Sommerville 36f2e1844f Merge branch 'saas-dev' into saas-showbuilder 2015-08-05 15:32:04 -04:00
Albert Santoni e49d337db0 Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev 2015-08-05 14:50:31 -04:00
Duncan Sommerville 33d2fe0900 SAAS-989 - Move file metadata editor to right-hand showbuilder pane 2015-08-04 19:56:12 -04:00
Duncan Sommerville 57c1d74286 SAAS-985 - Port sandwich menu to showbuilder branch 2015-08-04 16:37:45 -04:00
Duncan Sommerville 4200f56265 SAAS-999 - Change Advanced Search Options to dropdown 2015-08-04 15:38:48 -04:00
Duncan Sommerville f138dc6b47 SAAS-948 - tab layout for right-hand pane 2015-07-31 18:28:16 -04:00
drigato 7de507c99a Forgot to commit promo banner 2015-07-31 10:49:24 -04:00
drigato ff61fab62a SAAS-973: Airtime Billing page - Add support for August promotion plans
Fix to not allow current promo plans to downgrade to another promo plan
Added promo banner to billing page
2015-07-31 10:46:02 -04:00
drigato bccba2f9d5 SAAS-973: Airtime Billing page - Add support for August promotion plans
Front-end changes to price grid, and plan title
2015-07-30 12:53:37 -04:00
Duncan Sommerville 8f5f0eb5fe SAAS-948 - CSS overhaul for new show builder page 2015-07-29 20:28:54 -04:00
Duncan Sommerville 661a87dfbc SAAS-948 - Frontend tweaks and fixes 2015-07-29 13:35:01 -04:00
Duncan Sommerville fcbc37977f SAAS-948 - Frontend tweaks 2015-07-28 11:42:04 -04:00
Duncan Sommerville 59d89b0b9e SAAS-948 - ShowBuilder redesign editors and fixes 2015-07-27 15:37:55 -04:00
Duncan Sommerville ba90b1f1eb Merge branch 'saas-dev' into saas-showbuilder
Conflicts:
	airtime_mvc/public/css/styles.css
2015-07-20 12:23:11 -04:00
Duncan Sommerville d7d9a994d5 SAAS-948 - ShowBuilder redesign initial commit 2015-07-15 18:53:19 -04:00
drigato dddc6e6591 Fix for context menu on calendar being too small sometimes 2015-07-15 07:19:48 -04:00
drigato fdef9d9f78 Fixed calendar context menu width 2015-07-14 13:45:37 -04:00
Albert Santoni 2693c9f02c Small bugfix for CC-6064 2015-07-14 11:25:11 -04:00
Albert Santoni 45b09a0d24 Merge branch 'saas-dev' into saas-dev-usability-hints
Conflicts:
	airtime_mvc/public/js/airtime/schedule/add-show.js
2015-07-14 10:56:12 -04:00
Duncan Sommerville c05d4bac2f Merge branch 'saas-dev' into saas-stream-settings 2015-07-13 13:27:34 -04:00
Duncan Sommerville 6d883d2fa4 Fix Add Show button bug and update styling 2015-07-13 13:23:24 -04:00
drigato 55999a07ec SAAS-940: Provide usability hints to user 2015-07-13 08:06:41 -04:00
Duncan Sommerville 37ed35f5b2 Merge branch 'saas-dev' into saas-stream-settings
Conflicts:
	airtime_mvc/application/models/Preference.php
2015-07-10 10:29:38 -04:00
drigato c44035c27d SAAS-938: Long track metadata messes up player bar on the radio page 2015-07-10 09:08:19 -04:00
drigato 5ec3684ea6 CSS fix onradio page schedule widget
Widen width or show time and name columns on mobile phones
2015-07-09 10:34:48 -04:00
Duncan Sommerville ac2e1a2d4b SAAS-876 - More work on stream settings page 2015-07-08 16:04:09 -04:00
Duncan Sommerville ad39174f57 Fix fieldset flow for Firefox 2015-07-08 14:19:50 -04:00
Duncan Sommerville 6b9d9e8063 Merge branch 'saas-dev' into saas-stream-settings 2015-07-08 12:47:24 -04:00
drigato b200a29f43 SAAS-928: Time strings on Radio Page are not localized 2015-07-07 09:21:44 -04:00
Duncan Sommerville 457230ba07 SAAS-876 - Initial commit 2015-07-03 13:32:41 -04:00
Albert Santoni 00dfd64677 Merge pull request #117 from sourcefabric/saas-dev-schedule-widget-angular
Saas dev schedule widget angular
2015-07-01 15:05:59 -04:00
Duncan Sommerville 3c33cfd8b2 Remove min-width on showbuilder panel to fix add-content pane issue 2015-06-30 16:35:25 -04:00
Duncan Sommerville 7f9b54b006 SAAS-908 - Styles for new field layout 2015-06-30 12:15:15 -04:00
drigato 5f925f2f1f Merge branch 'saas-dev' into saas-dev-schedule-widget-angular 2015-06-30 09:46:36 -04:00
drigato 6db75550cc SAAS-870: Schedule widget displays shows in wrong timezone
Timezone conversion done in frontend
2015-06-30 09:38:53 -04:00
Duncan Sommerville 133f1b72ca Remove min-height on datatables for now 2015-06-29 11:32:28 -04:00
Duncan Sommerville 9d60a3d130 Move Help Translate Airtime link to help menu 2015-06-26 14:27:27 -04:00
Duncan Sommerville 3a51e66b07 Add transifex link to login page 2015-06-26 13:25:19 -04:00
Duncan Sommerville 6497bc28c5 Show collapsible sections (other than 'dangerous settings') by default on preferences page 2015-06-25 17:43:15 -04:00
drigato a338616aca Add max-width to logo on radio page 2015-06-16 15:38:21 -04:00
drigato 68a02e3c95 Radio page background scrolling issue on small screens 2015-06-16 12:53:07 -04:00
drigato 4bebe1e0fb Radio page fixes 2015-06-16 12:50:40 -04:00
Albert Santoni 609f073a25 Merge branch '2.5.x-installer' into saas-dev-plus
Conflicts:
	airtime_mvc/public/css/styles.css
	airtime_mvc/public/index.php
2015-06-16 11:20:43 -04:00
Albert Santoni 57d63ebb19 Backport some CSS fixes 2015-06-16 11:17:41 -04:00
Albert Santoni 8c9981a155 Merge branch '2.5.x' into 2.5.x-installer
Conflicts:
	airtime_mvc/public/index.php
2015-06-16 10:37:06 -04:00
Albert Santoni aa286efee4 Testing htaccess fix and fixed background cover scrolling issue in Chrome on Android 2015-06-15 17:54:28 -04:00
drigato 7d84e92b1b Undo last commit 2015-06-15 16:40:47 -04:00
drigato cd6e326e13 Radio page fix for background image on android 2015-06-15 16:36:29 -04:00
drigato 4c6ba869e3 Fix Radio Page schedule widget iframe size 2015-06-15 16:07:42 -04:00
drigato 0c4888fbd6 Radio Page fixes
Added scrolling back to radio page
2015-06-15 15:03:34 -04:00
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