lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working on a new navbar and minor design tweaks for the status page

Browse Source
This commit is contained in:
James Brooks
2016-03-21 17:38:50 +00:00
parent ac31067333
commit 4d07d2c8b1
6 changed files with 63 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Foundation/Providers/ComposerServiceProvider.php
View File

@@ -33,8 +33,8 @@ class ComposerServiceProvider extends ServiceProvider
$factory->composer('*', AppComposer::class); $factory->composer('*', AppComposer::class);
$factory->composer('*', CurrentUserComposer::class); $factory->composer('*', CurrentUserComposer::class);
$factory->composer(['index'], MetricsComposer::class); $factory->composer(['index'], MetricsComposer::class);
$factory->composer(['index', 'incident', 'subscribe', 'signup'], StatusPageComposer::class); $factory->composer(['index', 'single-incident', 'subscribe', 'signup'], StatusPageComposer::class);
$factory->composer(['index', 'incident', 'subscribe.*', 'signup', 'dashboard.settings.theme'], ThemeComposer::class); $factory->composer(['index', 'single-incident', 'subscribe.*', 'signup', 'dashboard.settings.theme'], ThemeComposer::class);
$factory->composer('dashboard.*', DashboardComposer::class); $factory->composer('dashboard.*', DashboardComposer::class);
$factory->composer(['setup', 'dashboard.settings.localization'], TimezoneLocaleComposer::class); $factory->composer(['setup', 'dashboard.settings.localization'], TimezoneLocaleComposer::class);
} }

2
app/Http/Controllers/StatusPageController.php
View File

@@ -121,7 +121,7 @@ class StatusPageController extends AbstractApiController
*/ */
public function showIncident(Incident $incident) public function showIncident(Incident $incident)
{ {
return View::make('incident') return View::make('single-incident')
->withIncident($incident); ->withIncident($incident);
} }

21
resources/assets/sass/_status-page.scss vendored
View File

@@ -389,4 +389,25 @@ body.status-page {
.section-timeline, .section-components, .section-metrics, .section-scheduled { .section-timeline, .section-components, .section-metrics, .section-scheduled {
margin-top: 40px; margin-top: 40px;
} }
.navbar-custom {
width: 100%;
border-radius: 0px;
margin-bottom: 0px;
a.navbar-brand {
font-size: 30px;
font-weight: 600;
}
.navbar-nav li a {
color: $cachet-base-dark;
font-size: 1.7rem;
margin: 5px 0px;
}
.nav>li>a:focus,.navbar-custom .nav>li>a:hover {
background-color: transparent;
}
}
} }

2
resources/views/layout/master.blade.php
View File

@@ -66,6 +66,8 @@
<script src="{{ elixir('dist/js/all.js') }}"></script> <script src="{{ elixir('dist/js/all.js') }}"></script>
</head> </head>
<body class="status-page"> <body class="status-page">
@yield('outer-content')
@include('partials.banner') @include('partials.banner')
<div class="container"> <div class="container">

33
resources/views/partials/nav.blade.php Normal file
View File

@@ -0,0 +1,33 @@
<div class="navbar navbar-custom" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<i class="zmdi zmdi-menu"></i>
</button>
<a class="navbar-brand" href="/">
<span>{{ $app_name }}</span>
</a>
</div>
<div class="navbar-collapse collapse" id="navbar-menu">
<ul class="nav navbar-nav navbar-right">
@if($current_user)
<li class="dropdown">
<a href="#" data-toggle="dropdown">
<i class="icon ion-person"></i> {{ $current_user->username }}
<span class="caret"></span>
</a>
<ul class="dropdown-menu arrow">
<li><a href="{{ route('dashboard.incidents.add') }}">{{ trans('dashboard.incidents.add.title') }}</a></li>
<li><a href="/dashboard">{{ trans('dashboard.dashboard') }}</a></li>
<li><a href="{{ route('auth.logout') }}">{{ trans('dashboard.logout') }}</a></li>
</ul>
</li>
@elseif(Config::get('setting.dashboard_login_link'))
<li><a href="/dashboard" class="btn btn-primary navbar-btn">{{ trans('dashboard.dashboard') }}</a></li>
@endif
</ul>
</div>
</div>
</div>

10
resources/views/incident.blade.php → resources/views/single-incident.blade.php
View File

@@ -1,12 +1,10 @@
@extends('layout.master') @extends('layout.master')
@section('outer-content')
@include('partials.nav')
@stop
@section('content') @section('content')
<div class="section-messages">
@include('dashboard.partials.errors')
</div>
@include('partials.about-app')
<h4>{{ formatted_date($incident->created_at) }}</h4> <h4>{{ formatted_date($incident->created_at) }}</h4>
<div class="timeline"> <div class="timeline">