Skip to content

Commit

Permalink
Исправление ошибок
Browse files Browse the repository at this point in the history
  • Loading branch information
@butschster
butschster committed Feb 20, 2016
1 parent 637bb1e commit 8bc6748
Show file tree
Hide file tree
Showing 59 changed files with 378 additions and 312 deletions.
2 changes: 1 addition & 1 deletion resources/views/default/_partials/navigation.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@endforeach

@foreach(AdminNavigation::getRootSection()->getSections() as $section)
@include('cms::navigation.sections', ['section' => $section])
@include(AdminTemplate::getTemplateViewPath('_partials.navigation.sections', ['section' => $section]))
@endforeach
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/default/_partials/navigation/sections.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@endforeach

@foreach($section->getSections() as $sub_section )
@include('cms::navigation.sections', ['section' => $sub_section])
@include(AdminTemplate::getTemplateViewPath('_partials.navigation.sections', ['section' => $sub_section])
@endforeach
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/default/column/action.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<td>
<td {!! HTML::attributes($attributes) !!}>
<div class="text-right">
<a class="btn btn-default btn-sm btnAction" href="{{ $url }}" data-href="{{ $url }}" @if ($style == 'short') data-toggle="tooltip" title="{{ $value }}" @endif target="{{ $target }}">
@if ($icon)
Expand Down
6 changes: 2 additions & 4 deletions resources/views/default/column/checkbox.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<td>
<div style="width: 30px;">
<input type="checkbox" class="adminCheckboxRow" value="{{ $value }}"/>
</div>
<td {!! HTML::attributes($attributes) !!}>
<input type="checkbox" class="adminCheckboxRow" value="{{ $value }}"/>
</td>
8 changes: 4 additions & 4 deletions resources/views/default/column/control.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<td>
<td {!! HTML::attributes($attributes) !!}>
<div class="text-right pull-right" style="width: 90px;">
@if ($editable)
<a href="{{ $editUrl }}" class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('admin::lang.table.edit') }}"><i class="fa fa-pencil"></i></a>
<a href="{{ $editUrl }}" class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.edit') }}"><i class="fa fa-pencil"></i></a>
@endif
@if ($deletable)
<form action="{{ $deleteUrl }}" method="POST" style="display:inline-block;">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<input type="hidden" name="_method" value="DELETE" />
<button class="btn btn-danger btn-sm btn-delete" data-toggle="tooltip" title="{{ trans('admin::lang.table.delete') }}">
<button class="btn btn-danger btn-sm btn-delete" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.delete') }}">
<i class="fa fa-times"></i>
</button>
</form>
@endif
@if ($restorable)
<form action="{{ $restoreUrl }}" method="POST" style="display:inline-block;">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<button class="btn btn-primary btn-sm" data-toggle="tooltip" title="{{ trans('admin::lang.table.restore') }}">
<button class="btn btn-primary btn-sm" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.restore') }}">
<i class="fa fa-reply"></i>
</button>
</form>
Expand Down
4 changes: 3 additions & 1 deletion resources/views/default/column/count.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<td>{{{ $value }}} {!! $append !!}</td>
<td {!! HTML::attributes($attributes) !!}>
{{{ $value }}} {!! $append !!}
</td>
4 changes: 3 additions & 1 deletion resources/views/default/column/custom.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<td>{!! $value !!} {!! $append !!}</td>
<td {!! HTML::attributes($attributes) !!}>
{!! $value !!} {!! $append !!}
</td>
4 changes: 3 additions & 1 deletion resources/views/default/column/datetime.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<td data-order="{{ $originalValue }}">{{ $value }} {!! $append !!}</td>
<td {!! HTML::attributes($attributes) !!}>
{{ $value }} {!! $append !!}
</td>
6 changes: 4 additions & 2 deletions resources/views/default/column/filter.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@if ( ! is_null($value))
<a href="{{ $url }}"><i class="fa {{ $isSelf ? 'fa-filter' : 'fa-arrow-circle-o-right' }}" data-toggle="tooltip" title="{{ $isSelf ? trans('admin::lang.table.filter') : trans('admin::lang.table.filter-goto') }}"></i></a>
@endif
<a href="{{ $url }}" class="btn btn-link btn-outline">
<i class="fa {{ $icon }}" data-toggle="tooltip" title="{{ $title }}"></i>
</a>
@endif
4 changes: 3 additions & 1 deletion resources/views/default/column/header.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<th data-orderable="{{ $orderable ? 'true' : 'false' }}">{!! $title !!}</th>
<th data-orderable="{{ $orderable ? 'true' : 'false' }}" class="row-header">
{!! $title !!}
</th>
4 changes: 2 additions & 2 deletions resources/views/default/column/image.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<td>
<td {!! HTML::attributes($attributes) !!}>
@if ( ! empty($value))
<a href="{{ $value }}" data-toggle="lightbox">
<img class="thumbnail" src="{{ $value }}" width="80px">
</a>
@endif
{!! $append !!}
</td>
</td>
3 changes: 3 additions & 0 deletions resources/views/default/column/link.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<td {!! HTML::attributes($attributes) !!}>
{!! link_to($link, $value, $linkAttributes) !!} {!! $append !!}
</td>
12 changes: 5 additions & 7 deletions resources/views/default/column/lists.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<td>
<ul class="list-unstyled">
@foreach ($values as $value)
<li>{{ $value }}</li>
@endforeach
</ul>
</td>
<td {!! HTML::attributes($attributes) !!}>
@foreach ($values as $value)
<span class="label label-info">{{ $value }}</span>
@endforeach
</td>
38 changes: 18 additions & 20 deletions resources/views/default/column/order.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<td>
<div class="text-right" style="width: 110px;">
@if ($movableUp)
<form action="{{ $moveUpUrl }}" method="POST" style="display:inline-block;">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<button class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('admin::lang.table.moveUp') }}">
&uarr;
</button>
</form>
@endif
@if ($movableDown)
<form action="{{ $moveDownUrl }}" method="POST" style="display:inline-block;">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<button class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('admin::lang.table.moveDown') }}">
&darr;
</button>
</form>
@endif
</div>
</td>
<td {!! HTML::attributes($attributes) !!}>
@if ($movableUp)
<form action="{{ $moveUpUrl }}" method="POST" style="display:inline-block;">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<button class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.moveUp') }}">
&uarr;
</button>
</form>
@endif
@if ($movableDown)
<form action="{{ $moveDownUrl }}" method="POST" style="display:inline-block;">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<button class="btn btn-default btn-sm" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.moveDown') }}">
&darr;
</button>
</form>
@endif
</td>
2 changes: 1 addition & 1 deletion resources/views/default/column/string.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<td>{{ $value }} {!! $append !!}</td>
<td {!! HTML::attributes($attributes) !!}>{{ $value }} {!! $append !!}</td>
6 changes: 3 additions & 3 deletions resources/views/default/column/tree_control.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
@if ($editable)
<a href="{{ $editUrl }}" class="btn btn-default btn-xs" data-toggle="tooltip" title="{{ trans('admin::lang.table.edit') }}"><i class="fa fa-pencil"></i></a>
<a href="{{ $editUrl }}" class="btn btn-default btn-xs" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.edit') }}"><i class="fa fa-pencil"></i></a>
@endif
@if ($deletable)
<form action="{{ $deleteUrl }}" method="POST" style="display:inline-block;">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<input type="hidden" name="_method" value="DELETE" />
<button class="btn btn-danger btn-xs btn-delete" data-toggle="tooltip" title="{{ trans('admin::lang.table.delete') }}">
<button class="btn btn-danger btn-xs btn-delete" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.delete') }}">
<i class="fa fa-times"></i>
</button>
</form>
@endif
@if ($restorable)
<form action="{{ $restoreUrl }}" method="POST" style="display:inline-block;">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<button class="btn btn-primary btn-xs" data-toggle="tooltip" title="{{ trans('admin::lang.table.restore') }}">
<button class="btn btn-primary btn-xs" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.restore') }}">
<i class="fa fa-reply"></i>
</button>
</form>
Expand Down
6 changes: 4 additions & 2 deletions resources/views/default/column/url.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@if ( ! is_null($url))
<a href="{{ $url }}"><i class="fa fa-arrow-circle-o-right" data-toggle="tooltip" title="{{ trans('admin::lang.table.filter-goto') }}"></i></a>
@endif
<a href="{{ $url }}">
<i class="fa fa-arrow-circle-o-right" data-toggle="tooltip" title="{{ trans('sleeping_owl::lang.table.filter-goto') }}"></i>
</a>
@endif
6 changes: 6 additions & 0 deletions resources/views/default/columnfilter/filter_list.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<tr>
@foreach ($columns as $index => $column)
<?php $columnFilter = array_get($columnFilters, $index); ?>
<td data-index="{{ $index }}">{!! $columnFilter !!}</td>
@endforeach
</tr>
62 changes: 33 additions & 29 deletions resources/views/default/display/datatables.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,46 @@
</div>
</div>
@endif
@if ($creatable)
<a class="btn btn-primary" href="{{ $createUrl }}"><i class="fa fa-plus"></i> {{ trans('admin::lang.table.new-entry') }}</a>
@endif
<div class="pull-right tableActions">
@foreach ($actions as $action)
{!! $action !!}
@endforeach
</div>
<table class="table table-striped datatables" data-order="{{ json_encode($order) }}" data-attributes="{{ json_encode($attributes, JSON_FORCE_OBJECT) }}">
<thead>
<tr>
<div class="panel panel-default">
<div class="panel-heading">
@if ($creatable)
{!! link_to($createUrl, trans('sleeping_owl::lang.table.new-entry'), [
'class' => 'btn btn-primary btn-labeled', 'data-icon' => 'plus'
]) !!}
@endif

<div class="pull-right tableActions">
@foreach ($actions as $action)
{!! $action !!}
@endforeach
</div>
</div>
<table {!! HTML::attributes($attributes) !!}>
<colgroup>
@foreach ($columns as $column)
{!! $column->header() !!}
<col width="{!! $column->getWidth() !!}" />
@endforeach
</tr>
</thead>
<tfoot>
</colgroup>
<thead>
<tr>
@foreach ($columns as $index => $column)
<?php
$columnFilter = array_get($columnFilters, $index);
?>
<td data-index="{{ $index }}">{!! $columnFilter !!}</td>
@foreach ($columns as $column)
{!! $column->getHeader()->render() !!}
@endforeach
</tr>
</tfoot>
<tbody>
@foreach ($collection as $instance)
</thead>
<tbody>
@foreach ($collection as $model)
<tr>
@foreach ($columns as $column)
<?php
$column->setInstance($instance);
?>
{!! $column !!}
<?php $column->setModel($model); ?>
{!! $column->render() !!}
@endforeach
</tr>
@endforeach
</tbody>
</table>
</tbody>

<tfoot>
@include('sleeping_owl::default.columnfilter.filter_list')
</tfoot>
</table>
</div>
54 changes: 30 additions & 24 deletions resources/views/default/display/datatablesAsync.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,38 @@
</div>
</div>
@endif
@if ($creatable)
<a class="btn btn-primary" href="{{ $createUrl }}"><i class="fa fa-plus"></i> {{ trans('admin::lang.table.new-entry') }}</a>
@endif
<div class="pull-right tableActions">
@foreach ($actions as $action)
{!! $action !!}
@endforeach
</div>
<table class="table table-striped datatables" data-order="{{ json_encode($order) }}" data-url="{{ $url }}" data-attributes="{{ json_encode($attributes, JSON_FORCE_OBJECT) }}">
<thead>
<tr>
<div class="panel panel-default">
<div class="panel-heading">
@if ($creatable)
{!! link_to($createUrl, trans('sleeping_owl::lang.table.new-entry'), [
'class' => 'btn btn-primary btn-labeled', 'data-icon' => 'plus'
]) !!}
@endif

<div class="pull-right tableActions">
@foreach ($actions as $action)
{!! $action !!}
@endforeach
</div>
</div>
<table {!! HTML::attributes($attributes) !!}>
<colgroup>
@foreach ($columns as $column)
{!! $column->header() !!}
<col width="{!! $column->getWidth() !!}" />
@endforeach
</tr>
</thead>
<tfoot>
</colgroup>
<thead>
<tr>
@foreach ($columns as $index => $column)
<?php
$columnFilter = array_get($columnFilters, $index);
?>
<td data-index="{{ $index }}">{!! $columnFilter !!}</td>
@foreach ($columns as $column)
{!! $column->getHeader()->render() !!}
@endforeach
</tr>
</tfoot>
<tbody>
</tbody>
</table>
</thead>
<tbody>
</tbody>

<tfoot>
@include('sleeping_owl::default.columnfilter.filter_list')
</tfoot>
</table>
</div>
2 changes: 1 addition & 1 deletion resources/views/default/display/tabbed.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</ul>
<div class="tab-content">
@foreach ($tabs as $tab)
{!! $tab->content() !!}
{!! $tab->getContent()->render() !!}
@endforeach
</div>
</div>
Loading

0 comments on commit 8bc6748

Please sign in to comment.