Browse Source

Change logo function helpers name

Change appLogoImage() to app_logo_image()
Change appLogoPath() to app_logo_path()
pull/32/head
Nafies Luthfi 7 years ago
parent
commit
3cc999c0bc
  1. 6
      app/helpers.php
  2. 2
      resources/views/auth/app-install.blade.php
  3. 2
      resources/views/auth/login.blade.php
  4. 2
      resources/views/invoices/pdf.blade.php
  5. 2
      resources/views/layouts/partials/sidebar.blade.php
  6. 2
      resources/views/payments/pdf.blade.php
  7. 2
      resources/views/users/agency/edit.blade.php
  8. 2
      resources/views/users/agency/show.blade.php
  9. 12
      tests/Unit/Helpers/AppLogoImageTest.php

6
app/helpers.php

@ -211,10 +211,10 @@ function dateDifference($date1, $date2, $differenceFormat = '%a')
* @param array $attributes
* @return \Illuminate\Support\HtmlString
*/
function appLogoImage($attributes = [])
function app_logo_image($attributes = [])
{
return Html::image(
appLogoPath(),
app_logo_path(),
'Logo '.Option::get('agency_name', 'Laravel'),
$attributes
);
@ -225,7 +225,7 @@ function appLogoImage($attributes = [])
*
* @return string
*/
function appLogoPath()
function app_logo_path()
{
$defaultLogoImagePath = 'default-logo.png';
$optionLogoImagePath = Option::get('agency_logo_path');

2
resources/views/auth/app-install.blade.php

@ -11,7 +11,7 @@
<div class="row">
<div class="col-sm-6">
<div class="text-center">
{!! appLogoImage(['style' => 'width:150px']) !!}
{!! app_logo_image(['style' => 'width:150px']) !!}
<h3>{{ config('app.name') }}</h3>
</div>
</div>

2
resources/views/auth/login.blade.php

@ -5,7 +5,7 @@
@section('content')
<div class="login-panel col-md-4 col-md-offset-4 text-center">
{!! appLogoImage() !!}
{!! app_logo_image() !!}
<h3>{{ config('app.name') }}</h3>
<div class="panel panel-default">
<div class="panel-body">

2
resources/views/invoices/pdf.blade.php

@ -39,7 +39,7 @@
<tbody>
<tr>
<td style="width:100px;">
{!! appLogoImage(['style' => 'width:100%']) !!}
{!! app_logo_image(['style' => 'width:100%']) !!}
</td>
<td style="width:380px">
<div style="width:300px">

2
resources/views/layouts/partials/sidebar.blade.php

@ -10,7 +10,7 @@
<div class="navbar-default sidebar hidden-print" role="navigation">
<div class="sidebar-nav navbar-collapse">
<a class="navbar-brand text-center" title="Home | {{ Option::get('agency_tagline', 'Laravel app description') }}" href="{{ route('home') }}">
{{ appLogoImage(['class' => 'sidebar-logo']) }}
{{ app_logo_image(['class' => 'sidebar-logo']) }}
<div class="small" style="margin-top:10px">{{ config('app.name') }}</div>
</a>
@include('layouts.partials.lang-switcher')

2
resources/views/payments/pdf.blade.php

@ -22,7 +22,7 @@
<table class="receipt-table">
<tbody>
<tr>
<td style="width:140px;">{{ appLogoImage(['style' => 'width: 100px;']) }}</td>
<td style="width:140px;">{{ app_logo_image(['style' => 'width: 100px;']) }}</td>
<td style="width:330px">
<div style="width:280px">
<h4 style="margin:0px; border-bottom: 3px; font-size: 21.5px">{{ Option::get('agency_name') }}</h4>

2
resources/views/users/agency/edit.blade.php

@ -31,7 +31,7 @@
<div class="col-md-3 text-center">
{{ Form::open(['route' => 'users.agency.logo-upload', 'method' => 'patch', 'files' => true]) }}
<legend>{{ __('agency.logo') }}</legend>
<p>{!! appLogoImage(['style' => 'margin:20px auto']) !!}</p>
<p>{!! app_logo_image(['style' => 'margin:20px auto']) !!}</p>
{!! FormField::file('logo', [
'label' => __('agency.logo_change'),
'info' => ['text' => __('agency.logo_upload_info'), 'class' => 'warning'],

2
resources/views/users/agency/show.blade.php

@ -6,7 +6,7 @@
<div class="row">
<div class="col-md-4 text-center">
<p>{!! appLogoImage() !!}</p>
<p>{!! app_logo_image() !!}</p>
<h3 class="text-primary">{{ Option::get('agency_name') }}</h3>
<p>{{ Option::get('agency_tagline') }}</p>

12
tests/Unit/Helpers/AppLogoImageTest.php

@ -17,13 +17,13 @@ class AppLogoImageTest extends TestCase
'value' => 'icon_user_1.png',
]);
$this->assertEquals(asset('assets/imgs/icon_user_1.png'), appLogoPath());
$this->assertEquals(asset('assets/imgs/icon_user_1.png'), app_logo_path());
}
/** @test */
public function app_logo_path_function_returns_default_logo_image_path_if_no_image_logo_path_setting()
{
$this->assertEquals(asset('assets/imgs/default-logo.png'), appLogoPath());
$this->assertEquals(asset('assets/imgs/default-logo.png'), app_logo_path());
}
/** @test */
@ -33,7 +33,7 @@ class AppLogoImageTest extends TestCase
$logoString .= ' src="'.asset('assets/imgs/default-logo.png').'"';
$logoString .= ' alt="Logo Laravel">';
$this->assertEquals($logoString, appLogoImage());
$this->assertEquals($logoString, app_logo_image());
}
/** @test */
@ -48,7 +48,7 @@ class AppLogoImageTest extends TestCase
$logoString .= ' src="'.asset('assets/imgs/icon_user_1.png').'"';
$logoString .= ' alt="Logo Laravel">';
$this->assertEquals($logoString, appLogoImage());
$this->assertEquals($logoString, app_logo_image());
}
/** @test */
@ -69,7 +69,7 @@ class AppLogoImageTest extends TestCase
'class' => '123',
'style' => 'display: inline',
];
$this->assertEquals($logoString, appLogoImage($overrides));
$this->assertEquals($logoString, app_logo_image($overrides));
}
/** @test */
@ -84,6 +84,6 @@ class AppLogoImageTest extends TestCase
$logoString .= ' src="'.asset('assets/imgs/default-logo.png').'"';
$logoString .= ' alt="Logo Laravel">';
$this->assertEquals($logoString, appLogoImage());
$this->assertEquals($logoString, app_logo_image());
}
}
Loading…
Cancel
Save