Input file & image filenames (#2)

* Add filename in Label

* Updated filename to basename

Author: TcFxGt4AGE

views/fields/file.blade.php

@@ -1,5 +1,14 @@
 <div>
     <input type="{{ $type }}" name="{{ $name }}" id="{{ $name }}File" class="inputfile {{ $class ?? '' }}" value="{{ $value }}" {!! $extraAttributes  !!}>
-    <label class="btn-secondary btn-block" for="{{ $name }}File"><i class="zmdi zmdi-upload"></i><span>{{ $placeholder ?? 'Select File...' }}</span></label>
+    <label class="btn-secondary btn-block" for="{{ $name }}File">
+        <i class="zmdi zmdi-upload"></i>
+        @if(isset($model) && $model->hasMedia($name))
+            <span>
+                    {{ $model->firstMedia($name)->basename }} (Click to change)
+             </span>
+        @else
+            <span>{{ $placeholder ?? 'Select File...' }}</span>
+        @endif
+    </label>
     <span class="required"></span>
 </div>

views/fields/image.blade.php

@@ -6,7 +6,7 @@
             <i class="zmdi zmdi-upload"></i>
             @if(isset($model) && $model->hasMedia($name))
                 <span>
-                    {{ sprintf('%s.%s', ...array_values($model->firstMedia($name)->only(['filename', 'extension']))) }} (Click to change)
+                    {{ $model->firstMedia($name)->basename }} (Click to change)
                 </span>
             @else
                 <span>{{ $placeholder ?? 'Select Image...' }}</span>
@@ -19,4 +19,4 @@
             <img src="{{ image($model->firstMedia($name), $preview) }}" class="ml-1 img-thumbnail" alt="Image">
         @endif
     @endif
-</div>
+</div>