Merged updates from other projects

This commit is contained in:
Deon George
2018-05-07 21:34:10 +10:00
parent d6cb505e1c
commit e9cad27afc
26 changed files with 16763 additions and 2811 deletions

View File

@@ -4,15 +4,15 @@
<!-- Logo -->
<a href="{{ url('/home') }}" class="logo">
<!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini">{!! config('name_html_short','<b>A</b>N') !!}</span>
<span class="logo-mini">{!! config('app.name_html_short','<b>A</b>N') !!}</span>
<!-- logo for regular state and mobile devices -->
<span class="logo-lg">{!! config('name_html_long','<b>App</b>Name') !!}</span>
<span class="logo-lg">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
</a>
<!-- Header Navbar -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->
<a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
<span class="sr-only">{{ trans('message.togglenav') }}</span>
</a>
<!-- Navbar Right Menu -->

View File

@@ -30,7 +30,7 @@
<!-- /.search form -->
<!-- Sidebar Menu -->
<ul class="sidebar-menu">
<ul class="sidebar-menu" data-widget="tree">
<li class="header">Menu</li>
<!-- Optionally, you can add icons to the links -->
<li class="active"><a href="{{ url('home',['date'=>(isset($ido) ? $ido->id : NULL)]) }}"><i class='fa fa-link'></i> <span>{{ trans('message.home') }}</span></a></li>