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

app/Http/Controllers/Webprofile/Backend/InformationController.php

@@ -233,7 +233,7 @@ class InformationController extends Controller
             'manual' => $manual,
         ];
         
-        return view('webprofile.backend.informations.edit_per_bahasa', $data)->withTitle(trans('feature.edit_agenda'));
+        return view('webprofile.backend.informations.edit_per_bahasa', $data)->withTitle(trans('feature.edit_information'));
     }
 
 

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

@@ -114,16 +114,33 @@
                 <h2>جدول أعمال</h2>
               </div><!-- end title -->
               <ul class="recent_posts_widget">
-                  @foreach($info as $value)
+                  @foreach($agenda as $value)
                   <li>
                     <a href="{!! url('info/'.$value->slug) !!}"><img src="https://www.unesa.ac.id/assets/demos/logounesa.png" alt="">@if ($value->rSa) {!! $value->rSa->title !!} @endif</a>
                     <a class="readmore" href="#">{!! InseoHelper::tglbulanindo2($value->event_date) !!}</a>
                   </li>
                   @endforeach
               </ul>
-              <a href="{!! url('agenda') !!}" class="btn btn-primary">انظر جدول الأعمال الكامل</a>
+              <a href="{!! url('agendas') !!}" class="btn btn-primary">انظر جدول الأعمال الكامل</a>
             </div><!-- end widget -->
 
+          	
+            <div class="widget">
+            	<div class="title">
+                <h2>كل المعلومات</h2>
+              </div><!-- end title -->
+              <ul class="recent_posts_widget">
+                  @foreach($info as $value)
+                  <li>
+                    <a href="{!! url('information/'.$value->slug) !!}"><img src="https://www.unesa.ac.id/assets/demos/logounesa.png" alt="">@if ($value->rSa) {!! $value->rSa->title !!} @endif</a>
+                    <a class="readmore" href="#">{!! InseoHelper::tglbulanindo2($value->event_date) !!}</a>
+                  </li>
+                  @endforeach
+              </ul>
+              <a href="{!! url('informations') !!}" class="btn btn-primary">انظر المعلومات الكاملة</a>
+            </div><!-- end widget -->
+            
+            
             <div class="widget">
               <div id="tabbed_widget" class="tabbable">
                 <ul class="nav nav-tabs">

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

@@ -4,7 +4,9 @@
   <section class="post-wrapper-top jt-shadow clearfix">
     <div class="container">
       <div class="col-lg-12">
-          <h2>إعلان  - {!! $data->title !!}</h2>
+        @if($data->rSa)
+          <h2>إعلان  - {!! $data? $data->rSa->title : 'كل المعلومات' !!}</h2>
+        @endif
       </div>
     </div>
   </section><!-- end post-wrapper-top -->

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

@@ -114,16 +114,33 @@
                 <h2>AGENDA</h2>
               </div><!-- end title -->
               <ul class="recent_posts_widget">
+                  @foreach($agenda as $value)
+                  <li>
+                    <a href="{!! url('agenda/'.$value->slug) !!}"><img src="https://www.unesa.ac.id/assets/demos/logounesa.png" alt="">@if ($value->rDe) {!! $value->rDe->title !!} @endif</a>
+                    <a class="readmore" href="#">{!! InseoHelper::tglbulanindo2($value->event_date) !!}</a>
+                  </li>
+                  @endforeach
+              </ul>
+              <a href="{!! url('agendas') !!}" class="btn btn-primary">Siehe vollständige Agenda</a>
+            </div><!-- end widget -->
+
+
+            <div class="widget">
+            	<div class="title">
+                <h2>Information</h2>
+              </div><!-- end title -->
+              <ul class="recent_posts_widget">
                   @foreach($info as $value)
                   <li>
-                    <a href="{!! url('info/'.$value->slug) !!}"><img src="https://www.unesa.ac.id/assets/demos/logounesa.png" alt="">@if ($value->rDe) {!! $value->rDe->title !!} @endif</a>
+                    <a href="{!! url('information/'.$value->slug) !!}"><img src="https://www.unesa.ac.id/assets/demos/logounesa.png" alt="">@if ($value->rDe) {!! $value->rDe->title !!} @endif</a>
                     <a class="readmore" href="#">{!! InseoHelper::tglbulanindo2($value->event_date) !!}</a>
                   </li>
                   @endforeach
               </ul>
-              <a href="{!! url('agenda') !!}" class="btn btn-primary">Siehe vollständige Agenda</a>
+              <a href="{!! url('informations') !!}" class="btn btn-primary">Siehe vollständige Informationen</a>
             </div><!-- end widget -->          	
             
+            
             <div class="widget">
               <div id="tabbed_widget" class="tabbable">
                 <ul class="nav nav-tabs">

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

@@ -4,7 +4,9 @@
   <section class="post-wrapper-top jt-shadow clearfix">
     <div class="container">
       <div class="col-lg-12">
-          <h2>Information - {!! $data->title !!}</h2>
+        @if($data->rDe)
+          <h2>Information - {!! $data? $data->rDe->title : 'Alle Informationen' !!}</h2>
+        @endif
       </div>
     </div>
   </section><!-- end post-wrapper-top -->

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

@@ -65,7 +65,9 @@
                                       </div>
                                     <div class="news-text">
                                       <strong> {!! InseoHelper::tglbulanindo2($value->event_date) !!}</strong> — 
-                                      {!! strip_tags(substr(html_entity_decode($value->content,ENT_COMPAT,"UTF-8"),0 , 250)) !!}
+                                      @if ($value->rEn)
+                                      {!! strip_tags(substr(html_entity_decode($value->rEn->content,ENT_COMPAT,"UTF-8"),0 , 250)) !!}
+                                      @endif
                                     <br><a class="pull-right" style="padding-right: 20px;" target="_blank" href="{!! url('information/'.$value->slug) !!}">
                                     Read more »»</a>
                                     </div>

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

@@ -114,16 +114,34 @@
                 <h2>议程</h2>
               </div><!-- end title -->
               <ul class="recent_posts_widget">
+                  @foreach($agenda as $value)
+                  <li>
+                    <a href="{!! url('agenda/'.$value->slug) !!}"><img src="https://www.unesa.ac.id/assets/demos/logounesa.png" alt="">@if ($value->rZh) {!! $value->rZh->title !!} @endif</a>
+                    <a class="readmore" href="#">{!! InseoHelper::tglbulanindo2($value->event_date) !!}</a>
+                  </li>
+                  @endforeach
+              </ul>
+              <a href="{!! url('agendas') !!}" class="btn btn-primary">查看完整议程</a>
+            </div><!-- end widget -->
+
+          	
+            <div class="widget">
+            	<div class="title">
+                <h2>信息</h2>
+              </div><!-- end title -->
+              <ul class="recent_posts_widget">
                   @foreach($info as $value)
                   <li>
-                    <a href="{!! url('info/'.$value->slug) !!}"><img src="https://www.unesa.ac.id/assets/demos/logounesa.png" alt="">@if ($value->rZh) {!! $value->rZh->title !!} @endif</a>
+                    <a href="{!! url('information/'.$value->slug) !!}"><img src="https://www.unesa.ac.id/assets/demos/logounesa.png" alt="">@if ($value->rZh) {!! $value->rZh->title !!} @endif</a>
                     <a class="readmore" href="#">{!! InseoHelper::tglbulanindo2($value->event_date) !!}</a>
                   </li>
                   @endforeach
               </ul>
-              <a href="{!! url('agenda') !!}" class="btn btn-primary">查看完整议程</a>
+              <a href="{!! url('informations') !!}" class="btn btn-primary">
+查看完整信息</a>
             </div><!-- end widget --> 
             
+            
             <div class="widget">
               <div id="tabbed_widget" class="tabbable">
                 <ul class="nav nav-tabs">

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

@@ -4,7 +4,9 @@
   <section class="post-wrapper-top jt-shadow clearfix">
     <div class="container">
       <div class="col-lg-12">
-          <h2>信息 - {!! $data->title !!}</h2>
+      @if($data->rZh)
+          <h2>信息 - {!! $data? $data->rZh->title : '信息' !!}</h2>
+      @endif
       </div>
     </div>
   </section><!-- end post-wrapper-top -->