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

Refactor validator stuff and fix variable names in views

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/dashboard/components/edit.blade.php
+1 -1
View File
@@ -58,7 +58,7 @@
</div>
</fieldset>
<input type="hidden" name="component[user_id]" value="{{ $component->agent_id || $loggedUser->id }}">
<input type="hidden" name="component[user_id]" value="{{ $component->agent_id || $current_user->id }}">
<input type="hidden" name="component[order]" value="{{ $component->order or 0 }}">
<div class="btn-group">
resources/views/dashboard/incidents/add.blade.php
+5 -5
View File
@@ -17,12 +17,12 @@
<form class="form-vertical" name="IncidentForm" role="form" method="POST" autocomplete="off">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
@if($incidentTemplates->count() > 0)
@if($incident_templates->count() > 0)
<div class="form-group">
<label for="incident-template">{{ trans('forms.incidents.templates.template') }}</label>
<select class="form-control" name="template">
<option selected></option>
@foreach($incidentTemplates as $tpl)
@foreach($incident_templates as $tpl)
<option value="{{ $tpl->slug }}">{{ $tpl->name }}</option>
@endforeach
</select>
@@ -62,19 +62,19 @@
<option value='0'>{{ trans('forms.incidents.logged_in_only') }}</option>
</select>
</div>
@if(!$componentsInGroups->isEmpty() || !$componentsOutGroups->isEmpty())
@if(!$components_in_groups->isEmpty() || !$components_out_groups->isEmpty())
<div class="form-group">
<label>{{ trans('forms.incidents.component') }}</label>
<select name='incident[component_id]' class='form-control'>
<option value='0' selected></option>
@foreach($componentsInGroups as $group)
@foreach($components_in_groups as $group)
<optgroup label="{{ $group->name }}">
@foreach($group->components as $component)
<option value='{{ $component->id }}'>{{ $component->name }}</option>
@endforeach
</optgroup>
@endforeach
@foreach($componentsOutGroups as $component)
@foreach($components_out_groups as $component)
<option value='{{ $component->id }}'>{{ $component->name }}</option>
@endforeach
</select>
resources/views/dashboard/incidents/templates/edit.blade.php
+5 -5
View File
@@ -13,12 +13,12 @@
<div class="content-wrapper">
<div class="row">
<div class="col-md-12">
@if($updatedTemplate = Session::get('updatedTemplate'))
<div class="alert alert-{{ $updatedTemplate->isValid() ? 'success' : 'danger' }}">
@if($updatedTemplate->isValid())
{{ sprintf("%s - %s", trans('dashboard.notifications.awesome'), trans('dashboard.incidents.templates.edit.success')) }}
@if($updated_template = Session::get('updated_template'))
<div class="alert alert-{{ ($template_errors = Session::get('template_errors')) ? 'danger' : 'success' }}">
@if($template_errors)
{{ sprintf("%s - %s", trans('dashboard.notifications.whoops'), trans('dashboard.incidents.templates.edit.failure').' '.$template_errors) }}
@else
{{ sprintf("%s - %s", trans('dashboard.notifications.whoops'), trans('dashboard.incidents.templates.edit.failure').' '.$updatedTemplate->getErrors()) }}
{{ sprintf("%s - %s", trans('dashboard.notifications.awesome'), trans('dashboard.incidents.templates.edit.success')) }}
@endif
</div>
@endif
resources/views/dashboard/incidents/templates/index.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<div class="row">
<div class="col-sm-12">
<div class="striped-list">
@foreach($incidentTemplates as $template)
@foreach($incident_templates as $template)
<div class="row striped-list-item">
<div class="col-xs-6">
<strong>{{ $template->name }}</strong>
resources/views/dashboard/schedule/add.blade.php
+2 -2
View File
@@ -18,12 +18,12 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<input type="hidden" name="incident[visible]" value="1">
<fieldset>
@if($incidentTemplates->count() > 0)
@if($incident_templates->count() > 0)
<div class="form-group">
<label for="incident-template">{{ trans('forms.incidents.templates.template') }}</label>
<select class="form-control" name="template">
<option selected></option>
@foreach($incidentTemplates as $tpl)
@foreach($incident_templates as $tpl)
<option value="{{ $tpl->slug }}">{{ $tpl->name }}</option>
@endforeach
</select>
resources/views/dashboard/schedule/edit.blade.php
+2 -2
View File
@@ -18,12 +18,12 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<input type="hidden" name="incident[visible]" value="1">
<fieldset>
@if($incidentTemplates->count() > 0)
@if($incident_templates->count() > 0)
<div class="form-group">
<label for="incident-template">{{ trans('forms.incidents.templates.template') }}</label>
<select class="form-control" name="template">
<option selected></option>
@foreach($incidentTemplates as $tpl)
@foreach($incident_templates as $tpl)
<option value="{{ $tpl->slug }}">{{ $tpl->name }}</option>
@endforeach
</select>
resources/views/dashboard/settings/security.blade.php
+2 -2
View File
@@ -38,13 +38,13 @@
</div>
</div>
@if(! $unsecureUsers->isEmpty())
@if(!$unsecure_users->isEmpty())
<hr>
<div class="panel panel-danger">
<div class="panel-heading">{{ trans('dashboard.settings.security.two-factor') }}</div>
<div class="list-group">
@foreach($unsecureUsers as $user)
@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>
resources/views/dashboard/subscribers/index.blade.php
+1 -1
View File
@@ -8,7 +8,7 @@
<span class="uppercase">
<i class="icon icon ion-android-alert"></i> {{ trans('dashboard.subscribers.subscribers') }}
</span>
@if($loggedUser->isAdmin)
@if($current_user->isAdmin)
<a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.subscribers.add') }}">
{{ trans('dashboard.subscribers.add.title') }}
</a>
resources/views/dashboard/team/add.blade.php
+1 -1
View File
@@ -28,7 +28,7 @@
<label>{{ trans('forms.user.password') }}</label>
<input type="password" class="form-control" name="password" value="">
</div>
@if($loggedUser->isAdmin)
@if($current_user->isAdmin)
<div class="form-group">
<label>{{ trans('forms.user.user_level') }}</label>
<select name="level" class="form-control">
resources/views/dashboard/team/edit.blade.php
+2 -2
View File
@@ -26,13 +26,13 @@
</div>
<div class="form-group">
<label>{{ trans('forms.user.password') }}</label>
<input type="password" class="form-control" name="password" value="" {{ !$loggedUser->isAdmin ? "disabled": "" }}>
<input type="password" class="form-control" name="password" value="" {{ !$current_user->isAdmin ? "disabled": "" }}>
</div>
</fieldset>
<div class="form-group">
<button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
@if($loggedUser->isAdmin)
@if($current_user->isAdmin)
<a class="btn btn-danger" href="/dashboard/user/{{ $user->id }}/api/regen">{{ trans('cachet.api.revoke') }}</a>
@endif
</div>
resources/views/dashboard/team/index.blade.php
+3 -3
View File
@@ -8,7 +8,7 @@
<span class="uppercase">
<i class="icon icon ion-android-alert"></i> {{ trans('dashboard.team.team') }}
</span>
@if($loggedUser->isAdmin)
@if($current_user->isAdmin)
<a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.team.add') }}">
{{ trans('dashboard.team.add.title') }}
</a>
@@ -21,9 +21,9 @@
<p class="lead">{{ trans('dashboard.team.description') }}</p>
<div class="user-grid">
@foreach($teamMembers as $member)
@foreach($team_members as $member)
<div class="user col-sm-3 col-xs-6">
<a href="@if($loggedUser->id == $member->id) {{ url('dashboard/user') }} @else /dashboard/team/{{ $member->id }} @endif">
<a href="@if($current_user->id == $member->id) {{ url('dashboard/user') }} @else /dashboard/team/{{ $member->id }} @endif">
<img src="{{ $member->gravatar }}">
</a>
<div class="name">{{ $member->username }}</div>
resources/views/dashboard/user/index.blade.php
+8 -8
View File
@@ -17,11 +17,11 @@
<fieldset>
<div class="form-group">
<label>{{ trans('forms.user.username') }}</label>
<input type="text" class="form-control" name="username" value="{{ $loggedUser->username }}" required>
<input type="text" class="form-control" name="username" value="{{ $current_user->username }}" required>
</div>
<div class="form-group">
<label>{{ trans('forms.user.email') }}</label>
<input type="email" class="form-control" name="email" value="{{ $loggedUser->email }}" required>
<input type="email" class="form-control" name="email" value="{{ $current_user->email }}" required>
</div>
<div class="form-group">
<label>{{ trans('forms.user.password') }}</label>
@@ -31,8 +31,8 @@
<div class="form-group">
<label>{{ trans('forms.user.api-token') }}</label>
<div class="input-group">
<input type="text" class="form-control" name="api_key" disabled value="{{ $loggedUser->api_key }}">
<a href="/dashboard/user/{{ $loggedUser->id }}/api/regen" class="input-group-addon btn btn-danger">{{ trans('cachet.api.regenerate') }}</a>
<input type="text" class="form-control" name="api_key" disabled value="{{ $current_user->api_key }}">
<a href="/dashboard/user/{{ $current_user->id }}/api/regen" class="input-group-addon btn btn-danger">{{ trans('cachet.api.regenerate') }}</a>
</div>
<span class="help-block">{{ trans('forms.user.api-token-help') }}</span>
</div>
@@ -40,17 +40,17 @@
<div class="form-group">
<label class="checkbox-inline">
<input type="hidden" name="google2fa" value="0">
<input type='checkbox' name="google2fa" value="1" {{ $loggedUser->hasTwoFactor ? "checked" : "" }}>
<input type='checkbox' name="google2fa" value="1" {{ $current_user->hasTwoFactor ? "checked" : "" }}>
{{ trans('forms.setup.enable_google2fa') }}
</label>
</div>
@if($loggedUser->hasTwoFactor)
@if($current_user->hasTwoFactor)
<div class="form-group">
<?php
$google2fa_url = PragmaRX\Google2FA\Vendor\Laravel\Facade::getQRCodeGoogleUrl(
'CachetHQ',
$loggedUser->email,
$loggedUser->google_2fa_secret
$current_user->email,
$current_user->google_2fa_secret
);
?>
<img src="{{ $google2fa_url }}" class="img-responsive">