From 3cbb16621ba4697a2751a62ddae47f9e1951ce90 Mon Sep 17 00:00:00 2001 From: Zachary Klosko <31484611+zklosko@users.noreply.github.com> Date: Mon, 18 May 2020 15:06:25 -0400 Subject: [PATCH] Moving tutorials over to site nav --- docs/_data/navigation.yml | 15 ++++++--- docs/quickstart.md | 52 -------------------------------- docs/scheduling-shows.md | 51 +++++++++++++++++++++++++++++++ docs/{manual.md => tutorials.md} | 20 +----------- docs/upload-tracks.md | 39 ------------------------ 5 files changed, 63 insertions(+), 114 deletions(-) create mode 100644 docs/scheduling-shows.md rename docs/{manual.md => tutorials.md} (75%) delete mode 100644 docs/upload-tracks.md diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml index 12b44dd3d..5ef2c2c2a 100644 --- a/docs/_data/navigation.yml +++ b/docs/_data/navigation.yml @@ -26,10 +26,15 @@ sidebar: - page: - title: Using LibreTime subfolderitems: - - page: Interface Tour - url: upload - - page: Tutorials - url: manual + - page: Scheduling Shows + url: scheduling-shows + - page: Broadcasting Live + url: live-broadcast + - page: Adding Users + url: users + subsubfolderitems: + - page: More Tutorials + url: tutorials - page: - title: Contribute to LibreTime subfolderitems: @@ -52,3 +57,5 @@ sidebar: url: rights-royalties - page: Media Folders used by LibreTime url: folders + - page: Preparing Media for Upload + url: preparing-media diff --git a/docs/quickstart.md b/docs/quickstart.md index f08374962..d8f10f34a 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -81,58 +81,6 @@ After the install is completed, head to the IP address of the server LibreTime w to complete the welcome wizard. While not strictly necessary, it is recommended that you change the passwords prompted in the welcome wizard if you intend on accessing the server from the Internet. The welcome wizard will walk you through the rest of the installation process. -## Scheduling your first show - -Log in using your username and password using the link in the upper right corner. (If you just installed -LibreTime, your username/password is admin/admin.) - -The main workflow in LibreTime is **Upload** media -> create a show on the **Calendar** -> **Schedule Tracks**. - -Once you log in, click on the big blue button on the left navigation that says **Upload**. - -![](img/Select_files.png) - -Select the type of media you are uploading (Music, Station IDs, etc.) by using the dropdown box -at the top of the pane. After that, either drag and drop media into the area below or click the -dashed rectangle to open a file browser. - -Once your files have uploaded and have been successfully imported (as shown in the pane on the right), -click on **Calendar** on the left navigation. - -![](img/Screenshot558-Add_Show.png) - -Click on the blue **+ New Show** button to add a new show. - -![](img/Screenshot560-Show_when.png) - -At the very minimum, fill out the show's name and when the show will take place. If the show will repeat regularly, -check the **Repeats?** box and fill out the repeat information. Click on the grey **+ Add this show** button at the top -of the pane to add your show to the calendar. - -Once your show is created, click on it to open its context menu. Select **Schedule Tracks** to open the track scheduler. - -![](img/Screenshot561-Add_show_content.png) - -The track scheduler behaves similar to iTunes or Windows Media Player: media browser on the left, playlist on the right. -Find the tracks that you'd like to schedule by using the search box or sorting columns and then drag them -into the playlist. - -![](img/Screenshot562-Drag_show_content.png) - -The bar at the end of the show's playlist will show the amount of time the show is underscheduled or overscheduled. -Shows that are underscheduled will have dead air at the end and shows that are overscheduled -will fade out exactly when the show is over (the orange colored entry), meaning tracks scheduled to start -after this point will not play (dark red colored entries). Click the **Ok** button in the bottom right to save. - -Show playback will start and end as per each show's start and end times, allowing you to rely completely on -LibreTime for running your station or using LibreTime as a part of your live setup to cover when DJs are not present. -When media is playing, the **On Air** indicator at the top will turn red. - -![](img/on-air-status.png) - -You can listen to your stream by going to `yourserverIP:8000` or by clicking the **Listen** button under the On Air -indicator. - Congratulations! You've successfully set up LibreTime! ## Next Steps diff --git a/docs/scheduling-shows.md b/docs/scheduling-shows.md new file mode 100644 index 000000000..2e0a13996 --- /dev/null +++ b/docs/scheduling-shows.md @@ -0,0 +1,51 @@ +# Scheduling Shows + +Log in using your username and password using the link in the upper right corner. (If you just installed +LibreTime, your username/password is admin/admin.) + +The main workflow in LibreTime is **Upload** media -> create a show on the **Calendar** -> **Schedule Tracks**. + +Once you log in, click on the big blue button on the left navigation that says **Upload**. + +![](img/Select_files.png) + +Select the type of media you are uploading (Music, Station IDs, etc.) by using the dropdown box +at the top of the pane. After that, either drag and drop media into the area below or click the +dashed rectangle to open a file browser. + +Once your files have uploaded and have been successfully imported (as shown in the pane on the right), +click on **Calendar** on the left navigation. + +![](img/Screenshot558-Add_Show.png) + +Click on the blue **+ New Show** button to add a new show. + +![](img/Screenshot560-Show_when.png) + +At the very minimum, fill out the show's name and when the show will take place. If the show will repeat regularly, +check the **Repeats?** box and fill out the repeat information. Click on the grey **+ Add this show** button at the top +of the pane to add your show to the calendar. + +Once your show is created, click on it to open its context menu. Select **Schedule Tracks** to open the track scheduler. + +![](img/Screenshot561-Add_show_content.png) + +The track scheduler behaves similar to iTunes or Windows Media Player: media browser on the left, playlist on the right. +Find the tracks that you'd like to schedule by using the search box or sorting columns and then drag them +into the playlist. + +![](img/Screenshot562-Drag_show_content.png) + +The bar at the end of the show's playlist will show the amount of time the show is underscheduled or overscheduled. +Shows that are underscheduled will have dead air at the end and shows that are overscheduled +will fade out exactly when the show is over (the orange colored entry), meaning tracks scheduled to start +after this point will not play (dark red colored entries). Click the **Ok** button in the bottom right to save. + +Show playback will start and end as per each show's start and end times, allowing you to rely completely on +LibreTime for running your station or using LibreTime as a part of your live setup to cover when DJs are not present. +When media is playing, the **On Air** indicator at the top will turn red. + +![](img/on-air-status.png) + +You can listen to your stream by going to `yourserverIP:8000` or by clicking the **Listen** button under the On Air +indicator. \ No newline at end of file diff --git a/docs/manual.md b/docs/tutorials.md similarity index 75% rename from docs/manual.md rename to docs/tutorials.md index c185ca5c6..9ef5572ad 100644 --- a/docs/manual.md +++ b/docs/tutorials.md @@ -1,4 +1,4 @@ -Manual +Tutorials ------ This page contains links to number of tutorials. @@ -27,11 +27,6 @@ There are also a number of tutorials in Spanish on [Vimeo](https://vimeo.com/use * [Help](help) * [Listen](listen) -## For DJs -* [How to upload and schedule tracks on your show](upload-tracks) -* [Broadcasting live with MIXXX or B.U.T.T.](live-broadcast) -* [How to prepare media for ingest to LibreTime](preparing-media) - ## For Program Managers * [Building a schedule](build-schedule) * [How to set up an automatic top of the hour ID with intro playlist feature](intro-playlist) @@ -52,21 +47,8 @@ There are also a number of tutorials in Spanish on [Vimeo](https://vimeo.com/use ### Advanced Configuration * [Configuring FreeIPA authentication](freeipa) * [Using and configuring Icecast and Shoutcast](icecast-shoutcast) -* [Configuring track types](track-types) * [Interface Customization](interface-customization) -* [Setting up SSL](ssl-config) * [Promoting your station through your Icecast stream](promoting-your-station) * [How to back up the LibreTime media folder and database](backing-up-the-server) * [Upgrading LibreTime](upgrading) * [Uninstalling LibreTime](uninstall) - -## For Developers and Contributors -* [Setting up a LibreTime instance with Vagrant](vagrant) -* [Setting up a LibreTime instance with Multipass](multipass) -* [Database access](database) -* [Translating LibreTime](interface-localization) - -## Appendix -* [HD Audio Module information](hd-audio-modules) -* [Rights and royalty information](rights-royalties) -* [Information on media folders used by LibreTime](folders) diff --git a/docs/upload-tracks.md b/docs/upload-tracks.md deleted file mode 100644 index a3532cfa5..000000000 --- a/docs/upload-tracks.md +++ /dev/null @@ -1,39 +0,0 @@ -# How to Upload Tracks and Schedule Your Show -* YouTube video - -[![Upload Tracks](http://img.youtube.com/vi/TJtWUzAlP08/0.jpg)](https://www.youtube-nocookie.com/embed/TJtWUzAlP08 "How to upload tracks") - -* Step-by-step Text Based - -**Audience**: DJ with permission to schedule a specific show - -1. **Login** to LibreTime with your DJ username and password at -[http://HOSTNAME/user](http://HOSTNAME/user) *Note: replace HOSTNAME with the -web site address given to you by your station admin* -1. Click the blue **Upload** button in the top left of the screen. -1. Click the background where it says **Drop files here or click to browse your -computer** or drag on and drop your music files from your desktop. -1. If you clicked then browse your file system to find the music files you want -to play and click them and then click **Open** -1. The tracks should start to upload and when they are completed show up on the -right under **Recent Uploads**. *Note: you will need to keep this window open -while they are uploading* -1. You can also upload short segments to schedule between your tracks recorded, -for instance, with Audacity. -1. LibreTime in general supports mp3, ogg, flac, wav and m4a file types. If -a track isn’t supported the import will be marked as failed under -**Import Status** -1. Once you have uploaded all of the tracks you plan on airing you click on -**Calendar** -1. Find your upcoming show in the Calendar and click on it and click **Schedule -Tracks** from the pop-up menu. -1. Now click the tracks you want to add and click **+ Add to show** or -click and drag the tracks to the right. -1. You can also add station **Smart Blocks**, **Playlists** and **Webstreams** -by clicking those sections at the top of the screen. -1. When you are done you can re-order your tracks by clicking and dragging -them. -1. When your tracks are in order and there is no empty time remaning click -**Ok** to finish. -1. Your next show should now be scheduled to play during its scheduled time -slot.