Commit 07b6b405 authored by Nicolas Widart's avatar Nicolas Widart

Squashed 'Modules/Core/' changes from e8e79e4..dab167b

dab167b Removing the user info from the sidebar
b4f6083 Adding the sitename from settings

git-subtree-dir: Modules/Core
git-subtree-split: dab167b858cec0f6f2eca5dbce8cf3410a8b53ca
parent ec7b8142
<?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'));
}
}
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
</head> </head>
<body class="skin-blue"> <body class="skin-blue">
<header class="header"> <header class="header">
<a href="#" class="logo"> <a href="{{ URL::route('dashboard.index') }}" class="logo">
@section('title') <?php if (isset($sitename)): ?>
SocialDashy {{ $sitename->translate(App::getLocale())->value }}
@show <?php endif; ?>
</a> </a>
@include('core::partials.top-nav') @include('core::partials.top-nav')
</header> </header>
......
...@@ -2,23 +2,6 @@ ...@@ -2,23 +2,6 @@
<aside class="left-side sidebar-offcanvas"> <aside class="left-side sidebar-offcanvas">
<!-- sidebar: style can be found in sidebar.less --> <!-- sidebar: style can be found in sidebar.less -->
<section class="sidebar"> <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"> <ul class="sidebar-menu">
<?php $items = \Modules\Core\Navigation\NavigationOrdener::order($items); ?> <?php $items = \Modules\Core\Navigation\NavigationOrdener::order($items); ?>
<?php foreach($items as $i => $item): ?> <?php foreach($items as $i => $item): ?>
......
<?php <?php
View::creator('core::partials.sidebar-nav', 'Modules\Core\Composers\SidebarViewCreator'); View::creator('core::partials.sidebar-nav', 'Modules\Core\Composers\SidebarViewCreator');
View::composer('core::layouts.master', 'Modules\Core\Composers\MasterViewComposer');
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment