更新:优化小部件引用,自定义logo支持小部件

zhuchunshu · Jan 16, 2023 · 4858fe6 · 4858fe6
1 parent 82b10b0
commit 4858fe6
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 122 deletions.
diff --git a/app/Themes/CodeFec/resources/views/layouts/themes/header-1.blade.php b/app/Themes/CodeFec/resources/views/layouts/themes/header-1.blade.php
@@ -5,8 +5,8 @@
                 <span class="navbar-toggler-icon"></span>
             </button>
             <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
-                <a href="/"> @if(!get_options('web_logo')){{get_options('web_name', 'CodeFec')}}@else
-                        <img src="{{get_options('web_name', 'CodeFec')}}" alt="{{ get_options('web_name', 'CodeFec') }}"> @endif</a>
+                @if(!get_options('web_logo')) <a href="/">{{get_options('web_name', 'CodeFec')}}</a>@else
+                       @include(get_component_view_name(get_options('web_logo'))) @endif
             </h1>
             <div class="flex-row navbar-nav order-md-last">
                 @include('App::layouts.themes.header-right')

diff --git a/app/Themes/CodeFec/resources/views/layouts/themes/header-2.blade.php b/app/Themes/CodeFec/resources/views/layouts/themes/header-2.blade.php
@@ -5,8 +5,8 @@
                 <span class="navbar-toggler-icon"></span>
             </button>
             <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
-                <a href="/"> @if(!get_options('web_logo')){{get_options('web_name', 'CodeFec')}}@else
-                        <img src="{{get_options('web_name', 'CodeFec')}}" alt="{{ get_options('web_name', 'CodeFec') }}"> @endif</a>
+                @if(!get_options('web_logo')) <a href="/">{{get_options('web_name', 'CodeFec')}}</a>@else
+                    @include(get_component_view_name(get_options('web_logo'))) @endif
             </h1>
             <div class="flex-row navbar-nav order-md-last">
                 @include('App::layouts.themes.header-right')

diff --git a/app/Themes/CodeFec/resources/views/layouts/themes/header-3.blade.php b/app/Themes/CodeFec/resources/views/layouts/themes/header-3.blade.php
@@ -5,8 +5,8 @@
                 <span class="navbar-toggler-icon"></span>
             </button>
             <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
-                <a href="/"> @if(!get_options('web_logo')){{get_options('web_name', 'CodeFec')}}@else
-                        <img src="{{get_options('web_name', 'CodeFec')}}" alt="{{ get_options('web_name', 'CodeFec') }}"> @endif</a>
+                @if(!get_options('web_logo')) <a href="/">{{get_options('web_name', 'CodeFec')}}</a>@else
+                    @include(get_component_view_name(get_options('web_logo'))) @endif
             </h1>
             <div class="flex-row navbar-nav order-md-last">
                 @include('App::layouts.themes.header-right')

diff --git a/app/Themes/CodeFec/resources/views/layouts/themes/header-4.blade.php b/app/Themes/CodeFec/resources/views/layouts/themes/header-4.blade.php
@@ -5,8 +5,8 @@
                 <span class="navbar-toggler-icon"></span>
             </button>
             <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
-                <a href="/"> @if(!get_options('web_logo')){{get_options('web_name', 'CodeFec')}}@else
-                        <img src="{{get_options('web_name', 'CodeFec')}}" alt="{{ get_options('web_name', 'CodeFec') }}"> @endif</a>
+                @if(!get_options('web_logo')) <a href="/">{{get_options('web_name', 'CodeFec')}}</a>@else
+                    @include(get_component_view_name(get_options('web_logo'))) @endif
             </h1>
             <div class="flex-row navbar-nav order-md-last">
                 @include('App::layouts.themes.header-right')

diff --git a/app/Themes/CodeFec/resources/views/layouts/themes/header-5.blade.php b/app/Themes/CodeFec/resources/views/layouts/themes/header-5.blade.php
@@ -15,8 +15,8 @@
                 <span class="navbar-toggler-icon"></span>
             </button>
             <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
-                <a href="/"> @if(!get_options('web_logo')){{get_options('web_name', 'CodeFec')}}@else
-                        <img src="{{get_options('web_name', 'CodeFec')}}" alt="{{ get_options('web_name', 'CodeFec') }}"> @endif</a>
+                @if(!get_options('web_logo')) <a href="/">{{get_options('web_name', 'CodeFec')}}</a>@else
+                    @include(get_component_view_name(get_options('web_logo'))) @endif
             </h1>
             <div class="flex-row navbar-nav order-md-last">
                 @include('App::layouts.themes.header-right')

diff --git a/app/Themes/CodeFec/resources/views/layouts/themes/header-6.blade.php b/app/Themes/CodeFec/resources/views/layouts/themes/header-6.blade.php
@@ -15,8 +15,8 @@
                 <span class="navbar-toggler-icon"></span>
             </button>
             <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
-                <a href="/"> @if(!get_options('web_logo')){{get_options('web_name', 'CodeFec')}}@else
-                        <img src="{{get_options('web_name', 'CodeFec')}}" alt="{{ get_options('web_name', 'CodeFec') }}"> @endif</a>
+                @if(!get_options('web_logo')) <a href="/">{{get_options('web_name', 'CodeFec')}}</a>@else
+                    @include(get_component_view_name(get_options('web_logo'))) @endif
             </h1>
             <div class="flex-row navbar-nav order-md-last">
                 @include('App::layouts.themes.header-right')

diff --git a/app/Themes/CodeFec/resources/views/layouts/themes/header-7.blade.php b/app/Themes/CodeFec/resources/views/layouts/themes/header-7.blade.php
@@ -15,8 +15,8 @@
                 <span class="navbar-toggler-icon"></span>
             </button>
             <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
-                <a href="/"> @if(!get_options('web_logo')){{get_options('web_name', 'CodeFec')}}@else
-                        <img src="{{get_options('web_name', 'CodeFec')}}" alt="{{ get_options('web_name', 'CodeFec') }}"> @endif</a>
+                @if(!get_options('web_logo')) <a href="/">{{get_options('web_name', 'CodeFec')}}</a>@else
+                    @include(get_component_view_name(get_options('web_logo'))) @endif
             </h1>
             <div class="flex-row navbar-nav order-md-last">
                 @include('App::layouts.themes.header-right')

diff --git a/app/Themes/CodeFec/resources/views/layouts/themes/header-8.blade.php b/app/Themes/CodeFec/resources/views/layouts/themes/header-8.blade.php
@@ -15,8 +15,8 @@
                 <span class="navbar-toggler-icon"></span>
             </button>
             <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
-                <a href="/"> @if(!get_options('web_logo')){{get_options('web_name', 'CodeFec')}}@else
-                        <img src="{{get_options('web_name', 'CodeFec')}}" alt="{{ get_options('web_name', 'CodeFec') }}"> @endif</a>
+                @if(!get_options('web_logo')) <a href="/">{{get_options('web_name', 'CodeFec')}}</a>@else
+                    @include(get_component_view_name(get_options('web_logo'))) @endif
             </h1>
             <div class="flex-row navbar-nav order-md-last">
                 @include('App::layouts.themes.header-right')