From f1c613249a15a06cbc463baa7c9a7b9aed5080bf Mon Sep 17 00:00:00 2001 From: Michael Mollick Date: Tue, 20 Oct 2015 23:52:48 -0400 Subject: [PATCH 1/6] Support for full width header added --- app/Composers/ThemeComposer.php | 2 ++ .../views/dashboard/settings/theme.blade.php | 27 +++++++++++++++++++ resources/views/index.blade.php | 5 ++++ resources/views/layout/master.blade.php | 5 ++++ resources/views/partials/about-app.blade.php | 1 + resources/views/partials/stylesheet.blade.php | 11 ++++++++ 6 files changed, 51 insertions(+) diff --git a/app/Composers/ThemeComposer.php b/app/Composers/ThemeComposer.php index 98074023..83fd95c8 100644 --- a/app/Composers/ThemeComposer.php +++ b/app/Composers/ThemeComposer.php @@ -28,6 +28,8 @@ class ThemeComposer // Theme colors. $view->withThemeBackgroundColor(Setting::get('style_background_color', '#F0F3F4')); $view->withThemeBackgroundFills(Setting::get('style_background_fills', '#FFFFFF')); + $view->withThemeBannerBackgroundColor(Setting::get('style_banner_background_color', '')); + $view->withThemeBannerPadding(Setting::get('style_banner_padding', '40px 0 0 0')); $view->withThemeTextColor(Setting::get('style_text_color', '#333333')); $view->withThemeReds(Setting::get('style_reds', '#ff6f6f')); $view->withThemeBlues(Setting::get('style_blues', '#3498db')); diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php index d10ea484..a4c5d870 100644 --- a/resources/views/dashboard/settings/theme.blade.php +++ b/resources/views/dashboard/settings/theme.blade.php @@ -32,6 +32,33 @@
+
+
+
+ {{----}} + + +
+
+
+
+ {{----}} + + +
+
+
+
+ +
+
+
+
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index b3fca4ba..55e026e8 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -7,6 +7,11 @@ @include('partials.about-app') +@if(Setting::get('style_fullwidth_header')) +
+
+@endif +
{{ $systemMessage }}
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index e5a03ecc..2682ab28 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -57,7 +57,12 @@ + @if(Setting::get('style_fullwidth_header')) +
+ @else
+ @endif + @yield('content')
diff --git a/resources/views/partials/about-app.blade.php b/resources/views/partials/about-app.blade.php index 48aaa011..3e83865c 100644 --- a/resources/views/partials/about-app.blade.php +++ b/resources/views/partials/about-app.blade.php @@ -17,3 +17,4 @@

{!! $about_app !!}

@endif + diff --git a/resources/views/partials/stylesheet.blade.php b/resources/views/partials/stylesheet.blade.php index cafc4122..a979947c 100644 --- a/resources/views/partials/stylesheet.blade.php +++ b/resources/views/partials/stylesheet.blade.php @@ -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,14 @@ body.status-page { .metrics { color: {{ $theme_metrics }} !important; } .links { color: {{ $theme_links }} !important; } +/** + * Banner background + */ +.app-banner { + background-color: {{ $theme_banner_background_color }} !important; + padding: {{ $theme_banner_padding }} !important; +} + /** * Alert overrides. */ From efee85685bc2b391017a31be0e23e6a1b765d5e3 Mon Sep 17 00:00:00 2001 From: Michael Mollick Date: Wed, 21 Oct 2015 00:02:27 -0400 Subject: [PATCH 2/6] Updated language files with new theme fields --- resources/lang/da/forms.php | 3 +++ resources/lang/de/forms.php | 3 +++ resources/lang/en-UD/forms.php | 3 +++ resources/lang/en/forms.php | 3 +++ resources/lang/es/forms.php | 3 +++ resources/lang/fr/forms.php | 3 +++ resources/lang/id/forms.php | 3 +++ resources/lang/it/forms.php | 3 +++ resources/lang/ko/forms.php | 3 +++ resources/lang/nl/forms.php | 3 +++ resources/lang/pl/forms.php | 3 +++ resources/lang/pt-BR/forms.php | 25 +++++++++++-------- resources/lang/ru/forms.php | 3 +++ resources/lang/zh-CN/forms.php | 3 +++ .../views/dashboard/settings/theme.blade.php | 9 +++---- 15 files changed, 56 insertions(+), 17 deletions(-) diff --git a/resources/lang/da/forms.php b/resources/lang/da/forms.php index 3d771915..708cc8b7 100755 --- a/resources/lang/da/forms.php +++ b/resources/lang/da/forms.php @@ -118,6 +118,9 @@ return [ 'theme' => [ '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)', diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php index 4b34626b..5971eaef 100755 --- a/resources/lang/de/forms.php +++ b/resources/lang/de/forms.php @@ -117,6 +117,9 @@ return [ 'theme' => [ 'background-color' => 'Hintergrundfarbe', 'text-color' => 'Schriftfarbe', + 'banner-background-color' => 'Banner Background Color', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php index aa21e02a..d85b30f1 100755 --- a/resources/lang/en-UD/forms.php +++ b/resources/lang/en-UD/forms.php @@ -117,6 +117,9 @@ return [ 'theme' => [ '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?', ], ], diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index bd006f5b..87fe7fc0 100755 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -118,6 +118,9 @@ return [ 'theme' => [ '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)', diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php index 70652c20..eaf0d410 100755 --- a/resources/lang/es/forms.php +++ b/resources/lang/es/forms.php @@ -108,6 +108,9 @@ return [ '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?', ], ], diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php index 5cecb0d6..cba21f32 100755 --- a/resources/lang/fr/forms.php +++ b/resources/lang/fr/forms.php @@ -117,6 +117,9 @@ return [ 'theme' => [ 'background-color' => 'Couleur de fond', 'text-color' => 'Couleur Texte', + 'banner-background-color' => 'Banner Background Color', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/id/forms.php b/resources/lang/id/forms.php index a4c3d93c..0f9e19ef 100755 --- a/resources/lang/id/forms.php +++ b/resources/lang/id/forms.php @@ -117,6 +117,9 @@ return [ 'theme' => [ 'background-color' => 'Warna Latar', 'text-color' => 'Warna Teks', + 'banner-background-color' => 'Banner Background Color', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/it/forms.php b/resources/lang/it/forms.php index d2c1ed0d..d3105750 100644 --- a/resources/lang/it/forms.php +++ b/resources/lang/it/forms.php @@ -118,6 +118,9 @@ return [ '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?', ], ], diff --git a/resources/lang/ko/forms.php b/resources/lang/ko/forms.php index e1bc6673..58eaf5e8 100755 --- a/resources/lang/ko/forms.php +++ b/resources/lang/ko/forms.php @@ -118,6 +118,9 @@ return [ '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?', ], ], diff --git a/resources/lang/nl/forms.php b/resources/lang/nl/forms.php index 4ca2640b..f137f90f 100755 --- a/resources/lang/nl/forms.php +++ b/resources/lang/nl/forms.php @@ -117,6 +117,9 @@ return [ 'theme' => [ 'background-color' => 'Achtergrondkleur', 'text-color' => 'Tekstkleur', + 'banner-background-color' => 'Banner Background Color', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/pl/forms.php b/resources/lang/pl/forms.php index 537be3c8..1e91e841 100755 --- a/resources/lang/pl/forms.php +++ b/resources/lang/pl/forms.php @@ -110,6 +110,9 @@ return [ '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?', ], ], diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php index d210d8e9..37cb8d33 100755 --- a/resources/lang/pt-BR/forms.php +++ b/resources/lang/pt-BR/forms.php @@ -116,17 +116,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', ], ], diff --git a/resources/lang/ru/forms.php b/resources/lang/ru/forms.php index dda60ff5..8b0ec634 100644 --- a/resources/lang/ru/forms.php +++ b/resources/lang/ru/forms.php @@ -118,6 +118,9 @@ return [ '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?', ], ], diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php index 90c11dc4..b763cb54 100755 --- a/resources/lang/zh-CN/forms.php +++ b/resources/lang/zh-CN/forms.php @@ -118,6 +118,9 @@ return [ '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?', ], ], diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php index a4c5d870..f5eb653c 100644 --- a/resources/views/dashboard/settings/theme.blade.php +++ b/resources/views/dashboard/settings/theme.blade.php @@ -35,15 +35,13 @@
- {{----}} - +
- {{----}} - +
@@ -52,8 +50,7 @@
From 77245c3b71ed3a2e159a7838a4969091a9ed443e Mon Sep 17 00:00:00 2001 From: Michael Mollick Date: Wed, 21 Oct 2015 00:14:18 -0400 Subject: [PATCH 3/6] Fixing checkbox to toggle fullwidth banner --- resources/views/dashboard/settings/theme.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php index f5eb653c..23e9e42b 100644 --- a/resources/views/dashboard/settings/theme.blade.php +++ b/resources/views/dashboard/settings/theme.blade.php @@ -48,7 +48,7 @@
From bd6b9fcabf857d98d696c5b08583005ea8da24d5 Mon Sep 17 00:00:00 2001 From: Michael Mollick Date: Wed, 21 Oct 2015 00:16:46 -0400 Subject: [PATCH 4/6] Applied StyleCI patch --- resources/lang/da/forms.php | 26 +++++++++++++------------- resources/lang/de/forms.php | 8 ++++---- resources/lang/en-UD/forms.php | 8 ++++---- resources/lang/en/forms.php | 26 +++++++++++++------------- resources/lang/es/forms.php | 10 +++++----- resources/lang/fr/forms.php | 8 ++++---- resources/lang/id/forms.php | 8 ++++---- resources/lang/it/forms.php | 10 +++++----- resources/lang/ko/forms.php | 10 +++++----- resources/lang/nl/forms.php | 8 ++++---- resources/lang/pl/forms.php | 10 +++++----- resources/lang/pt-BR/forms.php | 26 +++++++++++++------------- resources/lang/ru/forms.php | 10 +++++----- resources/lang/zh-CN/forms.php | 10 +++++----- 14 files changed, 89 insertions(+), 89 deletions(-) diff --git a/resources/lang/da/forms.php b/resources/lang/da/forms.php index 708cc8b7..df9ad3da 100755 --- a/resources/lang/da/forms.php +++ b/resources/lang/da/forms.php @@ -116,20 +116,20 @@ return [ 'custom-css' => 'Tilpasset stylesheet', ], 'theme' => [ - 'background-color' => 'Baggrundsfarve', - 'background-fills' => 'Baggrundsfyld (Komponenter, hændelser og footer)', + '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', + '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', ], ], diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php index 5971eaef..7193cdfd 100755 --- a/resources/lang/de/forms.php +++ b/resources/lang/de/forms.php @@ -115,11 +115,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?', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php index d85b30f1..d59372b7 100755 --- a/resources/lang/en-UD/forms.php +++ b/resources/lang/en-UD/forms.php @@ -115,11 +115,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?', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index 87fe7fc0..b4d8c6f2 100755 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -116,20 +116,20 @@ return [ 'custom-css' => 'Custom Stylesheet', ], 'theme' => [ - 'background-color' => 'Background Color', - 'background-fills' => 'Background Fills (Components, Incidents, Footer)', + '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', + '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', ], ], diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php index eaf0d410..0d273aba 100755 --- a/resources/lang/es/forms.php +++ b/resources/lang/es/forms.php @@ -105,12 +105,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?', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php index cba21f32..053d94ed 100755 --- a/resources/lang/fr/forms.php +++ b/resources/lang/fr/forms.php @@ -115,11 +115,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?', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/id/forms.php b/resources/lang/id/forms.php index 0f9e19ef..c062070d 100755 --- a/resources/lang/id/forms.php +++ b/resources/lang/id/forms.php @@ -115,11 +115,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?', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/it/forms.php b/resources/lang/it/forms.php index d3105750..ac283e01 100644 --- a/resources/lang/it/forms.php +++ b/resources/lang/it/forms.php @@ -115,12 +115,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?', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/ko/forms.php b/resources/lang/ko/forms.php index 58eaf5e8..86192544 100755 --- a/resources/lang/ko/forms.php +++ b/resources/lang/ko/forms.php @@ -115,12 +115,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?', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/nl/forms.php b/resources/lang/nl/forms.php index f137f90f..48e5e3a4 100755 --- a/resources/lang/nl/forms.php +++ b/resources/lang/nl/forms.php @@ -115,11 +115,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?', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/pl/forms.php b/resources/lang/pl/forms.php index 1e91e841..bdf3da3b 100755 --- a/resources/lang/pl/forms.php +++ b/resources/lang/pl/forms.php @@ -107,12 +107,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?', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php index 37cb8d33..a7abd05e 100755 --- a/resources/lang/pt-BR/forms.php +++ b/resources/lang/pt-BR/forms.php @@ -116,20 +116,20 @@ return [ 'custom-css' => 'Folha de estilos personalizada', ], 'theme' => [ - 'background-color' => 'Cor de fundo', - 'background-fills' => 'Preenchimento do fundo (Componentes, Incidentes, Rodapé)', + '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', + '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', ], ], diff --git a/resources/lang/ru/forms.php b/resources/lang/ru/forms.php index 8b0ec634..5d000fae 100644 --- a/resources/lang/ru/forms.php +++ b/resources/lang/ru/forms.php @@ -115,12 +115,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?', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php index b763cb54..8edc1443 100755 --- a/resources/lang/zh-CN/forms.php +++ b/resources/lang/zh-CN/forms.php @@ -115,12 +115,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?', + 'banner-padding' => 'Banner Padding', + 'fullwidth-banner' => 'Enable fullwidth banner?', ], ], From 152c46e4309284291030beac25200d72f0e9424c Mon Sep 17 00:00:00 2001 From: Michael Mollick Date: Wed, 21 Oct 2015 22:18:34 -0400 Subject: [PATCH 5/6] Reworking the header, logo is always contained in the center column per the original header --- composer.json | 3 +- composer.lock | 57 ++++++++++++++++--- resources/views/index.blade.php | 5 -- resources/views/layout/master.blade.php | 8 +-- resources/views/partials/about-app.blade.php | 13 ----- resources/views/partials/banner.blade.php | 16 ++++++ resources/views/partials/stylesheet.blade.php | 3 + 7 files changed, 72 insertions(+), 33 deletions(-) create mode 100644 resources/views/partials/banner.blade.php diff --git a/composer.json b/composer.json index b77d96e0..8c87310d 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,8 @@ "fzaninotto/faker": "^1.5", "graham-campbell/testbench-core": "^1.0", "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.8" + "phpunit/phpunit": "^4.8", + "laravel/homestead": "dev-master" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 8c11a2a3..a9b46f39 100644 --- a/composer.lock +++ b/composer.lock @@ -1,11 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "6e0387e8efc04fc7cb084b6ad8c70ce3", - "content-hash": "fb168177d45e3399c9e971831b79c3b3", + "hash": "4424167995f5ee7e2ce91d557a1f3156", "packages": [ { "name": "alt-three/emoji", @@ -1665,7 +1664,7 @@ "name": "Jeremy Lindblom", "email": "jeremeamia@gmail.com", "homepage": "https://github.com/jeremeamia", - "role": "Developer" + "role": "developer" } ], "description": "Serialize Closure objects, including their context and binding", @@ -3552,6 +3551,47 @@ ], "time": "2015-05-11 14:41:42" }, + { + "name": "laravel/homestead", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/laravel/homestead.git", + "reference": "92308796309767bbde56669b334ef4b7dd4b31e0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/homestead/zipball/92308796309767bbde56669b334ef4b7dd4b31e0", + "reference": "92308796309767bbde56669b334ef4b7dd4b31e0", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "symfony/console": "~2.0", + "symfony/process": "~2.0" + }, + "bin": [ + "homestead" + ], + "type": "library", + "autoload": { + "psr-4": { + "Laravel\\Homestead\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" + } + ], + "description": "A virtual machine for web artisans.", + "time": "2015-10-19 21:21:09" + }, { "name": "mockery/mockery", "version": "0.9.4", @@ -4517,14 +4557,13 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": { + "laravel/homestead": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { "php": "^5.5.9" }, - "platform-dev": [], - "platform-overrides": { - "php": "5.5.9" - } + "platform-dev": [] } diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 55e026e8..b3fca4ba 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -7,11 +7,6 @@ @include('partials.about-app') -@if(Setting::get('style_fullwidth_header')) -
-
-@endif -
{{ $systemMessage }}
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index 2682ab28..2f99abd3 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -57,12 +57,10 @@ - @if(Setting::get('style_fullwidth_header')) -
- @else -
- @endif + @include('partials.banner') + +
@yield('content')
diff --git a/resources/views/partials/about-app.blade.php b/resources/views/partials/about-app.blade.php index 3e83865c..196635d0 100644 --- a/resources/views/partials/about-app.blade.php +++ b/resources/views/partials/about-app.blade.php @@ -1,16 +1,3 @@ -@if($bannerImage = Setting::get('app_banner')) -
-
- - @if($app_url = Setting::get('app_domain')) - - @else - - @endif -
-
-@endif - @if($about_app)

{{ trans('cachet.about_this_site') }}

diff --git a/resources/views/partials/banner.blade.php b/resources/views/partials/banner.blade.php new file mode 100644 index 00000000..086287e1 --- /dev/null +++ b/resources/views/partials/banner.blade.php @@ -0,0 +1,16 @@ +@if($bannerImage = Setting::get('app_banner')) +
+
+
+
+ + @if($app_url = Setting::get('app_domain')) + + @else + + @endif +
+
+
+
+@endif \ No newline at end of file diff --git a/resources/views/partials/stylesheet.blade.php b/resources/views/partials/stylesheet.blade.php index a979947c..cdee2613 100644 --- a/resources/views/partials/stylesheet.blade.php +++ b/resources/views/partials/stylesheet.blade.php @@ -19,6 +19,9 @@ body.status-page { */ .app-banner { background-color: {{ $theme_banner_background_color }} !important; +} + +.app-banner-padding { padding: {{ $theme_banner_padding }} !important; } From 1271470da35244ca4de315b150108bc356c966c8 Mon Sep 17 00:00:00 2001 From: Michael Mollick Date: Thu, 22 Oct 2015 09:14:59 -0400 Subject: [PATCH 6/6] Changed the default padding options, was '40px 0 0 0', is now '40px 0' --- app/Composers/ThemeComposer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Composers/ThemeComposer.php b/app/Composers/ThemeComposer.php index 83fd95c8..5b3d0f6e 100644 --- a/app/Composers/ThemeComposer.php +++ b/app/Composers/ThemeComposer.php @@ -29,7 +29,7 @@ class ThemeComposer $view->withThemeBackgroundColor(Setting::get('style_background_color', '#F0F3F4')); $view->withThemeBackgroundFills(Setting::get('style_background_fills', '#FFFFFF')); $view->withThemeBannerBackgroundColor(Setting::get('style_banner_background_color', '')); - $view->withThemeBannerPadding(Setting::get('style_banner_padding', '40px 0 0 0')); + $view->withThemeBannerPadding(Setting::get('style_banner_padding', '40px 0')); $view->withThemeTextColor(Setting::get('style_text_color', '#333333')); $view->withThemeReds(Setting::get('style_reds', '#ff6f6f')); $view->withThemeBlues(Setting::get('style_blues', '#3498db'));