Skip to content

Commit

Permalink
v1.8 update
Browse files Browse the repository at this point in the history
  • Loading branch information
BroadcastEngineer authored and BroadcastEngineer committed Mar 20, 2018
1 parent ac6bf51 commit 38940f0
Show file tree
Hide file tree
Showing 21 changed files with 4,489 additions and 206 deletions.
7 changes: 7 additions & 0 deletions assets/theme/css/sb-admin-2.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,15 @@
* For details, see http://www.apache.org/licenses/LICENSE-2.0.
*/

@import url('https://fonts.googleapis.com/css?family=Roboto');

body {
background-color: #f8f8f8;
font-family: 'Roboto', sans-serif;
}

a, a:hover{
color:black;
}

#wrapper {
Expand Down
33 changes: 19 additions & 14 deletions database/cg.sql
View file

Large diffs are not rendered by default.

62 changes: 43 additions & 19 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<html lang="en">

<head>
<title>WebCG</title>
<title>WebCG Client</title>
<?php include("head.php"); ?>
</head>

Expand All @@ -55,12 +55,19 @@
</div>
</div>

<div class="row">
<div class="col-lg-12">
<div class="alert alert-success">
<strong>CasparCG</strong> [<?php echo $ip.":".$port;?>] is <?php echo $status; ?>
</div>
</div>
</div>

<div class="form-group input-group">
<span class="input-group-addon"><i><small><i class="fa fa-terminal fa-fw"></i> Executed Command</small></i></span>
<input id="executed-command" class="form-control input-sm" type="text" readonly>
<span class="input-group-addon"><small><strong>CasparCG</strong> [<?php echo $ip.":".$port;?>] is <?php echo $status; ?></small></span>
</div>

<span class="input-group-addon"><i><i class="fa fa-terminal fa-fw"></i> Executed Command</i></span>
<input id="executed-command" class="form-control input" type="text" readonly>
</div>

<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
Expand All @@ -83,14 +90,14 @@
<tbody>
<?php
$result = $mysqli->query("
SELECT layers.id AS id, layers.name AS name, video_layer, transitions.name AS transition_name, duration, directions.name AS direction_name
FROM layers, transitions, directions
WHERE
layers.visible = '1' AND
layers.transition = transitions.id AND
layers.direction = directions.id
ORDER BY video_layer DESC, layers.name
");
SELECT layers.id AS id, layers.name AS name, video_layer, transitions.name AS transition_name, duration, directions.name AS direction_name
FROM layers, transitions, directions
WHERE
layers.visible = '1' AND
layers.transition = transitions.id AND
layers.direction = directions.id
ORDER BY video_layer DESC, layers.name
");

$total_layers = mysqli_num_rows($result);

Expand All @@ -108,8 +115,15 @@
<td class="small"><?php echo $layer['duration']; ?> frame</td>
<td class="small"><?php echo $layer['direction_name']; ?></td>
<td>
<button type="button" class="btn btn-success btn-sm command" data-command="<?php echo $command_play; ?>"> <i class="fa fa-play" aria-hidden="true"></i> Play </button>
<button type="button" class="btn btn-danger btn-sm command" data-command="<?php echo $command_stop; ?>"> <i class="fa fa-stop" aria-hidden="true"></i> Stop </button>

<div class="btn-group">
<button type="button" class="btn btn-sm btn-success command" data-command="<?php echo $command_play; ?>">
<i class="fa fa-play" aria-hidden="true"></i> PLAY
</button>
<button type="button" class="btn btn-sm btn-danger command" data-command="<?php echo $command_stop; ?>">
<i class="fa fa-stop" aria-hidden="true"></i> STOP
</button>
</div>
</td>
</tr>
<?php
Expand All @@ -127,14 +141,24 @@
foreach ( detect_f($mysqli, $layer['id']) as $value ){
?>
<div class="form-group input-group col-lg-2 form-options">
<span class="input-group-addon input-sm"><strong><?php echo $value;?></strong></span>
<input type="text" name="<?php echo $value;?>" <?php if(isset($placeholders[$counter])){?> placeholder="<?php echo $placeholders[$counter]; ?> <?php } ?>" <?php if(isset($field_values[$counter])){?> value="<?php echo htmlspecialchars($field_values[$counter]); ?><?php } ?>" class="form-control input-sm">
<span class="input-group-addon input-sm">
<strong><?php echo $placeholders[$counter];?></strong>
</span>
<input type="text" name="<?php echo $value;?>"
<?php
if(isset($field_values[$counter])){
?>
value="<?php echo htmlspecialchars($field_values[$counter]);?>"
<?php
}
?>
class="form-control input input-sm">
</div>
<?php
$counter++;
}
?>
<button type="button" class="btn btn-primary btn-sm update" data-id="<?php echo $layer['id']; ?>" data-layer="<?php echo $layer['video_layer']; ?>"><i class="fa fa-refresh" aria-hidden="true"></i> Update</button>
<button type="button" class="btn btn-sm btn-primary update" data-id="<?php echo $layer['id']; ?>" data-layer="<?php echo $layer['video_layer']; ?>"><i class="fa fa-refresh" aria-hidden="true"></i> UPDATE</button>
</form>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion layer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@

<head>

<title>Layer: <?php echo $layer['name']; ?></title>
<title>Layer: <?php echo $layer['name']; ?> - WebCG Client</title>
<?php include("head.php"); ?>

<style>
Expand Down
Binary file removed layers-assets/elections/bg.jpg
View file
Binary file not shown.
Binary file removed layers-assets/elections/clinton.jpg
View file
Binary file not shown.
Binary file removed layers-assets/elections/trump.jpg
View file
Binary file not shown.
Loading

0 comments on commit 38940f0

Please sign in to comment.