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

Merge pull request #782 from chaseconey/dashboard-sidebar-css-fix-v2

Browse Source 
Dashboard - Active Menu Item CSS Fix v2
This commit is contained in:
James Brooks
2015-07-09 14:59:40 +01:00
parent 679005fe3f 721df30642
commit c5f3655d49
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/helpers.php
View File

@@ -31,9 +31,9 @@ if (!function_exists('set_active')) {
$classes[] = $active;
}
$class = implode(' ', $classes);
$class = e(implode(' ', $classes));
return empty($classes) ? '' : "class={$class}";
return empty($classes) ? '' : "class=\"{$class}\"";
}
}

18
resources/views/partials/dashboard/sidebar.blade.php
View File

@@ -25,53 +25,51 @@
</a>
</div>
<ul>
<li {{ set_active('dashboard') }}>
<li {!! set_active('dashboard') !!}>
<a href="{{ route('dashboard') }}">
<i class="icon ion-speedometer"></i>
<span>{{ trans('dashboard.dashboard') }}</span>
</a>
</li>
<li {{ set_active('dashboard/incidents*') }} {{ set_active('dashboard/schedule*') }}>
<li {!! set_active('dashboard/incidents*') !!} {!! set_active('dashboard/schedule*') !!}>
<a href="{{ route('dashboard.incidents') }}">
<i class="icon ion-android-alert"></i>
<span>{{ trans('dashboard.incidents.incidents') }}</span>
<span class="label label-info">{{ $incidentCount }}</span>
</a>
</li>
<li {{ set_active('dashboard/templates*') }}>
<li {!! set_active('dashboard/templates*') !!}>
<a href="{{ route('dashboard.templates') }}">
<i class="icons ion-document-text"></i>
<span>{{ trans('dashboard.incidents.incident-templates') }}</span>
</a>
</li>
<li {{ set_active('dashboard/components*') }}>
<li {!! set_active('dashboard/components*') !!}>
<a href="{{ route('dashboard.components') }}">
<i class="icons ion-outlet"></i>
<span>{{ trans('dashboard.components.components') }}</span>
<span class="label label-info">{{ $componentCount }}</span>
</a>
</li>
<li {{ set_active('dashboard/team*') }}>
<li {!! set_active('dashboard/team*') !!}>
<a href="{{ route('dashboard.team') }}">
<i class="icons ion-ios-people"></i>
<span>{{ trans('dashboard.team.team') }}</span>
</a>
</li>
<li {{ set_active('dashboard/metrics*') }}>
<li {!! set_active('dashboard/metrics*') !!}>
<a href="{{ route('dashboard.metrics') }}">
<i class="icon ion-stats-bars"></i>
<span>{{ trans('dashboard.metrics.metrics') }}</span>
</a>
</li>
<li {{ set_active('dashboard/subscribers*') }}>
<li {!! set_active('dashboard/subscribers*') !!}>
<a href="{{ route('dashboard.subscribers') }}">
<i class="icons ion-email"></i>
<span>{{ trans('dashboard.subscribers.subscribers') }}</span>
</a>
</li>
<li {{ set_active('dashboard/settings*') }}>
<li {!! set_active('dashboard/settings*') !!}>
<a href="{{ route('dashboard.settings.setup') }}">
<i class="icon ion-gear-a"></i>
<span>