Commit graph

124 commits

Author SHA1 Message Date
farggus
d0fcc4c24e
Update .js for translate adaptation
- Add i18n for 'or', 'and' text output
2020-03-30 01:24:57 +03:00
Codenift
043196b3ea fixed javascript for track type dropdown 2020-02-06 16:43:56 -05:00
Codenift
00e860183a Track Type Select Menu in Smartblock 2020-01-27 19:10:54 -05:00
Codenift
386918da2b Renamed media type to track type for tracks 2020-01-06 17:15:04 -05:00
Codenift
07a4117bd4 Media Type for tracks. Same PR from before with a couple minor fixes 2019-10-16 20:20:34 -04:00
r
3f43c9abb5 group smartblock search criteria fields to accurately reflect query 2019-02-04 14:18:02 -06:00
r
b532fe564e clarify smartblock OR vs AND 2019-02-03 16:16:47 -06:00
ryan
eec07d38f7 prevent multiple event bindings on collapsible advanced options header 2018-12-13 15:05:41 -06:00
ryan
13d6df24fb smartblock ui: add collapsed "advanced options" section 2018-12-13 09:11:42 -06:00
frecuencialibre
4752c728b9
Merge pull request #605 from Robbt/feature-smartblock-remaining-time
Add Fill Remaining Time Smartblock Limit
2018-12-12 15:43:49 -06:00
Robbt
4abe301fbb modified javascript and binary values to make dynamic default 2018-12-11 21:34:06 -05:00
ryan
a294747bbb copy changes and css for overflow label and help text 2018-12-11 14:31:34 -06:00
Robbt
008530364b Added jquery to hide or remove limit value 2018-11-26 15:26:19 -05:00
Robbt
e7c7f215d5 Added the option to allow smartblocks to overflow their time limits to the UI 2018-11-25 13:16:26 -05:00
Lucas Bickel
090fdae99b Merge remote-tracking branch 'robbt/feature/relative_smartblocks' into dev/merge-testing 2018-01-09 21:53:12 +01:00
Robbt
144f1b5561 Fixed form validation and display after errors and when removing rows 2018-01-08 21:48:31 -05:00
Robbt
7b8e630174 modified jquery find for shuffle and generate buttons to not target clear button 2018-01-08 18:24:39 -05:00
Robb Ebright
5e7a5b3e1d Revert "fixed smart block criteria view to show dropdown based upon current values vs. database values to fix display when form is invalid"
This reverts commit fc4f82a83a.
2018-01-07 15:27:58 -05:00
Robb Ebright
fc4f82a83a fixed smart block criteria view to show dropdown based upon current values vs. database values to fix display when form is invalid 2018-01-04 15:49:03 -05:00
Robb Ebright
6bdb570338 Modified smartblock form to allow preview of tracks meeting criteria for dynamic smartblocks 2017-11-21 21:22:06 -05:00
Robb Ebright
67807bb4b3 fixed blatant errors in jquery and php validation 2017-10-14 21:01:58 -04:00
Robb Ebright
311ecd393d working relative dates with drop down selects 2017-10-14 01:00:06 -04:00
Robb Ebright
6c6b33b553 fixed jquery javascript regarding datetime select dynamic modification 2017-10-13 18:54:04 -04:00
Robb Ebright
c78979c19c work in progress - need to write rules to parse when to show vs hide datetime select and add it to value field 2017-08-24 10:27:13 -04:00
Robb Ebright
c630a69b89 Added ability to text input relative date times w/o validation 2017-08-16 20:05:02 -04:00
drigato
28493497fd SAAS-1058: Podcast table schema
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
Albert Santoni
01b3ae1bf0 Allow smart blocks with no criteria 2015-09-02 16:25:30 -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
Duncan Sommerville
88a9594aca CC-6090 - restyle editor processing divs 2015-08-28 10:50:10 -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
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
Duncan Sommerville
3f25ab2647 CC-6079 - merge and remove underscore files 2015-08-18 15:23:42 -04:00
Duncan Sommerville
1957c7827f SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes 2015-08-12 14:35:27 -04:00
Duncan Sommerville
cc36fcd37b Showbuilder checkboxes and style fixes 2015-08-06 16:01:44 -04:00
Duncan Sommerville
4dab2abf4e Replaced reoccurring strings with string formatting to aid dynamic translations 2014-11-06 18:40:19 -05:00
denise
c8d7d23d62 CC-4963: Add cue in and cue out to smart block criteria list
Done
2013-02-19 16:38:58 -05:00
denise
525b2dcb33 CC-4895: Remove all json die() statements from code
- removed json_encode
2013-02-07 15:41:47 -05:00
denise
384298f680 CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist 2013-02-01 12:06:01 -05:00
denise
10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
2012-11-21 11:44:40 -05:00
denise
57fdab0ddf CC-1960: Internationalize Airtime / Support translations
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:33:37 -05:00
Martin Konecny
fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Martin Konecny
d1a22fe7ca CC-4677: Improve Smart block repeat description
-fixed
2012-11-15 11:30:56 -05:00
James
2b2a1db055 CC-2401: Shuffle option in playlists
- done
2012-11-13 17:32:10 -05:00
denise
b817684972 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
denise
a1a7396ec9 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks
-disabled this button in the library toolbar if dynamic blocks are open
2012-11-06 14:29:26 -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
denise
3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page
-done
2012-10-26 18:09:30 -04:00
Daniel James
7c799cd3af Fixed formatting of tooltip for smart blocks 2012-10-18 13:01:55 +01:00