diff --git a/app/Http/Controllers/Dashboard/ComponentController.php b/app/Http/Controllers/Dashboard/ComponentController.php index 2907121f5..bab78c83e 100644 --- a/app/Http/Controllers/Dashboard/ComponentController.php +++ b/app/Http/Controllers/Dashboard/ComponentController.php @@ -49,7 +49,7 @@ class ComponentController extends Controller 'components' => [ 'title' => trans('dashboard.components.components'), 'url' => route('dashboard.components.index'), - 'icon' => 'ion-outlet', + 'icon' => 'ion-ios-browsers', 'active' => false, ], 'groups' => [ diff --git a/app/Http/Controllers/Dashboard/IncidentController.php b/app/Http/Controllers/Dashboard/IncidentController.php index 81aa4082d..deba59602 100644 --- a/app/Http/Controllers/Dashboard/IncidentController.php +++ b/app/Http/Controllers/Dashboard/IncidentController.php @@ -70,7 +70,6 @@ class IncidentController extends Controller public function showIncidents() { $incidents = Incident::notScheduled()->orderBy('created_at', 'desc')->get(); - return View::make('dashboard.incidents.index') ->withPageTitle(trans('dashboard.incidents.incidents').' - '.trans('dashboard.dashboard')) ->withIncidents($incidents); diff --git a/app/Http/Controllers/Dashboard/ScheduleController.php b/app/Http/Controllers/Dashboard/ScheduleController.php index 3bab83a69..2199d681c 100644 --- a/app/Http/Controllers/Dashboard/ScheduleController.php +++ b/app/Http/Controllers/Dashboard/ScheduleController.php @@ -69,8 +69,9 @@ class ScheduleController extends Controller public function showIndex() { $schedule = Incident::scheduled()->orderBy('created_at')->get(); - - return View::make('dashboard.schedule.index')->withSchedule($schedule); + return View::make('dashboard.schedule.index') + ->withPageTitle(trans('dashboard.schedule.schedule').' - '.trans('dashboard.dashboard')) + ->withSchedule($schedule); } /** @@ -83,6 +84,7 @@ class ScheduleController extends Controller $incidentTemplates = IncidentTemplate::all(); return View::make('dashboard.schedule.add') + ->withPageTitle(trans('dashboard.schedule.add.title').' - '.trans('dashboard.dashboard')) ->withIncidentTemplates($incidentTemplates); } @@ -123,6 +125,7 @@ class ScheduleController extends Controller $incidentTemplates = IncidentTemplate::all(); return View::make('dashboard.schedule.edit') + ->withPageTitle(trans('dashboard.schedule.edit.title').' - '.trans('dashboard.dashboard')) ->withIncidentTemplates($incidentTemplates) ->withSchedule($schedule); } diff --git a/app/Http/Controllers/Dashboard/SettingsController.php b/app/Http/Controllers/Dashboard/SettingsController.php index da02d47e1..1945275e4 100644 --- a/app/Http/Controllers/Dashboard/SettingsController.php +++ b/app/Http/Controllers/Dashboard/SettingsController.php @@ -100,7 +100,7 @@ class SettingsController extends Controller Session::flash('redirect_to', $this->subMenu['setup']['url']); return View::make('dashboard.settings.app-setup') - ->withPageTitle('Application Setup - Dashboard') + ->withPageTitle(trans('dashboard.settings.app-setup.app-setup').' - '.trans('dashboard.dashboard')) ->withSubMenu($this->subMenu); } @@ -116,7 +116,7 @@ class SettingsController extends Controller Session::flash('redirect_to', $this->subMenu['analytics']['url']); return View::make('dashboard.settings.analytics') - ->withPageTitle('Analytics - Dashboard') + ->withPageTitle(trans('dashboard.settings.analytics.analytics').' - '.trans('dashboard.dashboard')) ->withSubMenu($this->subMenu); } @@ -132,7 +132,7 @@ class SettingsController extends Controller Session::flash('redirect_to', $this->subMenu['localization']['url']); return View::make('dashboard.settings.localization') - ->withPageTitle('Localization - Dashboard') + ->withPageTitle(trans('dashboard.settings.localization.localization').' - '.trans('dashboard.dashboard')) ->withSubMenu($this->subMenu); } @@ -148,7 +148,7 @@ class SettingsController extends Controller Session::flash('redirect_to', $this->subMenu['theme']['url']); return View::make('dashboard.settings.theme') - ->withPageTitle('Theme - Dashboard') + ->withPageTitle(trans('dashboard.settings.theme.theme').' - '.trans('dashboard.dashboard')) ->withSubMenu($this->subMenu); } @@ -166,7 +166,7 @@ class SettingsController extends Controller Session::flash('redirect_to', $this->subMenu['security']['url']); return View::make('dashboard.settings.security') - ->withPageTitle('Security - Dashboard') + ->withPageTitle(trans('dashboard.settings.security.security').' - '.trans('dashboard.dashboard')) ->withSubMenu($this->subMenu) ->withUnsecureUsers($unsecureUsers); } @@ -183,7 +183,7 @@ class SettingsController extends Controller Session::flash('redirect_to', $this->subMenu['stylesheet']['url']); return View::make('dashboard.settings.stylesheet') - ->withPageTitle('Stylesheet - Dashboard') + ->withPageTitle(trans('dashboard.settings.stylesheet.stylesheet').' - '.trans('dashboard.dashboard')) ->withSubMenu($this->subMenu); } diff --git a/resources/lang/zh-CN/dashboard.php b/resources/lang/zh-CN/dashboard.php index 60a0d3327..b2c64d151 100755 --- a/resources/lang/zh-CN/dashboard.php +++ b/resources/lang/zh-CN/dashboard.php @@ -53,13 +53,13 @@ return [ 'scheduled_at' => '计划在 :timestamp', 'add' => [ 'title' => '添加维护计划', - 'success' => '计划已添加。', - 'failure' => '计划添加失败。', + 'success' => '维护计划已添加。', + 'failure' => '维护计划添加失败。', ], 'edit' => [ 'title' => '编辑维护计划', - 'success' => '计划已更新!', - 'failure' => '计划更新失败。', + 'success' => '维护计划已更新!', + 'failure' => '维护计划更新失败。', ], 'delete' => [ 'success' => '维护计划已被删除,它将从您的状态页上消失。', @@ -183,7 +183,7 @@ return [ 'stylesheet' => '自定义样式', ], 'theme' => [ - 'theme' => '主题', + 'theme' => '主题设置', ], 'edit' => [ 'success' => '设置已保存。', diff --git a/resources/views/dashboard/components/add.blade.php b/resources/views/dashboard/components/add.blade.php index baf29f8c8..e17413b2f 100644 --- a/resources/views/dashboard/components/add.blade.php +++ b/resources/views/dashboard/components/add.blade.php @@ -6,7 +6,7 @@ - {{ trans('dashboard.components.components') }} + {{ trans('dashboard.components.components') }} > {{ trans('dashboard.components.add.title') }} diff --git a/resources/views/dashboard/components/edit.blade.php b/resources/views/dashboard/components/edit.blade.php index 48fba3105..f160e24cf 100644 --- a/resources/views/dashboard/components/edit.blade.php +++ b/resources/views/dashboard/components/edit.blade.php @@ -6,7 +6,7 @@ - {{ trans('dashboard.components.components') }} + {{ trans('dashboard.components.components') }} > {{ trans('dashboard.components.edit.title') }} diff --git a/resources/views/dashboard/components/index.blade.php b/resources/views/dashboard/components/index.blade.php index d4a1970e9..cb63323b3 100644 --- a/resources/views/dashboard/components/index.blade.php +++ b/resources/views/dashboard/components/index.blade.php @@ -8,7 +8,7 @@