Refactor validator stuff and fix variable names in views

This commit is contained in:
Graham Campbell
2015-08-03 22:32:36 +01:00
parent 5d958bac81
commit fcbbfdd84e
56 changed files with 514 additions and 766 deletions
@@ -1,6 +1,6 @@
<ul class="list-group components">
@if($componentGroups->count() > 0)
@foreach($componentGroups as $componentGroup)
@if($component_groups->count() > 0)
@foreach($component_groups as $componentGroup)
@if($componentGroup->components->count() > 0)
<li class="list-group-item group-name">
<i class="ion-ios-minus-outline group-toggle"></i>
@@ -14,13 +14,13 @@
</div>
@endif
@endforeach
@if($ungroupedComponents->count() > 0)
@if($ungrouped_components->count() > 0)
<li class="list-group-item break"></li>
@endif
@endif
@if($ungroupedComponents->count() > 0)
@foreach($ungroupedComponents as $component)
@if($ungrouped_components->count() > 0)
@foreach($ungrouped_components as $component)
@include('partials.component', compact($component))
@endforeach
@endif
@@ -1,10 +1,10 @@
@if($loggedUser)
@if($current_user)
<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="{{ $loggedUser->gravatar }}"></span> <span class="username">{{ $loggedUser->username }}</span>
<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">
@@ -35,7 +35,7 @@
<a href="{{ route('dashboard.incidents') }}">
<i class="icon ion-android-alert"></i>
<span>{{ trans('dashboard.incidents.incidents') }}</span>
<span class="label label-info">{{ $incidentCount }}</span>
<span class="label label-info">{{ $incident_count }}</span>
</a>
</li>
<li {!! set_active('dashboard/templates*') !!}>
@@ -48,7 +48,7 @@
<a href="{{ route('dashboard.components') }}">
<i class="icons ion-outlet"></i>
<span>{{ trans('dashboard.components.components') }}</span>
<span class="label label-info">{{ $componentCount }}</span>
<span class="label label-info">{{ $component_count }}</span>
</a>
</li>
<li {!! set_active('dashboard/team*') !!}>
+2 -2
View File
@@ -8,10 +8,10 @@
</div>
<div class="col-sm-6">
<div class="icons">
@if($loggedUser || Setting::get('dashboard_login_link'))
@if($current_user || Setting::get('dashboard_login_link'))
<a href="/dashboard" class="icon-link"><i class="ion-levels"></i> {{ trans('dashboard.dashboard') }}</a>
@endif
@if($loggedUser)
@if($current_user)
<a href="/auth/logout" class="icon-link"><i class="ion-android-exit"></i> {{ trans('dashboard.logout') }}</a>
@endif
<a href="/rss" class="icon-link rss"><i class="ion-social-rss"></i> {{ trans('cachet.rss-feed') }}</a>
+1 -1
View File
@@ -12,7 +12,7 @@
<div class="col-xs-10 col-xs-offset-2 col-sm-11 col-sm-offset-0">
<div class="panel panel-message">
<div class="panel-heading">
@if($loggedUser)
@if($current_user)
<div class="pull-right btn-group">
<a href="/dashboard/incidents/{{ $incident->id }}/edit" class="btn btn-default">{{ trans('forms.edit') }}</a>
<a href="/dashboard/incidents/{{ $incident->id }}/delete" class="btn btn-danger confirm-action" data-method='DELETE'>{{ trans('forms.delete') }}</a>
+1 -1
View File
@@ -5,7 +5,7 @@
<strong>{{ trans('cachet.incidents.scheduled') }}</strong>
</div>
<div class="list-group">
@foreach($scheduledMaintenance as $schedule)
@foreach($scheduled_maintenance as $schedule)
<div class="list-group-item">
<strong>{{ $schedule->name }}</strong> <small class="date"><abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $schedule->scheduled_at_formatted }}" data-timeago="{{ $schedule->scheduled_at_iso }}"></abbr></small>
{!! $schedule->formattedMessage !!}
@@ -1,11 +1,11 @@
@if($themeSetup)
@if($theme_setup)
<style type="text/css">
body.status-page {
@if($themeBackgroundColor)
background-color: {{ $themeBackgroundColor }};
@if($theme_background_color)
background-color: {{ $theme_background_color }};
@endif
@if($themeTextColor)
color: {{ $themeTextColor }};
@if($theme_text_color)
color: {{ $theme_text_color }};
@endif
}
</style>