Merge pull request #19796 from abpframework/auto-merge/prerel-8-2/2708

Merge branch dev with prerel-8.2

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml

@@ -43,6 +43,7 @@
                                     @for (var j = 0; j < featureGroup.Features.Count; j++)
                                     {
                                         var feature = featureGroup.Features[j];
+                                        var disabled = Model.IsDisabled(feature.Provider.Name);
                                         <div class="mt-2">
 
                                             <input type="text" abp-id-name="@Model.FeatureGroups[i].Features[j].Type" value="@feature.ValueType?.Name" hidden/>
@@ -53,6 +54,7 @@
                                                            type="checkbox"
                                                            abp-id-name="@Model.FeatureGroups[i].Features[j].BoolValue"
                                                            label="@feature.DisplayName"
+                                                           disabled="@disabled"
                                                            group-data-feature-name="@feature.Name"
                                                            group-data-parent-name="@(feature.ParentName ?? "")"
                                                            group-style="margin-inline-start: @(feature.Depth * 20)px"/>
@@ -74,6 +76,7 @@
                                                 <abp-input asp-for="@feature.Value"
                                                            label="@feature.DisplayName"
                                                            abp-id-name="@Model.FeatureGroups[i].Features[j].Value"
+                                                           disabled="@disabled"
                                                            type="@type"
                                                            group-data-feature-name="@feature.Name"
                                                            group-data-parent-name="@(feature.ParentName ?? "")"

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs

@@ -77,6 +77,11 @@ public class FeatureManagementModal : AbpPageModel
         return NoContent();
     }
 
+    public virtual bool IsDisabled(string providerName)
+    {
+        return providerName != ProviderName && providerName != DefaultValueFeatureValueProvider.ProviderName;
+    }
+
     public class FeatureGroupViewModel
     {
         public List<FeatureViewModel> Features { get; set; }

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/wwwroot/blazor-global-styles.css

@@ -16,3 +16,9 @@
     right: 0.75rem;
     top: 0.5rem;
 }
+/* <TEMPLATE-REMOVE IF-NOT='LEPTONX'> */
+:root .lpx-brand-logo {
+    --lpx-logo: url('/images/logo/leptonx/logo-light.png');
+    --lpx-logo-icon: url('/images/logo/leptonx/logo-light-thumbnail.png');
+}
+/* </TEMPLATE-REMOVE> */ 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/wwwroot/global-styles.css

@@ -1,3 +1,9 @@
 body {
     
-}
+}
+/* <TEMPLATE-REMOVE IF-NOT='LEPTONX'> */
+:root .lpx-brand-logo {
+    --lpx-logo: url('/images/logo/leptonx/logo-light.png');
+    --lpx-logo-icon: url('/images/logo/leptonx/logo-light-thumbnail.png');
+}
+/* </TEMPLATE-REMOVE> */ 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/blazor-global-styles.css

@@ -16,3 +16,9 @@
     right: 0.75rem;
     top: 0.5rem;
 }
+/* <TEMPLATE-REMOVE IF-NOT='LEPTONX'> */
+:root .lpx-brand-logo {
+    --lpx-logo: url('/images/logo/leptonx/logo-light.png');
+    --lpx-logo-icon: url('/images/logo/leptonx/logo-light-thumbnail.png');
+}
+/* </TEMPLATE-REMOVE> */ 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/global-styles.css

@@ -1,3 +1,9 @@
 body {
     
-}
+}
+/* <TEMPLATE-REMOVE IF-NOT='LEPTONX'> */
+:root .lpx-brand-logo {
+    --lpx-logo: url('/images/logo/leptonx/logo-light.png');
+    --lpx-logo-icon: url('/images/logo/leptonx/logo-light-thumbnail.png');
+}
+/* </TEMPLATE-REMOVE> */ 

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/blazor-global-styles.css

@@ -16,3 +16,9 @@
     right: 0.75rem;
     top: 0.5rem;
 }
+/* <TEMPLATE-REMOVE IF-NOT='LEPTONX'> */
+:root .lpx-brand-logo {
+    --lpx-logo: url('/images/logo/leptonx/logo-light.png');
+    --lpx-logo-icon: url('/images/logo/leptonx/logo-light-thumbnail.png');
+}
+/* </TEMPLATE-REMOVE> */ 

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/wwwroot/blazor-global-styles.css

@@ -16,3 +16,9 @@
     right: 0.75rem;
     top: 0.5rem;
 }
+/* <TEMPLATE-REMOVE IF-NOT='LEPTONX'> */
+:root .lpx-brand-logo {
+    --lpx-logo: url('/images/logo/leptonx/logo-light.png');
+    --lpx-logo-icon: url('/images/logo/leptonx/logo-light-thumbnail.png');
+}
+/* </TEMPLATE-REMOVE> */