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

Merge pull request #1648 from CachetHQ/navbar

Browse Source 
Navbar
This commit is contained in:
James Brooks
2016-03-22 20:21:31 +00:00
parent ac31067333 d342cdb6ad
commit f5e45ce938
7 changed files with 68 additions and 11 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('*', CurrentUserComposer::class);
$factory->composer(['index'], MetricsComposer::class);
$factory->composer(['index', 'incident', 'subscribe', 'signup'], StatusPageComposer::class);
$factory->composer(['index', 'incident', 'subscribe.*', 'signup', 'dashboard.settings.theme'], ThemeComposer::class);
$factory->composer(['index', 'single-incident', 'subscribe', 'signup'], StatusPageComposer::class);
$factory->composer(['index', 'single-incident', 'subscribe.*', 'signup', 'dashboard.settings.theme'], ThemeComposer::class);
$factory->composer('dashboard.*', DashboardComposer::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)
{
return View::make('incident')
return View::make('single-incident')
->withIncident($incident);
}

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

@@ -7,6 +7,10 @@ body.status-page {
font-weight: $base-font-weight;
-webkit-font-smoothing: antialiased;
&.no-padding {
padding-top: 0 !important;
}
hr {
margin-top: 10px;
margin-bottom: 10px;
@@ -389,4 +393,26 @@ body.status-page {
.section-timeline, .section-components, .section-metrics, .section-scheduled {
margin-top: 40px;
}
.navbar-custom {
padding-top: 10px;
padding-bottom: 10px;
width: 100%;
border-radius: 0px;
margin-bottom: 10px;
a.navbar-brand {
font-size: 30px;
font-weight: 600;
}
.navbar-nav li a {
color: $cachet-base-dark;
font-size: 1.7rem;
&:hover {
background-color: transparent;
}
}
}
}

1
resources/lang/en/cachet.php
View File

@@ -139,6 +139,7 @@ return [
],
// Other
'home' => 'Home',
'description' => 'Stay up to date with the latest service updates from :app.',
'powered_by' => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
'about_this_site' => 'About This Site',

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

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

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

@@ -0,0 +1,28 @@
<div class="navbar navbar-custom" role="navigation">
<div class="container">
<div class="navbar-header">
<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">
<li><a href="/">{{ trans('cachet.home') }}</a></li>
@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">{{ trans('dashboard.dashboard') }}</a></li>
@endif
</ul>
</div>
</div>
</div>

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

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