Commit Graph

334 Commits

Author SHA1 Message Date
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 0471d4bbdb Tweaked text shadow on usability hints 2015-08-19 11:47:13 -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 2c443bd27a Some navbar and page title fixes 2015-08-18 17:52:23 -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
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
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 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
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 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 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
Albert Santoni 849b8038ce Mostly new graphics for the calendar page 2015-08-10 17:11:40 -04:00
Albert Santoni 3bb1dccd65 Ditched hiding overflow, more styling changes 2015-08-10 12:32:39 -04:00
Albert Santoni fc7a700654 Consolidated some CSS 2015-08-10 12:23:22 -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 cc36fcd37b Showbuilder checkboxes and style fixes 2015-08-06 16:01:44 -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 57c1d74286 SAAS-985 - Port sandwich menu to showbuilder branch 2015-08-04 16:37:45 -04:00
Duncan Sommerville f138dc6b47 SAAS-948 - tab layout for right-hand pane 2015-07-31 18:28:16 -04:00
Duncan Sommerville 661a87dfbc SAAS-948 - Frontend tweaks and fixes 2015-07-29 13:35:01 -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
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 457230ba07 SAAS-876 - Initial commit 2015-07-03 13:32:41 -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
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
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 f4ff00355d Added Radio Page link 2015-06-12 17:21:46 -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
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 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 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
Albert Santoni be614415de SAAS-757: metadata edit window goes under the header menu 2015-04-30 10:29:43 -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
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
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
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
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
Duncan Sommerville 936d11b367 Merge branch '2.5.x-albertenhancements' into saas 2015-02-27 17:21:20 -05:00