- fix default template link

- update navigation - fix permissions
KodiComponents · May 23, 2016 · 70241ed · 70241ed
1 parent a2f9bfe
commit 70241ed
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 48 deletions.
diff --git a/src/Http/routes.php b/src/Http/routes.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::group(['prefix' => backend_url_segment(), 'as' => 'backend.', 'middleware' => ['web']], function () {
+Route::group(['prefix' => backend_url_segment(), 'as' => 'backend.', 'middleware' => ['web', 'backend.auth']], function () {
     Route::get('snippets', ['as' => 'snippet.list', 'uses' => 'SnippetController@getIndex']);
     Route::get('snippet/create', ['as' => 'snippet.create', 'uses' => 'SnippetController@getCreate']);
     Route::post('snippet/create', ['as' => 'snippet.create.post', 'uses' => 'SnippetController@postCreate']);
@@ -15,13 +15,13 @@
     Route::post('widget/{id}/edit', ['as' => 'widget.edit.post', 'uses' => 'WidgetController@postEdit']);
     Route::get('widget/create/{type?}', ['as' => 'widget.create', 'uses' => 'WidgetController@getCreate']);
     Route::post('widget/create', ['as' => 'widget.create.post', 'uses' => 'WidgetController@postCreate']);
-    Route::get('widget/{id/}template', ['as' => 'widget.template', 'uses' => 'WidgetController@getCreate']);
+    Route::get('widget/{id}/template', ['as' => 'widget.template', 'uses' => 'WidgetController@getTemplate']);
     Route::post('widget/{id}/delete', ['as' => 'widget.delete', 'uses' => 'WidgetController@postDelete']);
     Route::get('widget/popup/{id}', ['as' => 'widget.popup_list', 'uses' => 'WidgetController@getPopupList']);
     Route::get('widget/{type}', ['as' => 'widget.list.by_type', 'uses' => 'WidgetController@getIndex']);
 });
 
-Route::group(['as' => 'api.', 'middleware' => ['web', 'api']], function () {
+Route::group(['as' => 'api.', 'middleware' => ['web', 'api', 'backend.auth']], function () {
     RouteAPI::put('widget', ['as' => 'widget.place', 'uses' => 'API\WidgetController@putPlace']);
     RouteAPI::post('widget.set.template', [
         'as'   => 'widget.set.template',

diff --git a/src/Providers/EventsServiceProvider.php b/src/Providers/EventsServiceProvider.php
@@ -4,16 +4,14 @@
 
 use PackageManager;
 use KodiCMS\Pages\Helpers\Block;
-use KodiCMS\Users\Model\UserRole;
+use KodiCMS\Users\Model\Role;
 use KodiCMS\Widgets\Model\Widget;
-use KodiCMS\Widgets\Manager\WidgetManager;
 use KodiCMS\Widgets\Model\SnippetCollection;
 use KodiCMS\Widgets\Contracts\WidgetPaginator;
 use KodiCMS\Widgets\Collection\PageWidgetCollection;
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as BaseEventServiceProvider;
 use KodiCMS\Widgets\Observers\WidgetObserver;
-use KodiCMS\Widgets\Manager\WidgetManagerDatabase;
 use Request;
 use KodiCMS\Pages\Model\Page;
 
@@ -74,7 +72,7 @@ public function boot(DispatcherContract $events)
             }
 
             if (acl_check('widgets.roles') and ! $widget->isHandler()) {
-                $usersRoles = UserRole::lists('name', 'id')->all();
+                $usersRoles = Role::pluck('name', 'id')->all();
                 echo view('widgets::widgets.partials.permissions', compact('widget', 'usersRoles'))->render();
             }
         });

diff --git a/src/Providers/ModuleServiceProvider.php b/src/Providers/ModuleServiceProvider.php
@@ -17,6 +17,8 @@ public function boot()
         $this->app->alias('widget.manager', WidgetManager::class);
 
         $this->app['view']->addNamespace('snippets', snippets_path());
+
+        $this->registerNavigation();
     }
 
     public function register()
@@ -26,4 +28,28 @@ public function register()
             EventsServiceProvider::class,
         ]);
     }
+
+    private function registerNavigation()
+    {
+        if ($navigation = \Navigation::getPages()->findById('design')) {
+            $navigation->setFromArray([
+                [
+                    'id' => 'snippets',
+                    'title' => 'widgets::snippet.title.list',
+                    'url' => route('backend.snippet.list'),
+                    'permissions' => 'snippet.index',
+                    'priority' => 200,
+                    'icon' => 'cutlery',
+                ],
+                [
+                    'id' => 'widgets',
+                    'title' => 'widgets::core.title.list',
+                    'url' => route('backend.widget.list'),
+                    'permissions' => 'widgets.index',
+                    'priority' => 300,
+                    'icon' => 'cubes',
+                ],
+            ]);
+        }
+    }
 }
diff --git a/src/config/sitemap.php b/src/config/sitemap.php
diff --git a/src/resources/views/snippet/snippet_select.blade.php b/src/resources/views/snippet/snippet_select.blade.php
@@ -1,5 +1,4 @@
-@section('scripts')
-	@parent
+@push('scripts')
 <script type="text/javascript">
 $(function() {
 	var editSnippetUrl = '{{ route('backend.snippet.edit', ['***']) }}';
@@ -31,7 +30,7 @@ function update_snippets_list(e, response) {
 		.change();
 }
 </script>
-@stop
+@endpush
 
 <?php
 if (empty($templates))

diff --git a/src/resources/views/widgets/list.blade.php b/src/resources/views/widgets/list.blade.php
@@ -81,7 +81,9 @@
 				</td>
 				<td class="template">
 					@if ($widget->isRenderable())
-					<span class="editable-template label label-info" data-value="{{ $widget->template or null }}">{{ $widget->template }}</span>
+					<span class="editable-template label label-info" data-value="{{ $widget->template or null }}">
+						{{ $widget->template }}
+					</span>
 					@endif
 				</td>
 				<td class="cache">

diff --git a/src/resources/views/widgets/page/iframe.blade.php b/src/resources/views/widgets/page/iframe.blade.php
@@ -1,12 +1,10 @@
-@section('page-content')
-	@parent
-
+@push('page-content')
 	<div class="panel-heading">
 		<span class="panel-title" data-icon="cubes">
 			@lang('widgets::core.title.list') <span class="text-muted">[{{ $page->getLayout() }}]</span>
-		</h4>
+		</span>
 	</div>
 	<div class="panel-body no-padding panel-body-page-widgets">
 		<iframe src="{{ route('backend.pages.wysiwyg', [$page]) }}" style="width:100%;height:500px;border:none;"></iframe>
 	</div>
-@endsection
+@endpush
diff --git a/src/resources/views/widgets/page/list.blade.php b/src/resources/views/widgets/page/list.blade.php
@@ -1,8 +1,6 @@
-@section('page-content')
-	@parent
-
+@push('page-content')
 <div class="panel-heading panel-toggler" data-hotkeys="shift+w">
-	<span class="panel-title" data-icon="cubes">@lang('widgets::core.title.list')</h4>
+	<span class="panel-title" data-icon="cubes">@lang('widgets::core.title.list')</span>
 </div>
 <div class="panel-body panel-spoiler">
 	@if (is_null($page->id))
@@ -45,8 +43,8 @@
 	</table>
 	@endif
 </div>
-@stop
+@endpush
 
-@section('scripts')
+@push('scripts')
 <script src="/backend/cms/js/WidgetController.js"></script>
-@stop
+@endpush