mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 21:49:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix resposive mobile PR

Browse Source
This commit is contained in:
Joseph Cohen 2015-01-05 02:23:34 -06:00
parent 1a89dde195
commit 214898ae60
27 changed files with 344 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/js/start.js
View File

@ -53,6 +53,11 @@ $(function() {
}; };
}; };
$(".sidebar-toggler").click(function(e) {
e.preventDefault();
$(".wrapper").toggleClass("toggled");
});
$('.color-code').minicolors({ $('.color-code').minicolors({
control: 'hue', control: 'hue',
defaultValue: $(this).val() || '', defaultValue: $(this).val() || '',

42
app/assets/sass/partials/_base.scss
View File

@ -9,4 +9,46 @@ body.dashboard {
table-layout: fixed; table-layout: fixed;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
line-height: $base-line-height; line-height: $base-line-height;
.wrapper {
padding-left: 0;
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
transition: all 0.5s ease;
}
.wrapper.toggled {
padding-left: $sidebar-normal-width;;
}
.wrapper.toggled .sidebar {
width: $sidebar-normal-width;;
}
.wrapper.toggled .page-content {
position: absolute;
margin-right: -$sidebar-normal-width;;
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
.wrapper {
padding-left: 80px;
}
}
@media(min-width: $screen-sm-max) {
.wrapper {
padding-left: $sidebar-normal-width;
}
.wrapper.toggled {
padding-left: 0;
}
.wrapper.toggled .page-content {
position: relative;
margin-right: 0;
}
}
} }

57
app/assets/sass/partials/_content.scss
View File

@ -1,30 +1,33 @@
body.dashboard { body.dashboard {
.content { .page-content {
position: relative;
display: table-cell;
vertical-align: top;
width: 100%; width: 100%;
.row { .content-wrapper {
margin: 10px 0; padding-top: 20px;
padding-left: 40px;
padding-right: 40px;
&.header-fixed {
margin-top: 60px;
}
} }
.header { .header {
position: absolute; position: relative;
top: 0; top: 0;
left: 0; left: 0;
color: #333; color: #333;
background-color: #fff; background-color: #fff;
padding: 22px 14px; padding: 22px 40px;
width: 100%; width: 100%;
height: 70px; height: 70px;
font-size: 1.2em; font-size: 1.2em;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
z-index: 99; z-index: 99;
&.sub-header {
padding: 8px 2px;
height: 50px;
}
&.fixed { &.fixed {
position: fixed; position: fixed;
padding-left: 250px; padding-left: 270px;
}
i {
// padding-right: 10px;
} }
input, button, .btn { input, button, .btn {
position: relative; position: relative;
@ -44,9 +47,6 @@ body.dashboard {
text-transform: uppercase; text-transform: uppercase;
} }
} }
.content-wrapper {
margin-top: 80px;
}
.sub-header { .sub-header {
font-weight: 300; font-weight: 300;
@ -79,4 +79,31 @@ body.dashboard {
} }
} }
} }
// Header media queries
@media (max-width: $screen-xs-max) {
.page-content {
.content-wrapper {
padding-left: 20px;
padding-right: 20px;
}
.header {
padding-left: 20px;
padding-right: 20px;
&.fixed {
padding-left: 20px;
padding-right: 20px;
}
}
}
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
.page-content {
.header.fixed {
padding-left: 120px;
}
}
}
} }

104
app/assets/sass/partials/_sidebar.scss
View File

@ -1,15 +1,26 @@
body.dashboard { body.dashboard {
.sidebar { .sidebar {
display: table-cell; position: fixed;
vertical-align: top; left: $sidebar-normal-width;
width: $sidebar-normal-width; width: 0;
height: 100%;
margin-left: -$sidebar-normal-width;
overflow-y: auto;
background: $sidebar-background-color; background: $sidebar-background-color;
@include box-shadow($sidebar-border-shadow); @include box-shadow($sidebar-border-shadow);
position: relative; z-index: 1000;
z-index: 999; -webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
transition: all 0.5s ease;
.sidebar-inner { .sidebar-inner {
position: relative; position: absolute;
top: 0;
width: $sidebar-normal-width;
margin: 0;
padding: 0;
list-style: none;
.profile { .profile {
padding: 20px; padding: 20px;
@ -29,7 +40,7 @@ body.dashboard {
} }
} }
.quick-add-incident { .quick-add-incident {
@extend text-center; @extend .text-center;
padding: 10px; padding: 10px;
} }
ul { ul {
@ -99,15 +110,27 @@ body.dashboard {
} }
// Sidebar media queries // Sidebar media queries
@media (max-width: $screen-sm-max) { @media (min-width: $screen-xs-max) {
.sidebar {
width: $sidebar-normal-width;
}
.wrapper.toggled .sidebar {
width: 0;
}
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
.sidebar { .sidebar {
width: 80px; width: 80px;
left: 150px;
margin-left: -150px;
.sidebar-inner { .sidebar-inner {
width: 80px;
.profile .avatar img { .profile .avatar img {
width: 40px; width: 40px;
} }
.profile .username { .profile .username-wrapper {
@extend .hidden-xs;
@extend .hidden-sm; @extend .hidden-sm;
} }
.quick-add-incident { .quick-add-incident {
@ -115,12 +138,10 @@ body.dashboard {
padding: 3px 6px; padding: 3px 6px;
} }
i { i {
@extend .visible-xs;
@extend .visible-sm; @extend .visible-sm;
font-size: 20px; font-size: 20px;
} }
span { span {
@extend .hidden-xs;
@extend .hidden-sm; @extend .hidden-sm;
} }
} }
@ -130,22 +151,26 @@ body.dashboard {
font-size: 25px; font-size: 25px;
} }
& > span { & > span {
@extend .hidden-xs;
@extend .hidden-sm; @extend .hidden-sm;
} }
} }
} }
.bottom-menu-sidebar { .bottom-menu-sidebar {
@extend .hidden-xs;
@extend .hidden-sm; @extend .hidden-sm;
} }
} }
} }
// Sidebar media queries .sidebar-toggler {
@media (max-width: $screen-sm-max) { float: left;
.sidebar { padding: 10px;
@extend .hidden-xs; position: relative;
top: -15px;
left: -5px;
margin-right: 10px;
cursor: pointer;
i {
font-size: 25px;
} }
} }
@ -154,6 +179,7 @@ body.dashboard {
top: 0; top: 0;
bottom: 0; bottom: 0;
position: absolute; position: absolute;
margin-left: 228px;
width: 22%; width: 22%;
background: #fcfcfc; background: #fcfcfc;
border-right: 1px solid #E8ECF1; border-right: 1px solid #E8ECF1;
@ -162,7 +188,7 @@ body.dashboard {
margin: 0; margin: 0;
text-align: center; text-align: center;
font-size: 19px; font-size: 19px;
padding: 22px 0; padding: 30px 0;
} }
ul.menu { ul.menu {
@ -190,17 +216,41 @@ body.dashboard {
} }
} }
+ .content-panel { .sidebar-toggler {
top: 0; position: absolute;
position: relative; top: 3px;
width: 78%; left: 20px;
margin-left: 22%; font-size: 36px;
padding: 24px 50px; cursor: pointer;
padding-bottom: 80px;
} }
@media (max-width: $screen-sm-max) { + .content-wrapper {
top: 0;
position: relative;
margin-left: 25%;
padding-right: 20px !important;
}
}
// Sub-sidebar media queries
@media (max-width: $screen-xs-max) {
.sub-sidebar {
position: relative;
margin-left: 0;
width: 100%;
+ .content-wrapper {
margin-left: 0;
width: 100%;
}
}
}
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
.sub-sidebar {
margin-left: 80px;
width: 25%;
} }
} }
} }

3
app/views/dashboard/components/add-group.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class="uppercase"> <span class="uppercase">
<i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }} <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
</span> </span>

3
app/views/dashboard/components/add.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class="uppercase"> <span class="uppercase">
<i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }} <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
</span> </span>

3
app/views/dashboard/components/edit.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class="uppercase"> <span class="uppercase">
<i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }} <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
</span> </span>

78
app/views/dashboard/components/index.blade.php
View File

@ -1,48 +1,48 @@
@extends('layout.dashboard') @extends('layout.dashboard')
@section('content') @section('content')
@if(isset($subMenu)) <div class='content-panel'>
@include('partials.dashboard.sub-sidebar') @if(isset($subMenu))
@endif @include('partials.dashboard.sub-sidebar')
<div class='content-panel'> @endif
<div class="header"> <div class="content-wrapper">
<span class="uppercase"> <div class="header sub-header">
<i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }} <span class="uppercase">
</span> <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.components') }}
<a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.components.add') }}"> </span>
{{ trans('cachet.dashboard.component-add') }} <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.components.add') }}">
</a> {{ trans('cachet.dashboard.component-add') }}
<div class="clearfix"></div> </a>
</div> <div class="clearfix"></div>
<div class="content-wrapper"> </div>
<div class="row"> <div class="row">
<form name='componentList'> <form name='componentList'>
<div class="col-sm-12 striped-list" id='component-list'> <div class="col-sm-12 striped-list" id='component-list'>
@forelse($components as $component) @forelse($components as $component)
<div class='row striped-list-item'> <div class='row striped-list-item'>
<div class='col-md-8'> <div class='col-md-8'>
<h4> <h4>
@if($components->count() > 1) @if($components->count() > 1)
<span class='drag-handle'><i class='ion-drag'></i></span> <span class='drag-handle'><i class='ion-drag'></i></span>
@endif
{{ $component->name }} <small>{{ $component->humanStatus }}</small>
</h4>
@if($component->description)
<p><small>{{ $component->description }}</small></p>
@endif @endif
{{ $component->name }} <small>{{ $component->humanStatus }}</small> </div>
</h4> <div class='col-md-4 text-right'>
@if($component->description) <a href='/dashboard/components/{{ $component->id }}/edit' class='btn btn-default'>Edit</a>
<p><small>{{ $component->description }}</small></p> <a href='/dashboard/components/{{ $component->id }}/delete' class='btn btn-danger'>Delete</a>
@endif </div>
<input type='hidden' rel='order' name='component[{{ $component->id }}]' value='{{ $component->order }}' />
</div> </div>
<div class='col-md-4 text-right'> @empty
<a href='/dashboard/components/{{ $component->id }}/edit' class='btn btn-default'>Edit</a> <div class='list-group-item text-danger'>You should add a component.</div>
<a href='/dashboard/components/{{ $component->id }}/delete' class='btn btn-danger'>Delete</a> @endforelse
</div>
<input type='hidden' rel='order' name='component[{{ $component->id }}]' value='{{ $component->order }}' />
</div> </div>
@empty </form>
<div class='list-group-item text-danger'>You should add a component.</div> </div>
@endforelse
</div>
</form>
</div> </div>
</div> </div>
</div>
@stop @stop

55
app/views/dashboard/groups.blade.php
View File

@ -1,35 +1,36 @@
@extends('layout.dashboard') @extends('layout.dashboard')
@section('content') @section('content')
@if(isset($subMenu)) <div class='content-panel'>
@include('partials.dashboard.sub-sidebar') @if(isset($subMenu))
@endif @include('partials.dashboard.sub-sidebar')
<div class='content-panel'> @endif
<div class="header"> <div class="content-wrapper">
<span class="uppercase"> <div class="header sub-header">
<i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.component-groups') }} <span class="uppercase">
</span> <i class="icons ion-ios-keypad"></i> {{ trans('cachet.dashboard.component-groups') }}
<a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.components.groups.add') }}"> </span>
{{ trans('cachet.dashboard.component-groups-add') }} <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.components.groups.add') }}">
</a> {{ trans('cachet.dashboard.component-groups-add') }}
<div class="clearfix"></div> </a>
</div> <div class="clearfix"></div>
<div class="content-wrapper"> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 striped-list"> <div class="col-sm-12 striped-list">
@forelse($groups as $group) @forelse($groups as $group)
<div class='row striped-list-item'> <div class='row striped-list-item'>
<div class='col-md-8'> <div class='col-md-8'>
<strong>{{ $group->name }}</strong> <strong>{{ $group->name }}</strong>
</div> </div>
<div class='col-md-4 text-right'> <div class='col-md-4 text-right'>
<a href='#' class='btn btn-default'>Edit</a> <a href='#' class='btn btn-default'>Edit</a>
<a href='#' class='btn btn-danger'>Delete</a> <a href='#' class='btn btn-danger'>Delete</a>
</div>
</div> </div>
@empty
<div class='list-group-item text-danger'>You should add a component.</div>
@endforelse
</div> </div>
@empty
<div class='list-group-item text-danger'>You should add a component.</div>
@endforelse
</div> </div>
</div> </div>
</div> </div>

3
app/views/dashboard/incidents/add.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class="uppercase"> <span class="uppercase">
<i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.incident-add') }} <i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.incident-add') }}
</span> </span>

97
app/views/dashboard/incidents/edit.blade.php
View File

@ -1,57 +1,60 @@
@extends('layout.dashboard') @extends('layout.dashboard')
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class="uppercase"> <span class="uppercase">
<i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.incident-add') }} <i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.incident-add') }}
</span> </span>
> <small>Edit an Incident</small> > <small>Edit an Incident</small>
</div> </div>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
{{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }} {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }}
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label for="incident-name">Incident Name</label> <label for="incident-name">Incident Name</label>
<input type="text" class='form-control' name='incident[name]' id='incident-name' required value={{$incident->name}} /> <input type="text" class='form-control' name='incident[name]' id='incident-name' required value={{$incident->name}} />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="incident-name">Incident Status</label><br /> <label for="incident-name">Incident Status</label><br />
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="incident[status]" value="1" {{ ($incident->status == 1) ? "checked=checked" : "" }} /> <input type="radio" name="incident[status]" value="1" {{ ($incident->status == 1) ? "checked=checked" : "" }} />
<i class="icon ion-flag"></i> <i class="icon ion-flag"></i>
{{ trans('cachet.incident.status')[1] }} {{ trans('cachet.incident.status')[1] }}
</label> </label>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="incident[status]" value="2" {{ ($incident->status == 2) ? "checked=checked" : "" }}/> <input type="radio" name="incident[status]" value="2" {{ ($incident->status == 2) ? "checked=checked" : "" }}/>
<i class="icon ion-alert-circled"></i> <i class="icon ion-alert-circled"></i>
{{ trans('cachet.incident.status')[2] }} {{ trans('cachet.incident.status')[2] }}
</label> </label>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="incident[status]" value="3" {{ ($incident->status == 3) ? "checked=checked" : "" }}/> <input type="radio" name="incident[status]" value="3" {{ ($incident->status == 3) ? "checked=checked" : "" }}/>
<i class="icon ion-eye"></i> <i class="icon ion-eye"></i>
{{ trans('cachet.incident.status')[3] }} {{ trans('cachet.incident.status')[3] }}
</label> </label>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="incident[status]" value="4" {{ ($incident->status == 4) ? "checked=checked" : "" }}/> <input type="radio" name="incident[status]" value="4" {{ ($incident->status == 4) ? "checked=checked" : "" }}/>
<i class="icon ion-checkmark"></i> <i class="icon ion-checkmark"></i>
{{ trans('cachet.incident.status')[4] }} {{ trans('cachet.incident.status')[4] }}
</label> </label>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Message</label> <label>Message</label>
<textarea name="incident[message]" class="form-control" rows="5">{{$incident->message}}</textarea> <textarea name="incident[message]" class="form-control" rows="5">{{$incident->message}}</textarea>
<span class='help-block'>You may also use Markdown.</span> <span class='help-block'>You may also use Markdown.</span>
</div> </div>
</fieldset> </fieldset>
<input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}" /> <input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}" />
<input type="hidden" name="incident[id]" value={{$incident->id}} /> <input type="hidden" name="incident[id]" value={{$incident->id}} />
<button type="submit" class="btn btn-success">Save Incident</button> <button type="submit" class="btn btn-success">Save Incident</button>
<a class="btn btn-default" href="{{ route('dashboard.incidents') }}">Cancel</a> <a class="btn btn-default" href="{{ route('dashboard.incidents') }}">Cancel</a>
{{ Form::close() }} {{ Form::close() }}
</div>
</div> </div>
</div> </div>
</div>
@stop @stop

3
app/views/dashboard/incidents/incident-template.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class="uppercase"> <span class="uppercase">
<i class="icon ion-plus"></i> {{ trans('cachet.dashboard.incident-add') }} <i class="icon ion-plus"></i> {{ trans('cachet.dashboard.incident-add') }}
</span> </span>

5
app/views/dashboard/incidents/index.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header fixed"> <div class="header fixed">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class="uppercase"> <span class="uppercase">
<i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.incidents') }} <i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.incidents') }}
</span> </span>
@ -10,7 +13,7 @@
</a> </a>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="content-wrapper"> <div class="content-wrapper header-fixed">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<p class='lead'>{{ trans_choice('cachet.dashboard.logged_incidents', $incidents->count(), ['count' => $incidents->count()]) }}</p> <p class='lead'>{{ trans_choice('cachet.dashboard.logged_incidents', $incidents->count(), ['count' => $incidents->count()]) }}</p>

5
app/views/dashboard/index.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class="uppercase"> <span class="uppercase">
<i class="icon ion-speedometer"></i> {{ trans('cachet.dashboard.dashboard') }} <i class="icon ion-speedometer"></i> {{ trans('cachet.dashboard.dashboard') }}
</span> </span>
@ -17,7 +20,7 @@
{{ Form::open(['class' => 'component-inline form-horizontal', 'data-messenger' => 'Component updated.']) }} {{ Form::open(['class' => 'component-inline form-horizontal', 'data-messenger' => 'Component updated.']) }}
<div class='row striped-list-item'> <div class='row striped-list-item'>
<div class='col-lg-4 col-sm-12'> <div class='col-lg-4 col-sm-12'>
<strong>{{ $component->name }}</strong> <h4>{{ $component->name }}</h4>
</div> </div>
<div class='col-lg-8 col-sm-12 radio-items'> <div class='col-lg-8 col-sm-12 radio-items'>
@foreach(trans('cachet.component.status') as $statusID => $status) @foreach(trans('cachet.component.status') as $statusID => $status)

3
app/views/dashboard/metrics/index.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<i class="ion ion-stats-bars"></i> {{ trans('cachet.dashboard.metrics') }} <i class="ion ion-stats-bars"></i> {{ trans('cachet.dashboard.metrics') }}
</div> </div>
<div class="row"> <div class="row">

3
app/views/dashboard/notifications/index.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<i class="ion ion-email"></i> {{ trans('cachet.dashboard.notifications') }} <i class="ion ion-email"></i> {{ trans('cachet.dashboard.notifications') }}
</div> </div>
<div class="row"> <div class="row">

11
app/views/dashboard/settings/app-setup.blade.php
View File

@ -1,15 +1,10 @@
@extends('layout.dashboard') @extends('layout.dashboard')
@section('content') @section('content')
@if(isset($subMenu))
@include('partials.dashboard.sub-sidebar')
@endif
<div class='content-panel'> <div class='content-panel'>
<div class="header"> @if(isset($subMenu))
<span class="uppercase"> @include('partials.dashboard.sub-sidebar')
<i class="icon ion-gear-a"></i> {{ trans('cachet.dashboard.settings') }} @endif
</span>
</div>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">

11
app/views/dashboard/settings/security.blade.php
View File

@ -1,15 +1,10 @@
@extends('layout.dashboard') @extends('layout.dashboard')
@section('content') @section('content')
@if(isset($subMenu))
@include('partials.dashboard.sub-sidebar')
@endif
<div class='content-panel'> <div class='content-panel'>
<div class="header"> @if(isset($subMenu))
<span class="uppercase"> @include('partials.dashboard.sub-sidebar')
<i class="icon ion-gear-a"></i> {{ trans('cachet.dashboard.settings') }} @endif
</span>
</div>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">

11
app/views/dashboard/settings/stylesheet.blade.php
View File

@ -1,15 +1,10 @@
@extends('layout.dashboard') @extends('layout.dashboard')
@section('content') @section('content')
@if(isset($subMenu))
@include('partials.dashboard.sub-sidebar')
@endif
<div class='content-panel'> <div class='content-panel'>
<div class="header"> @if(isset($subMenu))
<span class="uppercase"> @include('partials.dashboard.sub-sidebar')
<i class="icon ion-gear-a"></i> {{ trans('cachet.dashboard.settings') }} @endif
</span>
</div>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">

11
app/views/dashboard/settings/theme.blade.php
View File

@ -1,15 +1,10 @@
@extends('layout.dashboard') @extends('layout.dashboard')
@section('content') @section('content')
@if(isset($subMenu))
@include('partials.dashboard.sub-sidebar')
@endif
<div class='content-panel'> <div class='content-panel'>
<div class="header"> @if(isset($subMenu))
<span class="uppercase"> @include('partials.dashboard.sub-sidebar')
<i class="icon ion-gear-a"></i> {{ trans('cachet.dashboard.settings') }} @endif
</span>
</div>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">

3
app/views/dashboard/team/edit.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class='uppercase'> <span class='uppercase'>
<i class="ion ion-person"></i> {{ trans('cachet.dashboard.user') }} <i class="ion ion-person"></i> {{ trans('cachet.dashboard.user') }}
</span> </span>

5
app/views/dashboard/team/index.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header fixed"> <div class="header fixed">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class="uppercase"> <span class="uppercase">
<i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.team') }} <i class="icon icon ion-android-alert"></i> {{ trans('cachet.dashboard.team') }}
</span> </span>
@ -10,7 +13,7 @@
</a> </a>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="content-wrapper"> <div class="content-wrapper header-fixed">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<p class='lead'>Team Members will be able to add, modify &amp; edit components and incidents.</p> <p class='lead'>Team Members will be able to add, modify &amp; edit components and incidents.</p>

3
app/views/dashboard/team/new.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class='uppercase'> <span class='uppercase'>
<i class="ion ion-person"></i> {{ trans('cachet.dashboard.user') }} <i class="ion ion-person"></i> {{ trans('cachet.dashboard.user') }}
</span> </span>

3
app/views/dashboard/user/index.blade.php
View File

@ -2,6 +2,9 @@
@section('content') @section('content')
<div class="header"> <div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<span class='uppercase'> <span class='uppercase'>
<i class="ion ion-person"></i> {{ trans('cachet.dashboard.user') }} <i class="ion ion-person"></i> {{ trans('cachet.dashboard.user') }}
</span> </span>

2
app/views/layout/dashboard.blade.php
View File

@ -5,7 +5,7 @@
<body class="dashboard"> <body class="dashboard">
<div class="wrapper"> <div class="wrapper">
@include('partials.dashboard.sidebar') @include('partials.dashboard.sidebar')
<div class="content"> <div class="page-content">
@yield('content') @yield('content')
</div> </div>
</div> </div>

5
app/views/partials/dashboard/sidebar.blade.php
View File

@ -10,7 +10,7 @@
</a> </a>
</div> </div>
</div> </div>
<div class='col-xs-9'> <div class='col-xs-9 username-wrapper'>
<div class="profile pull-left"> <div class="profile pull-left">
<div class="username">{{ Auth::user()->username }}</div> <div class="username">{{ Auth::user()->username }}</div>
</div> </div>
@ -50,7 +50,8 @@
</li> </li>
<li {{ set_active('dashboard/team*') }}> <li {{ set_active('dashboard/team*') }}>
<a href="{{ route('dashboard.team') }}"> <a href="{{ route('dashboard.team') }}">
<i class="icons ion-ios-people"></i> {{ trans('cachet.dashboard.team') }} <i class="icons ion-ios-people"></i>
<span>{{ trans('cachet.dashboard.team') }}</span>
</a> </a>
</li> </li>
{{-- <li {{ set_active('dashboard/metrics') }}> {{-- <li {{ set_active('dashboard/metrics') }}>

3
app/views/partials/dashboard/sub-sidebar.blade.php
View File

@ -1,4 +1,7 @@
<div class='sub-sidebar'> <div class='sub-sidebar'>
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
</div>
<h3>{{ $subTitle }}</h3> <h3>{{ $subTitle }}</h3>
<ul class='menu'> <ul class='menu'>
@foreach($subMenu as $key => $item) @foreach($subMenu as $key => $item)