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

Merge pull request #1618 from CachetHQ/fresh-look

Browse Source 
New backoffice theme
This commit is contained in:
James Brooks
2016-03-15 21:30:15 +00:00
parent 141ffeb474 9844d0cff4
commit 957d7e5722
46 changed files with 261 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
resources/assets/sass/modules/_btns.scss vendored
View File

@@ -1,3 +1,58 @@
@mixin pretty-buttons($color, $background, $text-shadow: none) {
color: $color;
@include gradient-vertical(lighten($background, 5%), darken($background, 5%), 0%, 100%);
border-color: darken($background, 10%);
border-bottom-color: darken($background, 20%);
text-shadow: $text-shadow;
@include box-shadow(inset 0 1px 0 rgba(255, 255, 255, .1));
&:hover,
&:focus,
&:active,
&.active {
@include gradient-vertical(darken($background, 0), darken($background, 10%), 0%, 100%);
border-color: darken($background, 20%);
color: $color;
}
&.disabled,
&[disabled],
fieldset[disabled] & {
&,
&:hover,
&:focus,
&:active,
&.active {
background-color: $background;
border-color: darken($background, 5%);
}
}
}
.btn {
&.btn-default {
@include pretty-buttons($btn-default-color, $btn-default-bg);
}
&.btn-primary {
@include pretty-buttons($btn-primary-color, $btn-primary-bg);
}
&.btn-success {
@include pretty-buttons($btn-success-color, $btn-success-bg);
}
&.btn-info {
@include pretty-buttons($btn-info-color, $btn-info-bg);
}
&.btn-warning {
@include pretty-buttons($btn-warning-color, $btn-warning-bg);
}
&.btn-danger {
@include pretty-buttons($btn-danger-color, $btn-danger-bg);
}
&.btn-inverse {
@include pretty-buttons(white, #474949);
}
}
.btn-outline {
background-color: transparent;
color: inherit;

7
resources/assets/sass/modules/_forms.scss vendored
View File

@@ -26,7 +26,7 @@ textarea {
.form-control {
display: block;
width: 100%;
height: 34px;
height: 45px;
padding: 6px 12px;
font-size: 14px;
line-height: 1.42857143;
@@ -53,3 +53,8 @@ textarea {
}
}
}
.minicolors-theme-bootstrap .minicolors-swatch {
top: 9px;
left: 9px;
}

16
resources/assets/sass/modules/_variables.scss vendored
View File

@@ -1,21 +1,21 @@
// Brand colours.
$brand-primary: darken(#428bca, 6.5%) !default;
$brand-primary: darken(#78909c, 6.5%) !default;
$brand-success: $cachet-primary !default;
$brand-info: $cachet-blue !default;
$brand-warning: $cachet-orange !default;
$brand-danger: $cachet-red !default;
// Default border radius
$border-radius-base: 2px !default;
$border-radius-base: 3px !default;
$border-radius-large: 4px !default;
$border-radius-small: 1px !default;
$border-radius-small: 2px !default;
//** Tooltip background color
$tooltip-bg: #333 !default;
$tooltip-opacity: .9 !default;
$base-background-color: #f1f1f1;
$base-font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif;
$base-font-family: "Open Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
$base-font-weight: 400;
$base-letter-spacing: 0.08em;
$base-font-size: 15px;
@@ -28,12 +28,12 @@ $header-background-color: lighten(#00695C, 10%);
$header-border-color: 1px solid darken($header-background-color, 10%);
$sidebar-transition-speed: .2s;
$sidebar-background-color: #F0F3F4;
$sidebar-border-color: 1px solid rgba(255, 255, 255, .1);
$sidebar-background-color: #78909c;
$sidebar-border-color: 1px solid #6c818c;
$sidebar-border-shadow: inset 0px -2px 3px rgba(0,0,0,0.25);
$sidebar-text-size: 0.9em;
$sidebar-text-color: #333;
$sidebar-text-active-color: #333;
$sidebar-text-color: #ffffff;
$sidebar-text-active-color: #ffffff;
$sidebar-normal-width: 230px;
$sidebar-phone-width: 75%;
$sidebar-active-color: #00695C;

11
resources/assets/sass/pages/_login.scss vendored
View File

@@ -1,15 +1,10 @@
body.login {
background: linear-gradient(rgba($cachet-icons, 0.2), rgba($cachet-icons, 0.3)), $cachet-green;
background: $sidebar-background-color;
.form-bg {
padding:20px;
border-radius:10px;
position: absolute;
border-radius: 10px;
margin: auto;
top: 0;
right: 0;
bottom: 0;
left: 0;
padding-top: 100px;
width: 320px;
height: 280px;
}

3
resources/assets/sass/partials/_content.scss vendored
View File

@@ -46,6 +46,9 @@ body.dashboard {
margin-top: 0;
text-transform: uppercase;
}
.ion {
margin-right: 2px;
}
}
.sub-header {

27
resources/assets/sass/partials/_sidebar.scss vendored
View File

@@ -23,6 +23,7 @@ body.dashboard {
list-style: none;
.profile {
text-align: center;
padding: 20px 10px;
margin-bottom: 0;
.dropdown-toggle {
@@ -33,18 +34,18 @@ body.dashboard {
}
.avatar {
width: 60px;
margin-right: 10px;
img {
border-radius: 50%;
width: 50px;
}
}
.username-wrapper {
@extend .hidden-sm;
}
&.username {
.username {
word-break: break-all;
margin-bottom: 0;
}
a {
color: $sidebar-text-color;
text-decoration: none;
}
}
.quick-add-incident {
@@ -70,9 +71,13 @@ body.dashboard {
a {
padding-top: 14px;
padding-bottom: 14px;
border-top: 1px solid #BED3EA;
border-bottom: 1px solid #BED3EA;
border-top: 1px solid #6c818c;
border-bottom: 1px solid #6c818c;
color: $sidebar-text-active-color;
&:focus,
&:hover {
text-decoration: none;
}
}
}
a {
@@ -85,7 +90,9 @@ body.dashboard {
text-align: center;
position: relative;
top: 1px;
margin-right: 5px;
}
&:focus,
&:hover {
text-decoration: none;
}
@@ -127,6 +134,7 @@ body.dashboard {
border-right: 1px solid #ddd;
border-top: 1px solid #ddd;
a {
color: #333333;
display: block;
position: relative;
text-align: center;
@@ -196,7 +204,7 @@ body.dashboard {
position: fixed;
margin-left: 228px;
width: 22%;
background: #fcfcfc;
background: #f9fdff;
border-right: 1px solid #E8ECF1;
h3 {
@@ -228,6 +236,9 @@ body.dashboard {
color: $cachet-secondary;
}
}
i {
margin-right: 5px;
}
}
}

65
resources/views/auth/login.blade.php
View File

@@ -22,36 +22,45 @@
<br>
<form method="POST" action="{{ route('auth.login', [], false) }}" accept-charset="UTF-8" autocomplete="off" name="{{ str_random(10) }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@if(Session::has('error'))
<p>{{ Session::get('error') }}</p>
@endif
<div class="form-group">
<label class="sr-only">{{ trans('forms.login.login') }}</label>
<input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.login') }}" required="required" name="login" type="text" value="{{ Binput::old('login') }}" autofocus>
</div>
<div class="form-group">
<label class="sr-only">{{ trans('forms.login.password') }}</label>
<input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.password') }}" required="required" name="password" type="password" value="">
</div>
<div class="form-group">
<div class="row">
<div class="col-xs-2">
<a class="btn btn-white btn-trans" href="{{ route('status-page') }}">
<span class="text-center">
<i class="ion-home"></i>
</span>
</a>
</div>
<div class="col-xs-10">
<button type="submit" class="btn btn-lg btn-block btn-white btn-trans">{{ trans('dashboard.login.login') }}</button>
</div>
<div class="panel">
<div class="panel-body">
<div class="text-center">
<h3>Log In</h3>
</div>
<br>
<form method="POST" action="{{ route('auth.login', [], false) }}" accept-charset="UTF-8" autocomplete="off" name="{{ str_random(10) }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
@if(Session::has('error'))
<p>{{ Session::get('error') }}</p>
@endif
<div class="form-group">
<label class="sr-only">{{ trans('forms.login.login') }}</label>
<input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.login') }}" required="required" name="login" type="text" value="{{ Binput::old('login') }}" autofocus>
</div>
<div class="form-group">
<label class="sr-only">{{ trans('forms.login.password') }}</label>
<input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.password') }}" required="required" name="password" type="password" value="">
</div>
<br>
<div class="form-group">
<div class="row">
<div class="col-xs-2">
<a class="btn btn-default btn-lg btn-trans" href="{{ route('status-page') }}">
<span class="text-center">
<i class="ion ion-home"></i>
</span>
</a>
</div>
<div class="col-xs-10">
<button type="submit" class="btn btn-info btn-lg btn-block btn-trans">{{ trans('dashboard.login.login') }}</button>
</div>
</div>
</div>
</form>
</div>
</form>
</div>
</div>
</div>
</div>

52
resources/views/auth/two-factor-auth.blade.php
View File

File diff suppressed because one or more lines are too long

4
resources/views/dashboard/components/add.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icons ion-ios-browsers"></i> {{ trans('dashboard.components.components') }}
<i class="ion ion-ios-browsers-outline"></i> {{ trans('dashboard.components.components') }}
</span>
&gt; <small>{{ trans('dashboard.components.add.title') }}</small>
</div>

4
resources/views/dashboard/components/edit.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icons ion-ios-browsers"></i> {{ trans('dashboard.components.components') }}
<i class="ion ion-ios-browsers-outline"></i> {{ trans('dashboard.components.components') }}
</span>
&gt; <small>{{ trans('dashboard.components.edit.title') }}</small>
</div>

4
resources/views/dashboard/components/groups/add.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icons ion-ios-keypad"></i> {{ trans_choice('dashboard.components.groups.groups', 2) }}
<i class="ion ion-ios-keypad"></i> {{ trans_choice('dashboard.components.groups.groups', 2) }}
</span>
&gt; <small>{{ trans('dashboard.components.groups.add.title') }}</small>
</div>

4
resources/views/dashboard/components/groups/edit.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icons ion-ios-keypad"></i> {{ trans_choice('dashboard.components.groups.groups', 2) }}
<i class="ion ion-ios-keypad"></i> {{ trans_choice('dashboard.components.groups.groups', 2) }}
</span>
&gt; <small>{{ trans('dashboard.components.groups.edit.title') }}</small>
</div>

4
resources/views/dashboard/components/groups/index.blade.php
View File

@@ -8,7 +8,7 @@
<div class="content-wrapper">
<div class="header sub-header">
<span class="uppercase">
<i class="icons ion-ios-keypad"></i> {{ trans_choice('dashboard.components.groups.groups', 2) }}
<i class="ion ion-ios-keypad"></i> {{ trans_choice('dashboard.components.groups.groups', 2) }}
</span>
<a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.components.groups.add') }}">
{{ trans('dashboard.components.groups.add.title') }}
@@ -23,7 +23,7 @@
<div class="col-xs-6">
<h4>
@if($groups->count() > 1)
<span class="drag-handle"><i class="ion-drag"></i></span>
<span class="drag-handle"><i class="ion ion-drag"></i></span>
@endif
{{ $group->name }}
<span class="label label-info">{{ $group->components->count() }}</span>

4
resources/views/dashboard/components/index.blade.php
View File

@@ -8,7 +8,7 @@
<div class="content-wrapper">
<div class="header sub-header">
<span class="uppercase">
<i class="icons ion-ios-browsers"></i> {{ trans('dashboard.components.components') }}
<i class="ion ion-ios-browsers-outline"></i> {{ trans('dashboard.components.components') }}
</span>
<a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.components.add') }}">
{{ trans('dashboard.components.add.title') }}
@@ -23,7 +23,7 @@
<div class="col-xs-6">
<h4>
@if($components->count() > 1)
<span class="drag-handle"><i class="ion-drag"></i></span>
<span class="drag-handle"><i class="ion ion-drag"></i></span>
@endif
{{ $component->name }} <small>{{ $component->human_status }}</small>
</h4>

12
resources/views/dashboard/incidents/add.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-android-alert"></i> {{ trans('dashboard.incidents.incidents') }}
<i class="ion ion-ios-information-outline"></i> {{ trans('dashboard.incidents.incidents') }}
</span>
&gt; <small>{{ trans('dashboard.incidents.add.title') }}</small>
</div>
@@ -36,22 +36,22 @@
<label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
<label class="radio-inline">
<input type="radio" name="status" value="1">
<i class="icon ion-flag"></i>
<i class="ion ion-flag"></i>
{{ trans('cachet.incidents.status')[1] }}
</label>
<label class="radio-inline">
<input type="radio" name="status" value="2">
<i class="icon ion-alert-circled"></i>
<i class="ion ion-alert-circled"></i>
{{ trans('cachet.incidents.status')[2] }}
</label>
<label class="radio-inline">
<input type="radio" name="status" value="3">
<i class="icon ion-eye"></i>
<i class="ion ion-eye"></i>
{{ trans('cachet.incidents.status')[3] }}
</label>
<label class="radio-inline">
<input type="radio" name="status" value="4">
<i class="icon ion-checkmark"></i>
<i class="ion ion-checkmark"></i>
{{ trans('cachet.incidents.status')[4] }}
</label>
</div>

12
resources/views/dashboard/incidents/edit.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-android-alert"></i> {{ trans('dashboard.incidents.incidents') }}
<i class="ion ion-ios-information-outline"></i> {{ trans('dashboard.incidents.incidents') }}
</span>
&gt; <small>{{ trans('dashboard.incidents.edit.title') }}</small>
</div>
@@ -25,22 +25,22 @@
<label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
<label class="radio-inline">
<input type="radio" name="status" value="1" {{ ($incident->status == 1) ? "checked=checked" : "" }}>
<i class="icon ion-flag"></i>
<i class="ion ion-flag"></i>
{{ trans('cachet.incidents.status')[1] }}
</label>
<label class="radio-inline">
<input type="radio" name="status" value="2" {{ ($incident->status == 2) ? "checked=checked" : "" }}>
<i class="icon ion-alert-circled"></i>
<i class="ion ion-alert-circled"></i>
{{ trans('cachet.incidents.status')[2] }}
</label>
<label class="radio-inline">
<input type="radio" name="status" value="3" {{ ($incident->status == 3) ? "checked=checked" : "" }}>
<i class="icon ion-eye"></i>
<i class="ion ion-eye"></i>
{{ trans('cachet.incidents.status')[3] }}
</label>
<label class="radio-inline">
<input type="radio" name="status" value="4" {{ ($incident->status == 4) ? "checked=checked" : "" }}>
<i class="icon ion-checkmark"></i>
<i class="ion ion-checkmark"></i>
{{ trans('cachet.incidents.status')[4] }}
</label>
</div>

2
resources/views/dashboard/incidents/index.blade.php
View File

@@ -8,7 +8,7 @@
<div class="content-wrapper">
<div class="header sub-header">
<span class="uppercase">
<i class="icon ion-android-alert"></i> {{ trans('dashboard.incidents.incidents') }}
<i class="ion ion-ios-information-outline"></i> {{ trans('dashboard.incidents.incidents') }}
</span>
<a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.incidents.add') }}">
{{ trans('dashboard.incidents.add.title') }}

4
resources/views/dashboard/index.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-ios-speedometer"></i> {{ trans('dashboard.dashboard') }}
<i class="ion ion-speedometer"></i> {{ trans('dashboard.dashboard') }}
</span>
</div>
<div class="content-wrapper">

4
resources/views/dashboard/metrics/add.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-stats-bars"></i> {{ trans('dashboard.metrics.metrics') }}
<i class="ion ion-ios-pie-outline"></i> {{ trans('dashboard.metrics.metrics') }}
</span>
> <small>{{ trans('dashboard.metrics.add.title') }}</small>
</div>

4
resources/views/dashboard/metrics/edit.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon icon ion-android-alert"></i> {{ trans('dashboard.metrics.metrics') }}
<i class="ion ion-ios-pie-outline"></i> {{ trans('dashboard.metrics.metrics') }}
</span>
> <small>{{ trans('dashboard.metrics.edit.title') }}</small>
</div>

4
resources/views/dashboard/metrics/index.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header fixed">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-stats-bars"></i> {{ trans('dashboard.metrics.metrics') }}
<i class="ion ion-ios-pie-outline"></i> {{ trans('dashboard.metrics.metrics') }}
</span>
<a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.metrics.add') }}">
{{ trans('dashboard.metrics.add.title') }}

2
resources/views/dashboard/notifications/index.blade.php
View File

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

46
resources/views/dashboard/partials/sidebar.blade.php
View File

@@ -1,77 +1,69 @@
<div class="sidebar">
<div class="sidebar-inner">
<div class="profile">
<div class="dropdown">
<a class="dropdown-toggle" href="#" id="profile-dropdown" data-toggle="dropdown" aria-expanded="true">
<span class="avatar"><img src="{{ $current_user->gravatar }}"></span> <span class="username">{{ $current_user->username }}</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="profile-dropdown">
<li role="presentation">
<a role="menuitem" tabindex="-1" href="{{ url('dashboard/user') }}">{{ trans('dashboard.team.profile') }}</a>
</li>
<li role="presentation">
<a role="menuitem" tabindex="-1" href="{{ route('auth.logout') }}">{{ trans('dashboard.logout') }}</a>
</li>
</ul>
</div>
<a href="{{ url('dashboard/user') }}">
<span class="avatar"><img src="{{ $current_user->gravatar }}"></span>
</a>
<a href="{{ url('dashboard/user') }}">
<h4 class="username">{{ $current_user->username }}</h4>
</a>
</div>
<div class="clearfix"></div>
<div class="quick-add-incident">
<a class="btn btn-block btn-default uppercase" href="{{ route('dashboard.incidents.add') }}">
<i class="icon ion-android-checkmark-circle visible-sm"></i>
<a class="btn btn-block btn-primary uppercase" href="{{ route('dashboard.incidents.add') }}">
<i class="ion ion-android-checkmark-circle visible-sm"></i>
<span class="hidden-sm">{{ trans('dashboard.incidents.add.title') }}</span>
</a>
</div>
<ul>
<li {!! set_active('dashboard') !!}>
<a href="{{ route('dashboard.index') }}">
<i class="icon ion-ios-speedometer"></i>
<i class="ion ion-speedometer"></i>
<span>{{ trans('dashboard.dashboard') }}</span>
</a>
</li>
<li {!! set_active('dashboard/incidents*') !!} {!! set_active('dashboard/schedule*') !!}>
<a href="{{ route('dashboard.incidents.index') }}">
<i class="icon ion-android-alert"></i>
<i class="ion ion-ios-information-outline"></i>
<span>{{ trans('dashboard.incidents.incidents') }}</span>
<span class="label label-info">{{ $incident_count }}</span>
</a>
</li>
<li {!! set_active('dashboard/templates*') !!}>
<a href="{{ route('dashboard.templates.index') }}">
<i class="icons ion-document-text"></i>
<i class="ion ion-ios-paper-outline"></i>
<span>{{ trans('dashboard.incidents.incident-templates') }}</span>
</a>
</li>
<li {!! set_active('dashboard/components*') !!}>
<a href="{{ route('dashboard.components.index') }}">
<i class="icons ion-ios-browsers"></i>
<i class="ion ion-ios-browsers-outline"></i>
<span>{{ trans('dashboard.components.components') }}</span>
<span class="label label-info">{{ $component_count }}</span>
</a>
</li>
<li {!! set_active('dashboard/metrics*') !!}>
<a href="{{ route('dashboard.metrics.index') }}">
<i class="icon ion-stats-bars"></i>
<i class="ion ion-ios-pie-outline"></i>
<span>{{ trans('dashboard.metrics.metrics') }}</span>
</a>
</li>
<li {!! set_active('dashboard/subscribers*') !!}>
<a href="{{ route('dashboard.subscribers.index') }}">
<i class="icons ion-email"></i>
<i class="ion ion-ios-email-outline"></i>
<span>{{ trans('dashboard.subscribers.subscribers') }}</span>
<span class="label label-info">{{ $subscriber_count }}</span>
</a>
</li>
<li {!! set_active('dashboard/team*') !!}>
<a href="{{ route('dashboard.team.index') }}">
<i class="icons ion-ios-people"></i>
<i class="ion ion-ios-people-outline"></i>
<span>{{ trans('dashboard.team.team') }}</span>
</a>
</li>
<li {!! set_active('dashboard/settings*') !!}>
<a href="{{ route('dashboard.settings.setup') }}">
<i class="icon ion-gear-a"></i>
<i class="ion ion-ios-gear-outline"></i>
<span>
{{ trans('dashboard.settings.settings') }}
</span>
@@ -81,13 +73,13 @@
<div class="bottom-menu-sidebar">
<ul>
<li data-toggle="tooltip" data-placement="top" title="{{ trans('dashboard.help') }}">
<a href="https://docs.cachethq.io" target="_blank"><i class="icon ion-help"></i></a>
<a href="https://docs.cachethq.io" target="_blank"><i class="ion ion-help"></i></a>
</li>
<li data-toggle="tooltip" data-placement="top" title="{{ trans('dashboard.status_page') }}">
<a href="{{ route('status-page') }}"><i class="icon ion-monitor"></i></a>
<a href="{{ route('status-page') }}"><i class="ion ion-monitor"></i></a>
</li>
<li data-toggle="tooltip" data-placement="top" title="{{ trans('dashboard.logout') }}">
<a href="{{ route('auth.logout') }}"><i class="icon ion-log-out"></i></a>
<a href="{{ route('auth.logout') }}"><i class="ion ion-log-out"></i></a>
</li>
</ul>
</div>

4
resources/views/dashboard/partials/sub-sidebar.blade.php
View File

@@ -1,11 +1,11 @@
<div class="sub-sidebar">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<h3>{{ $sub_title }}</h3>
<ul class="menu">
@foreach($sub_menu as $key => $item)
<li><a href="{{ $item['url'] }}" class="{{ $item['active'] ? 'active' : null }}"><i class="{{ $item['icon'] }}"></i> {{ $item['title'] }}</a></li>
<li><a href="{{ $item['url'] }}" class="{{ $item['active'] ? 'active' : null }}"><i class="ion {{ $item['icon'] }}"></i> {{ $item['title'] }}</a></li>
@endforeach
</ul>
</div>

12
resources/views/dashboard/partials/welcome-modal.blade.php
View File

@@ -18,19 +18,19 @@
<div class="row">
<div class="col-md-4 animated fadeInDown">
<a href="{{ route('dashboard.components.add') }}">
<i class="icon ion-ios-browsers"></i>
<i class="ion ion-ios-browsers"></i>
{{ trans('dashboard.welcome.steps.component') }}
</a>
</div>
<div class="col-md-4 animated fadeInDown two">
<a href="{{ route('dashboard.incidents.add') }}">
<i class="icon ion-android-alert"></i>
<i class="ion ion-android-alert"></i>
{{ trans('dashboard.welcome.steps.incident') }}
</a>
</div>
<div class="col-md-4 animated fadeInDown three">
<a href="{{ route('dashboard.settings.theme') }}">
<i class="icon ion-ios-paper-outline"></i>
<i class="ion ion-ios-paper-outline"></i>
{{ trans('dashboard.welcome.steps.customize') }}
</a>
</div>
@@ -38,19 +38,19 @@
<div class="row">
<div class="col-md-4 animated fadeInDown">
<a href="{{ route('dashboard.team.add') }}">
<i class="icons ion-ios-people"></i>
<i class="ion ion-ios-people"></i>
{{ trans('dashboard.welcome.steps.team') }}
</a>
</div>
<div class="col-md-4 animated fadeInDown two">
<a href="{{ route('dashboard.user') }}">
<i class="icon ion-code-working"></i>
<i class="ion ion-code-working"></i>
{{ trans('dashboard.welcome.steps.api') }}
</a>
</div>
<div class="col-md-4 animated fadeInDown three">
<a href="{{ route('dashboard.user') }}">
<i class="icon ion-unlocked"></i>
<i class="ion ion-unlocked"></i>
{{ trans('dashboard.welcome.steps.two-factor') }}
</a>
</div>

4
resources/views/dashboard/schedule/add.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-android-calendar"></i> {{ trans('dashboard.schedule.schedule') }}
<i class="ion ion-android-calendar"></i> {{ trans('dashboard.schedule.schedule') }}
</span>
&gt; <small>{{ trans('dashboard.schedule.add.title') }}</small>
</div>

4
resources/views/dashboard/schedule/edit.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-android-calendar"></i> {{ trans('dashboard.schedule.schedule') }}
<i class="ion ion-android-calendar"></i> {{ trans('dashboard.schedule.schedule') }}
</span>
&gt; <small>{{ trans('dashboard.schedule.edit.title') }}</small>
</div>

2
resources/views/dashboard/schedule/index.blade.php
View File

@@ -8,7 +8,7 @@
<div class="content-wrapper">
<div class="header sub-header">
<span class="uppercase">
<i class="icon ion-android-calendar"></i> {{ trans('dashboard.schedule.schedule') }}
<i class="ion ion-android-calendar"></i> {{ trans('dashboard.schedule.schedule') }}
</span>
<a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.schedule.add') }}">
{{ trans('dashboard.schedule.add.title') }}

4
resources/views/dashboard/settings/localization.blade.php
View File

@@ -41,7 +41,7 @@
<div class="form-group">
<label>
{{ trans('forms.settings.localization.date-format') }}
<a href="http://php.net/manual/en/function.date.php" target="_blank"><i class="icon ion-help-circled"></i></a>
<a href="http://php.net/manual/en/function.date.php" target="_blank"><i class="ion ion-help-circled"></i></a>
</label>
<input type="text" class="form-control" name="date_format" value="{{ Config::get('setting.date_format') ?: 'l jS F Y' }}">
</div>
@@ -52,7 +52,7 @@
<div class="form-group">
<label>
{{ trans('forms.settings.localization.incident-date-format') }}
<a href="http://php.net/manual/en/function.date.php" target="_blank"><i class="icon ion-help-circled"></i></a>
<a href="http://php.net/manual/en/function.date.php" target="_blank"><i class="ion ion-help-circled"></i></a>
</label>
<input type="text" class="form-control" name="incident_date_format" value="{{ Config::get('setting.incident_date_format') ?: 'l jS F Y H:i:s' }}">
</div>

2
resources/views/dashboard/settings/security.blade.php
View File

@@ -47,7 +47,7 @@
@foreach($unsecure_users as $user)
<div class="list-group-item">
<strong>{{ $user->username }}</strong>
<span class="label label-danger pull-right"><i class="ion-ios-unlocked"></i></span>
<span class="label label-danger pull-right"><i class="ion ion-ios-unlocked"></i></span>
</div>
@endforeach
</div>

4
resources/views/dashboard/subscribers/add.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-person"></i> {{ trans('dashboard.subscribers.subscribers') }}
<i class="ion ion-ios-email-outline"></i> {{ trans('dashboard.subscribers.subscribers') }}
</span>
</div>
<div class="content-wrapper">

4
resources/views/dashboard/subscribers/index.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header fixed">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon icon ion-email"></i> {{ trans('dashboard.subscribers.subscribers') }}
<i class="ion ion-ios-email-outline"></i> {{ trans('dashboard.subscribers.subscribers') }}
</span>
@if($current_user->isAdmin)
<a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.subscribers.add') }}">

4
resources/views/dashboard/team/add.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-person"></i> {{ trans('dashboard.team.team') }}
<i class="ion ion-ios-people-outline"></i> {{ trans('dashboard.team.team') }}
</span>
</div>
<div class="content-wrapper">

4
resources/views/dashboard/team/edit.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="ion ion-person"></i> {{ trans('dashboard.team.member') }}
<i class="ion ion-ios-people-outline"></i> {{ trans('dashboard.team.member') }}
</span>
</div>
<div class="content-wrapper">

4
resources/views/dashboard/team/index.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header fixed">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-ios-people"></i> {{ trans('dashboard.team.team') }}
<i class="ion ion-ios-people-outline"></i> {{ trans('dashboard.team.team') }}
</span>
@if($current_user->isAdmin)
<div class="button-group pull-right">

4
resources/views/dashboard/team/invite.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-person"></i> {{ trans('dashboard.team.team') }}
<i class="ion ion-ios-people-outline"></i> {{ trans('dashboard.team.team') }}
</span>
</div>
<div class="content-wrapper">

4
resources/views/dashboard/templates/add.blade.php
View File

@@ -23,10 +23,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-plus"></i> {{ trans('dashboard.incidents.templates.title') }}
<i class="ion ion-ios-paper-outline"></i> {{ trans('dashboard.incidents.templates.title') }}
</span>
&gt; <small>{{ trans('dashboard.incidents.templates.add.title') }}</small>
</div>

4
resources/views/dashboard/templates/edit.blade.php
View File

@@ -23,10 +23,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-document"></i> {{ trans('dashboard.incidents.templates.title') }}
<i class="ion ion-ios-paper-outline"></i> {{ trans('dashboard.incidents.templates.title') }}
</span>
&gt; <small>{{ trans('dashboard.incidents.templates.edit.title') }}</small>
</div>

4
resources/views/dashboard/templates/index.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="icon ion-document-text"></i> {{ trans('dashboard.incidents.templates.title') }}
<i class="ion ion-ios-paper-outline"></i> {{ trans('dashboard.incidents.templates.title') }}
</span>
<a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.templates.add') }}">
{{ trans('dashboard.incidents.templates.add.title') }}

12
resources/views/dashboard/user/index.blade.php
View File

@@ -3,10 +3,10 @@
@section('content')
<div class="header">
<div class="sidebar-toggler visible-xs">
<i class="icon ion-navicon"></i>
<i class="ion ion-navicon"></i>
</div>
<span class="uppercase">
<i class="ion ion-person"></i> {{ trans('dashboard.team.profile') }}
<i class="ion ion-ios-person-outline"></i> {{ trans('dashboard.team.profile') }}
</span>
</div>
<div class="content-wrapper">
@@ -17,10 +17,10 @@
{!! csrf_field() !!}
<fieldset>
<div class="row">
<div class="col-sm-1">
<a href="https://gravatar.com"><img src="{{ $current_user->gravatar }}" class="img-responsive img-thumbnail" title="{{ trans('forms.user.gravatar') }}" data-toggle="tooltip"></a>
</div>
<div class="col-sm-11">
<div class="col-sm-12">
<div class="form-group">
<a href="https://gravatar.com"><img src="{{ $current_user->gravatar }}" class="img-responsive img-thumbnail" title="{{ trans('forms.user.gravatar') }}" data-toggle="tooltip"></a>
</div>
<div class="form-group">
<label>{{ trans('forms.user.username') }}</label>
<input type="text" class="form-control" name="username" value="{{ $current_user->username }}" required>

4
resources/views/partials/component.blade.php
View File

@@ -6,11 +6,11 @@
@endif
@if($component->description)
<i class="ion-ios-help-outline help-icon" data-toggle="tooltip" data-title="{{ $component->description }}"></i>
<i class="ion ion-ios-help-outline help-icon" data-toggle="tooltip" data-title="{{ $component->description }}"></i>
@endif
@if(subscribers_enabled())
<a href="#" data-toggle="modal" data-target="#subscribe-modal" data-component-id="{{ $component->id }}"><i class="ion-ios-email-outline" data-toggle="tooltip" data-title="{{ trans('cachet.subscriber.email.component.tooltip-title', ['component_name' => $component->name]) }}"></i></a>
<a href="#" data-toggle="modal" data-target="#subscribe-modal" data-component-id="{{ $component->id }}"><i class="ion ion-ios-email-outline" data-toggle="tooltip" data-title="{{ trans('cachet.subscriber.email.component.tooltip-title', ['component_name' => $component->name]) }}"></i></a>
@endif
<div class="pull-right">

2
resources/views/partials/components.blade.php
View File

@@ -7,7 +7,7 @@
<strong>{{ $componentGroup->name }}</strong>
<div class="pull-right">
<i class="ion-ios-circle-filled text-component-{{ $componentGroup->lowest_status }} {{ $componentGroup->lowest_status_color }}" data-toggle="tooltip" title="{{ $componentGroup->lowest_human_status }}"></i>
<i class="ion ion-ios-circle-filled text-component-{{ $componentGroup->lowest_status }} {{ $componentGroup->lowest_status_color }}" data-toggle="tooltip" title="{{ $componentGroup->lowest_human_status }}"></i>
</div>
</li>

2
resources/views/setup.blade.php
View File

@@ -167,7 +167,7 @@
</div>
<div class="step block-4 hidden">
<div class="setup-success">
<i class="ion-checkmark-circled"></i>
<i class="ion ion-checkmark-circled"></i>
<h3>
{{ trans("setup.completed") }}
</h3>

2
resources/views/subscribe/manage.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="pull-right">
<p><a class="btn btn-success btn-outline" href="/"><i class="ion-home"></i></a></p>
<p><a class="btn btn-success btn-outline" href="/"><i class="ion ion-home"></i></a></p>
</div>
<div class="clearfix"></div>

2
resources/views/subscribe/signup.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="pull-right">
<p><a class="btn btn-success btn-outline" href="/"><i class="ion-home"></i></a></p>
<p><a class="btn btn-success btn-outline" href="/"><i class="ion ion-home"></i></a></p>
</div>
<div class="clearfix"></div>

2
resources/views/subscribe/subscribe.blade.php
View File

@@ -2,7 +2,7 @@
@section('content')
<div class="pull-right">
<p><a class="btn btn-success btn-outline" href="/"><i class="ion-home"></i></a></p>
<p><a class="btn btn-success btn-outline" href="/"><i class="ion ion-home"></i></a></p>
</div>
<div class="clearfix"></div>