Skip to content

Commit b94ba35

Browse files
pmattmannpmattmann
authored
Merge pull request ecamp#5288 from manuelmeister/fix/YSLogo
Harmonize Y+S logo on all channels & add icons in settings
2 parents 19cd4dd + 318c020 commit b94ba35

29 files changed

+214
-151
lines changed

‎common/assets/logos/GSLogo.svg‎

Lines changed: 6 additions & 0 deletions
Loading

‎common/assets/logos/JSLogo.svg‎

Lines changed: 6 additions & 0 deletions
Loading

‎frontend/src/components/campAdmin/CampActivityProgressLabels.vue‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<template>
2-
<content-group>
3-
<slot name="title">
4-
<div class="ec-content-group__title py-1 subtitle-1">
5-
{{ $tc('components.campAdmin.campActivityProgressLabels.title') }}
6-
<DialogActivityProgressLabelCreate v-if="!disabled" :camp="camp">
7-
<template #activator="{ on }">
8-
<ButtonAdd
9-
color="secondary"
10-
text
11-
:hide-label="$vuetify.breakpoint.xsOnly"
12-
class="my-n2"
13-
v-on="on"
14-
>
15-
{{ $tc('components.campAdmin.campActivityProgressLabels.create') }}
16-
</ButtonAdd>
17-
</template>
18-
</DialogActivityProgressLabelCreate>
19-
</div>
20-
</slot>
2+
<content-group
3+
:title="$tc('components.campAdmin.campActivityProgressLabels.title')"
4+
icon="mdi-eye-check"
5+
>
6+
<template #title-actions>
7+
<DialogActivityProgressLabelCreate v-if="!disabled" :camp="camp">
8+
<template #activator="{ on }">
9+
<ButtonAdd
10+
color="secondary"
11+
text
12+
:hide-label="$vuetify.breakpoint.xsOnly"
13+
class="my-n2"
14+
v-on="on"
15+
>
16+
{{ $tc('components.campAdmin.campActivityProgressLabels.create') }}
17+
</ButtonAdd>
18+
</template>
19+
</DialogActivityProgressLabelCreate>
20+
</template>
2121
<v-skeleton-loader
2222
v-if="camp.progressLabels()._meta.loading"
2323
type="list-item@3"

‎frontend/src/components/campAdmin/CampAddress.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ Displays address and allows to edit
33
-->
44

55
<template>
6-
<content-group :title="$tc('components.campAdmin.campAddress.title')">
6+
<content-group
7+
:title="$tc('components.campAdmin.campAddress.title')"
8+
icon="mdi-map-marker"
9+
>
710
<v-skeleton-loader v-if="camp._meta.loading" type="article" />
811
<div v-else class="mt-3">
912
<api-form :entity="camp" name="camp">

‎frontend/src/components/campAdmin/CampCategories.vue‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<template>
2-
<content-group>
3-
<slot name="title">
4-
<div class="ec-content-group__title py-1 subtitle-1">
5-
{{ $tc('components.campAdmin.campCategories.title') }}
6-
<DialogCategoryCreate v-if="!disabled" :camp="camp">
7-
<template #activator="{ on }">
8-
<ButtonAdd
9-
color="secondary"
10-
text
11-
:hide-label="$vuetify.breakpoint.xsOnly"
12-
class="my-n2"
13-
v-on="on"
14-
>
15-
{{ $tc('components.campAdmin.campCategories.create') }}
16-
</ButtonAdd>
17-
</template>
18-
</DialogCategoryCreate>
19-
</div>
20-
</slot>
2+
<content-group
3+
:title="$tc('components.campAdmin.campCategories.title')"
4+
icon="mdi-shape"
5+
>
6+
<template #title-actions>
7+
<DialogCategoryCreate v-if="!disabled" :camp="camp">
8+
<template #activator="{ on }">
9+
<ButtonAdd
10+
color="secondary"
11+
text
12+
:hide-label="$vuetify.breakpoint.xsOnly"
13+
class="my-n2"
14+
v-on="on"
15+
>
16+
{{ $tc('components.campAdmin.campCategories.create') }}
17+
</ButtonAdd>
18+
</template>
19+
</DialogCategoryCreate>
20+
</template>
2121
<v-skeleton-loader
2222
v-if="camp.categories()._meta.loading"
2323
type="list-item@3"

‎frontend/src/components/campAdmin/CampConditionalFields.vue‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ Displays fields which don't apply to all camps, but are required for some
55
<template>
66
<v-expansion-panel>
77
<v-expansion-panel-header>
8-
<h2 class="subtitle-1 font-weight-bold">
8+
<h2 class="subtitle-1 font-weight-bold d-flex align-center">
9+
<v-icon left size="20">{{
10+
$i18n.locale.includes('it') ? '$vuetify.icons.gs' : '$vuetify.icons.js'
11+
}}</v-icon>
912
{{ $tc('components.campAdmin.campConditionalFields.title') }}
1013
</h2>
1114
</v-expansion-panel-header>
@@ -14,6 +17,7 @@ Displays fields which don't apply to all camps, but are required for some
1417
<v-col cols="12" md="6" class="pb-0">
1518
<content-group
1619
:title="$tc('components.campAdmin.campConditionalFields.ysCamp.title')"
20+
icon="mdi-tent"
1721
>
1822
<v-skeleton-loader v-if="camp._meta.loading" type="article" />
1923
<div v-else class="mt-3">
@@ -30,6 +34,7 @@ Displays fields which don't apply to all camps, but are required for some
3034
<v-col cols="12" md="6" class="pb-0">
3135
<content-group
3236
:title="$tc('components.campAdmin.campConditionalFields.course.title')"
37+
icon="mdi-school"
3338
>
3439
<v-skeleton-loader v-if="camp._meta.loading" type="article" />
3540
<div v-else class="mt-3">

‎frontend/src/components/campAdmin/CampPeriods.vue‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,25 @@ Displays all periods of a single camp and allows to edit them & create new ones
33
-->
44

55
<template>
6-
<content-group>
7-
<slot name="title">
8-
<div class="ec-content-group__title py-1 subtitle-1">
9-
{{
10-
$tc('components.campAdmin.campPeriods.title', api.get().camps().items.length)
11-
}}
12-
<dialog-period-create v-if="!disabled" :camp="camp">
13-
<template #activator="{ on }">
14-
<button-add
15-
color="secondary"
16-
text
17-
class="my-n2"
18-
:hide-label="$vuetify.breakpoint.xsOnly"
19-
v-on="on"
20-
>
21-
{{ $tc('components.campAdmin.campPeriods.createPeriod') }}
22-
</button-add>
23-
</template>
24-
</dialog-period-create>
25-
</div>
26-
</slot>
6+
<content-group
7+
:title="$tc('components.campAdmin.campPeriods.title', api.get().camps().items.length)"
8+
icon="mdi-calendar-multiple"
9+
>
10+
<template #title-actiona>
11+
<dialog-period-create v-if="!disabled" :camp="camp">
12+
<template #activator="{ on }">
13+
<button-add
14+
color="secondary"
15+
text
16+
class="my-n2"
17+
:hide-label="$vuetify.breakpoint.xsOnly"
18+
v-on="on"
19+
>
20+
{{ $tc('components.campAdmin.campPeriods.createPeriod') }}
21+
</button-add>
22+
</template>
23+
</dialog-period-create>
24+
</template>
2725
<v-skeleton-loader v-if="camp.periods()._meta.loading" type="article" />
2826
<v-list>
2927
<period-item

‎frontend/src/components/campAdmin/CampSettings.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ Displays details on a single camp and allows to edit them.
33
-->
44

55
<template>
6-
<content-group :title="$tc('components.campAdmin.campSettings.title')">
6+
<content-group
7+
:title="$tc('components.campAdmin.campSettings.title')"
8+
icon="mdi-information"
9+
>
710
<v-skeleton-loader v-if="camp._meta.loading" type="article" />
811
<div v-else class="mt-3">
912
<api-form :entity="camp" name="camp">

‎frontend/src/components/layout/ContentGroup.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ Displays the content wrapped inside a card.
1010
v-if="title"
1111
class="ec-content-group__title py-1 subtitle-1"
1212
>
13-
<v-icon v-if="icon" left>{{ icon }}</v-icon>
13+
<v-icon v-if="icon" left size="20" class="mb-n1">{{ icon }}</v-icon>
1414
{{ title }}
15+
<v-spacer />
1516
<slot name="title-actions" />
1617
</component>
1718
</slot>

‎frontend/src/plugins/vuetify.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import GoogleLogo from '@/assets/GoogleLogo.svg'
77
import eCampLogo from '@/assets/eCampLogo.svg'
88
import CeviLogo from '@/assets/CeviLogo.svg'
99
import JublaLogo from '@/assets/JublaLogo.svg'
10+
import JSLogo from '@/common/assets/logos/JSLogo.svg'
11+
import GSLogo from '@/common/assets/logos/GSLogo.svg'
1012
import TentDay from '@/assets/tents/TentDay.svg'
1113
import PaperSize from '@/assets/icons/PaperSize.svg'
1214
import BigScreen from '@/assets/icons/BigScreen.svg'
@@ -30,6 +32,8 @@ class VuetifyLoaderPlugin {
3032
ecamp: { component: eCampLogo },
3133
cevi: { component: CeviLogo },
3234
jubla: { component: JublaLogo },
35+
js: { component: JSLogo },
36+
gs: { component: GSLogo },
3337
tentDay: { component: TentDay },
3438
paperSize: { component: PaperSize },
3539
bigScreen: { component: BigScreen },

0 commit comments

Comments
 (0)