Browse Source

Merge pull request #18680 from abpframework/issue-3466

UI/UX Improvements
pull/18810/head
Mahmut Gundogdu 3 years ago
committed by GitHub
parent
commit
f4f5b27fc2
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/cs.json
  2. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en-GB.json
  3. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
  4. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/es.json
  5. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fi.json
  6. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fr.json
  7. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hr.json
  8. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hu.json
  9. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/it.json
  10. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/nl.json
  11. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pl-PL.json
  12. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json
  13. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json
  14. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sk.json
  15. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sl.json
  16. 2
      modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
  17. 2
      npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html
  18. 4
      npm/ng-packs/packages/components/tree/src/lib/components/tree.component.scss
  19. 7
      npm/ng-packs/packages/feature-management/src/lib/components/feature-management-tab/feature-management-tab.component.html
  20. 10
      npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
  21. 2
      npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
  22. 2
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
  23. 2
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
  24. 10
      npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html
  25. 2
      npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
  26. 2
      npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html
  27. 4
      npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html
  28. 17
      npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.scss

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/cs.json

@ -8,7 +8,7 @@
"Surname": "Příjmení",
"EmailAddress": "Email",
"PhoneNumber": "Telefonní číslo",
"UserInformations": "Uživatelské informace",
"UserInformations": "Uživatelské Informace",
"DisplayName:IsDefault": "Výchozí",
"DisplayName:IsStatic": "Statické",
"DisplayName:IsPublic": "Veřejné",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en-GB.json

@ -8,7 +8,7 @@
"Surname": "Surname",
"EmailAddress": "Email address",
"PhoneNumber": "Phone number",
"UserInformations": "User information",
"UserInformations": "User Information",
"DisplayName:IsDefault": "Default",
"DisplayName:IsStatic": "Static",
"DisplayName:IsPublic": "Public",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json

@ -8,7 +8,7 @@
"Surname":"Surname",
"EmailAddress": "Email address",
"PhoneNumber": "Phone number",
"UserInformations": "User information",
"UserInformations": "User Information",
"DisplayName:IsDefault": "Default",
"DisplayName:IsStatic": "Static",
"DisplayName:IsPublic": "Public",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/es.json

@ -8,7 +8,7 @@
"Surname": "Apellido",
"EmailAddress": "Dirección e-mail",
"PhoneNumber": "Número de teléfono",
"UserInformations": "Información de usuario",
"UserInformations": "Información de Usuario",
"DisplayName:IsDefault": "Predeterminado",
"DisplayName:IsStatic": "Estático",
"DisplayName:IsPublic": "Público",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fi.json

@ -8,7 +8,7 @@
"Surname": "Sukunimi",
"EmailAddress": "Sähköpostiosoite",
"PhoneNumber": "Puhelinnumero",
"UserInformations": "Käyttäjän tiedot",
"UserInformations": "Käyttäjän Tiedot",
"DisplayName:IsDefault": "Oletus",
"DisplayName:IsStatic": "Staattinen",
"DisplayName:IsPublic": "Julkinen",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fr.json

@ -8,7 +8,7 @@
"Surname": "Nom",
"EmailAddress": "Adresse e-mail",
"PhoneNumber": "Numéro de téléphone",
"UserInformations": "Informations utilisateur",
"UserInformations": "Informations Utilisateur",
"DisplayName:IsDefault": "Par défaut",
"DisplayName:IsStatic": "Statique",
"DisplayName:IsPublic": "Public",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hr.json

@ -8,7 +8,7 @@
"Surname": "Prezime",
"EmailAddress": "Email adresa",
"PhoneNumber": "Broj telefona",
"UserInformations": "Informacije o korisniku",
"UserInformations": "Informacije o Korisniku",
"DisplayName:IsDefault": "Zadano",
"DisplayName:IsStatic": "Je statično",
"DisplayName:IsPublic": "Je javno",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hu.json

@ -8,7 +8,7 @@
"Surname": "Vezetéknév",
"EmailAddress": "Email cím",
"PhoneNumber": "Telefonszám",
"UserInformations": "Felhasználói információ",
"UserInformations": "Felhasználói Információ",
"DisplayName:IsDefault": "Alapértelmezett",
"DisplayName:IsStatic": "Statikus",
"DisplayName:IsPublic": "Publikus",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/it.json

@ -8,7 +8,7 @@
"Surname": "Cognome",
"EmailAddress": "Indirizzo e-mail",
"PhoneNumber": "Numero di telefono",
"UserInformations": "Informazioni utente",
"UserInformations": "Informazioni Utente",
"DisplayName:IsDefault": "Predefinito",
"DisplayName:IsStatic": "Statico",
"DisplayName:IsPublic": "Pubblico",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/nl.json

@ -8,7 +8,7 @@
"Surname": "Achternaam",
"EmailAddress": "E-mail adres",
"PhoneNumber": "Telefoonnummer",
"UserInformations": "Gebruikers informatie",
"UserInformations": "Gebruikers Informatie",
"DisplayName:IsDefault": "Standaard",
"DisplayName:IsStatic": "Statisch",
"DisplayName:IsPublic": "Openbaar",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pl-PL.json

@ -8,7 +8,7 @@
"Surname": "Nazwisko",
"EmailAddress": "Adres email",
"PhoneNumber": "Numer telefonu",
"UserInformations": "Notyfikacje użytkownika",
"UserInformations": "Notyfikacje Użytkownika",
"DisplayName:IsDefault": "Domyślny",
"DisplayName:IsStatic": "Statyczny",
"DisplayName:IsPublic": "Publiczny",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json

@ -8,7 +8,7 @@
"Surname": "Nume",
"EmailAddress": "Adresa de email",
"PhoneNumber": "Număr de telefon",
"UserInformations": "Informaţii de utilizator",
"UserInformations": "Informaţii de Utilizator",
"DisplayName:IsDefault": "Implicit",
"DisplayName:IsStatic": "Static",
"DisplayName:IsPublic": "Public",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json

@ -8,7 +8,7 @@
"Surname": "Фамилия",
"EmailAddress": "Адрес электронной почты",
"PhoneNumber": "Номер телефона",
"UserInformations": "Информация о пользователе",
"UserInformations": "Информация о Пользователе",
"DisplayName:IsDefault": "По умолчанию",
"DisplayName:IsStatic": "Статичная",
"DisplayName:IsPublic": "Доступно",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sk.json

@ -8,7 +8,7 @@
"Surname": "Priezvisko",
"EmailAddress": "Emailová adresa",
"PhoneNumber": "Telefónne číslo",
"UserInformations": "Informácie o používateľovi",
"UserInformations": "Informácie o Používateľovi",
"DisplayName:IsDefault": "Predvolený",
"DisplayName:IsStatic": "Statický",
"DisplayName:IsPublic": "Verejný",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sl.json

@ -8,7 +8,7 @@
"Surname": "Priimek",
"EmailAddress": "E-poštni naslov",
"PhoneNumber": "Telefonska številka",
"UserInformations": "Informacije o uporabniku",
"UserInformations": "Informacije o Uporabniku",
"DisplayName:IsDefault": "Privzeto",
"DisplayName:IsStatic": "Statično",
"DisplayName:IsPublic": "Javno",

2
modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json

@ -8,7 +8,7 @@
"Surname": "Soyadı",
"EmailAddress": "E-posta adresi",
"PhoneNumber": "Telefon numarası",
"UserInformations": "Kullanıcı bilgileri",
"UserInformations": "Kullanıcı Bilgileri",
"DisplayName:IsDefault": "Varsayılan",
"DisplayName:IsStatic": "Sabit",
"DisplayName:IsPublic": "Herkese Açık",

2
npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html

@ -27,7 +27,7 @@
formControlName="confirmPassword"
/>
</div>
<button class="me-2 btn btn-secondary" type="button" routerLink="/account/login">
<button class="me-2 btn btn-outline-primary" type="button" routerLink="/account/login">
{{ 'AbpAccount::Cancel' | abpLocalization }}
</button>
<abp-button

4
npm/ng-packs/packages/components/tree/src/lib/components/tree.component.scss

@ -43,4 +43,8 @@ abp-tree .ant-tree {
top: 1px;
cursor: pointer;
}
.ant-tree-checkbox-inner{
background-color: transparent;
}
}

7
npm/ng-packs/packages/feature-management/src/lib/components/feature-management-tab/feature-management-tab.component.html

@ -1,7 +1,10 @@
<p class="text-wrap">{{ 'AbpFeatureManagement::ManageHostFeaturesText' | abpLocalization }}</p>
<h2>{{ 'AbpFeatureManagement::Menu:FeatureManagement' | abpLocalization }}</h2>
<hr class="my-2" />
<p class="pt-2 text-wrap">{{ 'AbpFeatureManagement::ManageHostFeaturesText' | abpLocalization }}</p>
<button class="btn btn-primary" type="button" (click)="openFeaturesModal()">
<i class="fa fa-cog" aria-hidden="true"></i>
<i class="me-1 fa fa-cog" aria-hidden="true"></i>
{{ 'AbpFeatureManagement::ManageHostFeatures' | abpLocalization }}
</button>
<ng-container *ngIf="visibleFeatures">

10
npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html

@ -107,7 +107,7 @@
<small *ngIf="description" class="d-block form-text text-muted">{{ description }}</small>
</ng-template>
<div class="col-md-8"><div [ngbNavOutlet]="nav"></div></div>
<div class="col-md-8"><div class="py-0" [ngbNavOutlet]="nav"></div></div>
</ng-container>
<div class="col" *ngIf="!groups.length">
@ -117,9 +117,14 @@
</ng-template>
<ng-template #abpFooter>
<button abpClose type="button" class="btn btn-link">
{{ 'AbpFeatureManagement::Cancel' | abpLocalization }}
</button>
<abp-button
*ngIf="groups.length"
iconClass="fa fa-refresh"
buttonClass="btn btn-outline-primary"
[disabled]="modalBusy"
(click)="resetToDefault()"
aria-hidden="true"
@ -127,9 +132,6 @@
{{ 'AbpFeatureManagement::ResetToDefault' | abpLocalization }}
</abp-button>
<button abpClose type="button" class="btn btn-secondary">
{{ 'AbpFeatureManagement::Cancel' | abpLocalization }}
</button>
<abp-button
*ngIf="groups.length"
iconClass="fa fa-check"

2
npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html

@ -21,7 +21,7 @@
</ng-template>
<ng-template #abpFooter>
<button type="button" class="btn btn-secondary" abpClose>
<button type="button" class="btn btn-outline-primary" abpClose>
{{ 'AbpIdentity::Cancel' | abpLocalization }}
</button>
<abp-button iconClass="fa fa-check" [disabled]="form?.invalid" (click)="save()">{{

2
npm/ng-packs/packages/identity/src/lib/components/users/users.component.html

@ -69,7 +69,7 @@
</ng-template>
<ng-template #abpFooter>
<button type="button" class="btn btn-secondary" abpClose>
<button type="button" class="btn btn-outline-primary" abpClose>
{{ 'AbpIdentity::Cancel' | abpLocalization }}
</button>
<abp-button iconClass="fa fa-check" [disabled]="form?.invalid" (click)="save()">{{

2
npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html

@ -95,7 +95,7 @@
</div>
</ng-template>
<ng-template #abpFooter>
<button type="button" class="btn btn-secondary" abpClose>
<button type="button" class="btn btn-outline-primary" abpClose>
{{ 'AbpIdentity::Cancel' | abpLocalization }}
</button>
<abp-button iconClass="fa fa-check" (click)="submit()">{{

10
npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html

@ -1,8 +1,8 @@
<h2>{{ 'AbpSettingManagement::Menu:Emailing' | abpLocalization }}</h2>
<hr class="my-3" />
<hr class="my-2" />
<form *ngIf="form" [formGroup]="form" class="abp-md-form" (ngSubmit)="submit()" [validateOnSubmit]="true">
<form *ngIf="form" [formGroup]="form" class="py-2 abp-md-form" (ngSubmit)="submit()" [validateOnSubmit]="true">
<div class="mb-3 form-group">
<label class="form-label"
>{{ 'AbpSettingManagement::DefaultFromDisplayName' | abpLocalization
@ -67,7 +67,7 @@
<input type="text" class="form-control" formControlName="smtpUserName" />
</div>
<div class="mb-3 form-group">
<div class="form-group">
<label class="form-label">{{ 'AbpSettingManagement::SmtpPassword' | abpLocalization }}</label>
<input type="password" class="form-control" formControlName="smtpPassword" />
</div>
@ -75,9 +75,9 @@
<hr />
<button type="submit" class="btn btn-primary">
<abp-button buttonType="submit" iconClass="fa fa-save">
{{ 'AbpSettingManagement::Save' | abpLocalization }}
</button>
</abp-button>
<button
type="button"
(click)="openSendEmailModal()"

2
npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html

@ -39,7 +39,7 @@
</ng-template>
<ng-template #abpFooter>
<button abpClose type="button" class="btn btn-secondary">
<button abpClose type="button" class="btn btn-outline-primary">
{{ 'AbpTenantManagement::Cancel' | abpLocalization }}
</button>
<abp-button iconClass="fa fa-check" (click)="save()" [disabled]="tenantForm?.invalid">{{

2
npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html

@ -49,7 +49,7 @@
</form>
</ng-template>
<ng-template #abpFooter>
<button abpClose type="button" class="btn btn-secondary">
<button abpClose type="button" class="btn btn-outline-primary">
{{ 'AbpTenantManagement::Cancel' | abpLocalization }}
</button>
<abp-button

4
npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html

@ -25,14 +25,14 @@
<div class="footer">
<button
id="cancel"
class="confirmation-button confirmation-button--reject"
class="btn btn-outline-primary me-2"
[innerHTML]="data.options?.cancelText || 'AbpUi::Cancel' | abpLocalization"
*ngIf="!data?.options?.hideCancelBtn"
(click)="close(reject)"
></button>
<button
id="confirm"
class="confirmation-button confirmation-button--approve"
class="btn btn-primary"
[innerHTML]="data.options?.yesText || 'AbpUi::Yes' | abpLocalization"
*ngIf="!data?.options?.hideYesBtn"
(click)="close(confirm)"

17
npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.scss

@ -31,8 +31,7 @@
display: flex;
align-items: center;
justify-content: center;
margin: 0 0 10px 0;
padding: 20px;
padding: 40px 20px 10px;
.icon {
width: 100px;
height: 100px;
@ -54,29 +53,19 @@
}
.message {
display: block;
margin: 10px auto;
padding: 20px;
padding: 8px 20px 20px 20px;
font-size: 16px;
font-weight: 400;
text-align: center;
margin-bottom: 0;
}
}
.footer {
display: flex;
align-items: center;
justify-content: flex-end;
margin: 10px 0 0 0;
padding: 20px;
width: 100%;
.confirmation-button {
display: inline-block;
margin: 0px 5px;
padding: 10px 20px;
border: none;
border-radius: 6px;
font-size: 14px;
font-weight: 600;
}
}
}
}

Loading…
Cancel
Save