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

Fixes #653

Browse Source
This commit is contained in:
James Brooks
2015-05-20 22:38:09 +01:00
parent af69c99896
commit d70ca8d4e5
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/ComponentController.php
+8 -8
View File
@@ -131,7 +131,7 @@ class ComponentController extends AbstractController
return Redirect::back()->withInput(Binput::all()) return Redirect::back()->withInput(Binput::all())
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.whoops'), trans('dashboard.notifications.whoops'),
trans('dashboard.components.edit.failure') trans('dashboard.components.edit.failure')
)) ))
@@ -156,7 +156,7 @@ class ComponentController extends AbstractController
$component->tags()->sync($componentTags); $component->tags()->sync($componentTags);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.components.edit.success') trans('dashboard.components.edit.success')
); );
@@ -201,7 +201,7 @@ class ComponentController extends AbstractController
return Redirect::back()->withInput(Binput::all()) return Redirect::back()->withInput(Binput::all())
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.whoops'), trans('dashboard.notifications.whoops'),
trans('dashboard.components.add.failure') trans('dashboard.components.add.failure')
)) ))
@@ -226,7 +226,7 @@ class ComponentController extends AbstractController
$component->tags()->sync($componentTags); $component->tags()->sync($componentTags);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.components.add.success') trans('dashboard.components.add.success')
); );
@@ -320,7 +320,7 @@ class ComponentController extends AbstractController
return Redirect::back()->withInput(Binput::all()) return Redirect::back()->withInput(Binput::all())
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.whoops'), trans('dashboard.notifications.whoops'),
trans('dashboard.components.groups.add.failure') trans('dashboard.components.groups.add.failure')
)) ))
@@ -333,7 +333,7 @@ class ComponentController extends AbstractController
]); ]);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.components.groups.add.success') trans('dashboard.components.groups.add.success')
); );
@@ -361,7 +361,7 @@ class ComponentController extends AbstractController
return Redirect::back()->withInput(Binput::all()) return Redirect::back()->withInput(Binput::all())
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.whoops'), trans('dashboard.notifications.whoops'),
trans('dashboard.components.groups.edit.failure') trans('dashboard.components.groups.edit.failure')
)) ))
@@ -374,7 +374,7 @@ class ComponentController extends AbstractController
]); ]);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.components.groups.edit.success') trans('dashboard.components.groups.edit.success')
); );
app/Http/Controllers/Admin/IncidentController.php
+6 -6
View File
@@ -136,7 +136,7 @@ class IncidentController extends AbstractController
return Redirect::back()->withInput(Binput::all()) return Redirect::back()->withInput(Binput::all())
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.whoops'), trans('dashboard.notifications.whoops'),
trans('dashboard.incidents.add.failure') trans('dashboard.incidents.add.failure')
)) ))
@@ -156,7 +156,7 @@ class IncidentController extends AbstractController
]); ]);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.incidents.add.success') trans('dashboard.incidents.add.success')
); );
@@ -227,7 +227,7 @@ class IncidentController extends AbstractController
return Redirect::back()->withInput(Binput::all()) return Redirect::back()->withInput(Binput::all())
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.incidents.templates.add.failure') trans('dashboard.incidents.templates.add.failure')
)) ))
@@ -240,7 +240,7 @@ class IncidentController extends AbstractController
]); ]);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.incidents.templates.add.success') trans('dashboard.incidents.templates.add.success')
); );
@@ -316,7 +316,7 @@ class IncidentController extends AbstractController
return Redirect::back()->withInput(Binput::all()) return Redirect::back()->withInput(Binput::all())
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.incidents.templates.edit.failure') trans('dashboard.incidents.templates.edit.failure')
)) ))
@@ -329,7 +329,7 @@ class IncidentController extends AbstractController
]); ]);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.incidents.edit.success') trans('dashboard.incidents.edit.success')
); );
app/Http/Controllers/Admin/MetricController.php
+5 -5
View File
@@ -81,7 +81,7 @@ class MetricController extends AbstractController
return Redirect::back()->withInput(Binput::all()) return Redirect::back()->withInput(Binput::all())
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.whoops'), trans('dashboard.notifications.whoops'),
trans('dashboard.metrics.add.failure') trans('dashboard.metrics.add.failure')
)) ))
@@ -94,7 +94,7 @@ class MetricController extends AbstractController
]); ]);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.metrics.add.success') trans('dashboard.metrics.add.success')
); );
@@ -127,7 +127,7 @@ class MetricController extends AbstractController
if (!$point->isValid()) { if (!$point->isValid()) {
return Redirect::back()->withInput(Binput::all()) return Redirect::back()->withInput(Binput::all())
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.metrics.points.add.failure') trans('dashboard.metrics.points.add.failure')
)) ))
@@ -135,7 +135,7 @@ class MetricController extends AbstractController
} }
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.metrics.points.add.success') trans('dashboard.metrics.points.add.success')
); );
@@ -204,7 +204,7 @@ class MetricController extends AbstractController
]); ]);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.metrics.edit.success') trans('dashboard.metrics.edit.success')
); );
app/Http/Controllers/Admin/ScheduleController.php
+5 -5
View File
@@ -123,7 +123,7 @@ class ScheduleController extends AbstractController
return Redirect::back()->withInput(Binput::all()) return Redirect::back()->withInput(Binput::all())
->with('success', sprintf( ->with('success', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.whoops'), trans('dashboard.notifications.whoops'),
trans('dashboard.schedule.add.failure') trans('dashboard.schedule.add.failure')
)) ))
@@ -136,7 +136,7 @@ class ScheduleController extends AbstractController
]); ]);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.schedule.add.success') trans('dashboard.schedule.add.success')
); );
@@ -199,7 +199,7 @@ class ScheduleController extends AbstractController
return Redirect::back()->withInput(Binput::all()) return Redirect::back()->withInput(Binput::all())
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.schedule.edit.failure') trans('dashboard.schedule.edit.failure')
)) ))
@@ -212,7 +212,7 @@ class ScheduleController extends AbstractController
]); ]);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.schedule.edit.success') trans('dashboard.schedule.edit.success')
); );
@@ -236,7 +236,7 @@ class ScheduleController extends AbstractController
$schedule->delete(); $schedule->delete();
return Redirect::back()->with('warning', sprintf( return Redirect::back()->with('warning', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.whoops'), trans('dashboard.notifications.whoops'),
trans('dashboard.schedule.delete.failure') trans('dashboard.schedule.delete.failure')
)); ));
app/Http/Controllers/Admin/TeamController.php
+4 -4
View File
@@ -78,7 +78,7 @@ class TeamController extends AbstractController
return Redirect::back()->withInput(Binput::except('password')) return Redirect::back()->withInput(Binput::except('password'))
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.whoops'), trans('dashboard.notifications.whoops'),
trans('dashboard.team.add.failure') trans('dashboard.team.add.failure')
)) ))
@@ -91,7 +91,7 @@ class TeamController extends AbstractController
]); ]);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.team.add.success') trans('dashboard.team.add.success')
); );
@@ -126,7 +126,7 @@ class TeamController extends AbstractController
return Redirect::back()->withInput(Binput::except('password')) return Redirect::back()->withInput(Binput::except('password'))
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.whoops'), trans('dashboard.notifications.whoops'),
trans('dashboard.team.edit.failure') trans('dashboard.team.edit.failure')
)) ))
@@ -139,7 +139,7 @@ class TeamController extends AbstractController
]); ]);
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.team.edit.success') trans('dashboard.team.edit.success')
); );
app/Http/Controllers/Admin/UserController.php
+2 -2
View File
@@ -74,7 +74,7 @@ class UserController extends AbstractController
if (!$user->isValid()) { if (!$user->isValid()) {
return Redirect::back()->withInput(Binput::except('password')) return Redirect::back()->withInput(Binput::except('password'))
->with('title', sprintf( ->with('title', sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.whoops'), trans('dashboard.notifications.whoops'),
trans('dashboard.team.edit.failure') trans('dashboard.team.edit.failure')
)) ))
@@ -82,7 +82,7 @@ class UserController extends AbstractController
} }
$successMsg = sprintf( $successMsg = sprintf(
'<strong>%s</strong> %s', '%s - %s',
trans('dashboard.notifications.awesome'), trans('dashboard.notifications.awesome'),
trans('dashboard.team.edit.success') trans('dashboard.team.edit.success')
); );
resources/views/dashboard/incidents/templates/edit.blade.php
+2 -2
View File
@@ -16,9 +16,9 @@
@if($updatedTemplate = Session::get('updatedTemplate')) @if($updatedTemplate = Session::get('updatedTemplate'))
<div class="alert alert-{{ $updatedTemplate->isValid() ? 'success' : 'danger' }}"> <div class="alert alert-{{ $updatedTemplate->isValid() ? 'success' : 'danger' }}">
@if($updatedTemplate->isValid()) @if($updatedTemplate->isValid())
{{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.awesome'), trans('dashboard.incidents.templates.edit.success')) }} {{ sprintf("%s - %s", trans('dashboard.notifications.awesome'), trans('dashboard.incidents.templates.edit.success')) }}
@else @else
{{ sprintf("<strong>%s</strong> %s", trans('dashboard.notifications.whoops'), trans('dashboard.incidents.templates.edit.failure').' '.$updatedTemplate->getErrors()) }} {{ sprintf("%s - %s", trans('dashboard.notifications.whoops'), trans('dashboard.incidents.templates.edit.failure').' '.$updatedTemplate->getErrors()) }}
@endif @endif
</div> </div>
@endif @endif