cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/shopping-ui

Browse Source 
# Conflicts:
#	cookbook/models.py
#	vue/src/locales/en.json
This commit is contained in:
vabene1111
2024-01-08 06:45:56 +08:00
parent 44ac3cf51e 71e5484f0c
commit a5135de50b
25 changed files with 1454 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
vue/src/apps/SpaceManageView/SpaceManageView.vue
View File

@ -191,6 +191,37 @@
</b-form-select>
</b-form-group>
<h5>{{ $t('CustomLogos') }}</h5>
<p>{{$t('CustomLogoHelp')}} </p>
<b-form-group :label="$t('Logo')+' 32x32px'">
<generic-multiselect :initial_single_selection="space.logo_color_32"
:model="Models.USERFILE" :multiple="false" @change="space.logo_color_32 = $event.val;"></generic-multiselect>
</b-form-group>
<b-form-group :label="$t('Logo')+' 128x128px'">
<generic-multiselect :initial_single_selection="space.logo_color_128"
:model="Models.USERFILE" :multiple="false" @change="space.logo_color_128 = $event.val;"></generic-multiselect>
</b-form-group>
<b-form-group :label="$t('Logo')+' 144x144px'">
<generic-multiselect :initial_single_selection="space.logo_color_144"
:model="Models.USERFILE" :multiple="false" @change="space.logo_color_144 = $event.val;"></generic-multiselect>
</b-form-group>
<b-form-group :label="$t('Logo')+' 180x180px'">
<generic-multiselect :initial_single_selection="space.logo_color_180"
:model="Models.USERFILE" :multiple="false" @change="space.logo_color_180 = $event.val;"></generic-multiselect>
</b-form-group>
<b-form-group :label="$t('Logo')+' 192x192px'">
<generic-multiselect :initial_single_selection="space.logo_color_192"
:model="Models.USERFILE" :multiple="false" @change="space.logo_color_192 = $event.val;"></generic-multiselect>
</b-form-group>
<b-form-group :label="$t('Logo')+' 512x512px'">
<generic-multiselect :initial_single_selection="space.logo_color_512"
:model="Models.USERFILE" :multiple="false" @change="space.logo_color_512 = $event.val;"></generic-multiselect>
</b-form-group>
<b-form-group :label="$t('Logo')+' SVG'">
<generic-multiselect :initial_single_selection="space.logo_color_svg"
:model="Models.USERFILE" :multiple="false" @change="space.logo_color_svg = $event.val;"></generic-multiselect>
</b-form-group>
<b-button variant="success" @click="updateSpace()">{{ $t('Update') }}</b-button>
</b-col>
</b-row>

1115
vue/src/locales/en.json
View File

File diff suppressed because it is too large Load Diff