Removed Skip this step buttons in web installer, removed opus plugins from requirements.apt files

This commit is contained in:
Duncan Sommerville 2015-01-14 18:07:33 -05:00
parent f40d88b192
commit 380ec41201
6 changed files with 19 additions and 5 deletions

View File

@ -4,6 +4,10 @@
<form action="#" role="form" id="dbSettingsForm"> <form action="#" role="form" id="dbSettingsForm">
<h3 class="form-title">Database Settings</h3> <h3 class="form-title">Database Settings</h3>
<span id="helpBlock" class="help-block help-message"></span> <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"> <div class="form-group">
<label class="control-label" for="dbUser">Username</label> <label class="control-label" for="dbUser">Username</label>
<input required class="form-control" type="text" name="dbUser" id="dbUser" placeholder="Username" value="airtime"/> <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"/> <input class="form-control" type="hidden" name="dbErr" id="dbErr" aria-describedby="helpBlock"/>
<div> <div>
<input type="submit" formtarget="dbSettingsForm" class="btn btn-primary btn-next" value="Next &#10097;"/> <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> </div>
</form> </form>

View File

@ -23,7 +23,6 @@
<div> <div>
<input type="submit" formtarget="generalSettingsForm" class="btn btn-primary btn-next" value="Next &#10097;"/> <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-primary btn-back" value="&#10096; Back"/>
<input type="button" class="btn btn-default btn-skip" value="Skip this step &#10097;"/>
</div> </div>
</form> </form>

View File

@ -20,7 +20,6 @@
<div> <div>
<input type="submit" formtarget="mediaSettingsForm" class="btn btn-primary btn-next" value="Next &#10097;"/> <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-primary btn-back" value="&#10096; Back"/>
<input type="button" class="btn btn-default btn-skip" value="Skip this step &#10097;"/>
</div> </div>
</form> </form>

View File

@ -50,7 +50,6 @@
<div> <div>
<input type="submit" formtarget="rmqSettingsForm" class="btn btn-primary btn-next" value="Next &#10097;"/> <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-primary btn-back" value="&#10096; Back"/>
<input type="button" class="btn btn-default btn-skip" value="Skip this step &#10097;"/>
</div> </div>
</form> </form>

View File

@ -50,7 +50,6 @@ liquidsoap-plugin-icecast
liquidsoap-plugin-lame liquidsoap-plugin-lame
liquidsoap-plugin-mad liquidsoap-plugin-mad
liquidsoap-plugin-ogg liquidsoap-plugin-ogg
liquidsoap-plugin-opus
liquidsoap-plugin-portaudio liquidsoap-plugin-portaudio
liquidsoap-plugin-pulseaudio liquidsoap-plugin-pulseaudio
liquidsoap-plugin-taglib liquidsoap-plugin-taglib

View File

@ -40,5 +40,20 @@ libzend-framework-php
coreutils 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 silan
libopus0 libopus0