Penyesuaian perubahan tema untuk v2409.0.0

OpenSID · Sep 6, 2024 · 08e7d77 · 08e7d77
2 parents b96998a + 2fd70d7
commit 08e7d77
Show file tree

Hide file tree

Showing 14 changed files with 110 additions and 68 deletions.
diff --git a/catatan_rilis.md b/catatan_rilis.md
@@ -1,9 +1,6 @@
-Catatan Rilis v2408.0.0 :
+Catatan Rilis v2409.0.0 :
 
-### 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
@@ -5,7 +5,7 @@
 
 <?php defined('NAMA_DESA') || define('NAMA_DESA', $nama_desa) ?>
 <?php defined('THEME_NAME') || define('THEME_NAME', 'Palanta') ?>
-<?php defined('THEME_VERSION') || define('THEME_VERSION', 'v2408.0.0') ?>
+<?php defined('THEME_VERSION') || define('THEME_VERSION', 'v2409.0.0') ?>
 <?php defined('IS_PREMIUM') || define('IS_PREMIUM', $is_premium) ?>
 <?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/layouts/full_content.tpl.php b/layouts/full_content.tpl.php
@@ -2,20 +2,28 @@
 
 <!DOCTYPE html>
 <html>
+
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <?php theme_view("commons/meta"); ?>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<?php theme_view("commons/meta"); ?>
 </head>
+
 <body>
 	<div class="pagelayout">
 		<?php theme_view("partials/header"); ?>
 		<div class="default-row mt-20">
 			<div class="container-custom" style="margin-bottom:10px;">
-				<?php theme_view($halaman_peta); ?>
+				<?php
+				if ($tampil) {
+					theme_view($halaman_peta);
+				} else {
+					theme_view("partials/not_found");
+				}
+				?>
 			</div>
 		</div>
-	</div>	
+	</div>
 	<?php theme_view("commons/footer"); ?>
 </body>
-</html>
 
+</html>
diff --git a/layouts/gallery.tpl.php b/layouts/gallery.tpl.php
@@ -13,7 +13,15 @@
 			<div class="container-custom">
 				<div class="row-custom mlr-min-20">
 					<div class="pageleft">
-					<?php theme_view("partials/galeri"); ?>
+
+					<?php 
+					if ($tampil) {
+						theme_view("partials/galeri");
+					} else {
+						theme_view("partials/not_found");
+					}
+					?>
+
 					</div>
 					<div class="pageright">
 					<?php theme_view("partials/sidebar"); ?>

diff --git a/layouts/halaman_statis.tpl.php b/layouts/halaman_statis.tpl.php
@@ -19,10 +19,14 @@
 							</div>
 						</div>
 						<?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
@@ -2,47 +2,37 @@
 
 <!DOCTYPE html>
 <html>
+
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <?php theme_view("commons/meta"); ?>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<?php theme_view("commons/meta"); ?>
 </head>
+
 <body>
 	<div class="pagelayout">
 		<?php theme_view("partials/header"); ?>
 		<div class="default-row mt-20">
 			<div class="container-custom" style="margin-bottom:10px;">
-				<?php if(IS_PREMIUM) : ?>
-					<?php if (preg_match("/halaman_statis/i", $halaman_statis)) {
-					$this->load->view($halaman_statis);
+				<?php
+
+				$view_file = preg_match("/halaman_statis/i", $halaman_statis) ? $halaman_statis : str_replace('home/idm', 'idm/index', $halaman_statis);
+
+				if ($tampil) {
+					if (IS_PREMIUM || $idm) {
+						$this->load->view($view_file);
 					} 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/{$view_file}");
 					}
-					?>
-				<?php else : ?>
-					<?php if ($idm): ?>
-						<?php
-						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}");
-						}
-						?>  
-					<?php else : ?>
-						<?php
-						if (preg_match("/halaman_statis/i", $halaman_statis)) {
-						$this->load->view($halaman_statis);
-						} else {
-						$this->load->view("{$folder_themes}/partials/{$halaman_statis}");
-						}
-						?>
-					<?php endif; ?>
-				<?php endif ?>
+				} else {
+					$this->load->view("{$folder_themes}/partials/not_found");
+				}
+
+				?>
+
 			</div>
 		</div>
-	</div>	
+	</div>
 	<?php theme_view("commons/footer"); ?>
 </body>
-</html>
 
+</html>
diff --git a/layouts/kelompok.tpl.php b/layouts/kelompok.tpl.php
@@ -13,7 +13,11 @@
 			<div class="container-custom">
 				<div class="row-custom mlr-min-20">
 					<div class="pageleft">
-					<?php theme_view("partials/kelompok"); ?>
+					<?php if ($tampil) {
+						theme_view("partials/kelompok");
+					} else {
+						theme_view("partials/not_found");
+					} ?>
 					</div>
 					<div class="pageright">
 					<?php theme_view("partials/sidebar"); ?>

diff --git a/layouts/stat.tpl.php b/layouts/stat.tpl.php
@@ -2,34 +2,43 @@
 
 <!DOCTYPE html>
 <html>
+
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <?php theme_view("commons/meta"); ?>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<?php theme_view("commons/meta"); ?>
 </head>
+
 <body>
 	<div class="pagelayout">
 		<?php theme_view("partials/header"); ?>
 		<div class="default-row mt-20">
 			<div class="container-custom">
 				<div class="row-custom mlr-min-20">
 					<div class="pageleft">
-						<?php if ($tipe == 2): ?>
-							<?php theme_view("partials/stat_statistik_sos"); ?>
-						<?php elseif ($tipe == 3): ?>
-							<?php theme_view("partials/stat_wilayah"); ?>
-						<?php elseif ($tipe == 4): ?>
-							<?php theme_view("partials/stat_dpt"); ?>
-						<?php else: ?>
-							<?php theme_view("partials/stat_statistik"); ?>
-						<?php endif; ?>
+
+						<?php if ($tampil) { ?>
+							<?php if ($tipe == 2): ?>
+								<?php theme_view("partials/stat_statistik_sos"); ?>
+							<?php elseif ($tipe == 3): ?>
+								<?php theme_view("partials/stat_wilayah"); ?>
+							<?php elseif ($tipe == 4): ?>
+								<?php theme_view("partials/stat_dpt"); ?>
+							<?php else: ?>
+								<?php theme_view("partials/stat_statistik"); ?>
+							<?php endif; ?>
+						<?php } else { ?>
+							<?php theme_view("partials/not_found"); ?>
+						<?php } ?>
+
 					</div>
 					<div class="pageright">
-					<?php theme_view("partials/sidebar"); ?>
+						<?php theme_view("partials/sidebar"); ?>
 					</div>
 				</div>
 			</div>
 		</div>
-	</div>	
+	</div>
 	<?php theme_view("commons/footer"); ?>
 </body>
+
 </html>
diff --git a/layouts/sub_gallery.tpl.php b/layouts/sub_gallery.tpl.php
@@ -13,7 +13,11 @@
 			<div class="container-custom">
 				<div class="row-custom mlr-min-20">
 					<div class="pageleft">
-					<?php theme_view("partials/subgaleri"); ?>
+					<?php if ($tampil) {
+						theme_view("partials/subgaleri");
+					} else {
+						theme_view("partials/not_found");
+					} ?>
 					</div>
 					<div class="pageright">
 					<?php theme_view("partials/sidebar"); ?>

diff --git a/layouts/suplemen.tpl.php b/layouts/suplemen.tpl.php
@@ -13,7 +13,11 @@
 			<div class="container-custom">
 				<div class="row-custom mlr-min-20">
 					<div class="pageleft">
-					<?php theme_view("partials/suplemen"); ?>
+					<?php if ($tampil) {
+						theme_view("partials/suplemen");
+					} else {
+						theme_view("partials/not_found");
+					} ?>
 					</div>
 					<div class="pageright">
 					<?php theme_view("partials/sidebar"); ?>

diff --git a/partials/not_found.php b/partials/not_found.php
@@ -0,0 +1,14 @@
+<?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>
+				<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>
+			</div>
+		</div>
+	</div>
diff --git a/partials/stat_dpt.php b/partials/stat_dpt.php
@@ -4,7 +4,7 @@
 
 	<div class="heading-module l-flex">
 		<div class="heading-module-inner l-flex">
-			<i class="fa fa-pie-chart"></i><h1>Data Statistik</h1>
+			<i class="fa fa-pie-chart"></i><h1><?= $heading ?></h1>
 		</div>
 	</div>
 	<div class="c-flex" style="margin:20px 0 20px;text-align:center;width:100%;">
@@ -16,7 +16,7 @@
 		<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>

diff --git a/partials/stat_statistik.php b/partials/stat_statistik.php
@@ -167,7 +167,7 @@ function switchType(){
 
 <div class="box-body">
 	<div class="c-flex" style="margin:20px 0 20px;text-align:center;width:100%;">
-	<h1>Data Statistik <?=$heading?></h1>
+	<h1><?= $judul ?></h1>
 	</div>
 
 	<div class="c-flex">

diff --git a/partials/stat_wilayah.php b/partials/stat_wilayah.php
@@ -7,7 +7,7 @@
 		</div>
 	</div>
 	<div class="c-flex" style="margin:20px 0 20px;text-align:center;width:100%;">
-	<h1>Data Statistik <?=$heading?></h1>
+	<h1><?= $heading ?></h1>
 	</div>
 
 	<div class="box-body">