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

Installer tweaks and a pypo bugfix

Browse source 
* Moved all the remaining DEB requirements into the requirements files
* The installer should now be distro agnostic (unless you ask it to
  install third-party deps for you)
* Fixed pypo not being able to find replaygainupdater
* Tweaked a bunch of styling for the installer
This commit is contained in:
Albert Santoni 2015-02-10 18:06:46 -05:00
parent 861bb42f3f
commit d46f4a52eb
11 changed files with 218 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

71
airtime_mvc/application/configs/config-check.php
View file

@ -38,13 +38,12 @@ $result = $r1 && $r2;
}
body {
padding: 2em 0;
padding: 2em;
min-width: 600px;
width: 50%;
text-align: center;
margin: 3em auto;
margin: 3em ;
border: 1px solid lightgray;
border-radius: 5em;
border-radius: 5px;
}
</style>
@ -53,18 +52,42 @@ $result = $r1 && $r2;
<img class="logo" src="css/images/airtime_logo_jp.png" /><br/>
<strong>Configuration Checklist</strong>
</h2>
<?php
if (!$result) {
?>
<br/>
<h3 class="error">Looks like something went wrong!</h3>
<p>
Take a look at the checklist below for possible solutions. If you're tried the suggestions and are
still experiencing issues, come
<a href="https://forum.sourcefabric.org/">visit our forums</a>
or <a href="http://www.sourcefabric.org/en/airtime/manuals/">check out the manual</a>.
</p>
<?php
} else {
?>
<p>
Your Airtime station is up and running! Get started by logging in with the default username and password: admin/admin
</p>
<button onclick="location = location.pathname;">Log in to Airtime!</button>
<?php
}
?>
<table class="table">
<thead>
<tr>
<td class="component">
<th class="component">
Component
</td>
<td class="description">
</th>
<th class="description">
<strong>Description</strong>
</td>
<td class="solution">
<strong>Solution</strong>
</td>
</th>
<th class="solution">
<strong>Status or Solution</strong>
</th>
</tr>
</thead>
</table>
@ -172,7 +195,7 @@ $result = $r1 && $r2;
Check that the airtime-media-monitor service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>initctl list | grep airtime-media-monitor</code><br/>
If not, try <br/><code>sudo service airtime-media-monitor start</code>
If not, try running <code>sudo service airtime-media-monitor start</code>
<?php
}
?>
@ -192,7 +215,7 @@ $result = $r1 && $r2;
Check that the airtime-playout service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>initctl list | grep airtime-playout</code><br/>
If not, try <br/><code>sudo service airtime-playout restart</code>
If not, try running <code>sudo service airtime-playout restart</code>
<?php
}
?>
@ -212,7 +235,7 @@ $result = $r1 && $r2;
Check that the airtime-liquidsoap service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>initctl list | grep airtime-liquidsoap</code><br/>
If not, try <br/><code>sudo service airtime-liquidsoap restart</code>
If not, try running <code>sudo service airtime-liquidsoap restart</code>
<?php
}
?>
@ -221,26 +244,6 @@ $result = $r1 && $r2;
</tbody>
</table>
</div>
<?php
if (!$result) {
?>
<br/>
<strong>Looks like something went wrong!</strong>
<p>
If you've tried everything we've recommended above and are still experiencing issues, come
<a href="https://forum.sourcefabric.org/">visit our forums</a>
or <a href="http://www.sourcefabric.org/en/airtime/manuals/">check out the manual</a>.
</p>
<?php
} else {
?>
<p>
Your Airtime station is up and running! Get started by logging in with the default username and password: admin/admin
</p>
<button onclick="location = location.pathname;">Log in to Airtime!</button>
<?php
}
?>
<div class="footer">
<h3>
PHP Extension List

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

@ -2,10 +2,10 @@
?>
<form action="#" role="form" id="finishSettingsForm">
<h3 class="form-title">Setup Complete!</h3>
<h3 class="form-title">Manual Step: Start Airtime Services</h3>
<span id="helpBlock" class="help-block help-message"></span>
<p>
Looks like you're almost done! As a final step, run the following commands from the terminal:
Looks like you're almost done! As a final step, please run the following commands from the terminal:
</p>
<pre style="text-align: left">sudo service airtime-playout start
sudo service airtime-liquidsoap start

12
airtime_mvc/public/css/setup/config-check.css
View file

@ -3,13 +3,11 @@
}
.table {
padding: 0;
padding: 5px;
margin: 1em 0 0 0;
}
.checklist {
overflow: auto;
height: 50%;
min-height: 200px;
}
@ -22,8 +20,12 @@
width: 20%;
}
.description, .solution {
width: 40%;
.error {
color: red;
}
.description {
width: 300px;
}
.check {

43
airtime_mvc/public/css/setup/setup-config.css
View file

@ -1,8 +1,8 @@
html {
background: -webkit-linear-gradient(midnightblue, black); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(midnightblue, black); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(midnightblue, black); /* For Firefox 3.6 to 15 */
background: linear-gradient(midnightblue, black); /* Standard syntax */
background: -webkit-linear-gradient(#444, black); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(#444, black); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(#444, black); /* For Firefox 3.6 to 15 */
background: linear-gradient(#444, black); /* Standard syntax */
}
body {
@ -15,6 +15,14 @@ body {
margin: auto;
}
p, h1, h2, h3, h4, h5, h6 {
text-shadow: 0px 1px 1px #000;
}
code {
text-shadow: none;
}
.header {
padding-top: 1em;
height: 10%;
@ -36,8 +44,33 @@ body {
}
#airtimeLogo {
padding-top: .7em;
float: left;
padding-top: 0.6em;
}
.btn-primary {
text-shadow: 0px 1px 1px #000000;
background-color: #ff5d1a;
border-color: #8d3715;
}
.btn-primary:focus, .btn-primary:active, .form-control:focus
{
border-color: #ff5d1a;
outline: 0;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(255, 93, 26, 0.6);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(255, 93, 26, 0.6);
}
.btn-primary:hover, .btn-primary:focus, .btn-primary.focus, .btn-primary:active, .btn-primary.active, .open>.dropdown-toggle.btn-primary,
.btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus, .btn-primary[disabled].focus, fieldset[disabled] .btn-primary.focus, .btn-primary.disabled:active,
.btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active
{
background-color: #dc5118;
border-color: #632910;
}
/* ############################################################################

3
airtime_mvc/public/setup/database-setup.php
View file

@ -67,7 +67,8 @@ class DatabaseSetup extends Setup {
}
} catch (PDOException $e) {
throw new AirtimeDatabaseException("Couldn't establish a connection to the database! "
. "Please check your credentials and try again.",
. "Please check your credentials and try again. "
. "PDO Exception: " . $e->getMessage(),
array(
self::DB_NAME,
self::DB_USER,