Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions src/BootstrapBlazor.Server/Components/Components/Header.razor
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,9 @@
<li class="nav-item">
<a class="nav-link" href="introduction">@IntroductionText</a>
</li>
<li class="nav-item">
<a class="nav-link" href="components">@ComponentsText</a>
</li>
<li class="nav-item">
<a class="nav-link" href="tutorials">@TutorialsText</a>
</li>
@* @if (CultureInfo.CurrentUICulture.Name == "zh-CN")
{
<li class="nav-item">
<a class="nav-link" href="https://theme.blazor.zone">主题</a>
</li>
} *@
</ul>
</div>
<div class="d-flex flex-fill"></div>
Expand All @@ -43,7 +34,7 @@
</a>
</li>
<li class="nav-item">
<FullScreenButton class="nav-link p-2" TooltipText="点击切换全屏模式" />
<FullScreenButton class="nav-link p-2" TooltipText="@Localizer["FullScreenTooltipText"]" />
</li>
</ul>
<a class="btn btn-bd-download d-none d-lg-block mb-3 mb-md-0 ms-md-3" target="_blank" href="@DownloadUrl">@DownloadText</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ public partial class Header
[NotNull]
private string? IntroductionText { get; set; }

[NotNull]
private string? ComponentsText { get; set; }

[NotNull]
private string? DownloadText { get; set; }

Expand All @@ -53,7 +50,6 @@ protected override void OnInitialized()
DownloadText ??= Localizer[nameof(DownloadText)];
HomeText ??= Localizer[nameof(HomeText)];
IntroductionText ??= Localizer[nameof(IntroductionText)];
ComponentsText ??= Localizer[nameof(ComponentsText)];
TutorialsText ??= Localizer[nameof(TutorialsText)];
_versionString = $"v{PackageVersionService.Version}";
}
Expand Down
6 changes: 4 additions & 2 deletions src/BootstrapBlazor.Server/Components/Layout/PageLayout.razor
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
</HeadContent>

<CascadingValue Value="this" IsFixed="true">
<Layout IsPage="true" IsFullSide="@IsFullSide" IsFixedHeader="@IsFixedHeader" IsFixedFooter="@IsFixedFooter" IsFixedTabHeader="IsFixedTabHeader"
<Layout IsPage="true" IsFullSide="@IsFullSide" IsFixedHeader="@IsFixedHeader"
IsFixedFooter="@IsFixedFooter" IsFixedTabHeader="IsFixedTabHeader"
ShowFooter="@ShowFooter" ShowGotoTop="true" ShowCollapseBar="true" Menus="@Menus"
UseTabSet="@UseTabSet" TabDefaultUrl="layout-page" AdditionalAssemblies="new[] { GetType().Assembly }" class="@LayoutClassString">
UseTabSet="@UseTabSet" TabDefaultUrl="layout-page" AdditionalAssemblies="new[] { GetType().Assembly }"
class="@LayoutClassString">
<Header>
<span class="ms-3 flex-fill">Bootstrap of Blazor</span>
<Widget></Widget>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ protected override async Task OnInitializedAsync()

Menus = new List<MenuItem>
{
new() { Text = "返回组件库", Icon = "fa-fw fa-solid fa-house", Url = "components" },
new() { Text = "返回文档", Icon = "fa-fw fa-solid fa-house", Url = "introduction" },
new() { Text = "后台模拟器", Icon = "fa-fw fa-solid fa-desktop", Url = "layout-page" },
new() { Text = "示例网页", Icon = "fa-fw fa-solid fa-laptop", Url = "layout-demo/text=Parameter1" }
};
Expand Down
281 changes: 122 additions & 159 deletions src/BootstrapBlazor.Server/Components/Pages/Coms.razor

Large diffs are not rendered by default.

21 changes: 6 additions & 15 deletions src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,7 @@ public static List<MenuItem> GenerateMenus(this IStringLocalizer<NavMenu> Locali
{
var menus = new List<MenuItem>();

// 快速入门
var item = new DemoMenuItem()
{
Text = Localizer["GetStarted"],
Icon = "fa-solid fa-fw fa-font-awesome"
};
AddQuickStar(item);

item = new DemoMenuItem()
{
Text = Localizer["LayoutComponents"],
Icon = "fa-fw fa-solid fa-desktop"
Expand Down Expand Up @@ -124,16 +116,15 @@ public static List<MenuItem> GenerateMenus(this IStringLocalizer<NavMenu> Locali
Text = Localizer["Utility"],
Icon = "fa-fw fa-solid fa-code"
};

AddBootstrapBlazorUtility(item);

// 快速入门
item = new DemoMenuItem()
{
Text = Localizer["Components"],
Icon = "fa-fw fa-solid fa-heart fa-beat icon-summary",
Url = "components"
Text = Localizer["GetStarted"],
Icon = "fa-solid fa-fw fa-font-awesome"
};
AddSummary(item);
AddQuickStar(item);

return menus;

Expand Down Expand Up @@ -319,7 +310,7 @@ void AddQuickStar(DemoMenuItem item)
Url = "layout-page"
}
};
AddBadge(item, count: 0);
AddSummary(item);
}

void AddForm(DemoMenuItem item)
Expand Down Expand Up @@ -1698,7 +1689,7 @@ void AddSummary(DemoMenuItem item)
var count = 0;
count = menus.OfType<DemoMenuItem>().Sum(i => i.Count);
AddBadge(item, false, count);
menus.Insert(1, item);
menus.Insert(0, item);
}

void AddBadge(DemoMenuItem item, bool append = true, int? count = null)
Expand Down
135 changes: 2 additions & 133 deletions src/BootstrapBlazor.Server/Locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -1535,137 +1535,6 @@
"SkeletonsTreeTitle": "Tree skeleton",
"SkeletonsTreeIntro": "Display when tree component is loaded"
},
"BootstrapBlazor.Server.Components.Pages.Coms": {
"Search": "Search for the desired component",
"Text1": "Layout",
"DividerText": "Divider",
"LayoutText": "Layout",
"FooterText": "Footer",
"RowText": "Row",
"ScrollText": "Scroll",
"SkeletonText": "Skeleton",
"SplitText": "Split",
"Text2": "Navigation",
"AnchorText": "Anchor",
"AnchorLinkText": "AnchorLink",
"BreadcrumbText": "Breadcrumb",
"MenuText": "Menu",
"NavText": "Nav",
"DropdownText": "Dropdown",
"FullScreenText": "FullScreen",
"GoTopText": "GoTop",
"LogoutText": "Logout",
"PaginationText": "Pagination",
"StepsText": "Step",
"TabText": "Tab",
"Text3": "Form",
"EditorFormText": "EditorForm",
"ValidateFormText": "ValidateForm",
"AutoCompleteText": "AutoComplete",
"AutoFillText": "AutoFill",
"ButtonText": "Button",
"CascaderText": "CascadingSelection",
"CheckboxText": "Checkbox",
"CheckboxListText": "CheckboxList",
"ColorPickerText": "ColorPicker",
"DateTimePickerText": "DateTimePicker",
"DateTimeRangeText": "DateTimeRange",
"EditorText": "Editor",
"InputText": "Input",
"InputNumberText": "InputNumber",
"InputGroupText": "InputGroup",
"MarkdownText": "Markdown",
"FloatingLabelText": "FloatingLabel",
"RadioText": "Radio",
"RateText": "Rate",
"SelectText": "Select",
"MultiSelectText": "MultiSelect",
"SliderText": "Slider",
"SwitchText": "Switch",
"TextareaText": "Textarea",
"ToggleText": "Toggle",
"TransferText": "Transfer",
"UploadText": "Upload",
"Text4": "Data",
"AvatarText": "Avatar",
"BadgeText": "Badge",
"CardText": "Card",
"CalendarText": "Calendar",
"CaptchaText": "Captcha",
"CarouselText": "Carousel",
"CircleText": "Circle",
"ClientText": "Client",
"DisplayText": "Display",
"EmptyText": "Empty",
"LocatorText": "IpLocator",
"ImageViewerText": "ImageViewer",
"IpText": "IpAddress",
"PrintText": "Print",
"TitleText": "Title",
"DownloadText": "Download",
"TransitionText": "Transition",
"CollapseText": "Collapse",
"DropdownWidgetText": "DropdownWidget",
"GroupBoxText": "GroupBox",
"LinkButtonText": "LinkButton",
"ListViewText": "ListView",
"PopoverText": "Popover",
"QRCodeText": "QRCode",
"SearchText": "Search",
"RecognizerText": "Recognizer",
"SpeechWaveText": "SpeechWave",
"SwitchButtonText": "Switch Button",
"TableText": "Table",
"TagText": "Tag",
"TimelineText": "Timeline",
"TooltipText": "Tooltip",
"TreeViewText": "TreeView",
"BarcodeReaderText": "BarcodeReader",
"BlockText": "Block",
"CameraText": "Camera",
"HandwrittenPageText": "Handwritten",
"Text5": "Notification",
"AlertText": "Alert",
"ConsoleText": "Console",
"DialogText": "Dialog",
"DrawerText": "Drawer",
"EditDialogText": "EditDialog",
"MessageText": "Message",
"ModalText": "Modal",
"LightText": "Light",
"PopoverConfirmText": "PopConfirm",
"ProgressText": "Progress",
"ReconnectorText": "Reconnector",
"ResponsiveText": "Responsive",
"SpinnerText": "Spinner",
"SweetAlertText": "SweetAlert",
"SearchDialogText": "SearchDialog",
"ToastText": "Toast",
"TimerText": "Timer",
"Text6": "Chart",
"ChartText": "Chart",
"ChartSummaryText": "Summary",
"ChartLineText": "Line",
"ChartBarText": "Bar",
"ChartPieText": "Pie",
"ChartDoughnutText": "Doughnut",
"ChartBubbleText": "Bubble",
"DispatchText": "Dispatch",
"GeolocationText": "Geolocation",
"OnScreenKeyboardText": "OnScreenKeyboard",
"NotificationsText": "Notification",
"SignaturePadText": "SignaturePad",
"BluetoothText": "Bluetooth Service",
"PdfReaderText": "PDF Reader",
"VideoPlayerText": "VideoPlayer",
"FileViewerText": "FileViewer",
"WebSerialText": "SerialService",
"MindMapText": "MindMap",
"MermaidText": "Mermaid",
"WebSpeechText": "WebSpeech",
"ImageCropperText": "ImageCropper",
"BarcodeGeneratorText": "BarcodeGenerator"
},
"BootstrapBlazor.Server.Components.Pages.Breakpoints": {
"Heading": "Breakpoints",
"Heading1": "Breakpoints are customizable widths that determine how responsive layouts behave in Bootstrap across devices or viewport sizes",
Expand Down Expand Up @@ -4633,9 +4502,9 @@
"BootstrapBlazor.Server.Components.Components.Header": {
"DownloadText": "Download",
"HomeText": "Home",
"ComponentsText": "Components",
"IntroductionText": "Documents",
"TutorialsText": "Tutorials"
"TutorialsText": "Tutorials",
"FullScreenTooltipText": "Full Screen"
},
"BootstrapBlazor.Server.Components.Layout.BaseLayout": {
"SiteTitle": "Bootstrap Blazor enterprise-level UI component library",
Expand Down
Loading
Loading