Merge commit '07b6b405'

* commit '07b6b405': Squashed 'Modules/Core/' changes from e8e79e4..dab167b

Merge commit '07b6b405'
* commit '07b6b405': Squashed 'Modules/Core/' changes from e8e79e4..dab167b
4810bd58 · Nicolas Widart · 52d696d0 · 07b6b405 · 4810bd58 · 4810bd58
Commit 4810bd58 authored Oct 23, 2014 by Nicolas Widart
4 changed files
--- a/Modules/Core/Composers/MasterViewComposer.php
+++ b/Modules/Core/Composers/MasterViewComposer.php
+<?php namespace Modules\Core\Composers;
+
+use Illuminate\Contracts\View\View;
+use Modules\Setting\Repositories\SettingRepository;
+
+class MasterViewComposer
+{
+    /**
+     * @var SettingRepository
+     */
+    private $setting;
+
+    public function __construct(SettingRepository $setting)
+    {
+        $this->setting = $setting;
+    }
+    public function compose(View $view)
+    {
+        $view->with('sitename', $this->setting->findSettingForModule('site-name'));
+    }
+}
--- a/Modules/Core/Resources/views/layouts/master.blade.php
+++ b/Modules/Core/Resources/views/layouts/master.blade.php
@@ -32,10 +32,10 @@
 </head>
 <body class="skin-blue">
 <header class="header">
-    <a href="#" class="logo">
-        @section('title')
-        SocialDashy
-        @show
+    <a href="{{ URL::route('dashboard.index') }}" class="logo">
+        <?php if (isset($sitename)): ?>
+            {{ $sitename->translate(App::getLocale())->value }}
+        <?php endif; ?>
    </a>
    @include('core::partials.top-nav')
 </header>

--- a/Modules/Core/Resources/views/partials/sidebar-nav.blade.php
+++ b/Modules/Core/Resources/views/partials/sidebar-nav.blade.php
@@ -2,23 +2,6 @@
 <aside class="left-side sidebar-offcanvas">
    <!-- sidebar: style can be found in sidebar.less -->
    <section class="sidebar">
-        <!-- Sidebar user panel -->
-        <div class="user-panel">
-            <div class="pull-left image">
-                <img src="{{ $user->present()->gravatar() }}" class="img-circle" alt="User Image" />
-            </div>
-            <div class="pull-left info">
-                <?php if ($user->present()->fullname() != ' '): ?>
-                    <p><?= $user->present()->fullname(); ?></p>
-                <?php else: ?>
-                    <p><em>Complete your profile.</em></p>
-                <?php endif; ?>
-
-                <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
-            </div>
-        </div>
-
-        <!-- sidebar menu: : style can be found in sidebar.less -->
        <ul class="sidebar-menu">
            <?php $items = \Modules\Core\Navigation\NavigationOrdener::order($items); ?>
            <?php foreach($items as $i => $item): ?>

--- a/Modules/Core/composers.php
+++ b/Modules/Core/composers.php
 <?php

 View::creator('core::partials.sidebar-nav', 'Modules\Core\Composers\SidebarViewCreator');
+View::composer('core::layouts.master', 'Modules\Core\Composers\MasterViewComposer');