From e85cf04b99ce500b694396051c26cefa1ab59115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ton=C4=87i=20Vatavuk?= <tonci@sistemi.hr>
Date: Wed, 4 Dec 2024 09:37:21 +0100
Subject: [PATCH 1/2] Fix #4883: Add ShowEditMode parameter to ControlPanel to
 allow hiding the Edit Mode toggle button

---
 Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
index a58e82b8..5b8922f5 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
@@ -9,7 +9,7 @@
     <LanguageSwitcher ButtonClass="@ButtonClass" DropdownAlignment="@LanguageDropdownAlignment" />
 }
 
-@if (_showEditMode || (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered)))
+@if (ShowEditMode && (_showEditMode || (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered))))
 {
     <form method="post" class="app-form-inline" @formname="EditModeForm" @onsubmit="@(async () => await ToggleEditMode(PageState.EditMode))" data-enhance>
         <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
@@ -59,9 +59,15 @@
     [Parameter]
     public string LanguageDropdownAlignment { get; set; } = string.Empty; // Empty or Left or Right
 
+    /// <summary>
+    /// Ability to hide the Edit Mode toggle button
+    /// </summary>
+    [Parameter]
+    public bool ShowEditMode { get; set; } = true;
+
     private PageState _pageState;
     private bool _canViewAdminDashboard = false;
-    private bool _showEditMode = false;
+    private bool _showEditMode = false; // internal state (not the same as ShowEditMode parameter)
 
     protected override void OnParametersSet()
     {

From b2a7b813dee06eb3c302fa63778e9860e3e64e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ton=C4=87i=20Vatavuk?= <tonci@sistemi.hr>
Date: Wed, 4 Dec 2024 09:39:02 +0100
Subject: [PATCH 2/2] Remove redundant IServiceProvider injection

---
 .../Themes/Controls/Theme/ControlPanelInteractive.razor          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
index 57fd5b26..5f1f5d5d 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
@@ -15,7 +15,6 @@
 @inject ILogService LoggingService
 @inject IStringLocalizer<ControlPanelInteractive> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
-@inject IServiceProvider ServiceProvider
 
 <button type="button" class="btn @ButtonClass ms-1" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel" @onclick="ClearMessage">
     <span class="oi oi-cog"></span>