Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Sites Management Card review - MEED-7165 - Meeds-io/MIPs#137 #152

Merged
merged 2 commits into from
Jul 4, 2024
Merged

feat: Sites Management Card review - MEED-7165 - Meeds-io/MIPs#137 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2a599c
feat: Sites Management Card review - MEED-7165 - Meeds-io/MIPs#137
SaraBoutej Jul 3, 2024
95ed23f
Add new styling text method
SaraBoutej Jul 4, 2024
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
6 changes: 3 additions & 3 deletions ...vue-app/common-layout-components/components/manage-permissions/ManageAccessPermission.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
-->
<template>
<div>
<p class="font-weight-bold text-start text-color body-2">{{ whoCanView }}</p>
<p class="text-start">{{ whoCanView }}</p>
<v-select
v-model="type"
:items="typeLabel"
item-text="text"
item-value="value"
dense
class="caption"
class="pt-0"
outlined />
<exo-identity-suggester
v-if="showAccessPermissionsGroupSuggester"
Expand All @@ -41,7 +41,7 @@
include-groups
include-spaces
required />
<span v-if="!accessPermissions.length && showAccessPermissionsGroupSuggester" class="caption mx-2 mt-n3 position-absolute error-color">
<span v-if="!accessPermissions.length && showAccessPermissionsGroupSuggester" class="text-subtitle mx-2 mt-n3 position-absolute error-color">
{{ $t('siteNavigation.required.error.message') }}
</span>
<template v-if="showAccessPermissionsList">
Expand Down
2 changes: 1 addition & 1 deletion ...p/vue-app/common-layout-components/components/manage-permissions/ManageEditPermission.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
-->
<template>
<div>
<p class="font-weight-bold text-start text-color body-2">{{ whoCanEdit }}</p>
<p class="text-start">{{ whoCanEdit }}</p>
<exo-identity-suggester
ref="navigationNodeEditPermissions"
:labels="suggesterLabels"
Expand Down
2 changes: 1 addition & 1 deletion layout-webapp/src/main/webapp/vue-app/site-management/components/SiteCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
:site="site" />
</v-toolbar>
<div class="d-flex flex-grow-0 flex-shrink-1 rich-editor-content">
<span class="align-self-center text-wrap text-left text-break mx-2 text-truncate-4" v-sanitized-html="site.description"></span>
<span class="align-self-center text-wrap text-left text-break mx-4 text-truncate-4" v-sanitized-html="site.description"></span>
</div>
<v-footer absolute class="px-0 py-0">
<v-toolbar
Expand Down
40 changes: 14 additions & 26 deletions layout-webapp/src/main/webapp/vue-app/site-management/components/SitePropertiesDrawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,16 @@
required
@blur="convertSiteName">
<template #title>
<v-label>
<span class="text-color font-weight-bold">
{{ $t('siteManagement.label.siteLabel.title') }} *
</span>
</v-label>
<span>
{{ $t('siteManagement.label.siteLabel.title') }} *
</span>
</template>
</translation-text-field>
</v-card-text>
<v-card-text class="d-flex pb-2">
<v-label>
<span class="text-color font-weight-bold">
{{ $t('siteManagement.label.siteName.title') }} *
</span>
</v-label>
<span>
{{ $t('siteManagement.label.siteName.title') }} *
</span>
</v-card-text>
<v-card-text class="d-flex py-0">
<v-text-field
Expand All @@ -89,11 +85,9 @@
back-icon
rich-editor>
<template #title>
<v-label>
<span class="text-color font-weight-bold">
{{ $t('siteManagement.label.siteDescription.title') }}
</span>
</v-label>
<span>
{{ $t('siteManagement.label.siteDescription.title') }}
</span>
</template>
<rich-editor
id="siteDescription"
Expand All @@ -105,12 +99,8 @@
</translation-text-field>
</v-card-text>
<v-card-text class="mt-3 py-4 px-3">
<v-label>
<span class="text-color font-weight-bold mb-2 px-1 text-capitalize"> {{ $t('siteManagement.label.banner') }}</span>
</v-label>
<v-label>
<span class="text-color caption px-1 text-capitalize"> {{ $t('siteManagement.label.caption') }}</span>
</v-label>
<p class="mb-2 px-1 text-capitalize"> {{ $t('siteManagement.label.banner') }}</p>
<p class="text-subtitle px-1 text-capitalize"> {{ $t('siteManagement.label.caption') }}</p>
<site-management-banner-selector
ref="siteBannerSelector"
:src="siteBannerUrl"
Expand All @@ -121,17 +111,15 @@
@reset="resetBannerUploadId" />
</v-card-text>
<v-card-text class="mt-4">
<v-label>
<span class="text-color font-weight-bold mb-2"> {{ $t('siteManagement.label.displayOrder') }}</span>
</v-label>
<span class="mb-2"> {{ $t('siteManagement.label.displayOrder') }}</span>
<v-row class="mx-0 mt-2">
<v-col class="d-flex flex-row px-0 py-0 col-10">
<v-switch
v-model="displayed"
:disabled="displayedDisabled"
class="mt-2" />
<label v-if="displayed" class="subtitle-1 mx-1"> {{ $t('siteManagement.label.displayed') }} </label>
<label v-else class="subtitle-1 mx-1"> {{ $t('siteManagement.label.notDisplayed') }} </label>
<p v-if="displayed" class="mx-1"> {{ $t('siteManagement.label.displayed') }} </p>
<p v-else class="mx-1"> {{ $t('siteManagement.label.notDisplayed') }} </p>
</v-col>
<v-col class="col-2 px-0 py-0 mt-n1 orderDisplay">
<v-text-field
Expand Down