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

Move app_banner and app_banner_type into AppComposer

Browse Source
This commit is contained in:
James Brooks
2015-11-21 22:41:45 +00:00
parent 2e1e7a383d
commit 0e6ac90f7b
7 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Composers/AppComposer.php
View File

@@ -30,10 +30,12 @@ class AppComposer
$mailAddress = env('MAIL_ADDRESS', false);
$mailFrom = env('MAIL_NAME', false);
$view->withSubscribersEnabled($isEnabled && $mailAddress && $mailFrom);
$view->withAppName(Setting::get('app_name'));
$view->withAboutApp(Markdown::convertToHtml(Setting::get('app_about')));
$view->withAppBanner(Setting::get('app_banner'));
$view->withAppBannerType(Setting::get('app_banner_type'));
$view->withAppDomain(Setting::get('app_domain'));
$view->withAppName(Setting::get('app_name'));
$view->withShowSupport(Setting::get('show_support'));
$view->withSubscribersEnabled($isEnabled && $mailAddress && $mailFrom);
}
}

4
resources/views/dashboard/settings/theme.blade.php
View File

@@ -20,9 +20,9 @@
<div class="col-xs-12">
<div class="form-group">
<label>{{ trans('forms.settings.app-setup.banner') }}</label>
@if($banner = Setting::get('app_banner'))
@if($app_banner)
<div id="banner-view" class="well">
<img src="data:{{ Setting::get('app_banner_type') }};base64,{{ $banner }}" style="max-width: 100%">
<img src="data:{{ $app_banner_type }};base64,{{ $app_banner }}" style="max-width: 100%">
<br><br>
<button id="remove-banner" class="btn btn-danger">{{ trans('forms.remove') }}</button>
</div>

4
resources/views/layout/emails.blade.php
View File

@@ -13,13 +13,13 @@
<tr>
<td align="center" valign="top" class="body-cell">
<table width="544" border="0" cellpadding="0" cellspacing="0" class="box">
@if($banner_image = Setting::get('app_banner'))
@if($app_banner)
<tr>
<td class="header">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="header-logo">
<a href="{{ $app_domain }}"><img src="data:{{ Setting::get('app_banner_type') }};base64, {{ $banner_image}}"></a>
<a href="{{ $app_domain }}"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}"></a>
</td>
</tr>
</table>

7
resources/views/partials/banner.blade.php
View File

@@ -1,13 +1,12 @@
@if($bannerImage = Setting::get('app_banner'))
@if($app_banner = $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_domain)
<a href="{{ $app_domain }}" class="links"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
<a href="{{ $app_domain }}" class="links"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive"></a>
@else
<img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
<img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive">
@endif
</div>
</div>

2
resources/views/partials/stylesheet.blade.php
View File

@@ -2,7 +2,7 @@
body.status-page {
background-color: {{ $theme_background_color }};
color: {{ $theme_text_color }};
@if(Setting::get('app_banner'))
@if($app_banner)
padding-top: 0;
@endif
}

7
resources/views/signup.blade.php
View File

@@ -7,14 +7,13 @@
<div class="clearfix"></div>
@if($bannerImage = Setting::get('app_banner'))
@if($app_banner)
<div class="row app-banner">
<div class="col-md-12 text-center">
<?php $bannerType = Setting::get('app_banner_type') ?>
@if($app_domain)
<a href="{{ $app_domain }}"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
<a href="{{ $app_domain }}"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive"></a>
@else
<img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
<img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive">
@endif
</div>
</div>

7
resources/views/subscribe.blade.php
View File

@@ -7,14 +7,13 @@
<div class="clearfix"></div>
@if($bannerImage = Setting::get('app_banner'))
@if($app_banner)
<div class="row app-banner">
<div class="col-md-12 text-center">
<?php $bannerType = Setting::get('app_banner_type') ?>
@if($app_domain)
<a href="{{ $app_domain }}"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
<a href="{{ $app_domain }}"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive"></a>
@else
<img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
<img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive">
@endif
</div>
</div>