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

Remove $app_url in favour of AppComposer usage

Browse Source
This commit is contained in:
James Brooks
2015-11-21 22:36:09 +00:00
parent d76fa9465e
commit 44fea779df
6 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Composers/AppComposer.php
View File

@@ -33,6 +33,7 @@ class AppComposer
$view->withSubscribersEnabled($isEnabled && $mailAddress && $mailFrom);
$view->withAppName(Setting::get('app_name'));
$view->withAboutApp(Markdown::convertToHtml(Setting::get('app_about')));
$view->withAppDomain(Setting::get('app_domain'));
$view->withShowSupport(Setting::get('show_support'));
}
}

2
resources/views/dashboard/settings/app-setup.blade.php
View File

@@ -29,7 +29,7 @@
<div class="col-xs-12">
<div class="form-group">
<label>{{ trans('forms.settings.app-setup.site-url') }}</label>
<input type="text" class="form-control" name="app_domain" value="{{ Setting::get('app_domain') }}" required>
<input type="text" class="form-control" name="app_domain" value="{{ $app_domain }}" required>
</div>
</div>
</div>

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

@@ -19,7 +19,7 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="header-logo">
<a href="{{ $app_url }}"><img src="data:{{ Setting::get('app_banner_type') }};base64, {{ $banner_image}}"></a>
<a href="{{ $app_domain }}"><img src="data:{{ Setting::get('app_banner_type') }};base64, {{ $banner_image}}"></a>
</td>
</tr>
</table>

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

@@ -1,16 +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 @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(isset($app_domain))
<a href="{{ $app_domain }}" 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>
@endif
</div>
@endif

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

@@ -11,8 +11,8 @@
<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 }}"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
@if(isset($app_domain))
<a href="{{ $app_domain }}"><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

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

@@ -11,8 +11,8 @@
<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 }}"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
@if(isset($app_domain))
<a href="{{ $app_domain }}"><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