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">

24
resources/theme/frontend/metronic/welcome.blade.php
View File

@@ -8,7 +8,7 @@
<body class="hold-transition welcome-page">
{{-- SLIDER --}}
@if (isset($site_slider))
@if ($so->site_slider)
@include('widgets.slider')
@endif
{{-- END SLIDER --}}
@@ -16,35 +16,35 @@
<div class="main">
<div class="container">
{{-- SERVICE BOX --}}
@if (isset($page_servicebox))
@if ($so->services)
@include('widgets.servicebox')
@endif
{{-- END SERVICE BOX --}}
{{-- TESTIMONIALS --}}
@if (isset($page_blockquote))
@if ($so->block_quotes)
@include('widgets.blockquote')
@endif
{{-- END TESTIMONIALS --}}
{{-- ACTIVITY --}}
@if (isset($page_activity))
@if ($so->activities)
@include('widgets.activity')
@endif
{{-- END ACTIVITY --}}
@if (isset($page_tabs) OR isset($page_testimonials))
@if ($so->page_tabs OR $so->testimonials)
<!-- BEGIN TABS AND TESTIMONIALS -->
<div class="row mix-block margin-bottom-40">
{{-- TABS --}}
@if (isset($page_tabs))
@if ($so->page_tabs)
@include('widgets.tabs')
@endif
{{-- END TABS --}}
{{-- TESTIMONIALS --}}
@if (isset($page_testimonials))
@if ($so->testimonials)
@include('widgets.testimonials')
@endif
{{-- END TESTIMONIALS --}}
@@ -54,13 +54,13 @@
@endif
{{-- STEPS --}}
@if (isset($page_steps))
@if ($so->steps)
@include('widgets.steps')
@endif
{{-- END STEPS --}}
{{-- CLIENTS --}}
@if (true OR isset($page_clients))
@if ($so->clients)
@include('widgets.clients')
@endif
{{-- END CLIENTS --}}
@@ -68,8 +68,10 @@
</div>
<!-- BEGIN PAGE LEVEL JAVASCRIPTS (REQUIRED ONLY FOR CURRENT PAGE) -->
@js('/assets/jquery/plugins/fancybox/source/jquery.fancybox.pack.js','jq-fancybox','jquery')
@js('/assets/jquery/plugins/uniform/2.1.0/js/jquery.uniform.min.js','jq-uniform','jquery')
@js('/site/js/jquery/plugins/fancybox/source/jquery.fancybox.pack.js','jq-fancybox','jquery')
@css('/site/js/jquery/plugins/fancybox/source/jquery.fancybox.css')
@js('/site/js/jquery/plugins/uniform/2.1.0/js/jquery.uniform.min.js','jq-uniform','jquery')
@css('/site/js/jquery/plugins/uniform/2.1.0/css/uniform.default.css')
@js('/site/js/layout.js','layout','jquery')
</body>
@endsection

4
resources/theme/frontend/metronic/widgets/activity.blade.php
View File

@@ -2,14 +2,14 @@
<div class="row recent-work margin-bottom-40">
<div class="col-md-3">
<h2><a href="portfolio.html">Recent Activity</a></h2>
<p>{{ $page_activityintro }}</p>
<p>{{ $so->activity_intro }}</p>
</div>
<div class="col-md-9">
<div class="owl-carousel owl-carousel3">
{{-- @todo These should scroll --}}
@php($c=0)
@foreach ($page_activity as $o)
@foreach ($so->activities as $o)
<div class="recent-work-item">
<em>
<img src="{{ $o['image_small'] }}" alt="{{ $o['title'] }}" class="img-responsive">

2
resources/theme/frontend/metronic/widgets/blockquote.blade.php
View File

@@ -1,6 +1,6 @@
<!-- BEGIN BLOCKQUOTE BLOCK -->
<div class="row quote-v1 margin-bottom-30" style="background: #002090;">
@foreach ($page_blockquote as $o)
@foreach ($so->block_quotes as $o)
<div class="col-md-9">
<span>{{ $o['title'] }}</span>
</div>

52
resources/theme/frontend/metronic/widgets/clients.blade.php
View File

@@ -2,59 +2,21 @@
<div class="row margin-bottom-40 our-clients">
<div class="col-md-3">
<h2><a href="javascript:;">Our Clients</a></h2>
<p>Lorem dipsum folor margade sitede lametep eiusmod psumquis dolore.</p>
<p>{{ $so->clients_intro }}</p>
</div>
{{-- @todo make sure this scrolls --}}
<div class="col-md-9">
<div class="owl-carousel owl-carousel6-brands">
@foreach($so->clients as $c)
<div class="client-item">
<a href="javascript:;">
<img src="/image/generic/150/100/aaa" class="img-responsive" alt="">
<img src="/image/generic/150/100/fff" class="color-img img-responsive" alt="">
</a>
</div>
<div class="client-item">
<a href="javascript:;">
<img src="/image/generic/150/100/aaa" class="img-responsive" alt="">
<img src="/image/generic/150/100/eee" class="color-img img-responsive" alt="">
</a>
</div>
<div class="client-item">
<a href="javascript:;">
<img src="/image/generic/150/100/aaa" class="img-responsive" alt="">
<img src="/image/generic/150/100/ddd" class="color-img img-responsive" alt="">
</a>
</div>
<div class="client-item">
<a href="javascript:;">
<img src="/image/generic/150/100/aaa" class="img-responsive" alt="">
<img src="/image/generic/150/100/ccc" class="color-img img-responsive" alt="">
</a>
</div>
<div class="client-item">
<a href="javascript:;">
<img src="/image/generic/150/100/aaa" class="img-responsive" alt="">
<img src="/image/generic/150/100/bbb" class="color-img img-responsive" alt="">
</a>
</div>
<div class="client-item">
<a href="javascript:;">
<img src="/image/generic/150/100/aaa" class="img-responsive" alt="">
<img src="/image/generic/150/100/999" class="color-img img-responsive" alt="">
</a>
</div>
<div class="client-item">
<a href="javascript:;">
<img src="/image/generic/150/100/aaa" class="img-responsive" alt="">
<img src="/image/generic/150/100/888" class="color-img img-responsive" alt="">
</a>
</div>
<div class="client-item">
<a href="javascript:;">
<img src="/image/generic/150/100/aaa" class="img-responsive" alt="">
<img src="/image/generic/150/100/777" class="color-img img-responsive" alt="">
<img src="{{ $c['image'] }}" class="img-responsive" alt="">
<img src="{{ $c['hover'] }}" class="color-img img-responsive" alt="">
</a>
</div>
@endforeach
</div>
</div>
</div>

2
resources/theme/frontend/metronic/widgets/servicebox.blade.php
View File

@@ -1,6 +1,6 @@
<!-- BEGIN SERVICE BOX -->
<div class="row service-box margin-bottom-40">
@foreach ($page_servicebox as $o)
@foreach ($so->services as $o)
<div class="col-md-4 col-sm-4">
<div class="service-box-heading">
<em><i class="{{ $o['icon'] }}"></i></em>

149
resources/theme/frontend/metronic/widgets/slider.blade.php
View File

@@ -1,87 +1,82 @@
{{-- @todo needs to be optimised --}}
<!-- BEGIN SLIDER -->
<div class="page-slider margin-bottom-40">
<div id="carousel-example-generic" class="carousel slide carousel-slider">
<!-- Indicators -->
<ol class="carousel-indicators carousel-indicators-frontend">
<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
<li data-target="#carousel-example-generic" data-slide-to="1"></li>
<li data-target="#carousel-example-generic" data-slide-to="2"></li>
</ol>
<div id="carousel-example-generic" class="carousel slide carousel-slider">
<!-- Indicators -->
<ol class="carousel-indicators carousel-indicators-frontend">
<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
<li data-target="#carousel-example-generic" data-slide-to="1"></li>
<li data-target="#carousel-example-generic" data-slide-to="2"></li>
</ol>
<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
<!-- First slide -->
<div class="item carousel-item-eight active">
<div class="container">
<div class="carousel-position-six text-uppercase text-center" style="background: #000; color: #888; opacity: 0.5; font-style: bold;">
<h2 class="margin-bottom-20 animate-delay carousel-title-v1" data-animation="animated fadeInDown">
Header <br/>
<span class="carousel-title-normal">and Title</span>
</h2>
<p class="carousel-subtitle-v5 border-top-bottom margin-bottom-30" data-animation="animated fadeInDown">This is what you were looking for</p>
<a class="carousel-btn-green" href="#" data-animation="animated fadeInUp">Purchase Now!</a>
</div>
</div>
</div>
<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
<!-- Second slide -->
<div class="item carousel-item-nine">
<div class="container">
<div class="carousel-position-six">
<h2 class="animate-delay carousel-title-v6 text-uppercase" data-animation="animated fadeInDown">
Header and Title
</h2>
<p class="carousel-subtitle-v6 text-uppercase" data-animation="animated fadeInDown">
This is what you were looking for
</p>
<p class="carousel-subtitle-v7 margin-bottom-30" data-animation="animated fadeInDown">
Lorem ipsum dolor sit amet, consectetur adipiscing elit.<br/>
Sed est nunc, sagittis at consectetur id.
</p>
<a class="carousel-btn-green" href="#" data-animation="animated fadeInUp">Purchase Now!</a>
</div>
</div>
</div>
@foreach ($so->site_slider as $ss)
@switch($ss['style'])
<!-- Third slide -->
<div class="item carousel-item-ten">
<div class="container">
<div class="carousel-position-six">
<h2 class="animate-delay carousel-title-v6 text-uppercase" data-animation="animated fadeInDown">
Header and Title
</h2>
<p class="carousel-subtitle-v6 text-uppercase" data-animation="animated fadeInDown">
This is what you were looking for
</p>
<p class="carousel-subtitle-v7 margin-bottom-30" data-animation="animated fadeInDown">
Lorem ipsum dolor sit amet, consectetur adipiscing elit.<br/>
Sed est nunc, sagittis at consectetur id.
</p>
</div>
</div>
</div>
</div>
@case(1)
<div class="item carousel-item active" style="background: {{ $ss['image'] }};">
<!-- Controls -->
<a class="left carousel-control carousel-control-shop carousel-control-frontend" href="#carousel-example-generic" role="button" data-slide="prev">
<i class="fa fa-angle-left" aria-hidden="true"></i>
</a>
<a class="right carousel-control carousel-control-shop carousel-control-frontend" href="#carousel-example-generic" role="button" data-slide="next">
<i class="fa fa-angle-right" aria-hidden="true"></i>
</a>
</div>
<div class="container">
<div class="carousel-position-six text-uppercase text-center" style="background: #000; color: #888; opacity: 0.5; font-style: bold;">
<h2 class="margin-bottom-20 animate-delay carousel-title-v1" data-animation="animated fadeInDown">
{!! $ss['title'] !!}
</h2>
<p class="carousel-subtitle-v5 border-top-bottom margin-bottom-30" data-animation="animated fadeInDown">{!! $ss['text'] !!}</p>
@isset($ss['button'])
<a class="carousel-btn-green" href="{{ $ss['button']['url'] }}" data-animation="animated fadeInUp">{!! $ss['button']['text'] !!}</a>
@endisset
</div>
</div>
</div>
@break
@case(2)
<div class="item carousel-item" style="background: {{ $ss['image'] }};">
<div class="container">
<div class="carousel-position-six">
<h2 class="animate-delay carousel-title-v6 text-uppercase" data-animation="animated fadeInDown">
{!! $ss['title'] !!}
</h2>
<p class="carousel-subtitle-v6 text-uppercase" data-animation="animated fadeInDown">
{!! $ss['text'] !!}
</p>
<p class="carousel-subtitle-v7 margin-bottom-30" data-animation="animated fadeInDown">
{!! $ss['text2'] !!}
</p>
@isset($ss['button'])
<a class="carousel-btn-green" href="{{ $ss['button']['url'] }}" data-animation="animated fadeInUp">{!! $ss['button']['text'] !!}</a>
@endisset
</div>
</div>
</div>
@break
@endswitch
@endforeach
</div>
<!-- Controls -->
<a class="left carousel-control carousel-control-shop carousel-control-frontend" href="#carousel-example-generic" role="button" data-slide="prev">
<i class="fa fa-angle-left" aria-hidden="true"></i>
</a>
<a class="right carousel-control carousel-control-shop carousel-control-frontend" href="#carousel-example-generic" role="button" data-slide="next">
<i class="fa fa-angle-right" aria-hidden="true"></i>
</a>
</div>
</div>
<!-- END SLIDER -->
@js('/assets/jquery/plugins/owl.carousel/2.0.0/js/owl.carousel.min.js','jq-owl-carousel','jquery')<!-- slider for products -->
@css('/site/js/jquery/plugins/owl.carousel/2.0.0/css/owl.carousel.css')
@css('/site/css/animate.css')
@js('/site/js/jquery/plugins/owl.carousel/2.0.0/js/owl.carousel.min.js','jq-owl-carousel','jquery')<!-- slider for products -->
@js('/pages/js/bs-carousel.js','bs-carousel','jq-owl-carousel')
@section('scripts')
<script type="text/javascript">
jQuery(document).ready(function() {
Layout.initOWL();
});
</script>
<!-- END PAGE LEVEL JAVASCRIPTS -->
@append
<script type="text/javascript">
jQuery(document).ready(function() {
Layout.initOWL();
});
</script>
@append

2
resources/theme/frontend/metronic/widgets/steps.blade.php
View File

@@ -2,7 +2,7 @@
<div class="row margin-bottom-40 front-steps-wrapper front-steps-count-3">
{{-- Dynamically count the steps and choose the appropriate col-md-x --}}
@php($c=0)
@foreach ($page_steps as $o)
@foreach ($so->steps as $o)
<div class="col-md-4 col-sm-4 front-step-col">
<div class="front-step front-step{{ ++$c }}">
<h2>{{ $o['title'] }}</h2>

4
resources/theme/frontend/metronic/widgets/tabs.blade.php
View File

@@ -2,14 +2,14 @@
<div class="col-md-7 tab-style-1">
<ul class="nav nav-tabs">
@php($c=0)
@foreach ($page_tabs as $o)
@foreach ($so->page_tabs as $o)
<li @if(! $c++) class="active" @endif><a href="#tab-{{ $c }}" data-toggle="tab">{{ $o['title'] }}</a></li>
@endforeach
</ul>
<div class="tab-content">
@php($c=0)
@foreach ($page_tabs as $o)
@foreach ($so->page_tabs as $o)
<div class="tab-pane row fade in @if(! $c++) active @endif" id="tab-{{ $c }}">
<div class="col-md-3 col-sm-3">
<a href="{{ $o['image'] }}" class="fancybox-button" title="{{ $o['title'] }}" data-rel="fancybox-button">

2
resources/theme/frontend/metronic/widgets/testimonials.blade.php
View File

@@ -4,7 +4,7 @@
<!-- Carousel items -->
<div class="carousel-inner">
@php($c=0)
@foreach($page_testimonials as $o)
@foreach($so->testimonials as $o)
<div class="item @if(! $c++) active @endif">
<blockquote><p>{{ $o['quote'] }}</p></blockquote>
<div class="carousel-info">