shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed client portal

Browse Source
This commit is contained in:
denisdulici
2017-10-21 15:29:54 +03:00
parent 5e7d3392ab
commit 9710f81053
9 changed files with 65 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/partials/admin/header.blade.php
View File

@@ -173,7 +173,9 @@
<i class="fa fa-4 fa-user-o" style="color: #fff; font-size: 7em;"></i>
@endif
<p>
@if (!empty($user->name))
{{ $user->name }}
@endif
<small>{{ trans('header.last_login', ['time' => $user->last_logged_in_at]) }}</small>
</p>
</li>

24
resources/views/partials/customer/header.blade.php
View File

@@ -2,9 +2,9 @@
<!-- Logo -->
<a href="#" class="logo">
<!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><img src="{{ asset($company->company_logo) }}" class="logo-image-lg" width="25" alt="{{ $company->company_name }}"></span>
<span class="logo-mini"><img src="{{ !empty($company->company_logo) ? Storage::url($company->company_logo) : asset('public/img/company.png') }}" class="logo-image-mini" width="25" alt="{{ $company->company_name }}"></span>
<!-- logo for regular state and mobile devices -->
<span class="logo-lg"><img src="{{ asset($company->company_logo) }}" class="logo-image-lg" width="25" alt="{{ $company->company_name }}"> <b>{{ $company->company_name }}</b></span>
<span class="logo-lg"><img src="{{ !empty($company->company_logo) ? Storage::url($company->company_logo) : asset('public/img/company.png') }}" width="25" alt="{{ $company->company_name }}"> <b>{{ str_limit($company->company_name, 15) }}</b></span>
</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top">
@@ -53,7 +53,7 @@
<!-- Tasks: style can be found in dropdown.less -->
<li class="dropdown tasks-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
{!! language()->flag() !!}
<i class="fa fa-flag-o"></i>
</a>
<ul class="dropdown-menu">
<li class="header">{{ trans('header.change_language') }}</li>
@@ -66,15 +66,27 @@
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<img src="{{ asset($user->picture) }}" class="user-image" alt="User Image">
<span class="hidden-xs">{{ $user->name }}</span>
@if ($user->picture)
<img src="{{ Storage::url($user->picture) }}" class="user-image" alt="User Image">
@else
<i class="fa fa-user-o"></i>
@endif
@if (!empty($user->name))
<span class="hidden-xs">{{ $user->name }}</span>
@endif
</a>
<ul class="dropdown-menu">
<!-- User image -->
<li class="user-header">
<img src="{{ asset($user->picture) }}" class="img-circle" alt="User Image">
@if ($user->picture)
<img src="{{ Storage::url($user->picture) }}" class="img-circle" alt="User Image">
@else
<i class="fa fa-4 fa-user-o" style="color: #fff; font-size: 7em;"></i>
@endif
<p>
@if (!empty($user->name))
{{ $user->name }}
@endif
<small>{{ trans('header.last_login', ['time' => $user->last_logged_in_at]) }}</small>
</p>
</li>

26
resources/views/partials/customer/menu.blade.php
View File

@@ -3,35 +3,15 @@
<section class="sidebar">
<!-- Sidebar user panel -->
<div class="user-panel">
@if ($customer->picture)
<div class="pull-left image">
<img src="{{ asset($customer->picture) }}" class="img-circle" alt="{{ $customer->name }}">
<img src="{{ Storage::url($customer->picture) }}" class="img-circle" alt="{{ $customer->name }}">
</div>
@endif
<div class="pull-left info">
<p>{{ $customer->name }}</p>
@permission('read-companies-companies')
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="caret"></span> &nbsp;{{ trans('general.change') }}</a>
<ul class="dropdown-menu">
@foreach($companies as $com)
<li><a href="{{ url('companies/companies/'. $com->id .'/set') }}">{{ $com->company_name }}</a></li>
@endforeach
@permission('update-companies-companies')
<li role="separator" class="divider"></li>
<li><a href="{{ url('companies/companies') }}">{{ trans('companies.manage') }}</a></li>
@endpermission
</ul>
@endpermission
</div>
</div>
<!-- search form -->
<form action="#" method="get" id="form-search" class="sidebar-form">
<div id="customer-search" class="input-group">
<input type="text" name="main_search" value="<?php //echo $search; ?>" id="input-main-search" class="form-control" placeholder="Search...">
<span class="input-group-btn">
<button type="submit" name="main_search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i></button>
</span>
</div>
</form>
<!-- /.search form -->
<!-- sidebar menu: : style can be found in sidebar.less -->
{!! Menu::get('CustomerMenu') !!}
</section>