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

Merge pull request #1049 from mmollick/fullwidth_header

Browse Source 
Fullwidth header
This commit is contained in:
James Brooks
2015-10-22 17:12:26 +01:00
parent 974fd5015d 1271470da3
commit ffa6a8f3d6
22 changed files with 213 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/lang/da/forms.php
+14 -11
View File
@@ -120,17 +120,20 @@ return [
'custom-css' => 'Tilpasset stylesheet',
],
'theme' => [
'background-color' => 'Baggrundsfarve',
'background-fills' => 'Baggrundsfyld (Komponenter, hændelser og footer)',
'text-color' => 'Tekstfarve',
'dashboard-login' => 'Vis oversigtsside ikon i bunden af siden?',
'reds' => 'Rød (Brugt til fejl)',
'blues' => 'Blå (Brugt til information)',
'greens' => 'Grøn (Brugt til success)',
'yellows' => 'Gul (Brugt til advarsler)',
'oranges' => 'Orange (Brugt til noter)',
'metrics' => 'Graffyld',
'links' => 'Links',
'background-color' => 'Baggrundsfarve',
'background-fills' => 'Baggrundsfyld (Komponenter, hændelser og footer)',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
'text-color' => 'Tekstfarve',
'dashboard-login' => 'Vis oversigtsside ikon i bunden af siden?',
'reds' => 'Rød (Brugt til fejl)',
'blues' => 'Blå (Brugt til information)',
'greens' => 'Grøn (Brugt til success)',
'yellows' => 'Gul (Brugt til advarsler)',
'oranges' => 'Orange (Brugt til noter)',
'metrics' => 'Graffyld',
'links' => 'Links',
],
],
resources/lang/de/forms.php
+5 -2
View File
@@ -119,8 +119,11 @@ return [
'custom-css' => 'Benutzerdefiniertes Stylesheet',
],
'theme' => [
'background-color' => 'Hintergrundfarbe',
'text-color' => 'Schriftfarbe',
'background-color' => 'Hintergrundfarbe',
'text-color' => 'Schriftfarbe',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
],
],
resources/lang/en-UD/forms.php
+5 -2
View File
@@ -119,8 +119,11 @@ return [
'custom-css' => 'crwdns409:0crwdne409:0',
],
'theme' => [
'background-color' => 'crwdns410:0crwdne410:0',
'text-color' => 'crwdns411:0crwdne411:0',
'background-color' => 'crwdns410:0crwdne410:0',
'text-color' => 'crwdns411:0crwdne411:0',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
],
],
resources/lang/en/forms.php
+14 -11
View File
@@ -120,17 +120,20 @@ return [
'custom-css' => 'Custom Stylesheet',
],
'theme' => [
'background-color' => 'Background Color',
'background-fills' => 'Background Fills (Components, Incidents, Footer)',
'text-color' => 'Text Color',
'dashboard-login' => 'Show dashboard button in the footer?',
'reds' => 'Red (Used for errors)',
'blues' => 'Blue (Used for information)',
'greens' => 'Green (Used for success)',
'yellows' => 'Yellow (Used for alerts)',
'oranges' => 'Orange (Used for notices)',
'metrics' => 'Metrics Fill',
'links' => 'Links',
'background-color' => 'Background Color',
'background-fills' => 'Background Fills (Components, Incidents, Footer)',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
'text-color' => 'Text Color',
'dashboard-login' => 'Show dashboard button in the footer?',
'reds' => 'Red (Used for errors)',
'blues' => 'Blue (Used for information)',
'greens' => 'Green (Used for success)',
'yellows' => 'Yellow (Used for alerts)',
'oranges' => 'Orange (Used for notices)',
'metrics' => 'Metrics Fill',
'links' => 'Links',
],
],
resources/lang/es/forms.php
+6 -3
View File
@@ -110,9 +110,12 @@ return [
'custom-css' => 'Hoja de estilo personalizada',
],
'theme' => [
'background-color' => 'Color de fondo',
'text-color' => 'Color de Texto',
'dashboard-login' => '¿Mostrar botón del panel en el pie?',
'background-color' => 'Color de fondo',
'text-color' => 'Color de Texto',
'dashboard-login' => '¿Mostrar botón del panel en el pie?',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
],
],
resources/lang/fr/forms.php
+5 -2
View File
@@ -119,8 +119,11 @@ return [
'custom-css' => 'Feuille de style personnalisée',
],
'theme' => [
'background-color' => 'Couleur de fond',
'text-color' => 'Couleur Texte',
'background-color' => 'Couleur de fond',
'text-color' => 'Couleur Texte',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
],
],
resources/lang/id/forms.php
+5 -2
View File
@@ -119,8 +119,11 @@ return [
'custom-css' => 'Stylesheet Kustom',
],
'theme' => [
'background-color' => 'Warna Latar',
'text-color' => 'Warna Teks',
'background-color' => 'Warna Latar',
'text-color' => 'Warna Teks',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
],
],
resources/lang/it/forms.php
+6 -3
View File
@@ -119,9 +119,12 @@ return [
'custom-css' => 'Foglio di stile personalizzato',
],
'theme' => [
'background-color' => 'Colore di sfondo',
'text-color' => 'Colore del testo',
'dashboard-login' => 'Visualizzare il pulsante Dashboard nel footer?',
'background-color' => 'Colore di sfondo',
'text-color' => 'Colore del testo',
'dashboard-login' => 'Visualizzare il pulsante Dashboard nel footer?',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
],
],
resources/lang/ko/forms.php
+6 -3
View File
@@ -119,9 +119,12 @@ return [
'custom-css' => '사용자 정의 스타일시트',
],
'theme' => [
'background-color' => '배경색',
'text-color' => '글자색',
'dashboard-login' => 'Show dashboard button in the footer?',
'background-color' => '배경색',
'text-color' => '글자색',
'dashboard-login' => 'Show dashboard button in the footer?',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
],
],
resources/lang/nl/forms.php
+5 -2
View File
@@ -119,8 +119,11 @@ return [
'custom-css' => 'Custom Stylesheet',
],
'theme' => [
'background-color' => 'Achtergrondkleur',
'text-color' => 'Tekstkleur',
'background-color' => 'Achtergrondkleur',
'text-color' => 'Tekstkleur',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
],
],
resources/lang/pl/forms.php
+6 -3
View File
@@ -112,9 +112,12 @@ return [
'custom-css' => 'Własny Stylesheet',
],
'theme' => [
'background-color' => 'Kolor tła',
'text-color' => 'Kolor tekstu',
'dashboard-login' => 'Show dashboard button in the footer?',
'background-color' => 'Kolor tła',
'text-color' => 'Kolor tekstu',
'dashboard-login' => 'Show dashboard button in the footer?',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
],
],
resources/lang/pt-BR/forms.php
+14 -11
View File
@@ -120,17 +120,20 @@ return [
'custom-css' => 'Folha de estilos personalizada',
],
'theme' => [
'background-color' => 'Cor de fundo',
'background-fills' => 'Preenchimento do fundo (Componentes, Incidentes, Rodapé)',
'text-color' => 'Cor do texto',
'dashboard-login' => 'Exibir o botão do dashboard no rodapé?',
'reds' => 'Vermelho (Utilizado para erros)',
'blues' => 'Azul (utilizado para informações)',
'greens' => 'Verde (Utilizado para sucesso)',
'yellows' => 'Amarelo (Utilizado para alertas)',
'oranges' => 'Larange (Utilizado para notícias)',
'metrics' => 'Métricas',
'links' => 'Links',
'background-color' => 'Cor de fundo',
'background-fills' => 'Preenchimento do fundo (Componentes, Incidentes, Rodapé)',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
'text-color' => 'Cor do texto',
'dashboard-login' => 'Exibir o botão do dashboard no rodapé?',
'reds' => 'Vermelho (Utilizado para erros)',
'blues' => 'Azul (utilizado para informações)',
'greens' => 'Verde (Utilizado para sucesso)',
'yellows' => 'Amarelo (Utilizado para alertas)',
'oranges' => 'Larange (Utilizado para notícias)',
'metrics' => 'Métricas',
'links' => 'Links',
],
],
resources/lang/ru/forms.php
+6 -3
View File
@@ -119,9 +119,12 @@ return [
'custom-css' => 'Пользовательские таблицы стилей',
],
'theme' => [
'background-color' => 'Цвет фона',
'text-color' => 'Цвет текста',
'dashboard-login' => 'Show dashboard button in the footer?',
'background-color' => 'Цвет фона',
'text-color' => 'Цвет текста',
'dashboard-login' => 'Show dashboard button in the footer?',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
],
],
resources/lang/zh-CN/forms.php
+6 -3
View File
@@ -119,9 +119,12 @@ return [
'custom-css' => '自定义样式表',
],
'theme' => [
'background-color' => '背景色',
'text-color' => '文字颜色',
'dashboard-login' => 'Show dashboard button in the footer?',
'background-color' => '背景色',
'text-color' => '文字颜色',
'dashboard-login' => 'Show dashboard button in the footer?',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
],
],
resources/views/dashboard/settings/theme.blade.php
+24
View File
@@ -32,6 +32,30 @@
</div>
</div>
<hr>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.banner-background-color') }}</label>
<input type="text" class="form-control color-code" name="style.banner_background_color" value="{{ $theme_banner_background_color }}">
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.banner-padding') }}</label>
<input type="text" class="form-control" name="style.banner_padding" value="{{ $theme_banner_padding }}">
</div>
</div>
<div class="col-xs-12">
<div class="checkbox">
<label>
<input type="hidden" value="0" name="style.fullwidth_header">
<input type="checkbox" value="1" name="style.fullwidth_header" {{ Setting::get('style_fullwidth_header') ? 'checked' : null }}>
{{ trans('forms.settings.theme.fullwidth-banner') }}
</label>
</div>
</div>
</div>
<hr>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
resources/views/layout/master.blade.php
+3
View File
@@ -57,6 +57,9 @@
<script src="{{ elixir('dist/js/all.js') }}"></script>
</head>
<body class="status-page">
@include('partials.banner')
<div class="container">
@yield('content')
</div>
resources/views/partials/about-app.blade.php
+1 -13
View File
@@ -1,19 +1,7 @@
@if($bannerImage = Setting::get('app_banner'))
<div class="row app-banner">
<div class="col-md-12 text-center">
<?php $bannerType = Setting::get('app_banner_type') ?>
@if($app_url = Setting::get('app_domain'))
<a href="{{ $app_url }}" class="links"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
@else
<img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
@endif
</div>
</div>
@endif
@if($about_app)
<div class="about-app">
<h1>{{ trans('cachet.about_this_site') }}</h1>
<p>{!! $about_app !!}</p>
</div>
@endif
resources/views/partials/banner.blade.php
+16
View File
@@ -0,0 +1,16 @@
@if($bannerImage = Setting::get('app_banner'))
<div @if(Setting::get('style_fullwidth_header'))class="app-banner"@endif>
<div class="container">
<div class="row app-banner-padding @if(!Setting::get('style_fullwidth_header')) app-banner @endif">
<div class="col-md-12 text-center">
<?php $bannerType = Setting::get('app_banner_type') ?>
@if($app_url = Setting::get('app_domain'))
<a href="{{ $app_url }}" class="links"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
@else
<img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
@endif
</div>
</div>
</div>
</div>
@endif
resources/views/partials/stylesheet.blade.php
+14
View File
@@ -2,6 +2,9 @@
body.status-page {
background-color: {{ $theme_background_color }};
color: {{ $theme_text_color }};
@if(Setting::get('app_banner'))
padding-top: 0;
@endif
}
.reds { color: {{ $theme_reds }} !important; }
.blues { color: {{ $theme_blues }} !important; }
@@ -11,6 +14,17 @@ body.status-page {
.metrics { color: {{ $theme_metrics }} !important; }
.links { color: {{ $theme_links }} !important; }
/**
* Banner background
*/
.app-banner {
background-color: {{ $theme_banner_background_color }} !important;
}
.app-banner-padding {
padding: {{ $theme_banner_padding }} !important;
}
/**
* Alert overrides.
*/