Don't use tabs for now

This commit is contained in:
James Brooks
2014-12-13 13:30:44 +00:00
parent 437f4dbe36
commit 76d007b6c4
12 changed files with 111 additions and 185 deletions

View File

@@ -10,7 +10,7 @@ html, body {
@import "partials/base"; @import "partials/base";
@import "partials/wrapper"; @import "partials/wrapper";
@import "partials/header"; @import "partials/navbar";
@import "partials/sidebar"; @import "partials/sidebar";
@import "partials/content"; @import "partials/content";
@import "status-page"; @import "status-page";

View File

@@ -9,13 +9,13 @@ body.dashboard {
margin: 10px 0; margin: 10px 0;
} }
.header { .header {
background: #ffffff; background: darken(#ffffff, 8%);
padding: 14px; padding: 14px;
width: 100%; width: 100%;
height: 50px; height: 50px;
font-size: 18px; font-size: 1.2em;
i { i {
padding-right: 10px; // padding-right: 10px;
} }
input, button, .btn { input, button, .btn {
position: relative; position: relative;
@@ -25,5 +25,9 @@ body.dashboard {
width: 20%; width: 20%;
} }
} }
h3 {
margin-top: 0;
}
} }
} }

View File

@@ -1,4 +1,4 @@
$base-background-color: #f5f5f5; $base-background-color: #ffffff;
$base-font-family: "Avenir Next W01", "Helvetica Neue", "Helvetica", "Arial", sans-serif; $base-font-family: "Avenir Next W01", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
$base-font-weight: 300; $base-font-weight: 300;

View File

@@ -6,73 +6,51 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div role='tabpanel'> <h3>Components</h3>
<ul class="nav nav-tabs" role='tablist'> <ul class='list-group'>
<li role='presentation' class='active'><a data-toggle='tab' role='tab' href="#active">Active Components</a></li> @foreach($components as $component)
</ul> <li class='list-group-item'>
<div class="tab-content"> <div class='row'>
<div role='tabpanel' class='tab-pane active' id="active"> <div class='col-md-6'>
<div class='row'> <strong>{{ $component->name }}</strong>
<div class='col-md-12'>
<h3>Components</h3>
</div>
</div> </div>
<div class='row'> <div class='col-md-6'>
<ul class='list-group'> <ul class='nav nav-pills'>
@foreach($components as $component) <li role='presentation'><a href='javascript: void(0);'>Edit</a></li>
<li class='list-group-item'> <li role='presentation'><a href='javascript: void(0);'>Delete</a></li>
<div class='row'>
<div class='col-md-6'>
<strong>{{ $component->name }}</strong>
</div>
<div class='col-md-6'>
<ul class='nav nav-pills'>
<li role='presentation'><a href='javascript: void(0);'>Edit</a></li>
<li role='presentation'><a href='javascript: void(0);'>Delete</a></li>
</ul>
</div>
</div>
</li>
@endforeach
</ul> </ul>
</div> </div>
<div class='row'>
<div class='col-md-12'>
<h3>Create a component</h3>
</div>
</div>
<div class='row'>
<div class="col-md-12">
@if($component = Session::get('component'))
<div class='alert alert-{{ $component->isValid() ? "success" : "danger" }}'>
@if($component->isValid())
<strong>Awesome.</strong> Component added.
@else
<strong>Whoops.</strong> Something went wrong with the component. {{ $component->getErrors() }}
@endif
</div>
@endif
<form name='CreateComponentForm' class='form-vertical' role='form' action='/dashboard/components/create' method='POST'>
<fieldset>
<div class='form-group'>
<label for='incident-name'>Component Name</label>
<input type='text' class='form-control' name='component[name]' id='component-name' required />
</div>
<div class='form-group'>
<label>Description</label>
<textarea name='component[description]' class='form-control' rows='5'></textarea>
</div>
</fieldset>
<button type="submit" class="btn btn-primary">Submit</button>
<input type='hidden' name='component[user_id]' value='{{ Auth::user()->id }}' />
</form>
</div>
</div>
</div> </div>
</li>
@endforeach
</ul>
<h3>Create a component</h3>
@if($component = Session::get('component'))
<div class='alert alert-{{ $component->isValid() ? "success" : "danger" }}'>
@if($component->isValid())
<strong>Awesome.</strong> Component added.
@else
<strong>Whoops.</strong> Something went wrong with the component. {{ $component->getErrors() }}
@endif
</div> </div>
@endif
<form name='CreateComponentForm' class='form-vertical' role='form' action='/dashboard/components/create' method='POST'>
<fieldset>
<div class='form-group'>
<label for='incident-name'>Component Name</label>
<input type='text' class='form-control' name='component[name]' id='component-name' required />
</div>
<div class='form-group'>
<label>Description</label>
<textarea name='component[description]' class='form-control' rows='5'></textarea>
</div>
</fieldset>
<button type="submit" class="btn btn-primary">Submit</button>
<input type='hidden' name='component[user_id]' value='{{ Auth::user()->id }}' />
</form>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -6,32 +6,15 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div role='tabpanel'> <h3>Incidents</h3>
<ul class="nav nav-tabs" role='tablist'>
<li role='presentation' class='active'><a data-toggle='tab' role='tab' href="#incidents">Incidents</a></li>
<li role='presentation'><a data-toggle='tab' role='tab' href="#templates">Incident Templates</a></li>
</ul>
<div class="tab-content">
<div role='tabpanel' class='tab-pane active' id="incidents">
<div class='row'>
<div class='col-md-12'>
<h3>Incidents</h3>
@if ($incidents->count() === 0) @if ($incidents->count() === 0)
<strong>Woah! No incidents, your doing well!</strong> <p><strong>Woah! No incidents, your doing well!</strong></p>
@endif @else
</div> <p>You have <strong>{{ $incidents->count() }} incidents.</strong></p>
</div> @endif
</div>
<div role='tabpanel' class='tab-pane' id="templates"> <h3>Incident Templates</h3>
<div class='row'>
<div class='col-md-12'>
<h3>Incident Templates</h3>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
@stop @stop

View File

@@ -5,66 +5,49 @@
<i class="fa fa-dashboard"></i> {{ Lang::get('cachet.dashboard.dashboard') }} <i class="fa fa-dashboard"></i> {{ Lang::get('cachet.dashboard.dashboard') }}
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-md-12">
<div role='tabpanel'> <h3>Create an Incident</h3>
<ul class="nav nav-tabs" role='tablist'>
<li role='presentation' class='active'><a data-toggle='tab' role='tab' href="#create-incident">Create an Incident</a></li>
</ul>
<div class="tab-content">
<div role='tabpanel' class='tab-pane active' id="create-incident">
<div class='row'>
<div class='col-md-12'>
<h3>Create an Incident</h3>
</div>
</div>
<div class='row'> @if($incident = Session::get('incident'))
<div class='col-md-12'> <div class='alert alert-{{ $incident->isValid() ? "success" : "danger" }}'>
@if($incident = Session::get('incident')) @if($incident->isValid())
<div class='alert alert-{{ $incident->isValid() ? "success" : "danger" }}'> <strong>Awesome.</strong> Incident added.
@if($incident->isValid()) @else
<strong>Awesome.</strong> Incident added. <strong>Whoops.</strong> Something went wrong with the incident.
@else @endif
<strong>Whoops.</strong> Something went wrong with the incident.
@endif
</div>
@endif
{{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }}
<fieldset>
<div class='form-group'>
<label for='incident-name'>Incident Name</label>
<input type='text' class='form-control' name='incident[name]' id='incident-name' required />
</div>
<div class='form-group'>
<label for='incident-name'>Incident Status</label><br />
<label class='radio-inline'>
<input type='radio' name='incident[status]' value='1' /> {{ Lang::get('cachet.incident.status')[1] }}
</label>
<label class='radio-inline'>
<input type='radio' name='incident[status]' value='2' /> {{ Lang::get('cachet.incident.status')[2] }}
</label>
<label class='radio-inline'>
<input type='radio' name='incident[status]' value='3' /> {{ Lang::get('cachet.incident.status')[3] }}
</label>
<label class='radio-inline'>
<input type='radio' name='incident[status]' value='4' /> {{ Lang::get('cachet.incident.status')[4] }}
</label>
</div>
<div class='form-group'>
<label>Message</label>
<textarea name='incident[message]' class='form-control' rows='5'></textarea>
</div>
</fieldset>
<button type="submit" class="btn btn-primary">Submit</button>
<input type='hidden' name='component[user_id]' value='{{ Auth::user()->id }}' />
{{ Form::close() }}
</div>
</div>
</div>
</div>
</div> </div>
@endif
{{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }}
<fieldset>
<div class='form-group'>
<label for='incident-name'>Incident Name</label>
<input type='text' class='form-control' name='incident[name]' id='incident-name' required />
</div>
<div class='form-group'>
<label for='incident-name'>Incident Status</label><br />
<label class='radio-inline'>
<input type='radio' name='incident[status]' value='1' /> {{ Lang::get('cachet.incident.status')[1] }}
</label>
<label class='radio-inline'>
<input type='radio' name='incident[status]' value='2' /> {{ Lang::get('cachet.incident.status')[2] }}
</label>
<label class='radio-inline'>
<input type='radio' name='incident[status]' value='3' /> {{ Lang::get('cachet.incident.status')[3] }}
</label>
<label class='radio-inline'>
<input type='radio' name='incident[status]' value='4' /> {{ Lang::get('cachet.incident.status')[4] }}
</label>
</div>
<div class='form-group'>
<label>Message</label>
<textarea name='incident[message]' class='form-control' rows='5'></textarea>
</div>
</fieldset>
<button type="submit" class="btn btn-primary">Submit</button>
<input type='hidden' name='component[user_id]' value='{{ Auth::user()->id }}' />
{{ Form::close() }}
</div> </div>
</div> </div>
@stop @stop

View File

@@ -6,16 +6,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div role='tabpanel'> <h3>Metrics</h3>
<ul class="nav nav-tabs" role='tablist'>
<li role='presentation' class='active'><a data-toggle='tab' role='tab' href="#metrics">Metrics</a></li>
<li role='presentation'><a data-toggle='tab' role='tab' href="#add-point">Add Data Point</a></li>
</ul>
<div class="tab-content">
<div role='tabpanel' class='tab-pane active' id="metrics">Metrics</div>
<div role='tabpanel' class='tab-pane' id="add-point">Add a data point here</div>
</div>
</div>
</div> </div>
</div> </div>
@stop @stop

View File

@@ -6,20 +6,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div role='tabpanel'> <h3>Notifications</h3>
<ul class="nav nav-tabs" role='tablist'>
<li role='presentation' class='active'><a data-toggle='tab' role='tab' href="#notifications">Notifications</a></li>
</ul>
<div class="tab-content">
<div role='tabpanel' class='tab-pane active' id="notifications">
<div class='row'>
<div class='col-md-12'>
<h3>Subscribers</h3>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
@stop @stop

View File

@@ -4259,7 +4259,7 @@ body.dashboard {
font-weight: 300; font-weight: 300;
font-size: 16px; font-size: 16px;
letter-spacing: 0.08em; letter-spacing: 0.08em;
background: #f5f5f5; background: #ffffff;
display: table; display: table;
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -4360,18 +4360,18 @@ body.dashboard .content {
body.dashboard .content .row { body.dashboard .content .row {
margin: 10px 0; } margin: 10px 0; }
body.dashboard .content .header { body.dashboard .content .header {
background: #ffffff; background: #ebebeb;
padding: 14px; padding: 14px;
width: 100%; width: 100%;
height: 50px; height: 50px;
font-size: 18px; } font-size: 1.2em; }
body.dashboard .content .header i {
padding-right: 10px; }
body.dashboard .content .header input, body.dashboard .content .header button, body.dashboard .content .header .btn { body.dashboard .content .header input, body.dashboard .content .header button, body.dashboard .content .header .btn {
position: relative; position: relative;
top: -4px; } top: -4px; }
body.dashboard .content .header input { body.dashboard .content .header input {
width: 20%; } width: 20%; }
body.dashboard .content h3 {
margin-top: 0; }
body { body {
color: #333333; color: #333333;

View File

@@ -4259,7 +4259,7 @@ body.dashboard {
font-weight: 300; font-weight: 300;
font-size: 16px; font-size: 16px;
letter-spacing: 0.08em; letter-spacing: 0.08em;
background: #f5f5f5; background: #ffffff;
display: table; display: table;
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -4360,18 +4360,18 @@ body.dashboard .content {
body.dashboard .content .row { body.dashboard .content .row {
margin: 10px 0; } margin: 10px 0; }
body.dashboard .content .header { body.dashboard .content .header {
background: #ffffff; background: #ebebeb;
padding: 14px; padding: 14px;
width: 100%; width: 100%;
height: 50px; height: 50px;
font-size: 18px; } font-size: 1.2em; }
body.dashboard .content .header i {
padding-right: 10px; }
body.dashboard .content .header input, body.dashboard .content .header button, body.dashboard .content .header .btn { body.dashboard .content .header input, body.dashboard .content .header button, body.dashboard .content .header .btn {
position: relative; position: relative;
top: -4px; } top: -4px; }
body.dashboard .content .header input { body.dashboard .content .header input {
width: 20%; } width: 20%; }
body.dashboard .content h3 {
margin-top: 0; }
body { body {
color: #333333; color: #333333;

View File

@@ -1,4 +1,4 @@
{ {
"css/all.css": "css/all-145c0b5a.css", "css/all.css": "css/all-ebdfae2e.css",
"js/all.js": "js/all-d8f5640f.js" "js/all.js": "js/all-d8f5640f.js"
} }