Skip to content

Commit

Permalink
Merge pull request #21257 from abpframework/auto-merge/rel-8-3/3157
Browse files Browse the repository at this point in the history
Merge branch rel-9.0 with rel-8.3
  • Loading branch information
maliming authored Nov 5, 2024
2 parents 56cab1c + 5bd2a1a commit 8a25509
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h4>{{ selectedGroupDisplayName }}</h4>
<div class="mt-2" [ngStyle]="feature.style" (keyup.enter)="save()">
@switch (feature.valueType?.name) {
@case (valueTypes.ToggleStringValueType) {
<div class="form-check">
<div class="form-check" [class.px-4]="!!feature.parentName">
<input
class="form-check-input"
type="checkbox"
Expand All @@ -52,7 +52,7 @@ <h4>{{ selectedGroupDisplayName }}</h4>
</div>
}
@case (valueTypes.FreeTextStringValueType) {
<div class="mb-3 form-group">
<div class="mb-3 form-group" [class.px-2]="!!feature.parentName">
<label [htmlFor]="feature.name" class="form-label">{{
feature.displayName
}}</label>
Expand All @@ -74,7 +74,7 @@ <h4>{{ selectedGroupDisplayName }}</h4>
}
@case (valueTypes.SelectionStringValueType) {
@if (feature.valueType.itemSource?.items?.length) {
<div class="mb-3 form-group">
<div class="mb-3 form-group" [class.px-2]="!!feature.parentName">
<label [htmlFor]="feature.name" class="form-label">{{
feature.displayName
}}</label>
Expand Down
18 changes: 9 additions & 9 deletions templates/app/angular/src/app/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h3>Getting Started</h3>
$implicit: {
description:
'Learn how to create and run a new web application using the application startup template.',
href: 'https://docs.abp.io/en/commercial/latest/getting-started',
href: 'https://abp.io/docs/latest/get-started',
label: 'Getting Started'
}
}
Expand All @@ -36,7 +36,7 @@ <h4>Web Application Development Tutorial</h4>
$implicit: {
description:
'Learn how to build an ABP based web application named Acme.BookStore.',
href: 'https://docs.abp.io/en/commercial/latest/tutorials/book-store/part-1?UI=MVC&DB=EF',
href: 'https://abp.io/docs/latest/tutorials/book-store/part-01?UI=NG&DB=EF',
label: 'Explore Tutorial'
}
}
Expand All @@ -46,7 +46,7 @@ <h4>Web Application Development Tutorial</h4>
<h4>Customize Lepton Theme</h4>
<p class="text-muted mb-2">Learn how to customize LeptonX Theme as you wish.</p>
<a
href="https://docs.abp.io/en/commercial/latest/themes/lepton/customizing-lepton-theme"
href="https://abp.io/docs/latest/framework/ui/angular/theming"
class="btn btn-primary soft mb-5 mb-xl-0"
target="_blank"
>Customize Lepton</a
Expand All @@ -67,7 +67,7 @@ <h4>Customize Lepton Theme</h4>
label: 'Visit Support',
description:
'You can check for similar problems and solutions, or open a new topic to discuss your specific issue.',
href: 'https://support.abp.io/QA/Questions',
href: 'https://abp.io/support/questions',
card: 'card overflow-hidden',
imgClass: '',
imgSrc: 'assets/images/getting-started/img-support.png',
Expand All @@ -84,7 +84,7 @@ <h4>Customize Lepton Theme</h4>
label: 'Visit Blog',
description:
'You can find content on .NET development, cross-platform, ASP.NET application templates, ABP-related news, and more.',
href: 'https://blog.abp.io/abp',
href: 'https://abp.io/blog',
card: 'card h-md-100 overflow-hidden',
imgClass: 'margin-bottom: -24px',
imgSrc: 'assets/images/getting-started/img-blog.png',
Expand All @@ -107,7 +107,7 @@ <h4>Customize Lepton Theme</h4>
Explore all ABP users' experiences with the ABP Framework, discover articles and videos on
how to use ABP, and join raffles for a chance to win surprise gifts!
</p>
<a class="btn btn-brand soft mb-3" href="https://community.abp.io/" target="_blank"
<a class="btn btn-brand soft mb-3" href="https://abp.io/community/" target="_blank"
>Join ABP Community</a
>
</div>
Expand Down Expand Up @@ -145,7 +145,7 @@ <h4>Customize Lepton Theme</h4>
icon: 'bi bi-check fs-4',
iconClass: 'rounded-circle me-2 flex-center bg-brand soft',
title: 'Samples',
link: 'https://docs.abp.io/en/abp/latest/Samples/Index',
link: 'https://abp.io/docs/latest/Samples/Index',
},
{
iconType: 'icon',
Expand All @@ -161,7 +161,7 @@ <h4>Customize Lepton Theme</h4>
icon: 'bi bi-check fs-4',
iconClass: 'rounded-circle me-2 flex-center bg-brand soft',
title: 'FAQ',
link: 'https://commercial.abp.io/faq',
link: 'https://abp.io/faq',
},
]
}
Expand Down Expand Up @@ -219,7 +219,7 @@ <h3>Mastering ABP Framework</h3>
iconType: 'image',
icon: 'assets/images/getting-started/discord.svg',
title: 'Discord',
link: 'https://community.abp.io/discord'
link: 'https://abp.io/community/discord'
},
{
iconType: 'image',
Expand Down

0 comments on commit 8a25509

Please sign in to comment.