Commit Graph

436 Commits

Author SHA1 Message Date
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 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
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 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 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
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 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
drigato 4add0f0b7b CC-5786: Quota Enforcement in the File Upload API 2014-04-14 11:24:39 -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 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
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 9b45b9dc72 converting to a jquery UI based datepicker. 2013-08-16 15:12:00 -04:00
denise 950cc6d6b7 CC-5177: Create "?" icon beside linked show check box 2013-05-28 14:18:26 -04: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
denise fedf564090 CC-5081: Calendar -> Add a linked show icon 2013-05-09 12:14:49 -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
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
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 dd5882984e CC-4736: Let non-admin users update their user info
-done but needs design
2012-12-10 16:55:44 -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
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 d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -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 3329c36d0c - changed smart block range text boxes to align with new UI 2012-09-17 15:23:47 -04: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
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
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 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 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
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
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