From 32104da31f3e212b64ebe91f665bb4e4739d4324 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Sun, 19 Aug 2018 11:53:24 +0800 Subject: [PATCH] Change view extension from .tpl to .blade.php --- .gitattributes | 2 -- app/Providers/AppServiceProvider.php | 2 ++ resources/views/admin/{customize.tpl => customize.blade.php} | 0 resources/views/admin/{index.tpl => index.blade.php} | 0 resources/views/admin/{master.tpl => master.blade.php} | 0 resources/views/admin/{options.tpl => options.blade.php} | 0 resources/views/admin/{players.tpl => players.blade.php} | 0 resources/views/admin/{plugins.tpl => plugins.blade.php} | 0 resources/views/admin/{score.tpl => score.blade.php} | 0 resources/views/admin/{update.tpl => update.blade.php} | 0 resources/views/admin/{users.tpl => users.blade.php} | 0 resources/views/auth/{bind.tpl => bind.blade.php} | 0 resources/views/auth/{forgot.tpl => forgot.blade.php} | 0 resources/views/auth/{login.tpl => login.blade.php} | 0 resources/views/auth/{master.tpl => master.blade.php} | 0 resources/views/auth/{register.tpl => register.blade.php} | 0 resources/views/auth/{reset.tpl => reset.blade.php} | 0 .../views/common/dependencies/{script.tpl => script.blade.php} | 0 .../views/common/dependencies/{style.tpl => style.blade.php} | 0 resources/views/common/{language.tpl => language.blade.php} | 0 .../views/common/option-form/{addon.tpl => addon.blade.php} | 0 .../common/option-form/{checkbox.tpl => checkbox.blade.php} | 0 .../views/common/option-form/{group.tpl => group.blade.php} | 0 resources/views/common/option-form/{hint.tpl => hint.blade.php} | 0 resources/views/common/option-form/{item.tpl => item.blade.php} | 0 resources/views/common/option-form/{main.tpl => main.blade.php} | 0 .../views/common/option-form/{select.tpl => select.blade.php} | 0 resources/views/common/option-form/{text.tpl => text.blade.php} | 0 .../common/option-form/{textarea.tpl => textarea.blade.php} | 0 .../common/{texture-preview.tpl => texture-preview.blade.php} | 0 resources/views/common/{user-menu.tpl => user-menu.blade.php} | 0 resources/views/errors/{403.tpl => 403.blade.php} | 0 resources/views/errors/{404.tpl => 404.blade.php} | 0 resources/views/errors/{500.tpl => 500.blade.php} | 0 resources/views/errors/{503.tpl => 503.blade.php} | 0 resources/views/errors/{exception.tpl => exception.blade.php} | 0 resources/views/errors/{general.tpl => general.blade.php} | 0 resources/views/errors/{pretty.tpl => pretty.blade.php} | 0 resources/views/{index.tpl => index.blade.php} | 0 resources/views/setup/{locked.tpl => locked.blade.php} | 0 resources/views/setup/{master.tpl => master.blade.php} | 0 resources/views/setup/updates/{master.tpl => master.blade.php} | 0 .../views/setup/updates/{success.tpl => success.blade.php} | 0 .../views/setup/updates/{welcome.tpl => welcome.blade.php} | 0 .../views/setup/wizard/{database.tpl => database.blade.php} | 0 resources/views/setup/wizard/{finish.tpl => finish.blade.php} | 0 resources/views/setup/wizard/{info.tpl => info.blade.php} | 0 .../views/setup/wizard/{language.tpl => language.blade.php} | 0 resources/views/setup/wizard/{welcome.tpl => welcome.blade.php} | 0 resources/views/skinlib/{index.tpl => index.blade.php} | 0 resources/views/skinlib/{master.tpl => master.blade.php} | 0 resources/views/skinlib/{show.tpl => show.blade.php} | 0 resources/views/skinlib/{upload.tpl => upload.blade.php} | 0 resources/views/user/{closet.tpl => closet.blade.php} | 0 resources/views/user/{index.tpl => index.blade.php} | 0 resources/views/user/{master.tpl => master.blade.php} | 0 resources/views/user/{player.tpl => player.blade.php} | 0 resources/views/user/{profile.tpl => profile.blade.php} | 0 58 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 .gitattributes rename resources/views/admin/{customize.tpl => customize.blade.php} (100%) rename resources/views/admin/{index.tpl => index.blade.php} (100%) rename resources/views/admin/{master.tpl => master.blade.php} (100%) rename resources/views/admin/{options.tpl => options.blade.php} (100%) rename resources/views/admin/{players.tpl => players.blade.php} (100%) rename resources/views/admin/{plugins.tpl => plugins.blade.php} (100%) rename resources/views/admin/{score.tpl => score.blade.php} (100%) rename resources/views/admin/{update.tpl => update.blade.php} (100%) rename resources/views/admin/{users.tpl => users.blade.php} (100%) rename resources/views/auth/{bind.tpl => bind.blade.php} (100%) rename resources/views/auth/{forgot.tpl => forgot.blade.php} (100%) rename resources/views/auth/{login.tpl => login.blade.php} (100%) rename resources/views/auth/{master.tpl => master.blade.php} (100%) rename resources/views/auth/{register.tpl => register.blade.php} (100%) rename resources/views/auth/{reset.tpl => reset.blade.php} (100%) rename resources/views/common/dependencies/{script.tpl => script.blade.php} (100%) rename resources/views/common/dependencies/{style.tpl => style.blade.php} (100%) rename resources/views/common/{language.tpl => language.blade.php} (100%) rename resources/views/common/option-form/{addon.tpl => addon.blade.php} (100%) rename resources/views/common/option-form/{checkbox.tpl => checkbox.blade.php} (100%) rename resources/views/common/option-form/{group.tpl => group.blade.php} (100%) rename resources/views/common/option-form/{hint.tpl => hint.blade.php} (100%) rename resources/views/common/option-form/{item.tpl => item.blade.php} (100%) rename resources/views/common/option-form/{main.tpl => main.blade.php} (100%) rename resources/views/common/option-form/{select.tpl => select.blade.php} (100%) rename resources/views/common/option-form/{text.tpl => text.blade.php} (100%) rename resources/views/common/option-form/{textarea.tpl => textarea.blade.php} (100%) rename resources/views/common/{texture-preview.tpl => texture-preview.blade.php} (100%) rename resources/views/common/{user-menu.tpl => user-menu.blade.php} (100%) rename resources/views/errors/{403.tpl => 403.blade.php} (100%) rename resources/views/errors/{404.tpl => 404.blade.php} (100%) rename resources/views/errors/{500.tpl => 500.blade.php} (100%) rename resources/views/errors/{503.tpl => 503.blade.php} (100%) rename resources/views/errors/{exception.tpl => exception.blade.php} (100%) rename resources/views/errors/{general.tpl => general.blade.php} (100%) rename resources/views/errors/{pretty.tpl => pretty.blade.php} (100%) rename resources/views/{index.tpl => index.blade.php} (100%) rename resources/views/setup/{locked.tpl => locked.blade.php} (100%) rename resources/views/setup/{master.tpl => master.blade.php} (100%) rename resources/views/setup/updates/{master.tpl => master.blade.php} (100%) rename resources/views/setup/updates/{success.tpl => success.blade.php} (100%) rename resources/views/setup/updates/{welcome.tpl => welcome.blade.php} (100%) rename resources/views/setup/wizard/{database.tpl => database.blade.php} (100%) rename resources/views/setup/wizard/{finish.tpl => finish.blade.php} (100%) rename resources/views/setup/wizard/{info.tpl => info.blade.php} (100%) rename resources/views/setup/wizard/{language.tpl => language.blade.php} (100%) rename resources/views/setup/wizard/{welcome.tpl => welcome.blade.php} (100%) rename resources/views/skinlib/{index.tpl => index.blade.php} (100%) rename resources/views/skinlib/{master.tpl => master.blade.php} (100%) rename resources/views/skinlib/{show.tpl => show.blade.php} (100%) rename resources/views/skinlib/{upload.tpl => upload.blade.php} (100%) rename resources/views/user/{closet.tpl => closet.blade.php} (100%) rename resources/views/user/{index.tpl => index.blade.php} (100%) rename resources/views/user/{master.tpl => master.blade.php} (100%) rename resources/views/user/{player.tpl => player.blade.php} (100%) rename resources/views/user/{profile.tpl => profile.blade.php} (100%) diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 994c0d69..00000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -* text=auto -*.tpl linguist-language=php diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c4b11dd1..72dea085 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -63,6 +63,8 @@ class AppServiceProvider extends ServiceProvider // Support *.tpl extension name View::addExtension('tpl', 'blade'); + // Make the priority of *.blade.php higher than *.tpl + View::addExtension('blade.php', 'blade'); } /** diff --git a/resources/views/admin/customize.tpl b/resources/views/admin/customize.blade.php similarity index 100% rename from resources/views/admin/customize.tpl rename to resources/views/admin/customize.blade.php diff --git a/resources/views/admin/index.tpl b/resources/views/admin/index.blade.php similarity index 100% rename from resources/views/admin/index.tpl rename to resources/views/admin/index.blade.php diff --git a/resources/views/admin/master.tpl b/resources/views/admin/master.blade.php similarity index 100% rename from resources/views/admin/master.tpl rename to resources/views/admin/master.blade.php diff --git a/resources/views/admin/options.tpl b/resources/views/admin/options.blade.php similarity index 100% rename from resources/views/admin/options.tpl rename to resources/views/admin/options.blade.php diff --git a/resources/views/admin/players.tpl b/resources/views/admin/players.blade.php similarity index 100% rename from resources/views/admin/players.tpl rename to resources/views/admin/players.blade.php diff --git a/resources/views/admin/plugins.tpl b/resources/views/admin/plugins.blade.php similarity index 100% rename from resources/views/admin/plugins.tpl rename to resources/views/admin/plugins.blade.php diff --git a/resources/views/admin/score.tpl b/resources/views/admin/score.blade.php similarity index 100% rename from resources/views/admin/score.tpl rename to resources/views/admin/score.blade.php diff --git a/resources/views/admin/update.tpl b/resources/views/admin/update.blade.php similarity index 100% rename from resources/views/admin/update.tpl rename to resources/views/admin/update.blade.php diff --git a/resources/views/admin/users.tpl b/resources/views/admin/users.blade.php similarity index 100% rename from resources/views/admin/users.tpl rename to resources/views/admin/users.blade.php diff --git a/resources/views/auth/bind.tpl b/resources/views/auth/bind.blade.php similarity index 100% rename from resources/views/auth/bind.tpl rename to resources/views/auth/bind.blade.php diff --git a/resources/views/auth/forgot.tpl b/resources/views/auth/forgot.blade.php similarity index 100% rename from resources/views/auth/forgot.tpl rename to resources/views/auth/forgot.blade.php diff --git a/resources/views/auth/login.tpl b/resources/views/auth/login.blade.php similarity index 100% rename from resources/views/auth/login.tpl rename to resources/views/auth/login.blade.php diff --git a/resources/views/auth/master.tpl b/resources/views/auth/master.blade.php similarity index 100% rename from resources/views/auth/master.tpl rename to resources/views/auth/master.blade.php diff --git a/resources/views/auth/register.tpl b/resources/views/auth/register.blade.php similarity index 100% rename from resources/views/auth/register.tpl rename to resources/views/auth/register.blade.php diff --git a/resources/views/auth/reset.tpl b/resources/views/auth/reset.blade.php similarity index 100% rename from resources/views/auth/reset.tpl rename to resources/views/auth/reset.blade.php diff --git a/resources/views/common/dependencies/script.tpl b/resources/views/common/dependencies/script.blade.php similarity index 100% rename from resources/views/common/dependencies/script.tpl rename to resources/views/common/dependencies/script.blade.php diff --git a/resources/views/common/dependencies/style.tpl b/resources/views/common/dependencies/style.blade.php similarity index 100% rename from resources/views/common/dependencies/style.tpl rename to resources/views/common/dependencies/style.blade.php diff --git a/resources/views/common/language.tpl b/resources/views/common/language.blade.php similarity index 100% rename from resources/views/common/language.tpl rename to resources/views/common/language.blade.php diff --git a/resources/views/common/option-form/addon.tpl b/resources/views/common/option-form/addon.blade.php similarity index 100% rename from resources/views/common/option-form/addon.tpl rename to resources/views/common/option-form/addon.blade.php diff --git a/resources/views/common/option-form/checkbox.tpl b/resources/views/common/option-form/checkbox.blade.php similarity index 100% rename from resources/views/common/option-form/checkbox.tpl rename to resources/views/common/option-form/checkbox.blade.php diff --git a/resources/views/common/option-form/group.tpl b/resources/views/common/option-form/group.blade.php similarity index 100% rename from resources/views/common/option-form/group.tpl rename to resources/views/common/option-form/group.blade.php diff --git a/resources/views/common/option-form/hint.tpl b/resources/views/common/option-form/hint.blade.php similarity index 100% rename from resources/views/common/option-form/hint.tpl rename to resources/views/common/option-form/hint.blade.php diff --git a/resources/views/common/option-form/item.tpl b/resources/views/common/option-form/item.blade.php similarity index 100% rename from resources/views/common/option-form/item.tpl rename to resources/views/common/option-form/item.blade.php diff --git a/resources/views/common/option-form/main.tpl b/resources/views/common/option-form/main.blade.php similarity index 100% rename from resources/views/common/option-form/main.tpl rename to resources/views/common/option-form/main.blade.php diff --git a/resources/views/common/option-form/select.tpl b/resources/views/common/option-form/select.blade.php similarity index 100% rename from resources/views/common/option-form/select.tpl rename to resources/views/common/option-form/select.blade.php diff --git a/resources/views/common/option-form/text.tpl b/resources/views/common/option-form/text.blade.php similarity index 100% rename from resources/views/common/option-form/text.tpl rename to resources/views/common/option-form/text.blade.php diff --git a/resources/views/common/option-form/textarea.tpl b/resources/views/common/option-form/textarea.blade.php similarity index 100% rename from resources/views/common/option-form/textarea.tpl rename to resources/views/common/option-form/textarea.blade.php diff --git a/resources/views/common/texture-preview.tpl b/resources/views/common/texture-preview.blade.php similarity index 100% rename from resources/views/common/texture-preview.tpl rename to resources/views/common/texture-preview.blade.php diff --git a/resources/views/common/user-menu.tpl b/resources/views/common/user-menu.blade.php similarity index 100% rename from resources/views/common/user-menu.tpl rename to resources/views/common/user-menu.blade.php diff --git a/resources/views/errors/403.tpl b/resources/views/errors/403.blade.php similarity index 100% rename from resources/views/errors/403.tpl rename to resources/views/errors/403.blade.php diff --git a/resources/views/errors/404.tpl b/resources/views/errors/404.blade.php similarity index 100% rename from resources/views/errors/404.tpl rename to resources/views/errors/404.blade.php diff --git a/resources/views/errors/500.tpl b/resources/views/errors/500.blade.php similarity index 100% rename from resources/views/errors/500.tpl rename to resources/views/errors/500.blade.php diff --git a/resources/views/errors/503.tpl b/resources/views/errors/503.blade.php similarity index 100% rename from resources/views/errors/503.tpl rename to resources/views/errors/503.blade.php diff --git a/resources/views/errors/exception.tpl b/resources/views/errors/exception.blade.php similarity index 100% rename from resources/views/errors/exception.tpl rename to resources/views/errors/exception.blade.php diff --git a/resources/views/errors/general.tpl b/resources/views/errors/general.blade.php similarity index 100% rename from resources/views/errors/general.tpl rename to resources/views/errors/general.blade.php diff --git a/resources/views/errors/pretty.tpl b/resources/views/errors/pretty.blade.php similarity index 100% rename from resources/views/errors/pretty.tpl rename to resources/views/errors/pretty.blade.php diff --git a/resources/views/index.tpl b/resources/views/index.blade.php similarity index 100% rename from resources/views/index.tpl rename to resources/views/index.blade.php diff --git a/resources/views/setup/locked.tpl b/resources/views/setup/locked.blade.php similarity index 100% rename from resources/views/setup/locked.tpl rename to resources/views/setup/locked.blade.php diff --git a/resources/views/setup/master.tpl b/resources/views/setup/master.blade.php similarity index 100% rename from resources/views/setup/master.tpl rename to resources/views/setup/master.blade.php diff --git a/resources/views/setup/updates/master.tpl b/resources/views/setup/updates/master.blade.php similarity index 100% rename from resources/views/setup/updates/master.tpl rename to resources/views/setup/updates/master.blade.php diff --git a/resources/views/setup/updates/success.tpl b/resources/views/setup/updates/success.blade.php similarity index 100% rename from resources/views/setup/updates/success.tpl rename to resources/views/setup/updates/success.blade.php diff --git a/resources/views/setup/updates/welcome.tpl b/resources/views/setup/updates/welcome.blade.php similarity index 100% rename from resources/views/setup/updates/welcome.tpl rename to resources/views/setup/updates/welcome.blade.php diff --git a/resources/views/setup/wizard/database.tpl b/resources/views/setup/wizard/database.blade.php similarity index 100% rename from resources/views/setup/wizard/database.tpl rename to resources/views/setup/wizard/database.blade.php diff --git a/resources/views/setup/wizard/finish.tpl b/resources/views/setup/wizard/finish.blade.php similarity index 100% rename from resources/views/setup/wizard/finish.tpl rename to resources/views/setup/wizard/finish.blade.php diff --git a/resources/views/setup/wizard/info.tpl b/resources/views/setup/wizard/info.blade.php similarity index 100% rename from resources/views/setup/wizard/info.tpl rename to resources/views/setup/wizard/info.blade.php diff --git a/resources/views/setup/wizard/language.tpl b/resources/views/setup/wizard/language.blade.php similarity index 100% rename from resources/views/setup/wizard/language.tpl rename to resources/views/setup/wizard/language.blade.php diff --git a/resources/views/setup/wizard/welcome.tpl b/resources/views/setup/wizard/welcome.blade.php similarity index 100% rename from resources/views/setup/wizard/welcome.tpl rename to resources/views/setup/wizard/welcome.blade.php diff --git a/resources/views/skinlib/index.tpl b/resources/views/skinlib/index.blade.php similarity index 100% rename from resources/views/skinlib/index.tpl rename to resources/views/skinlib/index.blade.php diff --git a/resources/views/skinlib/master.tpl b/resources/views/skinlib/master.blade.php similarity index 100% rename from resources/views/skinlib/master.tpl rename to resources/views/skinlib/master.blade.php diff --git a/resources/views/skinlib/show.tpl b/resources/views/skinlib/show.blade.php similarity index 100% rename from resources/views/skinlib/show.tpl rename to resources/views/skinlib/show.blade.php diff --git a/resources/views/skinlib/upload.tpl b/resources/views/skinlib/upload.blade.php similarity index 100% rename from resources/views/skinlib/upload.tpl rename to resources/views/skinlib/upload.blade.php diff --git a/resources/views/user/closet.tpl b/resources/views/user/closet.blade.php similarity index 100% rename from resources/views/user/closet.tpl rename to resources/views/user/closet.blade.php diff --git a/resources/views/user/index.tpl b/resources/views/user/index.blade.php similarity index 100% rename from resources/views/user/index.tpl rename to resources/views/user/index.blade.php diff --git a/resources/views/user/master.tpl b/resources/views/user/master.blade.php similarity index 100% rename from resources/views/user/master.tpl rename to resources/views/user/master.blade.php diff --git a/resources/views/user/player.tpl b/resources/views/user/player.blade.php similarity index 100% rename from resources/views/user/player.tpl rename to resources/views/user/player.blade.php diff --git a/resources/views/user/profile.tpl b/resources/views/user/profile.blade.php similarity index 100% rename from resources/views/user/profile.tpl rename to resources/views/user/profile.blade.php