Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/Http/Controllers/BackEnd/EventController.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function datatables()
$data['preview_url'] = route('informasi.event.preview', $row->id);
}

return view('forms.aksi', $data);
return view('forms.aksi-grup', $data);
})
->rawColumns(['aksi'])
->make();
Expand Down
3 changes: 2 additions & 1 deletion catatan_rilis.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ Terimakasih [isi disini] yang telah berkontribusi langsung mengembangkan aplikas
2. [#1630](https://github.com/OpenSID/OpenDK/issues/1630) Sesuaikan perubahan tombol aksi agar konsisten.
3. [#1632](https://github.com/OpenSID/OpenDK/issues/1632) Penyesuaian pendaftaran kerjasama.
4. [#1635](https://github.com/OpenSID/OpenDK/issues/1635) Penyesuaian alert agar konsisten.
5. [#1627](https://github.com/OpenSID/OpenDK/issues/1627) Penyesuaian UI/UX di modul event.
5. [#1627](https://github.com/OpenSID/OpenDK/issues/1627) Penyesuaian UI/UX di modul event.
6. [#1628](https://github.com/OpenSID/OpenDK/issues/1628) Penyesuaian UI/UX di modul artikel.
1 change: 1 addition & 0 deletions resources/views/backend/event/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<th>Tanggal Selesai</th>
<th>Dihadiri Oleh</th>
<th>Status</th>
<th class="text-center" style="max-width: 100px;">Aksi</th>
</tr>
</thead>
</table>
Expand Down
24 changes: 22 additions & 2 deletions resources/views/informasi/artikel/_form.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,33 @@
<div class="form-group">
<label class="control-label" for="gambar">Gambar</label>

<img src="{{ is_img($artikel->gambar ?? null) }}" id="showgambar" style="width:100%; max-height:250px; float:left;" />
@if (isset($artikel) && $artikel->gambar)
<div style="padding:8px; background:#f5f5f5; border-radius:4px; margin-bottom:8px; display:flex; align-items:center; gap:10px;">
<img src="{{ $artikel->gambar }}"
style="max-height:60px; max-width:90px; object-fit:contain; border-radius:3px;"
class="img-thumbnail">
<div style="overflow: hidden;">
<span class="text-muted" style="word-break: break-all;">{{ basename($artikel->gambar) }}</span>
</div>
</div>
<small class="help-block text-muted">
Upload gambar baru di bawah untuk menggantikan gambar yang ada.
</small>
@else
<img class="hide" id="showgambar" style="width:100%; max-height:250px; float:left;" />
@endif

{!! html()->file('gambar')->class('form-control')->id('file-artikel')->accept('.jpg,.jpeg,.png') !!}
<x-upload-hint formats="JPG, JPEG, PNG" />
@if ($errors->has('gambar'))
<span class="help-block" style="color:red">{{ $errors->first('gambar') }}</span>
@endif

@if (isset($artikel) && $artikel->gambar)
<div class="clearfix"></div>
<br>
<img class="hide" id="showgambar" style="width:100%; max-height:250px; float:left;" />
@endif
</div>

<!-- kategori artikel -->
Expand Down Expand Up @@ -99,7 +120,6 @@ function readURL(input) {

$('#showgambar').attr('src', e.target.result);
$('#showgambar').removeClass('hide');
$('#showpdf').addClass('hide');

}

Expand Down
17 changes: 13 additions & 4 deletions resources/views/informasi/artikel/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@
d.id_kategori = $('#filter-kategori').val();
}
},
columns: [{
columns: [
{
data: 'aksi',
name: 'aksi',
class: 'text-center text-nowrap',
Expand All @@ -87,10 +88,18 @@ class: 'text-center text-nowrap',
{
data: 'judul',
name: 'judul',
class: 'artikel-title-cell',
render: function(data, type, row) {
var title = data;
if (title && title.length > 50) {
title = title.substr(0, 50) + '...';
}
return '<span title="' + (data ? data.replace(/"/g, '&quot;') : '') + '">' + title + '</span>';
}
},
{
data: 'kategori',
name: 'kategori',
name: 'kategori.nama_kategori'
},
{
data: 'status',
Expand All @@ -103,8 +112,8 @@ class: 'text-center',
data: 'tanggal_terbit',
name: 'tanggal_terbit',
class: 'text-center',
searchable: false,
},
searchable: false
}
],
order: [
[4, 'desc']
Expand Down