Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reorder final setup steps

Browse source
This commit is contained in:
Duncan Sommerville 2015-01-12 12:45:52 -05:00
parent 0fcac545e6
commit 2b882cc313
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
airtime_mvc/build/airtime-setup/forms/finish-settings.php
View file

@ -6,21 +6,28 @@
<span id="helpBlock" class="help-block help-message"></span> <span id="helpBlock" class="help-block help-message"></span>
<p> <p>
Looks like you're almost done! As a final step, run the following commands from the terminal:<br/> Looks like you're almost done! As a final step, run the following commands from the terminal:<br/>
<code>sudo service airtime-playout start</code>, <code>sudo service airtime-liquidsoap start</code>, <code>sudo service airtime-playout start</code><br/>
<code>sudo service airtime-media-monitor start</code>. <code>sudo service airtime-liquidsoap start</code><br/>
<code>sudo service airtime-media-monitor start</code>
</p> </p>
<p> <p>
Click "Done!" to bring up the Airtime configuration checklist; if your configuration is all green, Click "Done!" to bring up the Airtime configuration checklist; if your configuration is all green,
you're ready to get started with your personal Airtime station! you're ready to get started with your personal Airtime station!
</p> </p>
<p>
If you need to re-run the web installer, just remove <code>/etc/airtime/airtime.conf</code>.
</p>
<div> <div>
<input type="submit" formtarget="finishSettingsForm" class="btn btn-primary btn-next" value="Done!"/> <input type="submit" formtarget="finishSettingsForm" class="btn btn-primary btn-next" value="Done!"/>
<input type="button" class="btn btn-primary btn-back" value="&#10096; Back"/>
</div> </div>
</form> </form>
<script> <script>
$("#finishSettingsForm").submit(function(e) { $(document).ready(function() {
submitForm(e, "FinishSetup"); submitForm(e, "FinishSetup");
}); });
$("#finishSettingsForm").submit(function(e) {
window.location.replace("/?config");
});
</script> </script>

4
airtime_mvc/public/js/setup/setup-config.js
View file

@ -9,13 +9,9 @@ function cleanupStep(data, e) {
// If there are no errors, we can continue with // If there are no errors, we can continue with
// the installation process // the installation process
if (data.errors.length == 0) { if (data.errors.length == 0) {
if ($(e.target).attr("id") == "finishSettingsForm") {
window.location.replace("/?config");
} else {
// Call nextSlide from the submit button's context // Call nextSlide from the submit button's context
nextSlide.call($(e.target)); nextSlide.call($(e.target));
} }
}
removeOverlay(); removeOverlay();
} }