deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial refactoring work

Browse Source
This commit is contained in:
Deon George
2018-05-20 22:53:14 +10:00
parent d6cb505e1c
commit feda44db8a
121 changed files with 6601 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/theme/frontend/metronic/layouts/app.blade.php
View File

@@ -34,14 +34,15 @@
</div><!-- ./wrapper -->
{{-- BEGIN CORE PLUGINS (REQUIRED FOR ALL PAGES) --}}
@js('/assets/jquery/1.11.2/js/jquery.min.js','jquery')
@js('/assets/jquery/plugins/migrate/1.2.1/js/jquery-migrate.min.js','jq-migrate','jquery')
@js('/assets/bootstrap/3.3.5/js/bootstrap.min.js','bootstrap-js','jquery')
@js('/assets/jquery/plugins/back-to-top/back-to-top.js','back-to-top','jquery')
@js('/site/js/jquery/1.11.2/js/jquery.min.js','jquery')
@js('/site/js/bootstrap/3.3.5/js/bootstrap.min.js','bootstrap-js','jquery')
@js('/site/js/jquery/plugins/migrate/1.2.1/js/jquery-migrate.min.js','jq-migrate','jquery')
@js('/site/js/jquery/plugins/back-to-top/back-to-top.js','back-to-top','jquery')
{{-- END CORE PLUGINS --}}
{{-- Scripts --}}
{!! Asset::scripts() !!}
@section('scripts')
@include('layouts.partials.scripts')
@show

10
resources/theme/frontend/metronic/layouts/partials/footer.blade.php
View File

@@ -7,7 +7,7 @@
<!-- BEGIN BOTTOM ABOUT BLOCK -->
<div class="col-md-4 col-sm-6 pre-footer-col">
<h2>About us</h2>
<p>{!! $site_aboutus !!}</p>
<p>{!! $so->site_aboutus !!}</p>
<!--
<div class="photo-stream">
<h2>Photos Stream</h2>
@@ -80,11 +80,9 @@
<!-- BEGIN SOCIAL -->
<div class="col-md-4 col-sm-4">
<ul class="social-footer list-unstyled list-inline pull-right">
@if(isset($site_social) AND is_array($site_social))
@foreach ($site_social as $social)
<li><a href="{{ $social['url'] }}"><i class="fa fa-{{ $social['name'] }}"></i></a></li>
@endforeach
@endif
@foreach ($so->social as $social)
<li><a href="{{ $social['url'] }}"><i class="fa fa-{{ $social['name'] }}"></i></a></li>
@endforeach
</ul>
</div>
<!-- END SOCIAL -->

14
resources/theme/frontend/metronic/layouts/partials/htmlheader.blade.php
View File

@@ -9,24 +9,20 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta property="og:site_name" content="{{ config('app.name') }}" />
<meta property="og:title" content="{{ $page_title }}" />
<meta property="og:description" content="{{ $site_description }}" />
<meta property="og:title" content="{{ $so->name }}" />
<meta property="og:description" content="{{ $so->site_description }}" />
<meta property="og:type" content="website" />
<meta property="og:image" content="{{ $site_logo }}" />
<meta property="og:image" content="{{ $so->site_logo }}" />
<meta property="og:url" content="{{ url('/') }}" />
<link rel="shortcut icon" href="{{ object_get($so,'favicon','favicon.ico') }}" />
{{-- Fonts START --}}
<link href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|PT+Sans+Narrow|Source+Sans+Pro:200,300,400,600,700,900&amp;subset=all" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|PT+Sans+Narrow|Source+Sans+Pro:200,300,400,600,700,900&amp;subset=all" rel="stylesheet" type="text/css">
{{-- Fonts END --}}
@css('/assets/animate/css/animate.css')
@css('/assets/jquery/plugins/fancybox/source/jquery.fancybox.css')
@css('/assets/jquery/plugins/owl.carousel/2.0.0/css/owl.carousel.css')
@css('/assets/jquery/plugins/uniform/2.1.0/css/uniform.default.css')
@css('/assets/font-awesome/css/font-awesome.min.css')
@css('/assets/bootstrap/3.3.5/css/bootstrap.min.css')
@css('/site/js/bootstrap/3.3.5/css/bootstrap.min.css')
{{-- Theme styles START --}}
@css('/site/css/components.css')

34
resources/theme/frontend/metronic/layouts/partials/mainheader.blade.php
View File

@@ -27,32 +27,30 @@
<!-- BEGIN HEADER -->
<div class="header">
<div class="container">
<a class="site-logo" href="{{ url('/') }}"><img src="{{ $site_logo }}" alt="{{ config('app.name') }}" height="32"></a>
<a class="site-logo" href="{{ url('/') }}"><img src="{{ $so->logo_url() }}" alt="{{ config('app.name') }}" height="32"></a>
<a href="javascript:void(0);" class="mobi-toggler"><i class="fa fa-bars"></i></a>
<!-- BEGIN NAVIGATION -->
<div class="header-navigation pull-right font-transform-inherit">
<ul>
{{-- @todo Replace this with a function that can traverse children with multiple depths --}}
@if (isset($site_topmenu) AND is_array($site_topmenu))
@foreach ($site_topmenu as $item => $menu)
<li class="dropdown {{ Request::is($menu['url']) ? 'active' : '' }}">
@foreach ($so->top_menu as $item => $menu)
<li class="dropdown {{ Request::is($menu['url']) ? 'active' : '' }}">
@if (! array_get($menu,'children'))
<a {{ Request::is($menu['url']) ? 'class=active' : '' }} href="{{ url($menu['url']) }}">{{ $menu['name'] }}</a>
@else
<a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="javascript:;">{{ $item }}</a>
<ul class="dropdown-menu">
<li {{ (Request::is($menu['url']) ? 'class=active' : '') }}><a href="{{ url($menu['url']) }}">{{ $menu['name'] }}</a></li>
@foreach($menu['children'] as $name => $menuitem)
<li {{ (Request::is($menuitem['url']) ? 'class=active' : '') }}><a href="{{ url($menuitem['url']) }}">{{ $menuitem['name'] }}</a></li>
@endforeach
</ul>
@endif
@if (! array_get($menu,'children'))
<a {{ Request::is($menu['url']) ? 'class=active' : '' }} href="{{ url($menu['url']) }}">{{ $menu['name'] }}</a>
@else
<a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="javascript:;">{{ $item }}</a>
<ul class="dropdown-menu">
<li {{ (Request::is($menu['url']) ? 'class=active' : '') }}><a href="{{ url($menu['url']) }}">{{ $menu['name'] }}</a></li>
@foreach($menu['children'] as $name => $menuitem)
<li {{ (Request::is($menuitem['url']) ? 'class=active' : '') }}><a href="{{ url($menuitem['url']) }}">{{ $menuitem['name'] }}</a></li>
@endforeach
</ul>
@endif
</li>
@endforeach
@endif
</li>
@endforeach
<!-- BEGIN TOP SEARCH -->
<li class="menu-search">