kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 12:20:22 +00:00
Code Issues Projects Releases Wiki Activity

Use the custom-file-pickers also for the new file and image userfields

Browse Source
This commit is contained in:
Bernd Bestel
2020-11-11 18:49:08 +01:00
parent 9c81fc890b
commit e3ab943fe7
3 changed files with 64 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
views/components/userfields_tbody.blade.php
View File

@@ -14,8 +14,7 @@
<a href="{{ $userfieldObject->value }}"
target="_blank">{{ $userfieldObject->value }}</a>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_FILE)
<a class="show-as-dialog-link"
href="{{ $U('/files/userfiles/'. $userfieldObject->value) }}"
<a href="{{ $U('/files/userfiles/'. $userfieldObject->value) }}"
target="_blank">{{ base64_decode(explode('_', $userfieldObject->value)[1]) }}</a>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_IMAGE)
<a class="show-as-dialog-link"

64
views/components/userfieldsform.blade.php
View File

@@ -119,38 +119,48 @@
</div>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_FILE)
<div class="form-group">
<label for="{{ $userfield->name }}">{{ $userfield->caption }}</label>
<input type="file"
class="form-control userfield-input"
data-userfield-name="{{ $userfield->name }}">
<div class="d-none userfield-file">
<a href=""
class="userfield-current-file"
data-uf-name="{{ $userfield->name }}"></a>
<button type="button"
class="userfield-current-file btn btn-danger userfield-file-delete"
data-uf-name="{{ $userfield->name }}">
<i class="fas fa-trash"></i>
</button>
<label>{{ $userfield->caption }}</label>
<div class="input-group">
<div class="custom-file">
<input type="file"
class="custom-file-input userfield-input"
data-userfield-name="{{ $userfield->name }}">
<label class="custom-file-label"
for="{{ $userfield->name }}">
{{ $__t('No file selected') }}
</label>
</div>
<div class="input-group-append userfield-file-delete">
<span class="input-group-text"><i class="fas fa-trash"></i></span>
</div>
<div class="input-group-append">
<a href="#"
target="_blank"
class="input-group-text userfield-file-show d-none"><i class="fas fa-eye"></i></a>
</div>
</div>
</div>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_IMAGE)
<div class="form-group">
<label for="{{ $userfield->name }}">{{ $userfield->caption }}</label>
<input type="file"
class="form-control userfield-input"
data-userfield-name="{{ $userfield->name }}">
<div class="d-none userfield-file">
<img src=""
alt="{{ $userfield->name }}"
class="userfield-current-file"
data-uf-name="{{ $userfield->name }}" />
<button type="button"
class="userfield-current-file btn btn-danger userfield-file-delete"
data-uf-name="{{ $userfield->name }}">
<i class="fas fa-trash"></i>
</button>
<label>{{ $userfield->caption }}</label>
<div class="input-group">
<div class="custom-file">
<input type="file"
class="custom-file-input userfield-input"
data-userfield-name="{{ $userfield->name }}">
<label class="custom-file-label"
for="{{ $userfield->name }}">
{{ $__t('No file selected') }}
</label>
</div>
<div class="input-group-append userfield-file-delete">
<span class="input-group-text"><i class="fas fa-trash"></i></span>
</div>
</div>
<img src=""
alt="{{ $userfield->name }}"
class="userfield-current-file userfield-file-show d-none lazy mt-1"
data-uf-name="{{ $userfield->name }}" />
</div>
@endif