Merge pull request #635 from frecuencialibre/smartblock-overflow-copy

copy changes and css for overflow label and help text

airtime_mvc/application/forms/SmartBlockCriteria.php

@@ -448,7 +448,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
 
         $overflowTracks = new Zend_Form_Element_Checkbox('sp_overflow_tracks');
         $overflowTracks->setDecorators(array('viewHelper'))
-            ->setLabel(_('Overflow Time Limit:'));
+            ->setLabel(_('Allow last track to exceed time limit:'));
         if (isset($storedCrit["overflow_tracks"])) {
             $overflowTracks->setChecked($storedCrit["overflow_tracks"]["value"] == 1);
         }

airtime_mvc/public/css/playlist_builder.css

@@ -40,6 +40,7 @@
 
 .playlist_editor dt {
     float: left;
+    clear: left;
 }
 
 .playlist_editor input, .playlist_editor textarea {
@@ -508,10 +509,12 @@
 
 .side_playlist .zend_form dt {
     width: 170px;
+    margin-bottom: 10px;
 }
 
 .side_playlist .zend_form dd {
-    margin-bottom: 10px;
+    float: left;
+    margin: 0 0 10px;
 }
 .search-criteria dt label.sp_label
 {

airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js

@@ -533,7 +533,7 @@ function setupUI() {
 
     $(".overflow_tracks_help_icon").qtip({
         content: {
-            text: sprintf($.i18n._("The smartblock will normally schedule up to but not over the time limit. This will usually result in a smartblock that is less than the time limit set if there are no tracks short enough to fill the remaining time. Enable this option if you want to add tracks until it is longer than the smartblock. Any tracks longer than the smartblock limit maybe cut off during playback if they exceed a shows boundaries."), PRODUCT_NAME)
+            text: sprintf($.i18n._("<p>If this option is unchecked, the smartblock will schedule as many tracks as can be played out <strong>in their entirety</strong> within the specified duration. This will usually result in audio playback that is slightly less than the specified duration.</p><p>If this option is checked, the smartblock will also schedule one final track which will overflow the specified duration. This final track may be cut off mid-way if the show into which the smartblock is added finishes.</p>"), PRODUCT_NAME)
         },
         hide: {
             delay: 500,

docs/manual/library/index.md

@@ -106,7 +106,7 @@ By default, a smart block will not contain repeated items, which will limit the
 
 In addition Smart Blocks by default will never overflow the Time Limit. For instance if you set a time limit of 1 hour. It will add tracks to the schedule until it can't add any more tracks without exceeding the hour. This is to prevent tracks from being cut-off because they exceed the time limit of a show. 
 
-If you want a smartblock to schedule tracks until it is longer than the Time Limit you can check Overflow Time Limit. This will make LibreTime add tracks that meet the criteria until it equals or is longer than the time limit. The was the default behaviour with the Airtime software.
+If you want a smartblock to schedule tracks until it is longer than the Time Limit you can check "Allow last track to exceed time limit". This will make LibreTime add tracks that meet the criteria until it equals or is longer than the time limit. The was the default behaviour with the Airtime software.
 
 If you have a large number of files which meet the criteria that you specify, you may wish to limit the duration of the smart block using the **Limit to** field, so that it fits within the show you have in mind. Select **hours**, **minutes** or **items** from the drop-down menu, and click the **Generate** button again, if it is a static smart block. Then click the **Save** button.