From 380ec412019043a8a00434b9c40e50ea18d216b1 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Wed, 14 Jan 2015 18:07:33 -0500
Subject: [PATCH] Removed Skip this step buttons in web installer, removed opus
 plugins from requirements.apt files

---
 .../airtime-setup/forms/database-settings.php     |  5 ++++-
 .../airtime-setup/forms/general-settings.php      |  1 -
 .../build/airtime-setup/forms/media-settings.php  |  1 -
 .../airtime-setup/forms/rabbitmq-settings.php     |  1 -
 installer/lib/requirements-ubuntu-saucy.apt       |  1 -
 installer/lib/requirements-ubuntu-trusty.apt      | 15 +++++++++++++++
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/build/airtime-setup/forms/database-settings.php b/airtime_mvc/build/airtime-setup/forms/database-settings.php
index 4bc93ff8b..a97bc672d 100755
--- a/airtime_mvc/build/airtime-setup/forms/database-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/database-settings.php
@@ -4,6 +4,10 @@
 <form action="#" role="form" id="dbSettingsForm">
     <h3 class="form-title">Database Settings</h3>
     <span id="helpBlock" class="help-block help-message"></span>
+    <p>
+        Enter your Airtime database settings here. Empty or non-existent database names will be created and populated 
+        if the given user has administrative permissions in postgres.
+    </p>
     <div class="form-group">
         <label class="control-label" for="dbUser">Username</label>
         <input required class="form-control" type="text" name="dbUser" id="dbUser" placeholder="Username" value="airtime"/>
@@ -27,7 +31,6 @@
     <input class="form-control" type="hidden" name="dbErr" id="dbErr" aria-describedby="helpBlock"/>
     <div>
         <input type="submit" formtarget="dbSettingsForm" class="btn btn-primary btn-next" value="Next &#10097;"/>
-        <input type="button" class="btn btn-default btn-skip" value="Skip this step &#10097;"/>
     </div>
 </form>
 
diff --git a/airtime_mvc/build/airtime-setup/forms/general-settings.php b/airtime_mvc/build/airtime-setup/forms/general-settings.php
index dbfbb570a..f15e06d5a 100755
--- a/airtime_mvc/build/airtime-setup/forms/general-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/general-settings.php
@@ -23,7 +23,6 @@
     <div>
         <input type="submit" formtarget="generalSettingsForm" class="btn btn-primary btn-next" value="Next &#10097;"/>
         <input type="button" class="btn btn-primary btn-back" value="&#10096; Back"/>
-        <input type="button" class="btn btn-default btn-skip" value="Skip this step &#10097;"/>
     </div>
 </form>
 
diff --git a/airtime_mvc/build/airtime-setup/forms/media-settings.php b/airtime_mvc/build/airtime-setup/forms/media-settings.php
index fb74542ea..bc3b02761 100755
--- a/airtime_mvc/build/airtime-setup/forms/media-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/media-settings.php
@@ -20,7 +20,6 @@
     <div>
         <input type="submit" formtarget="mediaSettingsForm" class="btn btn-primary btn-next" value="Next &#10097;"/>
         <input type="button" class="btn btn-primary btn-back" value="&#10096; Back"/>
-        <input type="button" class="btn btn-default btn-skip" value="Skip this step &#10097;"/>
     </div>
 </form>
 
diff --git a/airtime_mvc/build/airtime-setup/forms/rabbitmq-settings.php b/airtime_mvc/build/airtime-setup/forms/rabbitmq-settings.php
index f82eb4bbe..f287c6bb5 100755
--- a/airtime_mvc/build/airtime-setup/forms/rabbitmq-settings.php
+++ b/airtime_mvc/build/airtime-setup/forms/rabbitmq-settings.php
@@ -50,7 +50,6 @@
     <div>
         <input type="submit" formtarget="rmqSettingsForm" class="btn btn-primary btn-next" value="Next &#10097;"/>
         <input type="button" class="btn btn-primary btn-back" value="&#10096; Back"/>
-        <input type="button" class="btn btn-default btn-skip" value="Skip this step &#10097;"/>
     </div>
 </form>
 
diff --git a/installer/lib/requirements-ubuntu-saucy.apt b/installer/lib/requirements-ubuntu-saucy.apt
index e7c7442d9..2bec0a3c0 100755
--- a/installer/lib/requirements-ubuntu-saucy.apt
+++ b/installer/lib/requirements-ubuntu-saucy.apt
@@ -50,7 +50,6 @@ liquidsoap-plugin-icecast
 liquidsoap-plugin-lame
 liquidsoap-plugin-mad
 liquidsoap-plugin-ogg
-liquidsoap-plugin-opus
 liquidsoap-plugin-portaudio
 liquidsoap-plugin-pulseaudio
 liquidsoap-plugin-taglib
diff --git a/installer/lib/requirements-ubuntu-trusty.apt b/installer/lib/requirements-ubuntu-trusty.apt
index e02f588a7..f5be8df10 100755
--- a/installer/lib/requirements-ubuntu-trusty.apt
+++ b/installer/lib/requirements-ubuntu-trusty.apt
@@ -40,5 +40,20 @@ libzend-framework-php
 
 coreutils
 
+liquidsoap-plugin-alsa
+liquidsoap-plugin-ao
+liquidsoap-plugin-faad
+liquidsoap-plugin-flac
+liquidsoap-plugin-icecast
+liquidsoap-plugin-lame
+liquidsoap-plugin-mad
+liquidsoap-plugin-ogg
+liquidsoap-plugin-portaudio
+liquidsoap-plugin-pulseaudio
+liquidsoap-plugin-taglib
+liquidsoap-plugin-voaacenc
+liquidsoap-plugin-vorbis
+
+sourcefabric-keyring
 silan
 libopus0
\ No newline at end of file