Fix code standards, update language files.

This commit is contained in:
James Brooks
2015-06-16 09:07:49 +01:00
parent 49411d8568
commit 9d879b162e
84 changed files with 613 additions and 613 deletions

View File

@@ -47,7 +47,7 @@ class IncidentController extends AbstractController
'icon' => 'ion-android-checkmark-circle',
'active' => true,
],
'schedule' => [
'schedule' => [
'title' => trans('dashboard.schedule.schedule'),
'url' => route('dashboard.schedule'),
'icon' => 'ion-android-calendar',

View File

@@ -43,8 +43,8 @@ class MetricController extends AbstractController
public function showAddMetric()
{
return View::make('dashboard.metrics.add')->with([
'pageTitle' => trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'),
'metricMetricPoints' => MetricPoint::all(),
'pageTitle' => trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'),
'metricMetricPoints' => MetricPoint::all(),
]);
}
@@ -165,8 +165,8 @@ class MetricController extends AbstractController
public function showEditMetricAction(Metric $metric)
{
return View::make('dashboard.metrics.edit')->with([
'pageTitle' => trans('dashboard.metrics.edit.title').' - '.trans('dashboard.dashboard'),
'metric' => $metric,
'pageTitle' => trans('dashboard.metrics.edit.title').' - '.trans('dashboard.dashboard'),
'metric' => $metric,
]);
}

View File

@@ -47,7 +47,7 @@ class ScheduleController extends AbstractController
'icon' => 'ion-android-checkmark-circle',
'active' => false,
],
'schedule' => [
'schedule' => [
'title' => trans('dashboard.schedule.schedule'),
'url' => route('dashboard.schedule'),
'icon' => 'ion-android-calendar',

View File

@@ -147,12 +147,12 @@ abstract class AbstractApiController extends BaseController
$pagination = [
'pagination' => [
'total' => $paginator->total(),
'count' => count($paginator->items()),
'per_page' => $paginator->perPage(),
'current_page' => $paginator->currentPage(),
'total_pages' => $paginator->lastPage(),
'links' => [
'total' => $paginator->total(),
'count' => count($paginator->items()),
'per_page' => $paginator->perPage(),
'current_page' => $paginator->currentPage(),
'total_pages' => $paginator->lastPage(),
'links' => [
'next_page' => $paginator->nextPageUrl(),
'previous_page' => $paginator->previousPageUrl(),
],

View File

@@ -56,8 +56,6 @@ class AtomController extends AbstractController
*
* @param \Roumen\Feed\Facades\Feed $feed
* @param \CachetHQ\Cachet\Models\Incident $incident
*
* @return void
*/
private function feedAddItem(&$feed, $incident)
{

View File

@@ -56,8 +56,6 @@ class RssController extends AbstractController
*
* @param \Roumen\Feed\Facades\Feed $feed
* @param \CachetHQ\Cachet\Models\Incident $incident
*
* @return void
*/
private function feedAddItem(&$feed, $incident)
{

View File

@@ -219,8 +219,6 @@ class SetupController extends AbstractController
*
* @param string $key
* @param mixed $value
*
* @return void
*/
protected function writeEnv($key, $value)
{
@@ -236,8 +234,6 @@ class SetupController extends AbstractController
/**
* Generate the app.key value.
*
* @return void
*/
protected function keyGenerate()
{