diff --git a/app/Http/Controllers/Dashboard/SettingsController.php b/app/Http/Controllers/Dashboard/SettingsController.php index eff77855..43d9d3db 100644 --- a/app/Http/Controllers/Dashboard/SettingsController.php +++ b/app/Http/Controllers/Dashboard/SettingsController.php @@ -35,6 +35,18 @@ class SettingsController extends Controller 'icon' => 'ion-gear-b', 'active' => false, ], + 'analytics' => [ + 'title' => trans('dashboard.settings.analytics.analytics'), + 'url' => route('dashboard.settings.analytics'), + 'icon' => 'ion-stats-bars', + 'active' => false, + ], + 'localization' => [ + 'title' => trans('dashboard.settings.localization.localization'), + 'url' => route('dashboard.settings.localization'), + 'icon' => 'ion-earth', + 'active' => false, + ], 'security' => [ 'title' => trans('dashboard.settings.security.security'), 'url' => route('dashboard.settings.security'), @@ -76,6 +88,38 @@ class SettingsController extends Controller ->withSubMenu($this->subMenu); } + /** + * Shows the settings analytics view. + * + * @return \Illuminate\View\View + */ + public function showAnalyticsView() + { + $this->subMenu['analytics']['active'] = true; + + Session::flash('redirect_to', $this->subMenu['analytics']['url']); + + return View::make('dashboard.settings.analytics') + ->withPageTitle('Analytics - Dashboard') + ->withSubMenu($this->subMenu); + } + + /** + * Shows the settings localization view. + * + * @return \Illuminate\View\View + */ + public function showLocalizationView() + { + $this->subMenu['localization']['active'] = true; + + Session::flash('redirect_to', $this->subMenu['localization']['url']); + + return View::make('dashboard.settings.localization') + ->withPageTitle('Localization - Dashboard') + ->withSubMenu($this->subMenu); + } + /** * Shows the settings theme view. * diff --git a/app/Http/Routes/DashboardRoutes.php b/app/Http/Routes/DashboardRoutes.php index 6cd756e3..da7c938e 100644 --- a/app/Http/Routes/DashboardRoutes.php +++ b/app/Http/Routes/DashboardRoutes.php @@ -218,6 +218,14 @@ class DashboardRoutes 'as' => 'setup', 'uses' => 'SettingsController@showSetupView', ]); + $router->get('analytics', [ + 'as' => 'analytics', + 'uses' => 'SettingsController@showAnalyticsView', + ]); + $router->get('localization', [ + 'as' => 'localization', + 'uses' => 'SettingsController@showLocalizationView', + ]); $router->get('security', [ 'as' => 'security', 'uses' => 'SettingsController@showSecurityView', diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index a8ee4234..d6e410fd 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -36,7 +36,7 @@ class ComposerServiceProvider extends ServiceProvider $factory->composer(['index', 'incident', 'subscribe'], StatusPageComposer::class); $factory->composer(['index', 'incident', 'subscribe', 'dashboard.settings.theme'], ThemeComposer::class); $factory->composer('dashboard.*', DashboardComposer::class); - $factory->composer(['setup', 'dashboard.settings.app-setup'], TimezoneLocaleComposer::class); + $factory->composer(['setup', 'dashboard.settings.localization'], TimezoneLocaleComposer::class); } /** diff --git a/resources/lang/da/dashboard.php b/resources/lang/da/dashboard.php index dbfccbcf..8107671e 100755 --- a/resources/lang/da/dashboard.php +++ b/resources/lang/da/dashboard.php @@ -163,6 +163,12 @@ return [ 'images-only' => 'Kun billeder kan uploades.', 'too-big' => 'Filen du prøvede at uploade er for stort, billet skal være mindre end :size', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'Sikkerhed', 'two-factor' => 'Brugere uden two-factor login', diff --git a/resources/lang/da/forms.php b/resources/lang/da/forms.php index 3d771915..6f59de1b 100755 --- a/resources/lang/da/forms.php +++ b/resources/lang/da/forms.php @@ -93,20 +93,24 @@ return [ 'app-setup' => [ 'site-name' => 'Sidens navn', 'site-url' => 'Sidens URL', - 'site-timezone' => 'Tidszone', - 'site-locale' => 'Sprog', - 'date-format' => 'Datoformat', - 'incident-date-format' => 'Datoformat for hændelser', 'display-graphs' => 'Vis grafer på statussiden?', 'about-this-page' => 'Om', 'days-of-incidents' => 'Hvor mange dage skal der vises hændelser for?', 'banner' => 'Bannerbillede', 'banner-help' => 'Det anbefales ikke at uploade billeder bredere end 930px.', + 'subscribers' => 'Tillad at man kan tilmelde sig emailnotifikationer?', + ], + 'analytics' => [ 'analytics_google' => 'Google Analytics kode', 'analytics_gosquared' => 'GoSquared Analytics kode', 'analytics_piwik_url' => 'URL til Piwik installation (uden http(s)://)', 'analytics_piwik_siteid' => 'Piwik\'s id', - 'subscribers' => 'Tillad at man kan tilmelde sig emailnotifikationer?', + ], + 'localization' => [ + 'site-timezone' => 'Tidszone', + 'site-locale' => 'Sprog', + 'date-format' => 'Datoformat', + 'incident-date-format' => 'Datoformat for hændelser', ], 'security' => [ 'allowed-domains' => 'Tilladte domæner', diff --git a/resources/lang/de/dashboard.php b/resources/lang/de/dashboard.php index 420adf86..fc82e734 100755 --- a/resources/lang/de/dashboard.php +++ b/resources/lang/de/dashboard.php @@ -163,6 +163,12 @@ return [ 'images-only' => 'Es können nur Bilder hochgeladen werden.', 'too-big' => 'Die von Ihnen hochgeladene Datei ist zu groß. Laden Sie ein Bild welches kleiner als :size ist hoch', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'Sicherheit', 'two-factor' => 'Nutzer ohne Zwei-Faktor-Authentifizierung', diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php index 4b34626b..27d7fbb8 100755 --- a/resources/lang/de/forms.php +++ b/resources/lang/de/forms.php @@ -92,20 +92,24 @@ return [ 'app-setup' => [ 'site-name' => 'Seitenname', 'site-url' => 'URL ihrer Seite', - 'site-timezone' => 'Zeitzone ihrer Seite', - 'site-locale' => 'Sprache ihrer Seite', - 'date-format' => 'Datumsformat', - 'incident-date-format' => 'Vorfall Zeitstempel-Format', 'display-graphs' => 'Graphen auf der Statusseite anzeigen?', 'about-this-page' => 'Über diese Seite', 'days-of-incidents' => 'Wie viele Tage mit Vorfällen sollen gezeigt werden?', 'banner' => 'Banner', 'banner-help' => 'Es wird empfohlen, dass Sie keine Dateien die breiter als 930 Pixel sind hochladen .', + 'subscribers' => 'Personen die Anmeldung für E-Mail-Benachrichtigung erlauben?', + ], + 'analytics' => [ 'analytics_google' => 'Google Analytics Code', 'analytics_gosquared' => 'GoSquared Analytics Code', 'analytics_piwik_url' => 'URL der Piwik-Instanz (ohne http(s)://)', 'analytics_piwik_siteid' => 'Piwik\'s Seiten-ID', - 'subscribers' => 'Personen die Anmeldung für E-Mail-Benachrichtigung erlauben?', + ], + 'localization' => [ + 'site-timezone' => 'Zeitzone ihrer Seite', + 'site-locale' => 'Sprache ihrer Seite', + 'date-format' => 'Datumsformat', + 'incident-date-format' => 'Vorfall Zeitstempel-Format', ], 'security' => [ 'allowed-domains' => 'Erlaubte Domains', diff --git a/resources/lang/en-UD/dashboard.php b/resources/lang/en-UD/dashboard.php index 866de46c..1dc2e99b 100755 --- a/resources/lang/en-UD/dashboard.php +++ b/resources/lang/en-UD/dashboard.php @@ -163,6 +163,12 @@ return [ 'images-only' => 'crwdns346:0crwdne346:0', 'too-big' => 'crwdns347:0crwdne347:0', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'crwdns348:0crwdne348:0', 'two-factor' => 'crwdns474:0crwdne474:0', diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php index aa21e02a..9ca4816f 100755 --- a/resources/lang/en-UD/forms.php +++ b/resources/lang/en-UD/forms.php @@ -92,20 +92,24 @@ return [ 'app-setup' => [ 'site-name' => 'crwdns233:0crwdne233:0', 'site-url' => 'crwdns398:0crwdne398:0', - 'site-timezone' => 'crwdns399:0crwdne399:0', - 'site-locale' => 'crwdns400:0crwdne400:0', - 'date-format' => 'crwdns401:0crwdne401:0', - 'incident-date-format' => 'crwdns485:0crwdne485:0', 'display-graphs' => 'crwdns472:0crwdne472:0', 'about-this-page' => 'crwdns402:0crwdne402:0', 'days-of-incidents' => 'crwdns403:0crwdne403:0', 'banner' => 'crwdns404:0crwdne404:0', 'banner-help' => 'crwdns405:0crwdne405:0', + 'subscribers' => 'crwdns513:0crwdne513:0', + ], + 'analytics' => [ 'analytics_google' => 'crwdns486:0crwdne486:0', 'analytics_gosquared' => 'crwdns487:0crwdne487:0', 'analytics_piwik_url' => 'crwdns511:0crwdne511:0', 'analytics_piwik_siteid' => 'crwdns512:0crwdne512:0', - 'subscribers' => 'crwdns513:0crwdne513:0', + ], + 'localization' => [ + 'site-timezone' => 'crwdns399:0crwdne399:0', + 'site-locale' => 'crwdns400:0crwdne400:0', + 'date-format' => 'crwdns401:0crwdne401:0', + 'incident-date-format' => 'crwdns485:0crwdne485:0', ], 'security' => [ 'allowed-domains' => 'crwdns407:0crwdne407:0', diff --git a/resources/lang/en/dashboard.php b/resources/lang/en/dashboard.php index 5fe4d771..a6555f1d 100755 --- a/resources/lang/en/dashboard.php +++ b/resources/lang/en/dashboard.php @@ -163,6 +163,12 @@ return [ 'images-only' => 'Only images may be uploaded.', 'too-big' => 'The file you uploaded is too big. Upload an image smaller than :size', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'Security', 'two-factor' => 'Users without two-factor authentication', diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index bd006f5b..fb6c5d87 100755 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -93,20 +93,24 @@ return [ 'app-setup' => [ 'site-name' => 'Site Name', 'site-url' => 'Site URL', - 'site-timezone' => 'Site Timezone', - 'site-locale' => 'Site Language', - 'date-format' => 'Date Format', - 'incident-date-format' => 'Incident Timestamp Format', 'display-graphs' => 'Display graphs on status page?', 'about-this-page' => 'About this page', 'days-of-incidents' => 'How many days of incidents to show?', 'banner' => 'Banner Image', 'banner-help' => "It's recommended that you upload files no bigger than 930px wide .", + 'subscribers' => 'Allow people to signup to email notifications?', + ], + 'analytics' => [ 'analytics_google' => 'Google Analytics code', 'analytics_gosquared' => 'GoSquared Analytics code', 'analytics_piwik_url' => 'URL of your Piwik instance (without http(s)://)', 'analytics_piwik_siteid' => 'Piwik\'s site id', - 'subscribers' => 'Allow people to signup to email notifications?', + ], + 'localization' => [ + 'site-timezone' => 'Site Timezone', + 'site-locale' => 'Site Language', + 'date-format' => 'Date Format', + 'incident-date-format' => 'Incident Timestamp Format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/es/dashboard.php b/resources/lang/es/dashboard.php index 79bcf7c4..e09c9737 100755 --- a/resources/lang/es/dashboard.php +++ b/resources/lang/es/dashboard.php @@ -115,6 +115,12 @@ return [ 'images-only' => 'Sólo puedes subir imágenes.', 'too-big' => 'El archivo subido es demasiado grande. Sube una imagen con tamaño menor a: tamaño', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'Seguridad', ], diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php index 70652c20..b4d5ec40 100755 --- a/resources/lang/es/forms.php +++ b/resources/lang/es/forms.php @@ -84,19 +84,24 @@ return [ 'app-setup' => [ 'site-name' => 'Nombre del sitio', 'site-url' => 'URL del sitio', - 'site-timezone' => 'Zona horaria del sitio', - 'site-locale' => 'Idioma del sitio', - 'date-format' => 'Formato de la fecha', 'display-graphs' => '¿Visualizar gráficas en la página de estado?', 'about-this-page' => 'Sobre esta página', 'days-of-incidents' => '¿Cuántos días de incidentes mostrar?', 'banner' => 'Imagen de inicio', 'banner-help' => 'Se recomienda subir una imagen no más grande de 930px de ancho.', + ], + 'analytics' => [ 'analytics_google' => 'Código de Google Analytics', 'analytics_gosquared' => 'Código de GoSquared Analytics', 'analytics_piwik_url' => 'URL de tu instancia Piwik (sin http(s)://)', 'analytics_piwik_siteid' => 'Id sitio Piwik', ], + 'localization' => [ + 'site-timezone' => 'Zona horaria del sitio', + 'site-locale' => 'Idioma del sitio', + 'date-format' => 'Formato de la fecha', + 'incident-date-format' => 'Incident Timestamp Format', + ], 'security' => [ 'allowed-domains' => 'Dominios permitidos', 'allowed-domains-help' => 'Separados por coma. El dominio establecido en la configuración del sitio formará automáticamente parte de los dominios permitidos.', diff --git a/resources/lang/fr/dashboard.php b/resources/lang/fr/dashboard.php index fc61ae50..825cc877 100755 --- a/resources/lang/fr/dashboard.php +++ b/resources/lang/fr/dashboard.php @@ -163,6 +163,12 @@ return [ 'images-only' => 'Seules les images peuvent être déposées.', 'too-big' => 'Le fichier déposé est trop grand. Déposer une image d\'une taille inférieur à :size', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'Sécurité', 'two-factor' => 'Utilisateurs sans authentification à deux facteurs', diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php index 5cecb0d6..f4854edf 100755 --- a/resources/lang/fr/forms.php +++ b/resources/lang/fr/forms.php @@ -92,20 +92,24 @@ return [ 'app-setup' => [ 'site-name' => 'Nom du site', 'site-url' => 'Url du site', - 'site-timezone' => 'Fuseau horaire du site', - 'site-locale' => 'Langage du site', - 'date-format' => 'Format Date', - 'incident-date-format' => 'Format de la date de l\'incident', 'display-graphs' => 'Afficher les graphiques sur la page de status ?', 'about-this-page' => 'À propos de cette page', 'days-of-incidents' => 'Combien de jours d\'incidents à montrer?', 'banner' => 'Image de la bannière', 'banner-help' => 'Il est recommandé que vous téléchargez des fichiers ne dépassant pas les 930px large .', + 'subscribers' => 'Permettre aux gens de s\'inscrire aux notifications par courrier électronique ?', + ], + 'analytics' => [ 'analytics_google' => 'Code de Google Analytics', 'analytics_gosquared' => 'Code de GoSquared Analytics', 'analytics_piwik_url' => 'URL de votre instance de Piwik (sans http(s)://)', 'analytics_piwik_siteid' => 'Id de site de Piwik', - 'subscribers' => 'Permettre aux gens de s\'inscrire aux notifications par courrier électronique ?', + ], + 'localization' => [ + 'site-timezone' => 'Fuseau horaire du site', + 'site-locale' => 'Langage du site', + 'date-format' => 'Format Date', + 'incident-date-format' => 'Format de la date de l\'incident', ], 'security' => [ 'allowed-domains' => 'Domaines autorisés', diff --git a/resources/lang/id/dashboard.php b/resources/lang/id/dashboard.php index 5bae974b..a635a600 100755 --- a/resources/lang/id/dashboard.php +++ b/resources/lang/id/dashboard.php @@ -163,6 +163,12 @@ return [ 'images-only' => 'Hanya gambar yang bisa diunggah.', 'too-big' => 'Berkas yang anda unggah terlalu besar. Mohon unggah gambar dengan ukuran tidak lebih dari :size', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'Keamanan', 'two-factor' => 'User tanpa otentikasi dua-faktor', diff --git a/resources/lang/id/forms.php b/resources/lang/id/forms.php index a4c3d93c..038478fb 100755 --- a/resources/lang/id/forms.php +++ b/resources/lang/id/forms.php @@ -92,20 +92,24 @@ return [ 'app-setup' => [ 'site-name' => 'Nama Situs', 'site-url' => 'URL', - 'site-timezone' => 'Zona Waktu', - 'site-locale' => 'Bahasa', - 'date-format' => 'Format Tanggal', - 'incident-date-format' => 'Format Waktu Insiden', 'display-graphs' => 'Tampilkan grafik di halaman status?', 'about-this-page' => 'Tentang halaman ini', 'days-of-incidents' => 'Berapa hari insiden akan ditampilkan?', 'banner' => 'Gambar Banner', 'banner-help' => 'Disarankan gambar yang anda unggah tidak lebih lebar dari 930px.', + 'subscribers' => 'Bolehkan pengunjung mendaftar notifikasi email?', + ], + 'analytics' => [ 'analytics_google' => 'Kode Google Analytics', 'analytics_gosquared' => 'Kode GoSquared Analytics', 'analytics_piwik_url' => 'URL Piwik anda (tanpa http(s)://)', 'analytics_piwik_siteid' => 'ID situs Piwik', - 'subscribers' => 'Bolehkan pengunjung mendaftar notifikasi email?', + ], + 'localization' => [ + 'site-timezone' => 'Zona Waktu', + 'site-locale' => 'Bahasa', + 'date-format' => 'Format Tanggal', + 'incident-date-format' => 'Format Waktu Insiden', ], 'security' => [ 'allowed-domains' => 'Domain yang dibolehkan', diff --git a/resources/lang/it/dashboard.php b/resources/lang/it/dashboard.php index 4e6ef16d..12682e8c 100644 --- a/resources/lang/it/dashboard.php +++ b/resources/lang/it/dashboard.php @@ -159,6 +159,12 @@ return [ 'images-only' => 'Possono essere caricate solo immagini.', 'too-big' => 'Il file che hai caricato è troppo grande. Carica un\'immagine più piccola di :size', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'Sicurezza', 'two-factor' => 'Utenti senza verifica in 2 passaggi', diff --git a/resources/lang/it/forms.php b/resources/lang/it/forms.php index d2c1ed0d..21fa685b 100644 --- a/resources/lang/it/forms.php +++ b/resources/lang/it/forms.php @@ -92,20 +92,24 @@ return [ 'app-setup' => [ 'site-name' => 'Nome del sito', 'site-url' => 'URL del sito', - 'site-timezone' => 'Fuso orario del sito', - 'site-locale' => 'Lingua del sito', - 'date-format' => 'Formato Data', - 'incident-date-format' => 'Formato Timestamp dell\'incidente', 'display-graphs' => 'Visualizzare grafici sulla Status Page?', 'about-this-page' => 'Su questa pagina', 'days-of-incidents' => 'Quanti giorni di incidenti mostrare?', 'banner' => 'Immagine Banner', 'banner-help' => 'Si consiglia di caricare file non più grandi di 930px di larghezza.', + 'subscribers' => 'Consentire alle persone di iscriversi alle notifiche email?', + ], + 'analytics' => [ 'analytics_google' => 'Codice Google Analytics', 'analytics_gosquared' => 'Codice GoSquared Analytics', 'analytics_piwik_url' => 'URL della tua istanza Piwik (senza http(s)://)', 'analytics_piwik_siteid' => 'ID sito Piwik', - 'subscribers' => 'Consentire alle persone di iscriversi alle notifiche email?', + ], + 'localization' => [ + 'site-timezone' => 'Fuso orario del sito', + 'site-locale' => 'Lingua del sito', + 'date-format' => 'Formato Data', + 'incident-date-format' => 'Formato Timestamp dell\'incidente', ], 'security' => [ 'allowed-domains' => 'Domini consentiti', diff --git a/resources/lang/ko/dashboard.php b/resources/lang/ko/dashboard.php index db49ed56..ab30e87e 100755 --- a/resources/lang/ko/dashboard.php +++ b/resources/lang/ko/dashboard.php @@ -142,6 +142,12 @@ return [ 'images-only' => '이미지만 업로드 할 수 있습니다.', 'too-big' => '업로드 한 파일이 너무 큽니다. :size 보다 작은 이미지를 올려주세요.', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => '보안', 'two-factor' => '2단계 인증을 사용하지 않는 사용자', diff --git a/resources/lang/ko/forms.php b/resources/lang/ko/forms.php index e1bc6673..6a2be89c 100755 --- a/resources/lang/ko/forms.php +++ b/resources/lang/ko/forms.php @@ -92,20 +92,24 @@ return [ 'app-setup' => [ 'site-name' => '사이트 이름', 'site-url' => '사이트 URL', - 'site-timezone' => '사이트 시간대', - 'site-locale' => '사이트 언어', - 'date-format' => '날짜 형식', - 'incident-date-format' => '문제 Timestamp 형식', 'display-graphs' => '상태 페이지에 그래프 보이기', 'about-this-page' => '이 페이지에 대하여', 'days-of-incidents' => '몇 일 동안 사건을 표시하시겠습니까?', 'banner' => '배너 이미지', 'banner-help' => '가로가 930 픽셀보다 작은 이미지를 업로드 하는 것을 권장합니다.', + 'subscribers' => '이메일 알림을 받기 위한 회원가입 허용', + ], + 'analytics' => [ 'analytics_google' => 'Google Analytics 코드', 'analytics_gosquared' => 'GoSquared Analytics 코드', 'analytics_piwik_url' => 'Piwik 인스턴스의 URL ( "http(s)://" 제외 )', 'analytics_piwik_siteid' => 'Piwik 사이트 id', - 'subscribers' => '이메일 알림을 받기 위한 회원가입 허용', + ], + 'localization' => [ + 'site-timezone' => '사이트 시간대', + 'site-locale' => '사이트 언어', + 'date-format' => '날짜 형식', + 'incident-date-format' => '문제 Timestamp 형식', ], 'security' => [ 'allowed-domains' => '허용된 도메인', diff --git a/resources/lang/nl/dashboard.php b/resources/lang/nl/dashboard.php index 68410e8c..59ca271b 100755 --- a/resources/lang/nl/dashboard.php +++ b/resources/lang/nl/dashboard.php @@ -163,6 +163,12 @@ return [ 'images-only' => 'Alleen afbeeldingen kunnen worden geüpload.', 'too-big' => 'Het bestand dat u heeft geüpload is te groot. Upload een afbeelding kleiner dan :size', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'Beveiliging', 'two-factor' => 'Gebruikers zonder authenticatie in twee stappen', diff --git a/resources/lang/nl/forms.php b/resources/lang/nl/forms.php index 4ca2640b..f39a9ad2 100755 --- a/resources/lang/nl/forms.php +++ b/resources/lang/nl/forms.php @@ -92,20 +92,24 @@ return [ 'app-setup' => [ 'site-name' => 'Site Naam', 'site-url' => 'Site URL', - 'site-timezone' => 'Site tijdzone', - 'site-locale' => 'Taal van de site', - 'date-format' => 'Datum formaat', - 'incident-date-format' => 'Incident Tijdsaanduiding Formaat', 'display-graphs' => 'Grafieken tonen op statuspagina?', 'about-this-page' => 'Over deze pagina', 'days-of-incidents' => 'Hoeveel dagen moeten incidenten getoond worden?', 'banner' => 'Banner afbeelding', 'banner-help' => 'Het wordt aanbevolen dat u geen bestanden upload die breeder zijn dan 930px.', + 'subscribers' => 'Bezoekers toestaan om te abonneren op e-mail notificaties?', + ], + 'analytics' => [ 'analytics_google' => 'Google Analytics-code', 'analytics_gosquared' => 'GoSquared Analytics-code', 'analytics_piwik_url' => 'URL van uw Piwik exemplaar (zonder http(s)://)', 'analytics_piwik_siteid' => 'Site-id van Piwik', - 'subscribers' => 'Bezoekers toestaan om te abonneren op e-mail notificaties?', + ], + 'localization' => [ + 'site-timezone' => 'Site tijdzone', + 'site-locale' => 'Taal van de site', + 'date-format' => 'Datum formaat', + 'incident-date-format' => 'Incident Tijdsaanduiding Formaat', ], 'security' => [ 'allowed-domains' => 'Toegestane domeinen', diff --git a/resources/lang/pl/dashboard.php b/resources/lang/pl/dashboard.php index 168fca61..d74fb150 100755 --- a/resources/lang/pl/dashboard.php +++ b/resources/lang/pl/dashboard.php @@ -142,6 +142,12 @@ return [ 'images-only' => 'Można wgrywać tylko pliki graficzne.', 'too-big' => 'Wgrany plik jest zbyt duży. Wgraj plik mnijeszy niż :size', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'Bezpieczeństwo', 'two-factor' => 'Użytkownicy bez autentykacji dwuetapowej', diff --git a/resources/lang/pl/forms.php b/resources/lang/pl/forms.php index 537be3c8..42e46fa8 100755 --- a/resources/lang/pl/forms.php +++ b/resources/lang/pl/forms.php @@ -86,19 +86,24 @@ return [ 'app-setup' => [ 'site-name' => 'Nazwa strony', 'site-url' => 'Adres URL strony', - 'site-timezone' => 'Strefa czasowa', - 'site-locale' => 'Język', - 'date-format' => 'Format daty', 'display-graphs' => 'Wyświetlać wykresy na panelu głównym?', 'about-this-page' => 'O tej stronie', 'days-of-incidents' => 'Ile dni incydentów pokazywać?', 'banner' => 'Obrazek z logo', 'banner-help' => 'Zaleca się wrzuać pliki nie szersze niż 930px.', + ], + 'analytics' => [ 'analytics_google' => 'Google Analytics code', 'analytics_gosquared' => 'GoSquared Analytics code', 'analytics_piwik_url' => 'URL of your Piwik instance (without http(s)://)', 'analytics_piwik_siteid' => 'Piwik\'s site id', ], + 'localization' => [ + 'site-timezone' => 'Strefa czasowa', + 'site-locale' => 'Język', + 'date-format' => 'Format daty', + 'incident-date-format' => 'Incident Timestamp Format', + ], 'security' => [ 'allowed-domains' => 'Dozwolone domenyw', 'allowed-domains-help' => 'Oddzielone przecinkiem. Domena ustawiona powyżej jest dozwolona domyślnie.', diff --git a/resources/lang/pt-BR/dashboard.php b/resources/lang/pt-BR/dashboard.php index 90470394..2906bddd 100755 --- a/resources/lang/pt-BR/dashboard.php +++ b/resources/lang/pt-BR/dashboard.php @@ -163,6 +163,12 @@ return [ 'images-only' => 'Somente imagens podem ser carregadas.', 'too-big' => 'O arquivo que você carregou é muito grande. Envie uma imagem inferior à :size', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'Segurança', ], diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php index d210d8e9..bb8a2734 100755 --- a/resources/lang/pt-BR/forms.php +++ b/resources/lang/pt-BR/forms.php @@ -93,20 +93,24 @@ return [ 'app-setup' => [ 'site-name' => 'Nome do site', 'site-url' => 'URL do site', - 'site-timezone' => 'Fuso horário do site', - 'site-locale' => 'Idioma do site', - 'date-format' => 'Formato da Data', - 'incident-date-format' => 'Formato da data para incidentes', 'display-graphs' => 'Exibir gráficos na página de status?', 'about-this-page' => 'Sobre esta página', 'days-of-incidents' => 'Exibir quantos dias de incidentes?', 'banner' => 'Imagem do banner', 'banner-help' => 'É recomendável que você faça upload de arquivos menores que 930px.', + 'subscribers' => 'Permitir assinaturas de notificações por email?', + ], + 'analytics' => [ 'analytics_google' => 'Código do Google Ananlytics', 'analytics_gosquared' => 'Código do GoSquared Analytics', 'analytics_piwik_url' => 'URL do Piwik (sem http(s)://)', 'analytics_piwik_siteid' => 'ID do Piwik', - 'subscribers' => 'Permitir assinaturas de notificações por email?', + ], + 'localization' => [ + 'site-timezone' => 'Fuso horário do site', + 'site-locale' => 'Idioma do site', + 'date-format' => 'Formato da Data', + 'incident-date-format' => 'Formato da data para incidentes', ], 'security' => [ 'allowed-domains' => 'Domínios permitidos', diff --git a/resources/lang/ru/dashboard.php b/resources/lang/ru/dashboard.php index dbf063e4..4b83868c 100644 --- a/resources/lang/ru/dashboard.php +++ b/resources/lang/ru/dashboard.php @@ -142,6 +142,12 @@ return [ 'images-only' => 'Могут быть загружены только изображения.', 'too-big' => 'Загруженный вами файл слишком большой. Загрузите картинку меньше чем :size', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => 'Безопасность', 'two-factor' => 'Пользователи без двухфакторной аутентификации', diff --git a/resources/lang/ru/forms.php b/resources/lang/ru/forms.php index dda60ff5..2931826c 100644 --- a/resources/lang/ru/forms.php +++ b/resources/lang/ru/forms.php @@ -92,20 +92,24 @@ return [ 'app-setup' => [ 'site-name' => 'Название сайта', 'site-url' => 'URL сайта', - 'site-timezone' => 'Часовой пояс сайта', - 'site-locale' => 'Язык сайта', - 'date-format' => 'Формат даты', - 'incident-date-format' => 'Формат даты и времени инцидента', 'display-graphs' => 'Отображать графики на статусной странице?', 'about-this-page' => 'Об этой странице', 'days-of-incidents' => 'Сколько дней показывать инциденты?', 'banner' => 'Картинка-баннер', 'banner-help' => 'Рекомендуется загружать картинки не больше 930 пикс. в ширину.', + 'subscribers' => 'Разрешить посетителям подписываться на email-уведомления?', + ], + 'analytics' => [ 'analytics_google' => 'Код Google Analytics', 'analytics_gosquared' => 'Код GoSquared Analytics', 'analytics_piwik_url' => 'URL установки Piwik (без http(s)://)', 'analytics_piwik_siteid' => 'Идентификатор сайта в Piwik', - 'subscribers' => 'Разрешить посетителям подписываться на email-уведомления?', + ], + 'localization' => [ + 'site-timezone' => 'Часовой пояс сайта', + 'site-locale' => 'Язык сайта', + 'date-format' => 'Формат даты', + 'incident-date-format' => 'Формат даты и времени инцидента', ], 'security' => [ 'allowed-domains' => 'Разрешенные домены', diff --git a/resources/lang/zh-CN/dashboard.php b/resources/lang/zh-CN/dashboard.php index c0e37f52..2e4f76fc 100755 --- a/resources/lang/zh-CN/dashboard.php +++ b/resources/lang/zh-CN/dashboard.php @@ -142,6 +142,12 @@ return [ 'images-only' => '只能上传图像。', 'too-big' => '你上传的文件太大了。上传的图像大小应小于:size', ], + 'analytics' => [ + 'analytics' => 'Analytics', + ], + 'localization' => [ + 'localization' => 'Localization', + ], 'security' => [ 'security' => '安全', 'two-factor' => '没有启用双因素身份验证的用户', diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php index 90c11dc4..58aad318 100755 --- a/resources/lang/zh-CN/forms.php +++ b/resources/lang/zh-CN/forms.php @@ -92,20 +92,24 @@ return [ 'app-setup' => [ 'site-name' => '站点名称', 'site-url' => '站点URL', - 'site-timezone' => '站点时区', - 'site-locale' => '站点语言', - 'date-format' => '日期格式', - 'incident-date-format' => '事件的时间戳格式', 'display-graphs' => '是否在状态页上显示图表', 'about-this-page' => '关于这个页面', 'days-of-incidents' => '显示多少天的事件？', 'banner' => '横幅图像', 'banner-help' => '建议上传文件宽度不大于930像素。', + 'subscribers' => '允许用户订阅邮件通知吗?', + ], + 'analytics' => [ 'analytics_google' => 'Google Analytics 代码', 'analytics_gosquared' => 'GoSquared Analytics 代码', 'analytics_piwik_url' => '输入Piwik实例的URL(不含http(s)://)', 'analytics_piwik_siteid' => 'Piwik 的站点 id', - 'subscribers' => '允许用户订阅邮件通知吗?', + ], + 'localization' => [ + 'site-timezone' => '站点时区', + 'site-locale' => '站点语言', + 'date-format' => '日期格式', + 'incident-date-format' => '事件的时间戳格式', ], 'security' => [ 'allowed-domains' => '允许的域', diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php index 00f4ef45..a06ded8a 100644 --- a/resources/views/dashboard/incidents/add.blade.php +++ b/resources/views/dashboard/incidents/add.blade.php @@ -104,14 +104,14 @@
- + {{ trans('forms.optional') }} - {{ trans('forms.optional') }}
-
- - - {{ trans('forms.optional') }} +
+
diff --git a/resources/views/dashboard/incidents/edit.blade.php b/resources/views/dashboard/incidents/edit.blade.php index ae458f46..d76236ad 100644 --- a/resources/views/dashboard/incidents/edit.blade.php +++ b/resources/views/dashboard/incidents/edit.blade.php @@ -77,9 +77,8 @@
- + {{ trans('forms.optional') }} - {{ trans('forms.optional') }}
diff --git a/resources/views/dashboard/metrics/add.blade.php b/resources/views/dashboard/metrics/add.blade.php index 7ff9d76a..a85793ff 100644 --- a/resources/views/dashboard/metrics/add.blade.php +++ b/resources/views/dashboard/metrics/add.blade.php @@ -46,10 +46,12 @@ -
- - - +
+
diff --git a/resources/views/dashboard/metrics/edit.blade.php b/resources/views/dashboard/metrics/edit.blade.php index 7fd624b4..05c66745 100644 --- a/resources/views/dashboard/metrics/edit.blade.php +++ b/resources/views/dashboard/metrics/edit.blade.php @@ -46,10 +46,12 @@
-
- - - display_chart ? 'checked' : null }}> +
+
diff --git a/resources/views/dashboard/schedule/add.blade.php b/resources/views/dashboard/schedule/add.blade.php index 9dbefc05..8259afaa 100644 --- a/resources/views/dashboard/schedule/add.blade.php +++ b/resources/views/dashboard/schedule/add.blade.php @@ -43,10 +43,11 @@
-
- - - {{ trans('forms.optional') }} +
+
diff --git a/resources/views/dashboard/settings/analytics.blade.php b/resources/views/dashboard/settings/analytics.blade.php new file mode 100644 index 00000000..72f2845c --- /dev/null +++ b/resources/views/dashboard/settings/analytics.blade.php @@ -0,0 +1,66 @@ +@extends('layout.dashboard') + +@section('content') +
+ @if(isset($sub_menu)) + @include('dashboard.partials.sub-sidebar') + @endif +
+
+ + {{ trans('dashboard.settings.analytics.analytics') }} + +
+
+
+
+ + @include('dashboard.partials.errors') +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+@stop diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php index 414bd320..7a77bcb6 100644 --- a/resources/views/dashboard/settings/app-setup.blade.php +++ b/resources/views/dashboard/settings/app-setup.blade.php @@ -43,94 +43,6 @@
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
@@ -141,28 +53,34 @@
-
- - - +
+
-
- - - +
+
-
- - - +
+
diff --git a/resources/views/dashboard/settings/localization.blade.php b/resources/views/dashboard/settings/localization.blade.php new file mode 100644 index 00000000..a88b64fd --- /dev/null +++ b/resources/views/dashboard/settings/localization.blade.php @@ -0,0 +1,91 @@ +@extends('layout.dashboard') + +@section('content') +
+ @if(isset($sub_menu)) + @include('dashboard.partials.sub-sidebar') + @endif +
+
+ + {{ trans('dashboard.settings.localization.localization') }} + +
+
+
+
+ + @include('dashboard.partials.errors') +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+
+@stop diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php index d10ea484..343ff268 100644 --- a/resources/views/dashboard/settings/theme.blade.php +++ b/resources/views/dashboard/settings/theme.blade.php @@ -91,9 +91,11 @@
-
- - +
+