diff --git a/Modules/Media/Resources/views/admin/edit.blade.php b/Modules/Media/Resources/views/admin/edit.blade.php index d601d0206..83e02c9c0 100644 --- a/Modules/Media/Resources/views/admin/edit.blade.php +++ b/Modules/Media/Resources/views/admin/edit.blade.php @@ -5,8 +5,8 @@ {{ trans('media::media.title.edit media') }} {{ $file->filename }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. -
  2. {{ trans('media::media.title.media') }}
    3. +
  3. {{ trans('core::core.breadcrumb.home') }}
    4. +
  4. {{ trans('media::media.title.media') }}
  5. {{ trans('media::media.title.edit media') }}
@stop @@ -29,7 +29,7 @@ @tags('asgardcms/media', $file)
- {{ trans('core::core.button.cancel') }} + {{ trans('core::core.button.cancel') }}
{{-- end nav-tabs-custom --}} diff --git a/Modules/Menu/Resources/views/admin/menuitems/create.blade.php b/Modules/Menu/Resources/views/admin/menuitems/create.blade.php index aa396a207..83d131a5d 100644 --- a/Modules/Menu/Resources/views/admin/menuitems/create.blade.php +++ b/Modules/Menu/Resources/views/admin/menuitems/create.blade.php @@ -5,8 +5,8 @@ {{ trans('menu::menu.titles.create menu item') }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. -
  2. {{ trans('menu::menu.breadcrumb.menu') }}
    3. +
  3. {{ trans('core::core.breadcrumb.home') }}
    4. +
  4. {{ trans('menu::menu.breadcrumb.menu') }}
  5. {{ trans('menu::menu.breadcrumb.create menu item') }}
@stop @@ -52,7 +52,7 @@
- {{ trans('core::core.button.cancel') }} + {{ trans('core::core.button.cancel') }}
diff --git a/Modules/Menu/Resources/views/admin/menuitems/edit.blade.php b/Modules/Menu/Resources/views/admin/menuitems/edit.blade.php index a80ba9c19..6062e0168 100644 --- a/Modules/Menu/Resources/views/admin/menuitems/edit.blade.php +++ b/Modules/Menu/Resources/views/admin/menuitems/edit.blade.php @@ -5,8 +5,8 @@ {{ trans('menu::menu.titles.edit menu item') }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. -
  2. {{ trans('menu::menu.breadcrumb.menu') }}
    3. +
  3. {{ trans('core::core.breadcrumb.home') }}
    4. +
  4. {{ trans('menu::menu.breadcrumb.menu') }}
  5. {{ trans('menu::menu.breadcrumb.edit menu item') }}
@stop @@ -52,7 +52,7 @@
- {{ trans('core::core.button.cancel') }} + {{ trans('core::core.button.cancel') }}
diff --git a/Modules/Menu/Resources/views/admin/menus/create.blade.php b/Modules/Menu/Resources/views/admin/menus/create.blade.php index 9741eee5d..8f16c8fe8 100644 --- a/Modules/Menu/Resources/views/admin/menus/create.blade.php +++ b/Modules/Menu/Resources/views/admin/menus/create.blade.php @@ -5,8 +5,8 @@ {{ trans('menu::menu.titles.create menu') }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. -
  2. {{ trans('menu::menu.breadcrumb.menu') }}
    3. +
  3. {{ trans('core::core.breadcrumb.home') }}
    4. +
  4. {{ trans('menu::menu.breadcrumb.menu') }}
  5. {{ trans('menu::menu.breadcrumb.create menu') }}
@stop @@ -52,7 +52,7 @@
- {{ trans('core::core.button.cancel') }} + {{ trans('core::core.button.cancel') }}
diff --git a/Modules/Menu/Resources/views/admin/menus/edit.blade.php b/Modules/Menu/Resources/views/admin/menus/edit.blade.php index 36b6ce90c..99bbf8b33 100644 --- a/Modules/Menu/Resources/views/admin/menus/edit.blade.php +++ b/Modules/Menu/Resources/views/admin/menus/edit.blade.php @@ -5,8 +5,8 @@ {{ trans('menu::menu.titles.edit menu') }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. -
  2. {{ trans('menu::menu.breadcrumb.menu') }}
    3. +
  3. {{ trans('core::core.breadcrumb.home') }}
    4. +
  4. {{ trans('menu::menu.breadcrumb.menu') }}
  5. {{ trans('menu::menu.breadcrumb.edit menu') }}
@stop @@ -21,7 +21,7 @@
- + {{ trans('menu::menu.button.create menu item') }}
@@ -70,7 +70,7 @@
- {{ trans('core::core.button.cancel') }} + {{ trans('core::core.button.cancel') }}
diff --git a/Modules/Menu/Resources/views/admin/menus/index.blade.php b/Modules/Menu/Resources/views/admin/menus/index.blade.php index cfa52b1c1..9763972b7 100644 --- a/Modules/Menu/Resources/views/admin/menus/index.blade.php +++ b/Modules/Menu/Resources/views/admin/menus/index.blade.php @@ -5,7 +5,7 @@ {{ trans('menu::menu.titles.menu') }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. +
  2. {{ trans('core::core.breadcrumb.home') }}
  3. {{ trans('menu::menu.breadcrumb.menu') }}
@stop @@ -15,7 +15,7 @@
- + {{ trans('menu::menu.button.create menu') }}
@@ -38,18 +38,18 @@ - + {{ $menu->name }} - + {{ $menu->title }}
- +
diff --git a/Modules/Menu/Services/MenuRenderer.php b/Modules/Menu/Services/MenuRenderer.php index 893030612..b9b9e3be2 100644 --- a/Modules/Menu/Services/MenuRenderer.php +++ b/Modules/Menu/Services/MenuRenderer.php @@ -2,8 +2,6 @@ namespace Modules\Menu\Services; -use Illuminate\Support\Facades\URL; - class MenuRenderer { /** @@ -48,7 +46,7 @@ private function generateHtmlFor($items) $this->menu .= '
    '; foreach ($items as $item) { $this->menu .= "
  1. id}\">"; - $editLink = URL::route('dashboard.menuitem.edit', [$this->menuId, $item->id]); + $editLink = route('dashboard.menuitem.edit', [$this->menuId, $item->id]); $style = $item->isRoot() ? 'none' : 'inline'; $this->menu .= << diff --git a/Modules/Page/Resources/views/admin/create.blade.php b/Modules/Page/Resources/views/admin/create.blade.php index 48bfb4d91..fa5f79e46 100644 --- a/Modules/Page/Resources/views/admin/create.blade.php +++ b/Modules/Page/Resources/views/admin/create.blade.php @@ -5,8 +5,8 @@ {{ trans('page::pages.create page') }}
      -
    1. {{ trans('core::core.breadcrumb.home') }}
      2. -
    2. {{ trans('page::pages.pages') }}
      3. +
    3. {{ trans('core::core.breadcrumb.home') }}
      4. +
    4. {{ trans('page::pages.pages') }}
    5. {{ trans('page::pages.create page') }}
    @stop diff --git a/Modules/Page/Resources/views/admin/edit.blade.php b/Modules/Page/Resources/views/admin/edit.blade.php index 1cf183d7e..04c86d52d 100644 --- a/Modules/Page/Resources/views/admin/edit.blade.php +++ b/Modules/Page/Resources/views/admin/edit.blade.php @@ -5,8 +5,8 @@ {{ trans('page::pages.edit page') }}
      -
    1. {{ trans('core::core.breadcrumb.home') }}
      2. -
    2. {{ trans('page::pages.pages') }}
      3. +
    3. {{ trans('core::core.breadcrumb.home') }}
      4. +
    4. {{ trans('page::pages.pages') }}
    5. {{ trans('page::pages.edit page') }}
    @stop diff --git a/Modules/Page/Resources/views/admin/index.blade.php b/Modules/Page/Resources/views/admin/index.blade.php index 8b91e87e8..9798dba40 100644 --- a/Modules/Page/Resources/views/admin/index.blade.php +++ b/Modules/Page/Resources/views/admin/index.blade.php @@ -5,7 +5,7 @@ {{ trans('page::pages.pages') }}
      -
    1. {{ trans('core::core.breadcrumb.home') }}
      2. +
    2. {{ trans('core::core.breadcrumb.home') }}
    3. {{ trans('page::pages.pages') }}
    @stop diff --git a/Modules/Setting/Resources/views/.gitkeep b/Modules/Setting/Resources/views/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Modules/Setting/Resources/views/admin/module-settings.blade.php b/Modules/Setting/Resources/views/admin/module-settings.blade.php index 45c861c80..4c16796cc 100644 --- a/Modules/Setting/Resources/views/admin/module-settings.blade.php +++ b/Modules/Setting/Resources/views/admin/module-settings.blade.php @@ -6,7 +6,7 @@
    1. {{ trans('core::core.breadcrumb.home') }}
      2. -
    2. {{ trans('setting::settings.breadcrumb.settings') }}
      3. +
    3. {{ trans('setting::settings.breadcrumb.settings') }}
    4. {{ trans('setting::settings.breadcrumb.module settings', ['module' => ucfirst($currentModule)]) }}
    @stop @@ -28,7 +28,7 @@
diff --git a/Modules/User/Resources/views/admin/account/api-keys/index.blade.php b/Modules/User/Resources/views/admin/account/api-keys/index.blade.php index 94d6a2bfb..5acaeba24 100644 --- a/Modules/User/Resources/views/admin/account/api-keys/index.blade.php +++ b/Modules/User/Resources/views/admin/account/api-keys/index.blade.php @@ -5,7 +5,7 @@ {{ trans('user::users.api-keys') }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. +
  2. {{ trans('core::core.breadcrumb.home') }}
  3. {{ trans('user::users.api-keys') }}
diff --git a/Modules/User/Resources/views/admin/account/profile/edit.blade.php b/Modules/User/Resources/views/admin/account/profile/edit.blade.php index d88ee216e..827d32aea 100644 --- a/Modules/User/Resources/views/admin/account/profile/edit.blade.php +++ b/Modules/User/Resources/views/admin/account/profile/edit.blade.php @@ -5,7 +5,7 @@ {{ trans('user::users.title.edit-profile') }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. +
  2. {{ trans('core::core.breadcrumb.home') }}
  3. {{ trans('user::users.breadcrumb.edit-profile') }}
@stop diff --git a/Modules/User/Resources/views/admin/roles/create.blade.php b/Modules/User/Resources/views/admin/roles/create.blade.php index c8415bedf..10e2fb735 100644 --- a/Modules/User/Resources/views/admin/roles/create.blade.php +++ b/Modules/User/Resources/views/admin/roles/create.blade.php @@ -3,8 +3,8 @@ @section('content-header')

New Role

    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. -
  2. {{ trans('user::roles.breadcrumb.roles') }}
    3. +
  3. {{ trans('core::core.breadcrumb.home') }}
    4. +
  4. {{ trans('user::roles.breadcrumb.roles') }}
  5. {{ trans('user::roles.breadcrumb.new') }}
@stop @@ -44,7 +44,7 @@
- {{ trans('user::button.cancel') }} + {{ trans('user::button.cancel') }}
diff --git a/Modules/User/Resources/views/admin/roles/edit.blade.php b/Modules/User/Resources/views/admin/roles/edit.blade.php index 4e601f428..a32481cb3 100644 --- a/Modules/User/Resources/views/admin/roles/edit.blade.php +++ b/Modules/User/Resources/views/admin/roles/edit.blade.php @@ -5,8 +5,8 @@ {{ trans('user::roles.title.edit') }} {{ $role->name }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. -
  2. {{ trans('user::roles.breadcrumb.roles') }}
    3. +
  3. {{ trans('core::core.breadcrumb.home') }}
    4. +
  4. {{ trans('user::roles.breadcrumb.roles') }}
  5. {{ trans('user::roles.breadcrumb.edit') }}
@stop @@ -53,7 +53,7 @@ @@ -63,7 +63,7 @@
- {{ trans('user::button.cancel') }} + {{ trans('user::button.cancel') }}
diff --git a/Modules/User/Resources/views/admin/roles/index.blade.php b/Modules/User/Resources/views/admin/roles/index.blade.php index 2bd03b028..aa44ac79c 100644 --- a/Modules/User/Resources/views/admin/roles/index.blade.php +++ b/Modules/User/Resources/views/admin/roles/index.blade.php @@ -5,7 +5,7 @@ {{ trans('user::roles.title.roles') }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. +
  2. {{ trans('core::core.breadcrumb.home') }}
  3. {{ trans('user::roles.breadcrumb.roles') }}
@stop @@ -15,7 +15,7 @@
- + {{ trans('user::roles.button.new-role') }}
@@ -39,17 +39,17 @@ - + {{ $role->id }} - + {{ $role->name }} - + {{ $role->created_at }} diff --git a/Modules/User/Resources/views/admin/users/create.blade.php b/Modules/User/Resources/views/admin/users/create.blade.php index b791f3a3b..de7ae2f69 100644 --- a/Modules/User/Resources/views/admin/users/create.blade.php +++ b/Modules/User/Resources/views/admin/users/create.blade.php @@ -5,8 +5,8 @@ {{ trans('user::users.title.new-user') }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. -
  2. {{ trans('user::users.breadcrumb.users') }}
    3. +
  3. {{ trans('core::core.breadcrumb.home') }}
    4. +
  4. {{ trans('user::users.breadcrumb.users') }}
  5. {{ trans('user::users.breadcrumb.new') }}
@stop @@ -95,7 +95,7 @@
- {{ trans('user::button.cancel') }} + {{ trans('user::button.cancel') }}
diff --git a/Modules/User/Resources/views/admin/users/edit.blade.php b/Modules/User/Resources/views/admin/users/edit.blade.php index 750922ef6..311303022 100644 --- a/Modules/User/Resources/views/admin/users/edit.blade.php +++ b/Modules/User/Resources/views/admin/users/edit.blade.php @@ -5,8 +5,8 @@ {{ trans('user::users.title.edit-user') }} {{ $user->present()->fullname() }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. -
  2. {{ trans('user::users.breadcrumb.users') }}
    3. +
  3. {{ trans('core::core.breadcrumb.home') }}
    4. +
  4. {{ trans('user::users.breadcrumb.users') }}
  5. {{ trans('user::users.breadcrumb.edit-user') }}
@stop diff --git a/Modules/User/Resources/views/admin/users/index.blade.php b/Modules/User/Resources/views/admin/users/index.blade.php index dfc23e312..b13470665 100644 --- a/Modules/User/Resources/views/admin/users/index.blade.php +++ b/Modules/User/Resources/views/admin/users/index.blade.php @@ -5,7 +5,7 @@ {{ trans('user::users.title.users') }}
    -
  1. {{ trans('core::core.breadcrumb.home') }}
    2. +
  2. {{ trans('core::core.breadcrumb.home') }}
  3. {{ trans('user::users.breadcrumb.users') }}
@stop @@ -15,7 +15,7 @@
- + {{ trans('user::users.button.new-user') }}
@@ -41,27 +41,27 @@ - + {{ $user->id }} - + {{ $user->first_name }} - + {{ $user->last_name }} - + {{ $user->email }} - + {{ $user->created_at }} diff --git a/Modules/Workshop/Resources/views/admin/workbench/index.blade.php b/Modules/Workshop/Resources/views/admin/workbench/index.blade.php index 45f27dda4..acb07a832 100644 --- a/Modules/Workshop/Resources/views/admin/workbench/index.blade.php +++ b/Modules/Workshop/Resources/views/admin/workbench/index.blade.php @@ -5,7 +5,7 @@ {{ trans('workshop::workbench.title') }}
    -
  1. {{ trans('user::users.breadcrumb.home') }}
    2. +
  2. {{ trans('user::users.breadcrumb.home') }}
  3. {{ trans('workshop::workbench.title') }}
@stop