diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 83c41136..5892e1d5 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -139,7 +139,7 @@ class ItemController extends Controller { // $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id'); - $data['tags']->prepend('Home dashboard', 0); + $data['tags']->prepend(__('app.dashboard'), 0); $data['current_tags'] = []; return view('items.create', $data); @@ -215,7 +215,7 @@ class ItemController extends Controller // Get the item $data['item'] = Item::find($id); $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id'); - $data['tags']->prepend('Home dashboard', 0); + $data['tags']->prepend(__('app.dashboard'), 0); $data['current_tags'] = $data['item']->tags(); //$data['current_tags'] = $data['item']->parent; //die(print_r($data['current_tags'])); diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index f5a9d4aa..324cfabe 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -22,8 +22,8 @@ class TagController extends Controller { $trash = (bool)$request->input('trash'); - $data['apps'] = Item::ofType('tag')->orderBy('title', 'asc')->get(); - $data['trash'] = Item::ofType('tag')->onlyTrashed()->get(); + $data['apps'] = Item::ofType('tag')->where('id', '>', 0)->orderBy('title', 'asc')->get(); + $data['trash'] = Item::ofType('tag')->where('id', '>', 0)->onlyTrashed()->get(); if($trash) { return view('tags.trash', $data); } else { diff --git a/app/Item.php b/app/Item.php index eb2dba55..f559945f 100644 --- a/app/Item.php +++ b/app/Item.php @@ -81,9 +81,9 @@ class Item extends Model if(in_array(0, $tags)) { $details = new Item([ "id" => 0, - "title" => 'Home dashboard', + "title" => __('app.dashboard'), "url" => '', - "pinned" => 1 + "pinned" => 0 ]); $tagdetails->prepend($details); } diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php index 6c336d1d..61e95454 100644 --- a/resources/lang/en/app.php +++ b/resources/lang/en/app.php @@ -79,6 +79,8 @@ return [ 'apps.preview' => 'Preview', 'apps.apptype' => 'Application Type', + 'dashboard' => 'Home dashboard', + 'user.user_list' => 'Users', 'user.add_user' => 'Add user', 'user.username' => 'Username',