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

2016-03-21 17:38:50 +00:00
parent ac31067333
commit 4d07d2c8b1
6 changed files with 63 additions and 9 deletions
@@ -66,6 +66,8 @@
    <script src="{{ elixir('dist/js/all.js') }}"></script>
 </head>
 <body class="status-page">
+    @yield('outer-content')
+
    @include('partials.banner')

    <div class="container">
@@ -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>
@@ -1,12 +1,10 @@
@extends('layout.master')

+@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>

 <div class="timeline">