Merge branch 'dev'

OpenSID · Sep 2, 2024 · ee1b1b2 · ee1b1b2
2 parents daa66ec + 775e418
commit ee1b1b2
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 40 deletions.
diff --git a/catatan_rilis.md b/catatan_rilis.md
@@ -1,12 +1,6 @@
-Catatan Rilis v2408.0.0 :
+Catatan Rilis v2409.0.0 :
 
-### FITUR : 
-1. Penambahan pengaturan tema, unggah gambar untuk foto tidak tersedia.
-
-### BUG : 
-1. Perbaikan menampilkan data galeri.
-2. Perbaikan regenerate captcha.
-
-
-### TEKNIS : 
-1. Penyesuaian logo dan sk pendirian pada halaman web kelompok/lembaga.
+### TEKNIS :
+1. Penyesuaian halaman statis.
+2. Penyesuaian halaman 404.
+3. Penyesuaian judul halaman statistik.
diff --git a/commons/meta.php b/commons/meta.php
@@ -1,6 +1,6 @@
 <?php defined('BASEPATH') || exit('No direct script access allowed'); ?>
 
-<?php defined('THEME_VERSION') or define('THEME_VERSION', 'v2408.0.0') ?>
+<?php defined('THEME_VERSION') or define('THEME_VERSION', 'v2409.0.0') ?>
 <?php defined('FOTO_TIDAK_TERSEDIA') or define('FOTO_TIDAK_TERSEDIA', theme_config('foto_tidak_tersedia') ? base_url(theme_config('foto_tidak_tersedia')) : asset('images/404-image-not-found.jpg')) ?>
 <?php $desa_title =  ucwords($this->setting->sebutan_desa) . ' '. $desa['nama_desa'] . ' '. ucwords($this->setting->sebutan_kecamatan) . ' '. $desa['nama_kecamatan'] . ' '. ucwords($this->setting->sebutan_kabupaten) . ' '. $desa['nama_kabupaten']; ?>
 

diff --git a/commons/not_found.php b/commons/not_found.php
@@ -6,9 +6,9 @@
 				<h1>404</h1>
 				<h2>Maaf</h2>
 				<h3>Halaman ini belum tersedia atau sedang dalam perbaikan</h3>
-        <p class="wow fadeInLeftBig">
-          <a href="<?= site_url(); ?>">Silahkan kembali lagi ke halaman Beranda</a>
-        </p>
+					<p class="wow fadeInLeftBig">
+					<a href="<?= site_url(); ?>">Silahkan kembali lagi ke halaman Beranda</a>
+				</p>
 			</div>
 		</div>
 	</div>
diff --git a/layouts/full_content.tpl.php b/layouts/full_content.tpl.php
@@ -18,7 +18,13 @@
 		<section>
 			<div class="content_bottom">
 				<div class="col-lg-12 col-md-12">
-					<?php theme_view($halaman_peta); ?>
+					<?php
+						if ($tampil) {
+							theme_view("partials/{$halaman_peta}");
+						} else {
+							theme_view("partials/not_found");
+						}
+					?>
 				</div>
 			</div>
 		</section>

diff --git a/layouts/gallery.tpl.php b/layouts/gallery.tpl.php
@@ -20,7 +20,12 @@
 			<div class="content_bottom">
 				<div class="col-lg-9 col-md-9">
 					<div class="content_left">
-						<?php $this->load->view("$folder_themes/partials/gallery"); ?>
+						<?php
+							if ($tampil) {
+								$this->load->view("$folder_themes/partials/gallery");
+							} else {
+								theme_view("partials/not_found");
+							} ?>
 					</div>
 				</div>
 				<div class="col-lg-3 col-md-3">

diff --git a/layouts/halaman_statis.tpl.php b/layouts/halaman_statis.tpl.php
@@ -21,10 +21,14 @@
 				<div class="col-lg-9 col-md-9">
 					<div class="content_left">
 						<?php
-							if (preg_match("/halaman_statis/i", $halaman_statis)) {
-								$this->load->view($halaman_statis);
+							if ($tampil) {
+								if (preg_match("/halaman_statis/i", $halaman_statis)) {
+									$this->load->view($halaman_statis);
+								} else {
+									$this->load->view("{$folder_themes}/partials/{$halaman_statis}");
+								}
 							} else {
-								$this->load->view("{$folder_themes}/partials/{$halaman_statis}");
+								$this->load->view("{$folder_themes}/partials/not_found");
 							}
 						?>
 					</div>

diff --git a/layouts/halaman_statis_lebar.tpl.php b/layouts/halaman_statis_lebar.tpl.php
@@ -25,11 +25,15 @@
 					<div class="col-lg-12 col-md-12">
 						<div id="contentwrapper" class="web">
 							<?php
-								if (preg_match("/halaman_statis/i", $halaman_statis)) {
-									$this->load->view($halaman_statis);
+								if ($tampil) {
+									if (preg_match("/halaman_statis/i", $halaman_statis)) {
+										$this->load->view($halaman_statis);
+									} else {
+										$halaman_statis = str_replace('home/idm', 'idm/index', $halaman_statis);
+										$this->load->view("{$folder_themes}/partials/{$halaman_statis}");
+									}
 								} else {
-									$halaman_statis = str_replace('home/idm', 'idm/index', $halaman_statis);
-									$this->load->view("{$folder_themes}/partials/{$halaman_statis}");
+									$this->load->view("{$folder_themes}/partials/not_found");
 								}
 							?>
 						</div>

diff --git a/layouts/kelompok.tpl.php b/layouts/kelompok.tpl.php
@@ -20,7 +20,13 @@
 			<div class="content_bottom">
 				<div class="col-lg-9 col-md-9">
 					<div class="content_left">
-					<?php $this->load->view("$folder_themes/partials/kelompok"); ?>
+					<?php
+						if ($tampil) {
+							$this->load->view("$folder_themes/partials/kelompok");
+						} else {
+							theme_view("partials/not_found");
+						}
+					?>
 					</div>
 				</div>
 				<div class="col-lg-3 col-md-3">

diff --git a/layouts/stat.tpl.php b/layouts/stat.tpl.php
@@ -20,15 +20,19 @@
 			<div class="content_bottom">
 				<div class="col-lg-9 col-md-9">
 					<div class="content_left">
-						<?php if ($tipe == 2): ?>
-							<?php $this->load->view("$folder_themes/partials/statistik_sos"); ?>
-						<?php elseif ($tipe == 3): ?>
-							<?php $this->load->view("$folder_themes/partials/wilayah"); ?>
-						<?php elseif ($tipe == 4): ?>
-							<?php $this->load->view("$folder_themes/partials/dpt"); ?>
-						<?php else: ?>
-							<?php $this->load->view("$folder_themes/partials/statistik"); ?>
-						<?php endif; ?>
+						<?php if ($tampil) { ?>
+							<?php if ($tipe == 2): ?>
+								<?php $this->load->view("$folder_themes/partials/statistik_sos"); ?>
+							<?php elseif ($tipe == 3): ?>
+								<?php $this->load->view("$folder_themes/partials/wilayah"); ?>
+							<?php elseif ($tipe == 4): ?>
+								<?php $this->load->view("$folder_themes/partials/dpt"); ?>
+							<?php else: ?>
+								<?php $this->load->view("$folder_themes/partials/statistik"); ?>
+							<?php endif; ?>
+						<?php } else { ?>
+							<?php theme_view("partials/not_found"); ?>
+						<?php } ?>
 					</div>
 				</div>
 			<div class="col-lg-3 col-md-3">

diff --git a/layouts/sub_gallery.tpl.php b/layouts/sub_gallery.tpl.php
@@ -20,7 +20,11 @@
 			<div class="content_bottom">
 				<div class="col-lg-9 col-md-9">
 					<div class="content_left">
-						<?php $this->load->view("$folder_themes/partials/sub_gallery"); ?>
+						<?php if ($tampil) {
+							$this->load->view("$folder_themes/partials/sub_gallery");
+						} else {
+							theme_view("partials/not_found");
+						} ?>
 					</div>
 				</div>
 				<div class="col-lg-3 col-md-3">

diff --git a/layouts/suplemen.tpl.php b/layouts/suplemen.tpl.php
@@ -20,7 +20,11 @@
 			<div class="content_bottom">
 				<div class="col-lg-9 col-md-9">
 					<div class="content_left">
-					<?php $this->load->view("$folder_themes/partials/suplemen"); ?>
+					<?php if ($tampil) {
+						$this->load->view("$folder_themes/partials/suplemen");
+					} else {
+						theme_view("partials/not_found");
+					} ?>
 					</div>
 				</div>
 				<div class="col-lg-3 col-md-3">

diff --git a/partials/dpt.php b/partials/dpt.php
@@ -3,14 +3,14 @@
 <div class="single_page_area">
 
 	<div class="single_page_area">
-		<h2>Daftar Calon Pemilih (pada tgl pemilihan <?= $tanggal_pemilihan ?>)</h2>
+		<h2><?= $heading ?></h2>
 
 		<div class="table-responsive">
 		<table id="dpt" class="table table-bordered table-striped">
 		<thead>
 		<tr>
 			<th class="text-center">No</th>
-			<th class="text-center">Nama Dusun</th>
+			<th class="text-center"><?= ucwords(setting('sebutan_dusun')) ?></th>
 			<th class="text-center">RW</th>
 			<th class="text-center">Jiwa</th>
 			<th class="text-center">L</th>
@@ -41,5 +41,8 @@
 		} ?>
 		</table>
 		</div>
+		<p style="color: red">
+			Tanggal Pemilihan : <?= $tanggal_pemilihan ?>
+		</p>
 	</div>
 </div> <!-- .list-frame -->
diff --git a/partials/not_found.php b/partials/not_found.php
@@ -0,0 +1,11 @@
+<?php defined('BASEPATH') || exit('No direct script access allowed'); ?>
+
+<div class="artikel" id="artikel-blank">
+		<div class="col-lg-12 col-md-12 col-sm-12">
+			<div class="error_page_content">
+				<h1>404</h1>
+				<h3><?= $judulPesan ?: 'Menu Tidak terdaftar'; ?></strong></h3>
+				<p class="wow fadeInLeftBig"><?= $isiPesan ?: "Silahkan tambah menu terlebih dahulu.<br>Anda bisa melihat panduan membuat menu di link <a href='https://panduan.opendesa.id/opensid/halaman-administrasi/admin-web/menu' target='_blank'>Panduan</a>"; ?></p>
+			</div>
+		</div>
+	</div>
diff --git a/partials/statistik.php b/partials/statistik.php
@@ -160,7 +160,7 @@ function switchType(){
 </style>
 <div class="box-body">
     <div class="single_page_area">
-        <h2 class="post_titile" >Data Demografi Berdasar <?=$heading?></h2>
+        <h2 class="post_titile" ><?= $judul ?></h2>
     </div>
     <div class="box-stats d-flex justify-content-end">
         <div class="btn-group-xs">

diff --git a/partials/wilayah.php b/partials/wilayah.php
@@ -1,7 +1,7 @@
 <?php defined('BASEPATH') || exit('No direct script access allowed'); ?>
 
 <div class="single_page_area">
-	<h2 class="post_titile" >Data Demografi Berdasar <?= $heading; ?></h2>
+	<h2 class="post_titile" ><?= $heading; ?></h2>
 	<div class="box-body">
 		<div class="table-responsive">
 		<?php if(count($daftar_dusun ?? []) > 0) : ?>