Initial refactoring work

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

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

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>

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>

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>

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

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>

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

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