Skip to content

Commit

Permalink
more small mobile fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@snipe
snipe committed Feb 26, 2015
1 parent c2bbc12 commit 2986300
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 92 deletions.
136 changes: 71 additions & 65 deletions app/views/backend/dashboard.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,74 +8,80 @@

{{-- Page content --}}
@section('content')
<link href="/assets/css/lib/morris.css" type="text/css" rel="stylesheet" />
<!-- morrisjs -->
<script src="/assets/js/raphael-min.js"></script>
<script src="/assets/js/morris.min.js"></script>




<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/lib/morris.css') }}">

<!-- morrisjs -->
<script src="{{ asset('assets/js/raphael-min.js') }}"></script>
<script src="{{ asset('assets/js/morris.min.js') }}"></script>


<div class="row">

<!-- morris bar & donut charts -->
<div class="col-md-12">
<h4 class="title">@lang('general.dashboard')</h4>
<br>
</div>
<div class="col-md-9 chart">
<h5>Recent Activity</h5>
<table class="table table-hover table-fixed break-word">
<thead>
<tr>
<th class="col-md-1"><span class="line"></span>@lang('general.date')</th>
<th class="col-md-2"><span class="line"></span>@lang('general.admin')</th>
<th class="col-md-3"><span class="line"></span>@lang('table.item')</th>
<th class="col-md-2"><span class="line"></span>@lang('table.actions')</th>
<th class="col-md-3"><span class="line"></span>@lang('general.user')</th>
</tr>
</thead>
<tbody>
@if (count($recent_activity) > 0)
@foreach ($recent_activity as $activity)
<tr>
<td>{{{ date("M d", strtotime($activity->created_at)) }}}</td>
<td>{{{ $activity->adminlog->fullName() }}}</td>
<td>
@if ($activity->asset_type=="hardware")
{{{ $activity->assetlog->name }}}
@elseif ($activity->asset_type=="software")
@if ($activity->licenselog)
{{{ $activity->licenselog->name }}}
@endif
@endif
</td>
<td>{{{ $activity->action_type }}}</td>
<td>
@if ($activity->userlog)
{{{ $activity->userlog->fullName() }}}
@endif
</td>
</tr>
@endforeach
@else
bupkiss
@endif
</tbody>
</table>


</div>
<div class="col-md-3 chart">
<h5>Asset Status</h5>
<div id="hero-assets" style="height: 250px;"></div>
</div>
<!-- morris bar & donut charts -->

<div class="col-md-12">
<h4 class="title">@lang('general.dashboard')</h4>
<br>
</div>
<div class="col-md-9 chart">
<h5>Recent Activity</h5>

<table class="table table-hover table-fixed break-word">
<thead>
<tr>
<th class="col-md-1"><span class="line"></span>@lang('general.date')</th>
<th class="col-md-2"><span class="line"></span>@lang('general.admin')</th>
<th class="col-md-3"><span class="line"></span>@lang('table.item')</th>
<th class="col-md-2"><span class="line"></span>@lang('table.actions')</th>
<th class="col-md-3"><span class="line"></span>@lang('general.user')</th>
</tr>
</thead>
<tbody>
@if (count($recent_activity) > 0)
@foreach ($recent_activity as $activity)
<tr>
<td>{{{ date("M d", strtotime($activity->created_at)) }}}</td>
<td>{{{ $activity->adminlog->fullName() }}}</td>
<td>
@if ($activity->asset_type=="hardware")
{{{ $activity->assetlog->name }}}
@elseif ($activity->asset_type=="software")
@if ($activity->licenselog)
{{{ $activity->licenselog->name }}}
@endif
@endif
</td>
<td>{{{ $activity->action_type }}}</td>
<td>
@if ($activity->userlog)
{{{ $activity->userlog->fullName() }}}
@endif
</td>
</tr>
@endforeach
@else
bupkiss
@endif
</tbody>
</table>


</div>
<div class="col-md-3 chart">
<h5>Asset Status</h5>
<div id="hero-assets" style="height: 250px;"></div>
</div>



</div>
Expand Down
45 changes: 20 additions & 25 deletions app/views/backend/layouts/default.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/compiled/icons.css') }}">

<!-- libraries -->
<link rel="stylesheet" href="{{ asset('assets/css/lib/jquery-ui-1.10.2.custom.css') }}" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="{{ asset('assets/css/lib/font-awesome.min.css') }}" type="text/css" rel="stylesheet" />
<link rel="stylesheet" href="{{ asset('assets/css/lib/morris.css') }}" type="text/css" rel="stylesheet" />
<link rel="stylesheet" href="{{ asset('assets/css/lib/select2.css') }}" type="text/css" rel="stylesheet">
<link rel="stylesheet" href="{{ asset('assets/css/lib/bootstrap.datepicker.css') }}" type="text/css" rel="stylesheet">
<link rel="stylesheet" href="{{ asset('assets/css/lib/jquery-ui-1.10.2.custom.css') }}" type="text/css">
<link rel="stylesheet" href="{{ asset('assets/css/lib/font-awesome.min.css') }}" type="text/css">
<link rel="stylesheet" href="{{ asset('assets/css/lib/morris.css') }}" type="text/css">
<link rel="stylesheet" href="{{ asset('assets/css/lib/select2.css') }}" type="text/css">
<link rel="stylesheet" href="{{ asset('assets/css/lib/bootstrap.datepicker.css') }}" type="text/css">
<link rel="stylesheet" href="{{ asset('assets/css/compiled/index.css') }}" type="text/css" media="screen" />
<link rel="stylesheet" href="{{ asset('assets/css/compiled/user-list.css') }}" type="text/css" media="screen" />
<link rel="stylesheet" href="{{ asset('assets/css/compiled/user-profile.css') }}" type="text/css" media="screen" />
Expand Down Expand Up @@ -103,7 +103,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">


@if (Setting::getSettings()->logo)
<a class="navbar-brand" href="/" style="padding: 5px;">
Expand All @@ -114,8 +114,6 @@
{{{ Setting::getSettings()->site_name }}}
</a>
@endif

</a>
</div>


Expand Down Expand Up @@ -238,9 +236,9 @@
<li {{{ (Request::is('auth/signin') ? 'class="active"' : '') }}}><a href="{{ route('signin') }}">@lang('general.sign_in')</a></li>
@endif
</ul>
</div>
</div>
</header>


<!-- end navbar -->
@if (Sentry::check())
<!-- sidebar -->
Expand Down Expand Up @@ -330,7 +328,9 @@
<!-- main container -->
<div class="content">

@if ((Sentry::check()) && (Sentry::getUser()->hasAccess('admin')))
@if ((Sentry::check()) && (Sentry::getUser()->hasAccess('admin')))
@if (Request::is('/'))

<!-- upper main stats -->
<div id="main-stats">
<div class="row stats-row">
Expand Down Expand Up @@ -367,10 +367,12 @@
</div>
</div>
</div>
</div>


<!-- end upper main stats -->
@endif
@endif


<div id="pad-wrapper">

Expand All @@ -386,25 +388,18 @@
</div>

<footer>
<div class="col-md-2">
</div>
<div id="footer">
<div class="col-md-9 col-sm-12 col-xs-12">
<div class="container">


<div class="col-md-12">
<div id="footer" class="col-md-offset-2 col-md-9 col-sm-12 col-xs-12 text-center">
<div class="muted credit">
<a target="_blank" href="http://snipeitapp.com">Snipe IT</a> is a free open source
project by <a target="_blank" href="http://twitter.com/snipeyhead">@snipeyhead</a>.
<a target="_blank" href="http://snipeitapp.com">Snipe IT</a> is a free open source
project by
<a target="_blank" href="http://twitter.com/snipeyhead">@snipeyhead</a>.
<a target="_blank" href="https://github.com/snipe/snipe-it">Fork it</a> |
<a target="_blank" href="http://docs.snipeitapp.com/">Documentation</a> |
<a href="https://crowdin.com/project/snipe-it">Help Translate It! </a> |
<a target="_blank" href="https://github.com/snipe/snipe-it/issues?state=open">Report a Bug</a>
&nbsp; &nbsp; (v1.2.5)</p>
</div>
</div>
</div>
&nbsp; &nbsp; (v1.2.5)
</div>
</div>
</footer>

Expand Down
4 changes: 2 additions & 2 deletions app/views/backend/users/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

@foreach ($users as $user)
<tr>
<td>
<td nowrap="nowrap">
@if ($user->avatar)
<img src="/uploads/avatars/{{{ $user->avatar }}}" class="img-circle avatar hidden-phone" style="max-width: 45px;" />
@else
Expand All @@ -69,7 +69,7 @@
<td>{{{ $user->licenses->count() }}}</td>
<td>{{ $user->isActivated() ? '<i class="fa fa-ok"></i>' : ''}}</td>

<td>
<td nowrap="nowrap">

<!-- If the user account is suspended - show the UNSUSPEND button. Do NOT evaluate if soft deleted! -->
@if (is_null($user->deleted_at))
Expand Down

0 comments on commit 2986300

Please sign in to comment.