Merge branch 'master' of https://github.com/LibreTime/libretime

airtime_mvc/application/services/PodcastService.php

@@ -412,7 +412,8 @@ class Application_Service_PodcastService
         if (empty($value)) {
             return null;
         }
-        $child = $node->addChild($name, $value, $namespace);
+        $child = $node->addChild($name, null, $namespace);
+        $child[0] = $value;
         return $child;
     }
 
@@ -444,7 +445,7 @@ class Application_Service_PodcastService
 
             $imageUrl = Application_Common_HTTPHelper::getStationUrl()."api/station-logo";
             $image = $channel->addChild("image");
-            $image->addChild("title", $podcast->getDbTitle());
+            $image->addChild("title", htmlspecialchars($podcast->getDbTitle()));
             self::addEscapedChild($image, "url", $imageUrl);
             self::addEscapedChild($image, "link", Application_Common_HTTPHelper::getStationUrl());
 

airtime_mvc/public/js/airtime/library/library.js

@@ -94,7 +94,6 @@ var AIRTIME = (function(AIRTIME) {
         PODCAST         : "podcast",
     });
 
-    // TODO: once the new manual pages are added, change links!
     mod.placeholder = function(mediaType) {
         switch (mediaType) {
             // TODO: remove duplication in a nice way?
@@ -103,35 +102,35 @@ var AIRTIME = (function(AIRTIME) {
                     "media": "tracks",
                     "icon": "icon-music",
                     "subtext": "Click 'Upload' to add some now.",
-                    "href": "http://libretime.org/manual/add-media/"
+                    "href": "http://libretime.org/manual/tracks/"
                 };
             case mod.MediaTypeIntegerEnum.PLAYLIST:
                 return {
                     "media": "playlists",
                     "icon": "icon-list",
                     "subtext": "Click 'New' to create one now.",
-                    "href": "http://libretime.org/manual/library/"
+                    "href": "http://libretime.org/manual/playlist/"
                 };
             case mod.MediaTypeIntegerEnum.BLOCK:
                 return {
                     "media": "smart blocks",
                     "icon": "icon-time",
                     "subtext": "Click 'New' to create one now.",
-                    "href": "http://libretime.org/manual/library/"
+                    "href": "http://libretime.org/manual/smartblocks/"
                 };
             case mod.MediaTypeIntegerEnum.WEBSTREAM:
                 return {
                     "media": "webstreams",
                     "icon": "icon-random",
                     "subtext": "Click 'New' to create one now.",
-                    "href": "http://libretime.org/manual/library/"
+                    "href": "http://libretime.org/manual/webstreams/"
                 };
             case mod.MediaTypeIntegerEnum.PODCAST:
                 return {
                     "media": "podcasts",
                     "icon": "icon-headphones",
                     "subtext": "Click 'Add' to create one now.",
-                    "href": "http://www.apple.com/ca/itunes/podcasts/fanfaq.html"
+                    "href": "http://libretime.org/manual/podcasts"
                 };
             default:
                 break;

docs/manual/dashboard/index.md

@@ -1,4 +1,6 @@
-The Now Playing page provides a view of the content your station will play out, or has already played out, which defaults to showing the 24 hours ahead. This page also enables you to make last-minute changes to running shows.
+The Dashboard is divided into two sections a Library section divided between [Tracks](../tracks),[Playlists](../playlists),[Smart Blocks](../smartblocks),[Webstreams](../webstreams), and [Podcasts](../podcasts) and the **Scheduled Shows** dialog on the right. This page provides an overview of the right-hand interface. Check the links to see information about the other sections which provide the content that can be scheduled. 
+
+The **Scheduled ShowS** page provides a view of the content your station is will playout, or has already played out, which defaults to showing the 24 hours ahead. This page also enables you to make last-minute changes to running shows. 
 
 If you've only just installed Libretime, there might not be any content shown yet. Click the calendar and clock icons above the table to change the date and time range, then click the **Find Shows** button (with the magnifying glass icon) to the right.
 
@@ -12,7 +14,7 @@ On the left side of the page, the **Start** and **End** times, **Duration** and
 
 Click the **Show/hide columns** button on the right to configure the metadata displayed, by checking the boxes in the pop-up window.
 
-<img src="static/Screenshot498-Show_hide_columns_240.png" width="595" height="520" />
+![](static/Screenshot498-Show_hide_columns_240.png)
 
 The row for the currently playing item is displayed with a bright green background. Any underbooked shows (shows with insufficient content to fill the time allowed) are displayed with a row indicating the length of the underbooking in minutes and seconds. These rows contain a red exclamation mark in the first column, and have a pink background.
 
@@ -39,49 +41,6 @@ Items which are no longer available have an exclamation mark icon in the second
 
 ![](static/Screenshot421-Missing_file_icon.png)
 
-Advanced and simple library searches
-------------------------------------
-
-In the top left corner of the page is an **Add / Remove Content** button which enables you to open Libretime's library.
-
-![](static/Screenshot422-Add_remove_content.png)
-
-In the library table which opens, the upper section is for the **Advanced Search Options**, which enable you to search within individual fields of the database such as **Title** or **Creator**. Like an Internet search engine, you do not have to type in the correct upper or lower case, press the **Enter** key, or even type the whole of the search term before matches from the Libretime library are displayed.
-
-<img src="static/Screenshot574-Advanced_search.png" alt="Advanced search options" width="740" />
-
-At the bottom of the library table, click the **First**, **Previous**, **Next**, **Last** or individual page number buttons to browse the search results. Right-clicking an item in the search results will display the available metadata for that item in a pop-up window.
-
-![](static/Screenshot433-Metadata_pop_up.png)
-
-The columns displayed in the search results correspond to the fields available for advanced searches (except for **Scheduled** and **Playlist / Block**, which indicate if a particular item is in use). To change the fields which can be searched, click the **Show / hide columns** button on the right side of the table, just above the search results.
-
-<img src="static/Screenshot499-Library_show_hide_columns_240.png" width="595" height="360" />
-
-Click the metadata column headings such as **Title**, **Creator**, **Album**, or <span style="font-weight: bold;">Genre</span> to sort the entries in ascending or descending order. In the second column, audio files are represented by a loudspeaker icon, while playlists are represented by a document icon. Smart blocks have a think bubble icon, and web streams have an arrow icon.
-
-To find all files uploaded by yourself, or another specific member of the station staff, click the **Show / hide columns** checkbox which enables the **Owner** column. After you have made your search, you can click the header of the **Uploaded** column to find the items that person added to the server most recently.
-
-Advanced search terms are matched using 'and' rather than 'or' logic, to narrow your search. Perhaps you have tagged some jazz-flavoured station idents intended for use in a particular show called 'Jazz Maverick' with the **Album** tag of *Jazz Maverick* and a **Genre** of *Ident*. You could then find exactly the idents you are searching for by typing *maverick* and *ident* into the respective advanced search fields.
-
-Use the drop-down menu at the top of the search results to display **Files**, **Playlists**, **Smart Blocks**, **Web Streams** or **All** items. By default 10 items are listed, but you can click the **Show** drop-down menu to change the list length to between 5 and 100 items.
-
-![](static/Screenshot426-Search_result_select.png)
-
-Click the Advanced Search Options link to collapse that area. Beneath the collapsed link is the **Simple Search** field, with a magnifying glass icon, which enables the selection of items based on any tag metadata stored in the Libretime database, whether that metadata column is currently displayed in the table or not. For example, to search for all items between four and five minutes duration, enter *00:04* into the simple search field (for 00 hours and 04 minutes).
-
-![](static/Screenshot425-Simple_search.png)
-
-If your jingles are tagged with *Jingle* in the **Genre** or other fields, you can very easily find them by entering *jingle* into the simple search field. The same technique can be used to find advertising and promotional files. (See the chapter *Preparing media for ingest* for tips on batch tagging files with metadata). Unlike advanced searches, simple searches use 'or' logic for multiple search terms, so a simple search for *jingle ident* will return items matching either keyword.
-
-Clicking on an item in the library table opens a pop-up menu which enables you to audition the item, or remove it from the Libretime library. Media types which cannot be auditioned directly in a web browser, such as FLAC, have a lock icon instead of a loudspeaker icon, but these files can be downloaded to your local computer for audition instead. The **Delete** option should be used with caution, because this action cannot be undone. For media files, you can also **Edit Metadata** stored for the file using this menu.
-
-![](static/Screenshot427-Library_pop_up.png)
-
-If the **Enable SoundCloud Upload** box on the Preferences page is checked, there will be an additional option on the pop-up menu, **Upload to SoundCloud**. As mentioned previously, you should only upload audio files to SoundCloud with the permission of the copyright holder.
-
-![](static/Screenshot432-Upload_to_SoundCloud.png)
-
 Adding content to a running show
 --------------------------------
 

docs/manual/getting-started/index.md

@@ -10,12 +10,7 @@ You can log in for the first time with the user name *admin* and the password se
 
 ![](static/Screenshot-Login.png)
 
-If you enter the password incorrectly three times, you will be presented with a reCAPTCHA challenge to prove that you are a human, and not a password-guessing robot. This feature helps protect your LibreTime installation against brute force 
-attacks.
-
-![](static/Screenshot466-Recaptcha_login.png)
-
-If activated, you will see a link **Reset password** below the password field, which enables users to obtain a password reminder by email. See the chapter *Preferences* for configuration details.
+You will see a link **Reset password** below the password field, which enables users to obtain a password reminder by email. You will need to have a mailserver configured to work with PHP for this to work. There is an issue open to add documentation for this. [#724](https://github.com/LibreTime/libretime/issues/724)
 
 ![](static/Screenshot467-Reset_password_link.png) 
 

docs/manual/playlists/index.md

@@ -1 +1,70 @@
-**TBD**
+Creating a new playlist
+-----------------------
+
+Once you have found the media that you require using the search tools, you can create a new playlist on the right hand side of the **Library** page. If it is not already open, click the **Open Media Builder** button to begin.
+
+![](static/Screenshot500-Open_media_builder_240.png)
+
+Then click the **New** button and select **New Playlist** from the pop-up menu.
+
+![](static/Screenshot434-New_playlist.png)
+
+At first, the new playlist will be shown as *Untitled Playlist*. Click the pencil icon on the right to give the playlist a name.
+
+![](static/Screenshot502-Untitled_playlist_240.png)
+
+Type the name you have chosen, then press the **Enter** key on your keyboard to save the new name. You can edit the name of the playlist later, by clicking on the pencil icon again.
+
+![](static/Screenshot503-My_playlist_240.png)
+
+Click the link **View / edit description** to expand a box where you can enter a **Description** for the playlist, then click the **Save** button. Setting good quality metadata here will help you find the playlist using the search box later, so you should be as descriptive as possible.
+
+![](static/Screenshot504-Example_playlist_240.png)
+
+Adding content to a playlist
+----------------------------
+
+With a playlist open, click on an item in the search results and then click **Add to Playlist** on the pop-up menu. Or drag and drop items from the search results on the left into the playlist on the right. Jingles and voice tracks can be added before, after or between music items.
+
+![](static/Screenshot505-Add_item_to_playlist_240.png)
+
+You can also select or deselect a whole page of search results using the **Select** button, just below the simple search field. Alternatively, use the checkboxes in the first column of the search results table to select individual items, then click the **Add to current playlist** button. Items that you own which you no longer require can be deleted from Libretime's library using the **Trashcan** button. 
+
+![](static/Screenshot439-Checkbox_select_items.png)
+
+After adding files to the playlist, the total playlist time is displayed in the top right corner. The duration of an individual file is shown in each row of the playlist in a white font, and beneath this figure the time since the beginning of the playlist is displayed in a smaller light grey font. This elapsed time figure can be used as a time check for voice tracks, although this option may limit the re-usability of the voice track.
+
+To audition a playlist file in your web browser, click the white triangle**** button on the left side of its row. (If the format of the file is not supported by your browser, the triangle in this button will be greyed out). If audition of the file format is supported, a pop-up window will open, with the playlist starting at the file you clicked.
+
+Click the small white **x** icon on the right hand side of each row to remove a file from the playlist. You can also drag and drop files to re-order them, or click the **Shuffle** button to re-order files automatically. Click the **Clear** button to remove all content from the playlist, or click the **Delete** button to remove the playlist from the Libretime library altogether.
+
+![](static/Screenshot506-Drag_drop_playlist_240.png)
+
+To adjust start and end fades, click the playlist **Fade** button (two horizontal white arrows crossing in a grey rectangle), to the left of the **Delete** and **Save** buttons. This action opens a beige bar in which you can set the **Fade in** duration for the first item in this playlist, and the **Fade out** duration for the last item. This duration figure represents the length of the fade, in seconds and tenths of a second, not the time at which the fade takes place. The default fade duration is set in the **Preferences** page on the **System** menu.
+
+![](static/Screenshot507-Fade_in_out_240.png)
+
+Click any one of the smaller **Fade** buttons between file rows to open another beige bar, which enables you to set **Fade out** and **Fade in** durations between two adjacent files in the playlist. The fade buttons for adjacent files change to an orange background when you click them.
+
+![](static/Screenshot508-Adjacent_fade_out_in_240.png)
+
+If your web browser supports the Web Audio API, you will see a **Show Waveform** button which enables you to view the waveforms of the adjacent items, adjust the fades and audition them. Click the **Fade Out** or **Fade In** button to change the fade curves by clicking in the waveforms, then click the **Play** button to audition the effect of any adjustment you have made. To audition just one part of the item, use the **Cursor** button to move the play cursor, which appears as a thin red line, on the waveform. The playback progress is shown by an orange colour on the waveform.
+
+![](static/Screenshot509-fade_editor_240.png)
+
+Each file in the playlist also has a button with two square brackets, which enables you to adjust **Cue In** and **Cue Out** times for that particular file. Like the fade button, the cue button changes to an orange background when you click it.
+
+**Cue In** and **Cue Out** points are set in hours, minutes, seconds and tenths of a second, relative to the start of the item. If a file has leading or trailing silence, corresponding cue points will be set automatically. The duration of the file in the playlist is updated automatically when you adjust a cue point, but the **Original Length** of the file is also displayed for your reference.
+
+![](static/Screenshot510-Cue_in_out_240.png)
+
+If a **Fade In** and **Cue In** are set on the same item in the playlist, the fade in begins at the **Cue In** point. If a **Fade Out** and **Cue Out** are set on the same item, the fade out ends at the **Cue Out** point. If your web browser supports the Web Audio API, you can click the **Show Waveform** button to adjust and audition cue points.
+
+![](static/Screenshot511-Visual_cue_editor_240.png)
+
+When your playlist is complete, click the **New** button in the top left corner to create another playlist, click the close icon (a white cross in a black circle) in the top right corner, or browse to another page of the Libretime interface.
+
+If you want to edit the playlist content or metadata later, you can find it by **Title**, **Creator**, **Last Modified** date, **Length**, **Owner** or **Year** using one of the search tools on the Library page. Click the playlist in the search results list, and then click **Edit** from the pop-up menu. You can also **Preview** the entire playlist in a pop-up audition window, **Duplicate** or **Delete** one of your playlists from this menu.
+
+![](static/Screenshot501-Edit_playlist_240.png)
+

docs/manual/podcasts/index.md

@@ -1 +1,10 @@
-**TBD**
+The Podcasts page allows you add subscriptions to podcasts which are often used to syndicated audio files using a URL called a RSS feed. This allows your LibreTime instance to automatically download new shows from the web.
+
+In order to add a podcast you need to get the RSS feed. All podcasts available on iTunes have a RSS feed but it is sometimes hidden. See this issue on our github page[#510](https://github.com/LibreTime/libretime/issues/510)for more information.
+
+The podcast interfaces provides you with the ability generate [Smartblocks](../smartblocks) that can be used in conjunction with [Autoloading Playlists](../calendar/#autoloading-playlist) to schedule the newest episode of a podcast without human intervention.
+
+##Video Tutorials##
+Coming Soon
+##How To##
+TBD

docs/manual/smartblocks/index.md

@@ -1 +1,42 @@
-**TBD**
+
+Creating a smart block
+----------------------
+
+Smart blocks are automatically filled with media files from the Libretime library, according to the criteria that you specify. This feature is intended to save staff time, compared to selecting items for a playlist manually.
+
+To create a smart block, click the **New** button on the right side of the Library page, and select **New Smart Block** from the pop-up menu. Like a playlist, smart blocks can have a title and **Description**, which you can edit. This helps you find relevant smart blocks in searches.
+
+![](static/Screenshot512-Example_smart_block_240.png)
+
+Click the link **Smart Block Options** to display the criteria and modifiers for the smart block. The criteria can be any one of Libretime's metadata categories, such as **Title**, **Creator** or **Genre**. The modifier depends on whether the metadata in question contains letters or numbers. For example, **Title** has modifiers including *contains* and *starts with*, whereas the modifiers for **BPM** include *is greater than* and *is in the range*.
+
+You can also set the **smart block type**. A **Static** smart block will save the criteria and generate the block content immediately. This enables you to edit the contents of the block in the **Library** page before adding it to a show. A **Dynamic** smart block will only save the criteria, and the specific content will be generated at the time the block is added to a show. After that, the content of the show can be changed or re-ordered in the **Now Playing** page. 
+
+![](static/Screenshot513-Creator_contains_240.png)
+
+Click the **plus button** on the left to add OR criteria, such as **Creator** containing *beck* OR *jimi*. (The criteria are not case sensitive). For a static smart block, click the **Generate** button to see the results. Dynamic smart blocks do not display the **Generate** or **Shuffle** buttons.
+
+![](static/Screenshot514-Contains_beck_or_jimi_240.png)
+
+If you don't like the ordering which is generated, click the **Shuffle** button, or drag and drop the smart block contents into the order that you prefer. You can also remove items or add new items manually from the Library. Changes to static smart block contents are saved automatically when you add items, remove or re-order them, or click the **Generate** button. Click the **Save** button in the upper right corner to save any changes to smart block criteria.
+
+To add an AND criteria, such as **Creator** containing *jimi* AND BPM in the range *120* to *130*, click the **plus button** on the right. If you see the message **0 files meet the criteria** in this case, it might mean that the files in the Library have not been tagged with BPM metadata. See the chapter *Preparing media for ingest* for tips on tagging content.
+
+![](static/Screenshot487-Smart_block_and_criteria.png)
+
+By default, a smart block will not contain repeated items, which will limit the duration of the block if you do not have sufficient items meeting the specified criteria in your **Library**. To override the default behaviour, check the **Allow Repeat Tracks** box. The **Sort tracks by** menu offers the options of **random**, **newest** or **oldest** items first.
+
+![](static/Screenshot582-Smart_block_repeat_tracks.png)
+
+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 "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 Libretime 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.
+
+Smart blocks can be added to shows in the same way as a manually created playlist is added. Smart blocks can also be added to one or more playlists. In the case of a playlist containing a static smart block, click **Expand Static Block** to view the contents. For a dynamic smart block, you can review the criteria and duration limit by clicking **Expand Dynamic Block**.
+
+![](static/Screenshot515-Expand_static_smart_block.png)
+
+Once created, smart blocks can be found in Library searches and refined at any time. They can be re-opened by clicking on the smart block and selecting **Edit** from the pop-up menu.
+

docs/manual/tracks/index.md

@@ -3,126 +3,39 @@ This page of the Libretime interface enables you to search the media library, so
 Searching the library
 ---------------------
 
-The search features on the left side of the **Library** page are the same as those available on the **Now Playing** page. Refer to the chapter *Now Playing* for details.
+In the top left corner of the page is an **Upload** button which enables you to add content to Libretime's library.
 
-Creating a new playlist
------------------------
+![](static/Screenshot422-Add_remove_content.png)
 
-Once you have found the media that you require using the search tools, you can create a new playlist on the right hand side of the **Library** page. If it is not already open, click the **Open Media Builder** button to begin.
+In the library table which opens, the upper section is for the **Advanced Search Options**, which enable you to search within individual fields of the database such as **Title** or **Creator**. Like an Internet search engine, you do not have to type in the correct upper or lower case, press the **Enter** key, or even type the whole of the search term before matches from the Libretime library are displayed.
 
-![](static/Screenshot500-Open_media_builder_240.png)
+![](static/Screenshot574-Advanced_search.png)
 
-Then click the **New** button and select **New Playlist** from the pop-up menu.
+At the bottom of the library table, click the **First**, **Previous**, **Next**, **Last** or individual page number buttons to browse the search results. Right-clicking an item in the search results will display the available metadata for that item in a pop-up window.
 
-![](static/Screenshot434-New_playlist.png)
+![](static/Screenshot433-Metadata_pop_up.png)
 
-At first, the new playlist will be shown as *Untitled Playlist*. Click the pencil icon on the right to give the playlist a name.
+The columns displayed in the search results correspond to the fields available for advanced searches (except for **Scheduled** and **Playlist / Block**, which indicate if a particular item is in use). To change the fields which can be searched, click the **Show / hide columns** button on the right side of the table, just above the search results.
 
-![](static/Screenshot502-Untitled_playlist_240.png)
+![](static/Screenshot499-Library_show_hide_columns_240.png)
 
-Type the name you have chosen, then press the **Enter** key on your keyboard to save the new name. You can edit the name of the playlist later, by clicking on the pencil icon again.
+Click the metadata column headings such as **Title**, **Creator**, **Album**, or <span style="font-weight: bold;">Genre</span> to sort the entries in ascending or descending order. In the second column, audio files are represented by a loudspeaker icon, while playlists are represented by a document icon. Smart blocks have a think bubble icon, and web streams have an arrow icon.
 
-![](static/Screenshot503-My_playlist_240.png)
+To find all files uploaded by yourself, or another specific member of the station staff, click the **Show / hide columns** checkbox which enables the **Owner** column. After you have made your search, you can click the header of the **Uploaded** column to find the items that person added to the server most recently.
 
-Click the link **View / edit description** to expand a box where you can enter a **Description** for the playlist, then click the **Save** button. Setting good quality metadata here will help you find the playlist using the search box later, so you should be as descriptive as possible.
+Advanced search terms are matched using 'and' rather than 'or' logic, to narrow your search. Perhaps you have tagged some jazz-flavoured station idents intended for use in a particular show called 'Jazz Maverick' with the **Album** tag of *Jazz Maverick* and a **Genre** of *Ident*. You could then find exactly the idents you are searching for by typing *maverick* and *ident* into the respective advanced search fields.
 
-![](static/Screenshot504-Example_playlist_240.png)
+Use the drop-down menu at the top of the search results to display **Files**, **Playlists**, **Smart Blocks**, **Web Streams** or **All** items. By default 10 items are listed, but you can click the **Show** drop-down menu to change the list length to between 5 and 100 items.
 
-Adding content to a playlist
-----------------------------
+![](static/Screenshot426-Search_result_select.png)
 
-With a playlist open, click on an item in the search results and then click **Add to Playlist** on the pop-up menu. Or drag and drop items from the search results on the left into the playlist on the right. Jingles and voice tracks can be added before, after or between music items.
+Click the Advanced Search Options link to collapse that area. Beneath the collapsed link is the **Simple Search** field, with a magnifying glass icon, which enables the selection of items based on any tag metadata stored in the Libretime database, whether that metadata column is currently displayed in the table or not. For example, to search for all items between four and five minutes duration, enter *00:04* into the simple search field (for 00 hours and 04 minutes).
 
-![](static/Screenshot505-Add_item_to_playlist_240.png)
+![](static/Screenshot425-Simple_search.png)
 
-You can also select or deselect a whole page of search results using the **Select** button, just below the simple search field. Alternatively, use the checkboxes in the first column of the search results table to select individual items, then click the **Add to current playlist** button. Items that you own which you no longer require can be deleted from Libretime's library using the **Trashcan** button. 
+If your jingles are tagged with *Jingle* in the **Genre** or other fields, you can very easily find them by entering *jingle* into the simple search field. The same technique can be used to find advertising and promotional files. (See the chapter *Preparing media for ingest* for tips on batch tagging files with metadata). Unlike advanced searches, simple searches use 'or' logic for multiple search terms, so a simple search for *jingle ident* will return items matching either keyword.
 
-![](static/Screenshot439-Checkbox_select_items.png)
+Clicking on an item in the library table opens a pop-up menu which enables you to audition the item, or remove it from the Libretime library. Media types which cannot be auditioned directly in a web browser, such as FLAC, have a lock icon instead of a loudspeaker icon, but these files can be downloaded to your local computer for audition instead. The **Delete** option should be used with caution, because this action cannot be undone. For media files, you can also **Edit Metadata** stored for the file using this menu.
 
-After adding files to the playlist, the total playlist time is displayed in the top right corner. The duration of an individual file is shown in each row of the playlist in a white font, and beneath this figure the time since the beginning of the playlist is displayed in a smaller light grey font. This elapsed time figure can be used as a time check for voice tracks, although this option may limit the re-usability of the voice track.
+![](static/Screenshot427-Library_pop_up.png)
 
-To audition a playlist file in your web browser, click the white triangle**** button on the left side of its row. (If the format of the file is not supported by your browser, the triangle in this button will be greyed out). If audition of the file format is supported, a pop-up window will open, with the playlist starting at the file you clicked.
-
-Click the small white **x** icon on the right hand side of each row to remove a file from the playlist. You can also drag and drop files to re-order them, or click the **Shuffle** button to re-order files automatically. Click the **Clear** button to remove all content from the playlist, or click the **Delete** button to remove the playlist from the Libretime library altogether.
-
-![](static/Screenshot506-Drag_drop_playlist_240.png)
-
-To adjust start and end fades, click the playlist **Fade** button (two horizontal white arrows crossing in a grey rectangle), to the left of the **Delete** and **Save** buttons. This action opens a beige bar in which you can set the **Fade in** duration for the first item in this playlist, and the **Fade out** duration for the last item. This duration figure represents the length of the fade, in seconds and tenths of a second, not the time at which the fade takes place. The default fade duration is set in the **Preferences** page on the **System** menu.
-
-![](static/Screenshot507-Fade_in_out_240.png)
-
-Click any one of the smaller **Fade** buttons between file rows to open another beige bar, which enables you to set **Fade out** and **Fade in** durations between two adjacent files in the playlist. The fade buttons for adjacent files change to an orange background when you click them.
-
-![](static/Screenshot508-Adjacent_fade_out_in_240.png)
-
-If your web browser supports the Web Audio API, you will see a **Show Waveform** button which enables you to view the waveforms of the adjacent items, adjust the fades and audition them. Click the **Fade Out** or **Fade In** button to change the fade curves by clicking in the waveforms, then click the **Play** button to audition the effect of any adjustment you have made. To audition just one part of the item, use the **Cursor** button to move the play cursor, which appears as a thin red line, on the waveform. The playback progress is shown by an orange colour on the waveform.
-
-![](static/Screenshot509-fade_editor_240.png)
-
-Each file in the playlist also has a button with two square brackets, which enables you to adjust **Cue In** and **Cue Out** times for that particular file. Like the fade button, the cue button changes to an orange background when you click it.
-
-**Cue In** and **Cue Out** points are set in hours, minutes, seconds and tenths of a second, relative to the start of the item. If a file has leading or trailing silence, corresponding cue points will be set automatically. The duration of the file in the playlist is updated automatically when you adjust a cue point, but the **Original Length** of the file is also displayed for your reference.
-
-![](static/Screenshot510-Cue_in_out_240.png)
-
-If a **Fade In** and **Cue In** are set on the same item in the playlist, the fade in begins at the **Cue In** point. If a **Fade Out** and **Cue Out** are set on the same item, the fade out ends at the **Cue Out** point. If your web browser supports the Web Audio API, you can click the **Show Waveform** button to adjust and audition cue points.
-
-![](static/Screenshot511-Visual_cue_editor_240.png)
-
-When your playlist is complete, click the **New** button in the top left corner to create another playlist, click the close icon (a white cross in a black circle) in the top right corner, or browse to another page of the Libretime interface.
-
-If you want to edit the playlist content or metadata later, you can find it by **Title**, **Creator**, **Last Modified** date, **Length**, **Owner** or **Year** using one of the search tools on the Library page. Click the playlist in the search results list, and then click **Edit** from the pop-up menu. You can also **Preview** the entire playlist in a pop-up audition window, **Duplicate** or **Delete** one of your playlists from this menu.
-
-![](static/Screenshot501-Edit_playlist_240.png)
-
-Creating a smart block
-----------------------
-
-Smart blocks are automatically filled with media files from the Libretime library, according to the criteria that you specify. This feature is intended to save staff time, compared to selecting items for a playlist manually.
-
-To create a smart block, click the **New** button on the right side of the Library page, and select **New Smart Block** from the pop-up menu. Like a playlist, smart blocks can have a title and **Description**, which you can edit. This helps you find relevant smart blocks in searches.
-
-![](static/Screenshot512-Example_smart_block_240.png)
-
-Click the link **Smart Block Options** to display the criteria and modifiers for the smart block. The criteria can be any one of Libretime's metadata categories, such as **Title**, **Creator** or **Genre**. The modifier depends on whether the metadata in question contains letters or numbers. For example, **Title** has modifiers including *contains* and *starts with*, whereas the modifiers for **BPM** include *is greater than* and *is in the range*.
-
-You can also set the **smart block type**. A **Static** smart block will save the criteria and generate the block content immediately. This enables you to edit the contents of the block in the **Library** page before adding it to a show. A **Dynamic** smart block will only save the criteria, and the specific content will be generated at the time the block is added to a show. After that, the content of the show can be changed or re-ordered in the **Now Playing** page. 
-
-![](static/Screenshot513-Creator_contains_240.png)
-
-Click the **plus button** on the left to add OR criteria, such as **Creator** containing *beck* OR *jimi*. (The criteria are not case sensitive). For a static smart block, click the **Generate** button to see the results. Dynamic smart blocks do not display the **Generate** or **Shuffle** buttons.
-
-![](static/Screenshot514-Contains_beck_or_jimi_240.png)
-
-If you don't like the ordering which is generated, click the **Shuffle** button, or drag and drop the smart block contents into the order that you prefer. You can also remove items or add new items manually from the Library. Changes to static smart block contents are saved automatically when you add items, remove or re-order them, or click the **Generate** button. Click the **Save** button in the upper right corner to save any changes to smart block criteria.
-
-To add an AND criteria, such as **Creator** containing *jimi* AND BPM in the range *120* to *130*, click the **plus button** on the right. If you see the message **0 files meet the criteria** in this case, it might mean that the files in the Library have not been tagged with BPM metadata. See the chapter *Preparing media for ingest* for tips on tagging content.
-
-![](static/Screenshot487-Smart_block_and_criteria.png)
-
-By default, a smart block will not contain repeated items, which will limit the duration of the block if you do not have sufficient items meeting the specified criteria in your **Library**. To override the default behaviour, check the **Allow Repeat Tracks** box. The **Sort tracks by** menu offers the options of **random**, **newest** or **oldest** items first.
-
-![](static/Screenshot582-Smart_block_repeat_tracks.png)
-
-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 "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 Libretime 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.
-
-Smart blocks can be added to shows in the same way as a manually created playlist is added. Smart blocks can also be added to one or more playlists. In the case of a playlist containing a static smart block, click **Expand Static Block** to view the contents. For a dynamic smart block, you can review the criteria and duration limit by clicking **Expand Dynamic Block**.
-
-![](static/Screenshot515-Expand_static_smart_block.png)
-
-Once created, smart blocks can be found in Library searches and refined at any time. They can be re-opened by clicking on the smart block and selecting **Edit** from the pop-up menu.
-
-Adding a web stream
--------------------
-
-A web stream URL and metadata can be added to the Libretime library, so that a remote stream can be searched for and scheduled to be *pulled* into a show. For example, at the top of the hour your station may pull a news report from journalists working in another studio. This is a different concept from **Master Source** and **Show Source** remote streams which are *pushed* into the Libretime playout schedule.
-
-To add a web stream, click the **New** button on the right side of the Library page, and select **New Webstream** from the pop-up menu. Like a playlist, web streams in the Library can have a title and **Description**, which may help you find them in searches later.
-
-![](static/Screenshot516-New_remote_webstream.png)
-
-The **Stream URL** setting must include the *port number* (such as 8000) and *mount point* (such as remote\_stream) of the remote stream, in addition to the streaming server name. A **Default Length** for the remote stream can also be set. If the stream is added at the end of a show which becomes overbooked as a result, it will be faded out when the show ends.

docs/manual/upload/index.md

@@ -1,23 +1,18 @@
-If you do not have direct access to the Libretime server, you can add files to the Libretime library using the **Add Media** page of the administration interface. (The **Add Media** page is not visible to *Guest* users). This page includes an upload queue for media files, which supports drag and drop from your computer's file manager if you are using a recent web browser, such as *Mozilla Firefox 16* or later.
+The primary way you can add files to the Libretime library is using the **Upload** page of the administration interface. (The **Upload** page is not visible to *Guest* users). This page includes an upload queue for media files, which supports drag and drop from your computer's file manager if you are using a recent web browser, such as *Mozilla Firefox 16* or later.
 
-Some web browsers may set an upload limit for a single file, between 200MB and 2GB. If you need to upload files larger than 200MB to the Libretime server on a regular basis, you may find it more convenient to perform the upload using SFTP, rather than through the browser. See the chapter *Automated file import* for more details.
+Some web browsers may set an upload limit for a single file, between 200MB and 2GB. In addition the default LibreTime webserver configuration limits file size to 500M.  If you need to upload files larger than 500MB to the Libretime server on a regular basis, you will need to have your admin update the configuration at `/etc/apache2/sites-available/airtime.conf `. Airtime previously supported import via SFTP but this functionality is still under development for LibreTime.
 
-![](static/Screenshot383-Add_media.png)
+![](static/upload-files-dialog)
 
-If your web browser does not support drag and drop, you can use the **Add files** button, which has a white plus sign in a green circle icon, to open a file selection window on your computer.
+If your web browser does not support drag and drop, you can click the background of the screen on the **Upload page**, to open up a file browser dialog.
+LibreTime will automatically attempt to upload files once you select them. You can track the file upload progress via the gray progress bar in the upload window.
 
-![](static/Screenshot143-File_upload.png)
+![](static/dialog-progress.png)
 
-After you have added all the files that you require to the upload queue, click the **Start upload** button, which has a green arrow icon.
+The upload speed will depend on the network connection between your computer and the Libretime server. While files are uploading you need to keep this browser window open or it will interrupt the file transfer.
 
-![](static/Screenshot144-Start_upload_1.png)
+![](static/pending-import.png)
 
-The row of the file currently being uploaded is highlighted in pale green. At the bottom of the upload queue, a progress bar and percentage indicates how much of the upload has taken place so far. The upload speed will depend on the network connection between your computer and the Libretime server.
+After the file transfer is complete, the file is then processed by the analyzer service and if it has been succesfully uploaded the **Import Status** will change from **Pending Import** to **Succesfully imported**. If it fails there was some reason your file was rejected by LibreTime and you will need to try again or contact your Admin to have them consult the logs and open up a bug report. It sometimes takes a few minutes for files to be processed but if they are all stuck at **Pending Import** then it is possible that the *airtime_analyzer* process has crashed and the admin will need to restart it. See [Troubleshooting](../troubleshooting) for more information. You can look specifically at any failed imports by clicking the radio button next to Failed.
 
-![](static/Screenshot145-Upload_status_1.png)
-
-Once it has been uploaded successfully, each file row displays a white check mark in a green circle icon.
-
-![](static/Screenshot146-Upload_done_1.png) 
-
-Your files are now imported into the Libretime library, ready to be included in your broadcast playlists, smart blocks and shows.
+Once they are done procesing your files ready to be included in your broadcast playlists, smart blocks and shows and can be viewed in the [Tracks](../Tracks) section of the Library.

docs/manual/webstreams/index.md

@@ -1 +1,10 @@
-**TBD**
+Adding a web stream
+-------------------
+
+A web stream URL and metadata can be added to the Libretime library, so that a remote stream can be searched for and scheduled to be *pulled* into a show. For example, at the top of the hour your station may pull a news report from journalists working in another studio. This is a different concept from **Master Source** and **Show Source** remote streams which are *pushed* into the Libretime playout schedule.
+
+To add a web stream, click the **New** button on the right side of the Library page, and select **New Webstream** from the pop-up menu. Like a playlist, web streams in the Library can have a title and **Description**, which may help you find them in searches later.
+
+![](static/Screenshot516-New_remote_webstream.png)
+
+The **Stream URL** setting must include the *port number* (such as 8000) and *mount point* (such as remote\_stream) of the remote stream, in addition to the streaming server name. A **Default Length** for the remote stream can also be set. If the stream is added at the end of a show which becomes overbooked as a result, it will be faded out when the show ends.