partners on every pages

sdebacker · Jun 18, 2014 · 9239424 · 9239424
1 parent 9e3170d
commit 9239424
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/app/TypiCMS/Modules/Pages/Views/pages/public/home.blade.php b/app/TypiCMS/Modules/Pages/Views/pages/public/home.blade.php
@@ -6,7 +6,7 @@
 
         <div class="col-sm-4">
 
-            @if($latestNews = News::latest(3))
+            @if($latestNews = News::latest(3) and count($latestNews))
             <h3>@lang('db.Latest news')</h3>
             <ul>
                 @foreach ($latestNews as $news)
@@ -20,7 +20,7 @@
             <a href="{{ route($lang . '.news') }}" class="btn btn-default btn-xs">@lang('db.All news')</a>
             @endif
 
-            @if($incomingEvents = Events::incoming())
+            @if($incomingEvents = Events::incoming() and count($incomingEvents))
             <h3>@lang('db.Incoming events')</h3>
             <ul>
                 @foreach ($incomingEvents as $event)
@@ -42,20 +42,4 @@
 
     </div>
 
-    <div class="partners">
-        @if($partners = Partners::getAll())
-        <h3>
-            <a href="{{ route($lang . '.partners') }}">@lang('db.Partners')</a>
-        </h3>
-        <ul>
-            @foreach ($partners as $partner)
-            <li>
-                <img src="{{ $partner->present()->thumb(null, 50, array(), 'logo') }}" alt="">
-                <a href="{{ $partner->website }}" target="_blank">{{ $partner->title }}</a>
-            </li>
-            @endforeach
-        </ul>
-        @endif
-    </div>
-
 @stop
diff --git a/app/views/public/master.blade.php b/app/views/public/master.blade.php
@@ -58,14 +58,34 @@
 
         @yield('main')
 
+        <div class="partners">
+            @if($partners = Partners::getAll() and count($partners))
+            <h3>
+                <a href="{{ route($lang . '.partners') }}">@lang('db.Partners')</a>
+            </h3>
+            <ul class="list-unstyled">
+                @foreach ($partners as $partner)
+                <li>
+                    <a href="{{ $partner->website }}" title="{{ $partner->title }}" target="_blank">
+                        <img src="{{ $partner->present()->thumb(null, 50, array(), 'logo') }}" alt="">
+                    </a>
+                </li>
+                @endforeach
+            </ul>
+            @endif
+        </div>
+
         @section('footer')
         <div class="row">
+
             <div class="col-sm-4">
                 {{ Menu::build('social', array('id' => 'social')) }}
             </div>
+
             <nav class="col-sm-8" role="navigation">
                 {{ Menu::build('footer') }}
             </nav>
+
         </div>
         @show