Merge branch 'master' of http://git.unesa.ac.id/bagus/webprofile-singlesite-5bahasa

app/Http/Controllers/Webprofile/Front/FrontController.php

@@ -69,7 +69,8 @@ class FrontController extends Controller
         $quote = Design::where('name_design', 'quote')->get();
         $widget_right = Design::where('name_design', 'widget_right')->orderBy('urutan', 'ASC')->get();
         $widget_left = Design::where('name_design', 'widget_left')->orderBy('urutan', 'ASC')->get();
-        $body = Design::where('name_design', 'body')->where('title_show' , 't')->get();
+        $body = Design::where('name_design', 'body')->get();
+        // $body = Design::where('name_design', 'body')->where('title_show' , 't')->orderBy('urutan', 'ASC')->get();
         $footer = Design::where('name_design', 'like', '%footer_row%')->get();
 
         $data = [

resources/views/webprofile/front/jollyany/ar/index.blade.php

@@ -52,6 +52,7 @@
     </section>
     @endif
     @endif
+@if(!isset($setting['default_content']) || strtolower($setting['default_content'] == 'tampil'))
   <section class="blog-wrapper">
   	<div class="container">
       	<div id="content" class="col-lg-8 col-md-8 col-sm-12 col-xs-12">
@@ -217,7 +218,7 @@
           </div><!-- end content -->
   	</div><!-- end container -->
   </section><!--end white-wrapper -->
-
+@endif
     {{-- Label Body Tambahan --}}
     @if(!isset($setting['body_position']) || strtolower($setting['body_position']) == 'bawah')
     @if ($body->count() != 0)

resources/views/webprofile/front/jollyany/ar/menu.blade.php

@@ -61,32 +61,32 @@
           </ul>
       </li>
       @elseif($setting['layout_menu'] == 1)
-        <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">{!! $value->rSa->name !!} <div class="arrow-up"></div></a>
+        <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">@if ($value->rSa) {!! $value->rSa->name !!} @endif <div class="arrow-up"></div></a>
           <ul class="dropdown-menu" role="menu">
           @foreach ($menu as $valuec)
             @if($valuec->parent == $value->id)
               @if($valuec->url)
-                <li><a href="{!! url((string)$valuec->url) !!}">{!! $valuec->rSa->name !!}</a></li>
+                <li><a href="{!! url((string)$valuec->url) !!}">@if ($valuec->rSa) {!! $valuec->rSa->name !!} @endif</a></li>
               @else
                 <li class="dropdown-submenu">
-                <b>  <a href="#">{!! $valuec->name !!}</a> </b>
+                <b>  <a href="#">@if ($valuec->rSa) {!! $valuec->rSa->name !!} @endif</a> </b>
                   <ul class="dropdown-menu">
                     @foreach ($menu as $valuec2)
                       @if($valuec2->parent == $valuec->id)
 
                       @if($valuec2->url)
-                        <li><a href="{!! url((string)$valuec2->url) !!}">{!! $valuec2->rSa->name !!}</a></li>
+                        <li><a href="{!! url((string)$valuec2->url) !!}">@if ($valuec2->rSa) {!! $valuec2->rSa->name !!} @endif</a></li>
                       
                                 @else
                                 <li class="dropdown-submenu">
                                  
-                                  <b> <a href="#">{!! $valuec2->rSa->name !!}</a></b>
+                                  <b> <a href="#">@if ($valuec2->rSa) {!! $valuec2->rSa->name !!} @endif</a></b>
                                   <ul class="dropdown-menu">
                                 @foreach($menu as $valuec3)
                                
                                 @if($valuec3->parent == $valuec2->id)
                                
-                                <li><a href="{!! url((string)$valuec3->url) !!}" target="_blank">{!! $valuec3->rSa->name !!}</a></li>
+                                <li><a href="{!! url((string)$valuec3->url) !!}" target="_blank">@if ($valuec3->rSa) {!! $valuec3->rSa->name !!} @endif</a></li>
                                  
                                 @endif
                                

resources/views/webprofile/front/jollyany/de/index.blade.php

@@ -52,6 +52,7 @@
     </section>
     @endif
     @endif
+@if(!isset($setting['default_content']) || strtolower($setting['default_content'] == 'tampil'))
   <section class="blog-wrapper">
   	<div class="container">
       	<div id="content" class="col-lg-8 col-md-8 col-sm-12 col-xs-12">
@@ -217,7 +218,7 @@
           </div><!-- end content -->
   	</div><!-- end container -->
   </section><!--end white-wrapper -->
-
+@endif
     {{-- Label Body Tambahan --}}
     @if(!isset($setting['body_position']) || strtolower($setting['body_position']) == 'bawah')
     @if ($body->count() != 0)

resources/views/webprofile/front/jollyany/download.blade.php

@@ -4,7 +4,7 @@
 <!-- <link rel="stylesheet" href="https://cdn.datatables.net/1.10.24/css/jquery.dataTables.min.css">
 <link rel="stylesheet" href="https://cdn.datatables.net/1.10.24/css/dataTables.bootstrap4.min.css"> -->
 
-<link rel="stylesheet" href="{!! asset('backend/js/datatables.net-bs/css/dataTables.bootstrap.min.css') !!}">
+{{-- <link rel="stylesheet" href="{!! asset('backend/js/datatables.net-bs/css/dataTables.bootstrap.min.css') !!}"> --}}
    
 <style>
 
@@ -82,15 +82,7 @@ tr.group:hover {
  
 @endsection
 @section('scripts')
-<script src="{!!asset('backend/js/datatables.net/js/jquery.dataTables.min.js') !!}"></script>
-<script src="{!!asset('backend/js/datatables.net-bs/js/dataTables.bootstrap.min.js') !!}"></script>
-<!-- <script src="{!!asset('backend/js/datatables.net-bs/js/dataTables.bootstrap.min.js') !!}"></script> -->
-
-<!-- <script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/dataTables.buttons.min.js') }}"></script>
-<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.bootstrap4.min.js') }}"></script>
-<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.colVis.min.js') }}"></script>
-<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.html5.min.js') }}"></script>
-<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.print.min.js') }}"></script> -->
+
 
 <script>
     // var url = "{{ route('download') }}";

resources/views/webprofile/front/jollyany/en/index.blade.php

@@ -53,6 +53,7 @@
     </section>
     @endif
     @endif
+@if(!isset($setting['default_content']) || strtolower($setting['default_content'] == 'tampil'))
   <section class="blog-wrapper">
   	<div class="container">
       	<div id="content" class="col-lg-8 col-md-8 col-sm-12 col-xs-12">
@@ -218,7 +219,7 @@
           </div><!-- end content -->
   	</div><!-- end container -->
   </section><!--end white-wrapper -->
-
+@endif
     {{-- Label Body Tambahan --}}
 
     @if(!isset($setting['body_position']) || strtolower($setting['body_position']) == 'bawah')

resources/views/webprofile/front/jollyany/index.blade.php

@@ -48,8 +48,10 @@
     </section>
     @endif
     @endif
+@if(!isset($setting['default_content']) || strtolower($setting['default_content'] == 'tampil'))
     <section class="blog-wrapper">
         <div class="container">
+            {{-- @if(!isset($setting['content']) || strtolower($setting['content'] == 'tampil')) --}}
                 <div id="content" class="col-lg-8 col-md-8 col-sm-12 col-xs-12">
                     <div class="title">
                     <h2>Berita Terbaru
@@ -86,7 +88,7 @@
                               </div><!-- end blog-carousel-header -->
                               <div class="blog-carousel-desc">
                                   {{-- <p>{!! substr(html_entity_decode($value->content),0 , 250) !!}</p> --}}
-                                  <p>{!! strip_tags(substr(html_entity_decode($value->content,ENT_COMPAT,"UTF-8"),0 , 250)) !!}</p>
+                                  <p>{!! substr(strip_tags(html_entity_decode($value->content,ENT_COMPAT,"UTF-8")),0 , 250) !!}</p>
                                   {{-- <p>{!! $value->content !!}</p> --}}
                               </div><!-- end blog-carousel-desc -->
                           </div><!-- end blog-carousel -->
@@ -108,7 +110,9 @@
 
                     </div><!-- end row -->
                 </div><!-- end content -->
+            {{-- @endif --}}
 
+            {{-- @if(!isset($setting['sidebar']) || strtolower($setting['sidebar'] == 'tampil')) --}}
                 <div id="sidebar" class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
                 {{-- <div class="widget">
                     <div id="google_translate_element"></div>
@@ -209,9 +213,11 @@
                             {!! $vwidget_right->value_design !!}
                         </div><!-- end widget -->
                     @endforeach
-          </div><!-- end content -->
+                </div><!-- end sidebar -->
+            {{-- @endif --}}
         </div><!-- end container -->
     </section><!--end white-wrapper -->
+@endif
 
     {{-- Label Body Tambahan --}}
     @if(!isset($setting['body_position']) || strtolower($setting['body_position']) == 'bawah')

resources/views/webprofile/front/jollyany/indexcustom.blade.php

@@ -85,7 +85,7 @@
                                 <a href="{!! url('post/'.$value->slug) !!}"><h2 style="color: #ffffff;">{{$value->title}}</h2></a>          
                                 </div><!-- end title -->
                                 <div class="shop_desc">
-                                    <p style="color: #ffffff;">{!! strip_tags(substr(html_entity_decode($value->content,ENT_COMPAT,"UTF-8"),0 , 250)) !!}</p>
+                                    <p style="color: #ffffff;">{!!   substr(strip_tags(html_entity_decode($value->content,ENT_COMPAT,"UTF-8")),0 , 250) !!}</p>
                                 </div><!-- end shop_desc -->
                                 <div class="blog-carousel-meta">
                                       <span style="color: #ffffff;"><i class="fa fa-calendar"></i> {!! InseoHelper::tglbulanindo2($value->post_date) !!}</span>

resources/views/webprofile/front/jollyany/master.blade.php

@@ -113,7 +113,8 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 
   <!-- SLIDER REVOLUTION 4.x CSS SETTINGS -->
   <link rel="stylesheet" type="text/css" href="https://statik.unesa.ac.id/profileunesa_konten_statik/front/rs-plugin/css/settings.css" media="screen" />
-
+  {{-- datatables --}}
+  <link rel="stylesheet" href="{!! asset('backend/js/datatables.net-bs/css/dataTables.bootstrap.min.css') !!}">
   @yield('assets')
 </head>
 <body>
@@ -251,7 +252,6 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
   <!-- SLIDER REVOLUTION 4.x SCRIPTS  -->
   <script type="text/javascript" src="https://statik.unesa.ac.id/profileunesa_konten_statik/front/rs-plugin/js/jquery.themepunch.plugins.min.js"></script>
   <script type="text/javascript" src="https://statik.unesa.ac.id/profileunesa_konten_statik/front/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
-  @yield('scripts')
   <script src="https://www.unesa.ac.id/assets/js/jquery.prettyPhoto.js"></script>
   <script type="text/javascript">
   (function($) {
@@ -307,5 +307,19 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
   <script type="text/javascript" src="https://statik.unesa.ac.id/profileunesa_konten_statik/front/switcher/js/fswit.js"></script>
   <script src="https://statik.unesa.ac.id/profileunesa_konten_statik/front/switcher/js/bootstrap-select.js"></script>
 
+
+<script src="{!!asset('backend/js/datatables.net/js/jquery.dataTables.min.js') !!}"></script>
+<script src="{!!asset('backend/js/datatables.net-bs/js/dataTables.bootstrap.min.js') !!}"></script>
+<!-- <script src="{!!asset('backend/js/datatables.net-bs/js/dataTables.bootstrap.min.js') !!}"></script> -->
+
+<!-- <script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/dataTables.buttons.min.js') }}"></script>
+<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.bootstrap4.min.js') }}"></script>
+<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.colVis.min.js') }}"></script>
+<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.html5.min.js') }}"></script>
+<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.print.min.js') }}"></script> -->
+
+
+  @yield('scripts')
+
 </body>
 </html>

resources/views/webprofile/front/jollyany/master2.blade.php

@@ -97,6 +97,8 @@
 
   <!-- SLIDER REVOLUTION 4.x CSS SETTINGS -->
   <link rel="stylesheet" type="text/css" href="https://statik.unesa.ac.id/profileunesa_konten_statik/front/rs-plugin/css/settings.css" media="screen" />
+ {{-- datatables --}}
+  <link rel="stylesheet" href="{!! asset('backend/js/datatables.net-bs/css/dataTables.bootstrap.min.css') !!}">
 
   @yield('assets')
 </head>
@@ -231,7 +233,7 @@
   <!-- SLIDER REVOLUTION 4.x SCRIPTS  -->
   <script type="text/javascript" src="https://statik.unesa.ac.id/profileunesa_konten_statik/front/rs-plugin/js/jquery.themepunch.plugins.min.js"></script>
   <script type="text/javascript" src="https://statik.unesa.ac.id/profileunesa_konten_statik/front/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
-  @yield('scripts')
+
   <script src="https://www.unesa.ac.id/assets/js/jquery.prettyPhoto.js"></script>
   <script type="text/javascript">
   (function($) {
@@ -287,5 +289,17 @@
   <script type="text/javascript" src="https://statik.unesa.ac.id/profileunesa_konten_statik/front/switcher/js/fswit.js"></script>
   <script src="https://statik.unesa.ac.id/profileunesa_konten_statik/front/switcher/js/bootstrap-select.js"></script>
 
+<script src="{!!asset('backend/js/datatables.net/js/jquery.dataTables.min.js') !!}"></script>
+<script src="{!!asset('backend/js/datatables.net-bs/js/dataTables.bootstrap.min.js') !!}"></script>
+<!-- <script src="{!!asset('backend/js/datatables.net-bs/js/dataTables.bootstrap.min.js') !!}"></script> -->
+
+<!-- <script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/dataTables.buttons.min.js') }}"></script>
+<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.bootstrap4.min.js') }}"></script>
+<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.colVis.min.js') }}"></script>
+<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.html5.min.js') }}"></script>
+<script src="{{ url('backend/assets/plugins/jquery-datatable/buttons/buttons.print.min.js') }}"></script> -->
+
+
+  @yield('scripts')
 </body>
 </html>

resources/views/webprofile/front/jollyany/page.blade.php

@@ -36,3 +36,14 @@
     </div><!-- end container -->
   </section><!--end white-wrapper -->
 @endsection
+@section('scripts')
+<script>
+
+ $(document).ready(function() {
+
+    var table1 = $('.data-table-ori').DataTable();
+ 
+
+} );
+</script>
+@stop
\ No newline at end of file

resources/views/webprofile/front/jollyany/zh/index.blade.php

@@ -52,6 +52,7 @@
     </section>
     @endif
     @endif
+@if(!isset($setting['default_content']) || strtolower($setting['default_content'] == 'tampil'))
   <section class="blog-wrapper">
   	<div class="container">
       	<div id="content" class="col-lg-8 col-md-8 col-sm-12 col-xs-12">
@@ -218,7 +219,7 @@
           </div><!-- end content -->
   	</div><!-- end container -->
   </section><!--end white-wrapper -->
-
+@endif
     {{-- Label Body Tambahan --}}
     @if(!isset($setting['body_position']) || strtolower($setting['body_position']) == 'bawah')
     @if ($body->count() != 0)

resources/views/webprofile/front/jollyany/zh/menu.blade.php

@@ -61,12 +61,14 @@
           </ul>
       </li>
       @elseif($setting['layout_menu'] == 1)
-        <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">{!! $value->rZh->name !!} <div class="arrow-up"></div></a>
+        <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdown-toggle">@if ($value->rZh) {!! $value->rZh->name !!} @endif <div class="arrow-up"></div></a>
           <ul class="dropdown-menu" role="menu">
           @foreach ($menu as $valuec)
             @if($valuec->parent == $value->id)
               @if($valuec->url)
+              @if ($valuec->rZh)
                 <li><a href="{!! url((string)$valuec->url) !!}">{!! $valuec->rZh->name !!}</a></li>
+                @endif
               @else
                 <li class="dropdown-submenu">
                 <b>  <a href="#">{!! $valuec->name !!}</a> </b>
@@ -75,19 +77,21 @@
                       @if($valuec2->parent == $valuec->id)
 
                       @if($valuec2->url)
+                      @if ($valuec2->rZh)
                         <li><a href="{!! url((string)$valuec2->url) !!}">{!! $valuec2->rZh->name !!}</a></li>
-                      
+                      @endif
                                 @else
                                 <li class="dropdown-submenu">
-                                 
+                                @if ($valuec2->rZh)
                                   <b> <a href="#">{!! $valuec2->rZh->name !!}</a></b>
+                                  @endif
                                   <ul class="dropdown-menu">
                                 @foreach($menu as $valuec3)
                                
                                 @if($valuec3->parent == $valuec2->id)
-                               
+                                @if ($valuec3->rZh)
                                 <li><a href="{!! url((string)$valuec3->url) !!}" target="_blank">{!! $valuec3->rZh->name !!}</a></li>
-                                 
+                                 @endif
                                 @endif
                                
                                 @endforeach