Merge branch 'master' of github.com:akaunting/akaunting
This commit is contained in:
		@@ -12,7 +12,7 @@
 | 
			
		||||
 | 
			
		||||
            @php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp
 | 
			
		||||
 | 
			
		||||
            <a href="{{ $landing_page }}" class="btn btn-success header-button-top"><span class="fa fa-tachometer-alt"></span>  {{ trans('general.go_to', ['name' => trans_choice('general.dashboards', 1)]) }}</a>
 | 
			
		||||
            <a href="{{ $landing_page }}" class="btn btn-success header-button-top"><span class="fa fa-tachometer-alt"></span>  {{ trans('general.go_to_dashboard') }}</a>
 | 
			
		||||
        </div>
 | 
			
		||||
    </div>
 | 
			
		||||
@endsection
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@
 | 
			
		||||
 | 
			
		||||
            @php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp
 | 
			
		||||
 | 
			
		||||
            <a href="{{ $landing_page }}" class="btn btn-success header-button-top"><span class="fa fa-tachometer-alt"></span>  {{ trans('general.go_to', ['name' => trans_choice('general.dashboards', 1)]) }}</a>
 | 
			
		||||
            <a href="{{ $landing_page }}" class="btn btn-success header-button-top"><span class="fa fa-tachometer-alt"></span>  {{ trans('general.go_to_dashboard') }}</a>
 | 
			
		||||
        </div>
 | 
			
		||||
    </div>
 | 
			
		||||
@endsection
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@
 | 
			
		||||
 | 
			
		||||
            @php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp
 | 
			
		||||
 | 
			
		||||
            <a href="{{ $landing_page }}" class="btn btn-success header-button-top"><span class="fa fa-tachometer-alt"></span>  {{ trans('general.go_to', ['name' => trans_choice('general.dashboards', 1)]) }}</a>
 | 
			
		||||
            <a href="{{ $landing_page }}" class="btn btn-success header-button-top"><span class="fa fa-tachometer-alt"></span>  {{ trans('general.go_to_dashboard') }}</a>
 | 
			
		||||
        </div>
 | 
			
		||||
    </div>
 | 
			
		||||
@endsection
 | 
			
		||||
 
 | 
			
		||||
@@ -58,7 +58,7 @@
 | 
			
		||||
                <div class="col-sm-6 text-right">
 | 
			
		||||
                    <a href="{{ url('/') }}" id="wizard-skip" class="btn btn-icon btn-success header-button-top">
 | 
			
		||||
                        <span class="btn-inner--icon"><i class="fa fa-tachometer-alt"></i></span>
 | 
			
		||||
                        <span class="btn-inner--text">{{ trans('general.go_to', ['name' => trans_choice('general.dashboards', 1)]) }}</span>
 | 
			
		||||
                        <span class="btn-inner--text">{{ trans('general.go_to_dashboard') }}</span>
 | 
			
		||||
                    </a>
 | 
			
		||||
                </div>
 | 
			
		||||
            </div>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user