diff --git a/app/Composers/ThemeComposer.php b/app/Composers/ThemeComposer.php index 98074023..5b3d0f6e 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')); $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/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/lang/da/forms.php b/resources/lang/da/forms.php index 6f59de1b..7d04bac4 100755 --- a/resources/lang/da/forms.php +++ b/resources/lang/da/forms.php @@ -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', ], ], diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php index 27d7fbb8..ca234e64 100755 --- a/resources/lang/de/forms.php +++ b/resources/lang/de/forms.php @@ -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?', ], ], diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php index 9ca4816f..e9f12ad8 100755 --- a/resources/lang/en-UD/forms.php +++ b/resources/lang/en-UD/forms.php @@ -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?', ], ], diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index fb6c5d87..6265c2cf 100755 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -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', ], ], diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php index b4d5ec40..82fb6891 100755 --- a/resources/lang/es/forms.php +++ b/resources/lang/es/forms.php @@ -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?', ], ], diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php index f4854edf..e4fedbcf 100755 --- a/resources/lang/fr/forms.php +++ b/resources/lang/fr/forms.php @@ -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?', ], ], diff --git a/resources/lang/id/forms.php b/resources/lang/id/forms.php index 038478fb..78600426 100755 --- a/resources/lang/id/forms.php +++ b/resources/lang/id/forms.php @@ -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?', ], ], diff --git a/resources/lang/it/forms.php b/resources/lang/it/forms.php index 21fa685b..b5315b08 100644 --- a/resources/lang/it/forms.php +++ b/resources/lang/it/forms.php @@ -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?', ], ], diff --git a/resources/lang/ko/forms.php b/resources/lang/ko/forms.php index 6a2be89c..2ae9ee93 100755 --- a/resources/lang/ko/forms.php +++ b/resources/lang/ko/forms.php @@ -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?', ], ], diff --git a/resources/lang/nl/forms.php b/resources/lang/nl/forms.php index f39a9ad2..d47ccd41 100755 --- a/resources/lang/nl/forms.php +++ b/resources/lang/nl/forms.php @@ -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?', ], ], diff --git a/resources/lang/pl/forms.php b/resources/lang/pl/forms.php index 42e46fa8..410c6a46 100755 --- a/resources/lang/pl/forms.php +++ b/resources/lang/pl/forms.php @@ -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?', ], ], diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php index bb8a2734..7673b545 100755 --- a/resources/lang/pt-BR/forms.php +++ b/resources/lang/pt-BR/forms.php @@ -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', ], ], diff --git a/resources/lang/ru/forms.php b/resources/lang/ru/forms.php index 2931826c..74a26f88 100644 --- a/resources/lang/ru/forms.php +++ b/resources/lang/ru/forms.php @@ -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?', ], ], diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php index 58aad318..c983d451 100755 --- a/resources/lang/zh-CN/forms.php +++ b/resources/lang/zh-CN/forms.php @@ -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?', ], ], diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php index 343ff268..be606186 100644 --- a/resources/views/dashboard/settings/theme.blade.php +++ b/resources/views/dashboard/settings/theme.blade.php @@ -32,6 +32,30 @@
{!! $about_app !!}