Browse Source

Added app name in sidebar

Fixed some view files
pull/1/head
Nafies Luthfi 8 years ago
parent
commit
a438f2a57d
  1. 1
      resources/views/layouts/partials/sidebar.blade.php
  2. 2
      resources/views/projects/create.blade.php
  3. 2
      resources/views/projects/partials/project-show.blade.php
  4. 2
      resources/views/users/calendar.blade.php
  5. 4
      tests/Feature/Api/ApiEventsTest.php

1
resources/views/layouts/partials/sidebar.blade.php

@ -10,6 +10,7 @@
<div class="sidebar-nav navbar-collapse">
<a class="navbar-brand text-center" title="Home | {{ Option::get('app_tagline', 'Laravel app description') }}" href="{{ route('home') }}">
{!! Html::image(url('assets/imgs/logo.png'),'Logo ' . Option::get('app_name','Laravel'), ['class' => 'sidebar-logo']) !!}
<div class="small" style="margin-top:10px">{{ Option::get('app_name','Laravel') }}</div>
</a>
<ul class="nav" id="side-menu">
<li>{!! html_link_to_route('home', 'Dashboard', [], ['icon' => 'dashboard']) !!}</li>

2
resources/views/projects/create.blade.php

@ -15,7 +15,7 @@
<div class="panel-heading"><h3 class="panel-title">{{ trans('project.create') }}</h3></div>
<div class="panel-body">
{!! FormField::text('name',['label'=> trans('project.name')]) !!}
{!! FormField::select('customer_id', $customers, ['placeholder' => '-- Customer Baru --']) !!}
{!! FormField::select('customer_id', $customers, ['placeholder' => 'Customer Baru']) !!}
<div class="row">
<div class="col-md-6">
{!! FormField::text('customer_name') !!}

2
resources/views/projects/partials/project-show.blade.php

@ -3,7 +3,7 @@
<div class="panel-body">
<table class="table table-condensed">
<tbody>
<tr><td>{{ trans('project.name') }}</td><td>{{ $project->name }}</td></tr>
<tr><td class="col-xs-3">{{ trans('project.name') }}</td><td class="col-xs-9">{{ $project->name }}</td></tr>
<tr><td>{{ trans('project.description') }}</td><td>{!! nl2br($project->description) !!}</td></tr>
<tr><td>{{ trans('project.proposal_date') }}</td><td>{{ dateId($project->proposal_date) }}</td></tr>
<tr><td>{{ trans('project.proposal_value') }}</td><td class="text-right">{{ formatRp($project->proposal_value) }}</td></tr>

2
resources/views/users/calendar.blade.php

@ -143,7 +143,7 @@
center: 'title',
left: 'month,agendaWeek,agendaDay,listYear'
},
// defaultView: 'month',
defaultView: 'agendaWeek',
height: 550,
selectable: true,
selectHelper: true,

4
tests/Feature/Api/ApiEventsTest.php

@ -126,7 +126,7 @@ class ApiEventsTest extends TestCase
$this->patchJson(route('api.events.reschedule'), [
'id' => $event->id,
'start' => '2016-11-07 13:00:00',
'start' => '2016-11-07 15:00:00',
'end' => '2016-11-07 15:00:00',
], [
'Authorization' => 'Bearer ' . $user->api_token
]);
@ -142,7 +142,7 @@ class ApiEventsTest extends TestCase
'id' => $event->id,
'user_id' => $user->id,
'start' => '2016-11-07 13:00:00',
'start' => '2016-11-07 15:00:00',
'end' => '2016-11-07 15:00:00',
]);
}
}
Loading…
Cancel
Save