layer control redesign

removed scale bar
larger close button for popups
2026-06-12 13:16:42 +02:00 · 2026-06-12 12:59:50 +02:00 · 2026-06-12 12:49:03 +02:00 · 2026-06-12 12:46:20 +02:00 · 2026-06-12 12:42:19 +02:00 · 2026-06-12 12:40:07 +02:00
23 changed files with 1865 additions and 1039 deletions
--- a/legacy/delete_data.php
+++ b/legacy/delete_data.php
@@ -1,48 +0,0 @@
-<?php
-
-
-	// ToDo's
-	// Whitelists oder Prepared Statements gegen SQL-Injection hinzufügen
-
-
-    include 'init.php';
-
-    $request = htmlspecialchars($_POST['request'], ENT_QUOTES);
-
-    if ($request=='buildings') {
-        $webgis_id = htmlspecialchars($_POST['webgis_id'], ENT_QUOTES);
-
-        try {
-
-            $pdo -> query("DELETE FROM buildings WHERE webgis_id = '$webgis_id'");
-
-        } catch (PDOException $e) {
-            echo "ERROR ".$e->getMessage();
-        }
-    }
-
-    if ($request == 'pipelines') {
-		$webgis_id = htmlspecialchars($_POST['webgis_id'], ENT_QUOTES);
-
-		try {
-
-			$pdo -> query("DELETE from pipelines where webgis_id= '$webgis_id' ");
-
-		} catch(PDOException $e) {
-			echo "ERROR ".$e->getMessage();
-		}
-	}
-
-    if ($request == 'valves') {
-		$webgis_id = htmlspecialchars($_POST['webgis_id'], ENT_QUOTES);
-
-		try {
-
-			$pdo -> query("DELETE from valves where webgis_id= '$webgis_id' ");
-
-		} catch(PDOException $e) {
-			echo "ERROR ".$e->getMessage();
-		}
-	}
-
-?>
--- a/legacy/find_data.php
+++ b/legacy/find_data.php
@@ -1,52 +0,0 @@
-<?php
-
-	// ToDo's
-	// Whitelists oder Prepared Statements gegen SQL-Injection hinzufügen
-
-    // PostgreSQL-Serververbindung
-    include 'init.php';
-
-    // HTTP-POST-Methode für Formulardaten
-    $table = htmlspecialchars($_POST['table'], ENT_QUOTES);
-    $field = htmlspecialchars($_POST['field'], ENT_QUOTES);
-    $value = htmlspecialchars($_POST['value'], ENT_QUOTES);
-    
-    try {
-        // Datenbankabfrage
-        $result = $pdo -> query("SELECT *, ST_AsGeoJSON(geom) as geojson FROM $table WHERE $field = '$value'");
-
-        $features = [];
-
-        foreach($result as $row) {
-            // PHP-Objekt erstellen
-            $geometry = json_decode($row['geojson']);
-            
-            // PHP-Objekt bereinigen 
-            unset($row['geom']);
-            unset($row['geojson']);
-            
-            // JSON-Feature hinzufügen
-            $feature = [
-                "type"=>"Feature", 
-                "geometry"=>$geometry, 
-                "properties"=>$row
-            ];
-
-            array_push($features, $feature);
-        };
-
-        // Feature-Collection hinzufügen
-        $featureCollection = [
-            "type"=>"FeatureCollection",
-            "features"=>$features
-        ];
-
-        echo json_encode($featureCollection);
-
-    // Fehlernachricht ausgeben
-    } catch(PDOException $e) {
-        echo "ERROR ".$e->getMessage();
-
-    }
-
-?>
--- a/legacy/insert_data.php
+++ b/legacy/insert_data.php
@@ -1,73 +0,0 @@
-<?php
-
-	// ToDo's
-	// Whitelists oder Prepared Statements gegen SQL-Injection hinzufügen
-
-    // PostgreSQL-Serververbindung
-    include 'init.php';
-
-    $request = htmlspecialchars($_POST['request'], ENT_QUOTES);
-
-    if ($request == 'valves') {
-        $valve_id = htmlspecialchars($_POST['valve_id'], ENT_QUOTES);
-        $valve_type = htmlspecialchars($_POST['valve_type'], ENT_QUOTES);
-        $valve_dma_id = htmlspecialchars($_POST['valve_dma_id'], ENT_QUOTES);
-        $valve_diameter = htmlspecialchars($_POST['valve_diameter'], ENT_QUOTES);
-        $valve_visibility = htmlspecialchars($_POST['valve_visibility'], ENT_QUOTES);
-        $valve_location = htmlspecialchars($_POST['valve_location'], ENT_QUOTES);
-        $valve_geometry = $_POST['valve_geometry'];
-
-        $result = $pdo -> query("SELECT * FROM valves WHERE valve_id = '$valve_id'");
-
-        if ($result->rowCount()>0) {
-            echo "ERROR: Valve ID already exists. Please type in another ID!";
-        } else {
-        // Datenbankabfrage
-            $result = $pdo -> query("INSERT INTO valves(valve_id, valve_type, valve_dma_id, valve_diameter, valve_location, valve_visibility,  geom) VALUES ('$valve_id', '$valve_type', '$valve_dma_id', '$valve_diameter', '$valve_location', '$valve_visibility',  ST_SetSRID(ST_GeomFromGeoJSON('$valve_geometry'), 4326))");
-        }
-    }
-
-    if ($request == 'pipelines') {
-        $pipeline_id = htmlspecialchars($_POST['pipeline_id'], ENT_QUOTES);
-        $pipeline_category = htmlspecialchars($_POST['pipeline_category'], ENT_QUOTES);
-        $pipeline_dma_id = htmlspecialchars($_POST['pipeline_dma_id'], ENT_QUOTES);
-        $pipeline_diameter = htmlspecialchars($_POST['pipeline_diameter'], ENT_QUOTES);
-        $pipeline_method = htmlspecialchars($_POST['pipeline_method'], ENT_QUOTES);
-        $pipeline_location = htmlspecialchars($_POST['pipeline_location'], ENT_QUOTES);
-        $pipeline_geometry = $_POST['pipeline_geometry'];
-
-        $result = $pdo -> query("SELECT * FROM pipelines WHERE pipeline_id = '$pipeline_id'");
-
-        if ($result->rowCount()>0) {
-            echo "ERROR: Pipeline ID already exists. Please type in another ID!";
-        } else {
-        // Datenbankabfrage
-            $result = $pdo -> query("INSERT INTO pipelines(pipeline_id, pipeline_category, pipeline_dma_id, pipeline_diameter, pipeline_method, pipeline_location,  geom) VALUES ('$pipeline_id', '$pipeline_category', '$pipeline_dma_id', '$pipeline_diameter', '$pipeline_method', '$pipeline_location',  ST_SetSRID(ST_GeomFromGeoJSON('$pipeline_geometry'), 4326))");
-        }
-    }
-
-    if ($request == 'buildings') {
-
-		$account_no = htmlspecialchars($_POST['account_no'], ENT_QUOTES);
-		$building_category = htmlspecialchars($_POST['building_category'], ENT_QUOTES);
-		$building_dma_id = htmlspecialchars($_POST['building_dma_id'], ENT_QUOTES);
-		$building_storey = htmlspecialchars($_POST['building_storey'], ENT_QUOTES);
-		$building_population = htmlspecialchars($_POST['building_population'], ENT_QUOTES);
-		$building_location = htmlspecialchars($_POST['building_location'], ENT_QUOTES);
-		$building_geometry = $_POST['building_geometry'];
-
-		$result = $pdo -> query("SELECT *from buildings where account_no= '$account_no'");
-
-		if ($result->rowCount()>0) {
-			echo "ERROR: Building ID already exists. Please type in another ID!";
-		} else {
-			$sql = $pdo -> query("INSERT INTO buildings(account_no, building_category, building_dma_id, building_storey, building_population, building_location, geom) VALUES ('$account_no', '$building_category', '$building_dma_id', '$building_storey', '$building_population', '$building_location', ST_Force3DZ(ST_SetSRID(ST_GeomFromGeoJSON('$building_geometry'), 4326)))");
-		}
-	}
-        
-
-
-
-
-
-    ?>
--- a/legacy/load_data.php
+++ b/legacy/load_data.php
@@ -1,63 +0,0 @@
-<?php
-
-	// ToDo's
-	// Whitelists oder Prepared Statements gegen SQL-Injection hinzufügen
-
-    // PostgreSQL-Serververbindung
-    include 'init.php';
-
-    // HTTP-POST-Methode für Formulardaten
-    $table = htmlspecialchars($_POST['table'], ENT_QUOTES);
-    $dma_id = htmlspecialchars($_POST['dma_id'], ENT_QUOTES);
-
-    if($table == 'valves') {
-        $dma_id_field = "valve_dma_id";
-    }
-
-    if($table == 'buildings') {
-        $dma_id_field = "building_dma_id";
-    }
-
-    if($table == 'pipelines') {
-        $dma_id_field = "pipeline_dma_id";
-    }
-    
-    try {
-        // Datenbankabfrage
-        $result = $pdo -> query("SELECT *, ST_AsGeoJSON(geom) as geojson FROM $table WHERE $dma_id_field = '$dma_id'");
-
-        $features = [];
-
-        foreach($result as $row) {
-            // PHP-Objekt erstellen
-            $geometry = json_decode($row['geojson']);
-            
-            // PHP-Objekt bereinigen 
-            unset($row['geom']);
-            unset($row['geojson']);
-            
-            // JSON-Feature hinzufügen
-            $feature = [
-                "type"=>"Feature", 
-                "geometry"=>$geometry, 
-                "properties"=>$row
-            ];
-
-            array_push($features, $feature);
-        };
-
-        // Feature-Collection hinzufügen
-        $featureCollection = [
-            "type"=>"FeatureCollection",
-            "features"=>$features
-        ];
-
-        echo json_encode($featureCollection);
-
-    // Fehlernachricht ausgeben
-    } catch(PDOException $e) {
-        echo "ERROR ".$e->getMessage();
-
-    }
-
-?>
--- a/legacy/test.html
+++ b/legacy/test.html
@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
-
-    <!-- jQuery UI -->
-    <link rel="stylesheet" href="source/jquery-ui.min.css">
-    <script src="source/jquery-ui.min.js"></script>
-
-    <!-- Bootstrap Stylesheet & Skript -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
-
-    <link rel="stylesheet" href="styles.css">
-
-    <!-- Sidebar Plugin -->
-    <link rel="stylesheet" href="plugins/sidebar/leaflet-sidebar.css">
-    <script src="plugins/sidebar/leaflet-sidebar.js"></script>
-     
-
-    <!-- Button Plugin -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet-easybutton@2/src/easy-button.css">
-    <script src="https://cdn.jsdelivr.net/npm/leaflet-easybutton@2/src/easy-button.js"></script>
-
-    <!-- Font Plugin -->
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/7.0.1/css/all.min.css">
-
-    <!-- PolylineMeasure Plugin -->
-    <link rel="stylesheet" href="https://ppete2.github.io/Leaflet.PolylineMeasure/Leaflet.PolylineMeasure.css">
-    <script src="https://ppete2.github.io/Leaflet.PolylineMeasure/Leaflet.PolylineMeasure.js"></script>
-
-    <!-- MousePosition Plugin -->
-    <link rel="stylesheet" href="plugins/mouseposition/L.Control.MousePosition.css">
-    <script src="plugins/mouseposition/L.Control.MousePosition.js"></script>
-
-    <!-- Geoman Plugin -->
-    <link rel="stylesheet" href="https://unpkg.com/@geoman-io/leaflet-geoman-free@latest/dist/leaflet-geoman.css">
-    <script src="https://unpkg.com/@geoman-io/leaflet-geoman-free@latest/dist/leaflet-geoman.js"></script>
-
-    <!-- Minimap Plugin -->
-    <link rel="stylesheet" href="plugins/minimap/Control.MiniMap.min.css">
-    <script src="plugins/minimap/Control.MiniMap.min.js"></script>
-
-    <!-- ajax Plugin -->
-    <script src="plugins/ajax/leaflet.ajax.js"></script>
-</head>
-
-<body>
-
-    <div class="popup-container">
-        
-        <input type="hidden" name="building_database_id" class="updateBuilding" value="something">
-        <input type="hidden" name="account_no_old" class="updateBuilding" value="something">
-
-        
-        <div class="popup-form-group">
-            <label class="control-label popup-label">Building ID</label>
-            <input type="text" class="form-control popup-input text-center updateBuilding" value="something" name="account_no">
-        </div>
-
-        <div class="popup-form-group">
-            <label class="control-label popup-label">Category</label>
-            <input type="text" class="form-control popup-input text-center updateBuilding" value="something" name="building_category">
-        </div>
-
-        <div class="popup-form-group">
-            <label class="control-label popup-label">Storey</label>
-            <input type="number" class="form-control popup-input text-center updateBuilding" value="something" name="building_storey">
-        </div>
-
-        <div class="popup-form-group">
-            <label class="control-label popup-label">Population</label>
-            <input type="number" class="form-control popup-input text-center updateBuilding" value="something" name="building_population">
-        </div>
-
-        <div class="popup-form-group">
-            <label class="control-label popup-label">Location</label>
-            <input type="text" class="form-control popup-input text-center updateBuilding" value="something" name="building_locationn">
-        </div>
-
-        <div class="popup-button-group">
-            <button type="submit" class="btn btn-success popup-button">Update</button>
-            <button type="submit" class="btn btn-danger popup-button">Delete</button>
-
-        </div>
-
-    </div>
-    
-
-
-
-
-</body>
-
-</html>
--- a/legacy/update_data.php
+++ b/legacy/update_data.php
@@ -1,98 +0,0 @@
-<?php
-    include 'init.php';
-
-    $request = htmlspecialchars($_POST['request'], ENT_QUOTES);
-
-    if ($request=='buildings') {
-        $webgis_id = htmlspecialchars($_POST['webgis_id'], ENT_QUOTES);
-        $account_no_old = htmlspecialchars($_POST['account_no_old'], ENT_QUOTES);
-        $account_no = htmlspecialchars($_POST['account_no'], ENT_QUOTES);
-        $building_category = htmlspecialchars($_POST['building_category'], ENT_QUOTES);
-        $building_storey = htmlspecialchars($_POST['building_storey'], ENT_QUOTES);
-        $building_population = htmlspecialchars($_POST['building_population'], ENT_QUOTES);
-        $building_location = htmlspecialchars($_POST['building_location'], ENT_QUOTES);
-        $building_dma_id = htmlspecialchars($_POST['building_dma_id'], ENT_QUOTES);
-
-
-        try {
-            
-            if ($account_no_old != $account_no) {
-                $result = $pdo -> query("SELECT * FROM buildings WHERE account_no = '$account_no'");
-
-                if ($result -> rowCount()>0) {
-                    echo "ERROR: Account Number already exists. Pleas type in another Account Number!";
-                } else {
-                    $pdo -> query("UPDATE buildings SET account_no = '$account_no', building_category = '$building_category', building_storey = '$building_storey', building_population = '$building_population', building_location = '$building_location', building_dma_id = '$building_dma_id' WHERE webgis_id = '$webgis_id'");
-                }
-
-            } else { $pdo -> query("UPDATE buildings SET account_no = '$account_no', building_category = '$building_category', building_storey = '$building_storey', building_population = '$building_population', building_location = '$building_location', building_dma_id = '$building_dma_id' WHERE webgis_id = '$webgis_id'");
-            }
-
-        } catch (PDOException $e) {
-            echo "ERROR ".$e->getMessage();
-        }
-    }
-
-
-    if ($request == 'pipelines') {
-		$webgis_id = htmlspecialchars($_POST['webgis_id'], ENT_QUOTES);
-		$pipeline_id_old = htmlspecialchars($_POST['pipeline_id_old'], ENT_QUOTES);
-		$pipeline_id = htmlspecialchars($_POST['pipeline_id'], ENT_QUOTES);
-		$pipeline_dma_id = htmlspecialchars($_POST['pipeline_dma_id'], ENT_QUOTES);
-		$pipeline_diameter = htmlspecialchars($_POST['pipeline_diameter'], ENT_QUOTES);
-		$pipeline_location = htmlspecialchars($_POST['pipeline_location'], ENT_QUOTES);
-		$pipeline_category = htmlspecialchars($_POST['pipeline_category'], ENT_QUOTES);
-		$pipeline_length = htmlspecialchars($_POST['pipeline_length'], ENT_QUOTES);
-
-
-		try {
-
-			if ($pipeline_id_old != $pipeline_id) {
-				$result = $pdo -> query("SELECT *from pipelines where pipeline_id = '$pipeline_id' ");
-
-				if ($result -> rowCount()>0) {
-					echo "ERROR: Pipeline ID already exists. Please choose a new ID";
-				} else {
-					$pdo -> query("UPDATE pipelines set pipeline_id = '$pipeline_id', pipeline_dma_id = '$pipeline_dma_id', pipeline_diameter = '$pipeline_diameter', pipeline_location = '$pipeline_location', pipeline_category='$pipeline_category', pipeline_length='$pipeline_length' where webgis_id = '$webgis_id'");
-				}
-			} else {
-				$pdo -> query("UPDATE pipelines set pipeline_id = '$pipeline_id', pipeline_dma_id = '$pipeline_dma_id', pipeline_diameter = '$pipeline_diameter', pipeline_location = '$pipeline_location', pipeline_category='$pipeline_category', pipeline_length='$pipeline_length' where webgis_id = '$webgis_id'");
-			}
-
-		} catch(PDOException $e) {
-			echo "ERROR ".$e->getMessage();
-		}
-	}
-
-
-    if ($request == 'valves') {
-		$webgis_id = htmlspecialchars($_POST['webgis_id'], ENT_QUOTES);
-		$valve_id_old = htmlspecialchars($_POST['valve_id_old'], ENT_QUOTES);
-		$valve_id = htmlspecialchars($_POST['valve_id'], ENT_QUOTES);
-		$valve_dma_id = htmlspecialchars($_POST['valve_dma_id'], ENT_QUOTES);
-		$valve_type = htmlspecialchars($_POST['valve_type'], ENT_QUOTES);
-		$valve_diameter = htmlspecialchars($_POST['valve_diameter'], ENT_QUOTES);
-		$valve_location = htmlspecialchars($_POST['valve_location'], ENT_QUOTES);
-		$valve_visibility = htmlspecialchars($_POST['valve_visibility'], ENT_QUOTES);
-
-
-		try {
-
-			if ($valve_id_old != $valve_id) {
-				$result = $pdo -> query("SELECT *from valves where valve_id = '$valve_id' ");
-
-				if ($result -> rowCount()>0) {
-					echo "ERROR: Valve ID already exists. Please choose a new ID";
-				} else {
-					$pdo -> query("UPDATE valves set valve_id = '$valve_id', valve_dma_id = '$valve_dma_id', valve_type = '$valve_type', valve_diameter = '$valve_diameter', valve_location = '$valve_location', valve_visibility = '$valve_visibility' where webgis_id = '$webgis_id' ");
-				}
-			} else {
-				$pdo -> query("UPDATE valves set valve_id = '$valve_id', valve_dma_id = '$valve_dma_id', valve_type = '$valve_type', valve_diameter = '$valve_diameter', valve_location = '$valve_location', valve_visibility = '$valve_visibility' where webgis_id = '$webgis_id' ");
-			}
-
-		} catch(PDOException $e) {
-			echo "ERROR ".$e->getMessage();
-		}
-	}
-
-?>
--- a/migrations/007_comment_moderation.sql
+++ b/migrations/007_comment_moderation.sql
@@ -0,0 +1,14 @@
+-- =====================================================================
+-- Migration 007: Adds Status Column to Comments for Moderation
+-- =====================================================================
+
+-- Adds Status Column with Default 'pending'
+ALTER TABLE comments
+    ADD COLUMN status VARCHAR(20) NOT NULL DEFAULT 'pending'
+    CHECK (status IN ('pending', 'approved', 'rejected'));
+
+-- Index for fast Status Filtering
+CREATE INDEX idx_comments_status ON comments(status);
+
+-- Approves existing Comments
+UPDATE comments SET status = 'approved';
--- a/migrations/008_comment_count_trigger.sql
+++ b/migrations/008_comment_count_trigger.sql
@@ -0,0 +1,65 @@
+-- =====================================================================
+-- Migration 008: Adds comment_count Column with automatic Trigger
+-- Mirrors Pattern from likes_count and dislikes_count.
+-- =====================================================================
+
+
+-- ---------------------------------------------------------------------
+-- Block 1: Adds comment_count Column to Contributions
+-- ---------------------------------------------------------------------
+ALTER TABLE contributions
+    ADD COLUMN comment_count INTEGER NOT NULL DEFAULT 0;
+
+
+-- ---------------------------------------------------------------------
+-- Block 2: Backfills existing Comment Counts
+-- ---------------------------------------------------------------------
+UPDATE contributions c
+SET comment_count = (
+    SELECT COUNT(*)
+    FROM comments cm
+    WHERE cm.contribution_id = c.contribution_id
+      AND cm.status = 'approved'
+);
+
+
+-- ---------------------------------------------------------------------
+-- Block 3: Trigger Function to update comment_count
+-- Fires on Status Change on comments. Only counts approved Comments
+-- ---------------------------------------------------------------------
+CREATE OR REPLACE FUNCTION update_comment_count()
+RETURNS TRIGGER AS $$
+BEGIN
+    IF TG_OP = 'INSERT' OR TG_OP = 'UPDATE' THEN
+        UPDATE contributions
+        SET comment_count = (
+            SELECT COUNT(*) FROM comments
+            WHERE contribution_id = NEW.contribution_id
+              AND status = 'approved'
+        )
+        WHERE contribution_id = NEW.contribution_id;
+    END IF;
+
+    IF TG_OP = 'DELETE' OR (TG_OP = 'UPDATE' AND OLD.contribution_id != NEW.contribution_id) THEN
+        UPDATE contributions
+        SET comment_count = (
+            SELECT COUNT(*) FROM comments
+            WHERE contribution_id = OLD.contribution_id
+              AND status = 'approved'
+        )
+        WHERE contribution_id = OLD.contribution_id;
+    END IF;
+
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+
+-- ---------------------------------------------------------------------
+-- Block 4: Attaches Trigger to comments Table
+-- ---------------------------------------------------------------------
+CREATE TRIGGER trigger_update_comment_count
+    AFTER INSERT OR DELETE OR UPDATE OF status
+    ON comments
+    FOR EACH ROW
+    EXECUTE FUNCTION update_comment_count();
--- a/public/admin.php
+++ b/public/admin.php
@@ -3,12 +3,6 @@
 // Moderation Page
 // Lists Contributions for Review. Moderators can approve, reject,
 // edit and delete Contributions. Includes Map Preview and Filtering.
-//
-// ToDo's:
-//   - Comment Moderation Tab 
-//   - News Management Tab
-//   - User Management Tab
-//   - Analytics Tab 
 // =====================================================================

 // Reads Environment Configfile
@@ -57,6 +51,7 @@ $stmt = $pdo->prepare("SELECT * FROM municipalities WHERE slug = :slug");
 $stmt->execute([':slug' => getenv('MUNICIPALITY_SLUG')]);
 $municipality = $stmt->fetch();

+
 // Loads News for Moderation
 $stmt = $pdo->prepare("
    SELECT news_id, title, content, author_name, published_at, created_at
@@ -67,6 +62,30 @@ $stmt = $pdo->prepare("
 $stmt->execute([':mid' => $municipality['municipality_id']]);
 $news_items = $stmt->fetchAll();

+
+// Loads all Comments with Contribution Titles for Moderation
+$stmt = $pdo->prepare("
+    SELECT cm.comment_id, cm.contribution_id, cm.author_name, cm.browser_id,
+           cm.content, cm.status, cm.created_at,
+           co.title AS contribution_title, co.category AS contribution_category
+    FROM comments cm
+    JOIN contributions co ON cm.contribution_id = co.contribution_id
+    WHERE co.municipality_id = :mid
+    ORDER BY cm.created_at DESC
+");
+$stmt->execute([':mid' => $municipality['municipality_id']]);
+$all_comments = $stmt->fetchAll();
+
+// Counts Comments per Status
+$comment_counts = ['pending' => 0, 'approved' => 0, 'rejected' => 0];
+foreach ($all_comments as $c) {
+    if (isset($comment_counts[$c['status']])) {
+        $comment_counts[$c['status']]++;
+    }
+}
+$comment_counts['total'] = count($all_comments);
+
+
 // Shows Login Page if not authenticated
 if ($page === 'login' || !is_admin()) {
    show_login_page($municipality, $login_error ?? null);
@@ -84,8 +103,8 @@ $categories = get_categories();

 // Loads all Contributions for Municipality
 $stmt = $pdo->prepare("
-    SELECT contribution_id, title, category, description, author_name,
-           geom_type, status, likes_count, dislikes_count, created_at, updated_at
+    SELECT contribution_id, title, category, description, author_name, photo_path,
+           geom_type, status, likes_count, dislikes_count, comment_count, created_at, updated_at
    FROM contributions
    WHERE municipality_id = :mid
    ORDER BY created_at DESC
@@ -112,7 +131,7 @@ $counts['total'] = count($all_contributions);
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Moderation — <?= htmlspecialchars($municipality['name']) ?></title>
-    <link rel="icon" href="<?= htmlspecialchars($municipality['logo_path'] ?? 'assets/icon-municipality.png') ?>" type="image/png">
+    <link rel="icon" href="assets/shield-halved-solid-off-black.png" type="image/png">

    <!-- Loads CSS Dependencies -->

@@ -159,6 +178,9 @@ $counts['total'] = count($all_contributions);
            <button class="page-tab active" onclick="showPageTab('contributions')">
                <i class="fa-solid fa-list-check"></i> Beiträge
            </button>
+            <button class="page-tab" onclick="showPageTab('comments')">
+                <i class="fa-solid fa-comments"></i> Kommentare
+            </button>
            <button class="page-tab" onclick="showPageTab('news')">
                <i class="fa-solid fa-newspaper"></i> Neuigkeiten
            </button>
@@ -176,27 +198,6 @@ $counts['total'] = count($all_contributions);
        <!-- ========================================================= -->
        <div id="tab-contributions" class="page-tab-content">

-            <!-- Statistics Cards -->
-            <div class="stats-grid">
-                <div class="stat-card">
-                    <div class="stat-number"><?= $counts['total'] ?></div>
-                    <div class="stat-label">Alle</div>
-                </div>
-                <div class="stat-card">
-                    <div class="stat-number"><?= $counts['pending'] ?></div>
-                    <div class="stat-label">Ausstehend</div>
-                </div>
-                <div class="stat-card">
-                    <div class="stat-number"><?= $counts['approved'] ?></div>
-                    <div class="stat-label">Akzeptiert</div>
-                </div>
-                <div class="stat-card">
-                    <div class="stat-number"><?= $counts['rejected'] ?></div>
-                    <div class="stat-label">Abgelehnt</div>
-                </div>
-                
-            </div>
-
            <!-- Status Filter Tabs -->
            <div class="filter-tabs">
                <button class="filter-tab active" onclick="filterByStatus('all', this)">
@@ -257,10 +258,29 @@ $counts['total'] = count($all_contributions);
                            <!-- Expanded Detail -->
                            <div class="contribution-row-detail">
                                <div class="detail-layout">
-                                    <!-- Map Preview -->
+                                    <!-- Map and Photo Slider -->
+                                    <div class="detail-slider" id="slider-<?= $item['contribution_id'] ?>">
+                                        <!-- Slide 1: Map -->
+                                        <div class="detail-slide active" data-slide="map">
                                            <div class="detail-map" id="map-<?= $item['contribution_id'] ?>"
                                                 data-contribution-id="<?= $item['contribution_id'] ?>">
                                            </div>
+                                        </div>
+                                        <?php if (!empty($item['photo_path'])): ?>
+                                            <!-- Slide 2: Photo -->
+                                            <div class="detail-slide" data-slide="photo" style="display:none;">
+                                                <img src="<?= htmlspecialchars($item['photo_path']) ?>" alt="Foto"
+                                                     class="detail-slide-photo" onclick="window.open('<?= htmlspecialchars($item['photo_path']) ?>', '_blank')">
+                                            </div>
+                                            <!-- Slider Arrows -->
+                                            <button class="slider-arrow slider-arrow-left" onclick="slideDetail(<?= $item['contribution_id'] ?>, -1)">
+                                                <i class="fa-solid fa-chevron-left"></i>
+                                            </button>
+                                            <button class="slider-arrow slider-arrow-right" onclick="slideDetail(<?= $item['contribution_id'] ?>, 1)">
+                                                <i class="fa-solid fa-chevron-right"></i>
+                                            </button>
+                                        <?php endif; ?>
+                                    </div>

                                    <!-- Content -->
                                    <div class="detail-content">
@@ -277,6 +297,10 @@ $counts['total'] = count($all_contributions);
                                                <i class="fa-solid fa-thumbs-up"></i> <?= $item['likes_count'] ?>
                                                &middot;
                                                <i class="fa-solid fa-thumbs-down"></i> <?= $item['dislikes_count'] ?>
+                                                &middot;
+                                                <i class="fa-solid fa-comment"></i> <?= $item['comment_count'] ?? 0 ?>
+
+                                                
                                            </span>
                                        </div>
                                    </div>
@@ -297,7 +321,7 @@ $counts['total'] = count($all_contributions);
                                    <?php endif; ?>

                                    <?php if ($item['status'] !== 'pending'): ?>
-                                        <button class="btn btn-reset" onclick="changeStatus(..., 'pending')">
+                                        <button class="btn btn-reset" onclick="changeStatus(<?= $item['contribution_id'] ?>, 'pending')">
                                            <i class="fa-solid fa-rotate-left"></i> Zurücksetzen
                                        </button>
                                    <?php endif; ?>
@@ -322,6 +346,113 @@ $counts['total'] = count($all_contributions);
        </div>


+        <!-- ========================================================= -->
+        <!-- Comments Moderation Tab                                   -->
+        <!-- ========================================================= -->
+        <div id="tab-comments" class="page-tab-content" style="display:none;">
+
+            <!-- Status Filter Tabs for Comments -->
+            <div class="filter-tabs" id="comment-filter-tabs">
+                <button class="filter-tab active" onclick="filterCommentsByStatus('all', this)">
+                    Alle <span class="tab-count"><?= $comment_counts['total'] ?></span>
+                </button>
+                <button class="filter-tab" onclick="filterCommentsByStatus('pending', this)">
+                    Ausstehend <span class="tab-count"><?= $comment_counts['pending'] ?></span>
+                </button>
+                <button class="filter-tab" onclick="filterCommentsByStatus('approved', this)">
+                    Akzeptiert <span class="tab-count"><?= $comment_counts['approved'] ?></span>
+                </button>
+                <button class="filter-tab" onclick="filterCommentsByStatus('rejected', this)">
+                    Abgelehnt <span class="tab-count"><?= $comment_counts['rejected'] ?></span>
+                </button>
+            </div>
+
+            <!-- Sort Controls -->
+            <div class="sort-controls">
+                <span id="comment-visible-count"><?= $comment_counts['total'] ?> Kommentare</span>
+                <select onchange="sortCommentRows(this.value)">
+                    <option value="date-desc">Neueste zuerst</option>
+                    <option value="date-asc">Älteste zuerst</option>
+                    <option value="contribution">Nach Beitrag</option>
+                </select>
+            </div>
+
+            <!-- Comments List -->
+            <div id="comments-mod-container">
+                <?php if (empty($all_comments)): ?>
+                    <div class="empty-state">
+                        <i class="fa-solid fa-comments" style="font-size:2rem;margin-bottom:8px;display:block;"></i>
+                        Noch keine Kommentare vorhanden.
+                    </div>
+                <?php else: ?>
+                    <?php foreach ($all_comments as $comment):
+                        $comment_cat = $categories[$comment['contribution_category'] ?? ''] ?? ['label' => 'Unbekannt', 'faIcon' => 'fa-question', 'color' => '#999'];
+                        $comment_status_label = ['pending' => 'Ausstehend', 'approved' => 'Akzeptiert', 'rejected' => 'Abgelehnt'];
+                    ?>
+                        <div class="contribution-row comment-mod-row"
+                             data-status="<?= $comment['status'] ?>"
+                             data-date="<?= $comment['created_at'] ?>"
+                             data-contribution="<?= htmlspecialchars($comment['contribution_title']) ?>">
+
+                            <!-- Collapsed: Contribution Title + Comment Status + Category -->
+                            <div class="contribution-row-header" onclick="toggleRow(this.parentElement)">
+                                <div class="contribution-row-summary">
+                                    <span class="title"><?= htmlspecialchars($comment['contribution_title']) ?></span>
+                                    <span class="badge badge-<?= $comment['status'] ?>"><?= $comment_status_label[$comment['status']] ?? $comment['status'] ?></span>
+                                    <span class="badge badge-category">
+                                        <i class="fa-solid <?= $comment_cat['faIcon'] ?>"></i>
+                                        <?= $comment_cat['label'] ?>
+                                    </span>
+                                </div>
+                                <i class="fa-solid fa-chevron-down collapse-icon"></i>
+                            </div>
+
+                            <!-- Expanded Detail -->
+                            <div class="contribution-row-detail">
+                                <div style="padding:12px 0;">
+                                    <!-- Comment Content -->
+                                    <div style="font-size:0.9rem;line-height:1.6;color:var(--color-text);margin-bottom:12px;">
+                                        <?= nl2br(htmlspecialchars($comment['content'])) ?>
+                                    </div>
+                                    <!-- Meta -->
+                                    <div class="detail-meta">
+                                        <span><i class="fa-solid fa-user"></i> <?= htmlspecialchars($comment['author_name']) ?></span>
+                                        <span><i class="fa-solid fa-calendar"></i> <?= date('d.m.Y, H:i', strtotime($comment['created_at'])) ?> Uhr</span>
+                                    </div>
+                                </div>
+
+                                <!-- Action Buttons -->
+                                <div class="action-buttons">
+                                    <?php if ($comment['status'] !== 'approved'): ?>
+                                        <button class="btn btn-approve" onclick="changeCommentStatus(<?= $comment['comment_id'] ?>, 'approved')">
+                                            <i class="fa-solid fa-check"></i> Akzeptieren
+                                        </button>
+                                    <?php endif; ?>
+                                    <?php if ($comment['status'] !== 'rejected'): ?>
+                                        <button class="btn btn-reject" onclick="changeCommentStatus(<?= $comment['comment_id'] ?>, 'rejected')">
+                                            <i class="fa-solid fa-xmark"></i> Ablehnen
+                                        </button>
+                                    <?php endif; ?>
+                                    <?php if ($comment['status'] !== 'pending'): ?>
+                                        <button class="btn btn-reset" onclick="changeCommentStatus(<?= $comment['comment_id'] ?>, 'pending')">
+                                            <i class="fa-solid fa-rotate-left"></i> Zurücksetzen
+                                        </button>
+                                    <?php endif; ?>
+                                    <button class="btn btn-edit" onclick="editModComment(<?= $comment['comment_id'] ?>, '<?= htmlspecialchars(addslashes($comment['content']), ENT_QUOTES) ?>')">
+                                        <i class="fa-solid fa-pen"></i> Bearbeiten
+                                    </button>
+                                    <button class="btn btn-delete" onclick="deleteModComment(<?= $comment['comment_id'] ?>)">
+                                        <i class="fa-solid fa-trash"></i> Löschen
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    <?php endforeach; ?>
+                <?php endif; ?>
+            </div>
+        </div>
+        
+
        <!-- ========================================================= -->
        <!-- News Article Tab                                      -->
        <!-- ========================================================= -->
@@ -391,464 +522,28 @@ $counts['total'] = count($all_contributions);


    <!-- ============================================================= -->
-    <!-- JavaScript: Leaflet, Interactions, API Calls                   -->
+    <!-- Loads JavaScript Dependencies                                 -->
    <!-- ============================================================= -->
    <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.4/leaflet.min.js"></script>

+    
+    <!-- ============================================================= -->
+    <!-- Admin Configuration passed to JavaScript                      -->
+    <!-- ============================================================= -->
    <script>
-        // Municipality Configuration for Map Previews
-        const MUNICIPALITY_CENTER = [<?= $municipality['center_lat'] ?>, <?= $municipality['center_lng'] ?>];
-        const MUNICIPALITY_ID = <?= $municipality['municipality_id'] ?>;
-        const API_URL = 'api/contributions.php';
-        const PRIMARY_COLOR = '<?= htmlspecialchars($municipality['primary_color']) ?>';
-
-        // Current Status Filter
-        let currentFilter = 'all';
-
-
-        // =============================================================
-        // Page Tab Navigation
-        // =============================================================
-
-        function showPageTab(tabName) {
-            // Hides all Tab Contents
-            document.querySelectorAll('.page-tab-content').forEach(function (el) {
-                el.style.display = 'none';
-            });
-
-            // Deactivates all Tab Buttons
-            document.querySelectorAll('.page-tab').forEach(function (el) {
-                el.classList.remove('active');
-            });
-
-            // Shows selected Tab and activates Button
-            document.getElementById('tab-' + tabName).style.display = 'block';
-            event.currentTarget.classList.add('active');
-        }
-
-
-        // =============================================================
-        // Collapsible Rows
-        // =============================================================
-
-        function toggleRow(row) {
-            const wasOpen = row.classList.contains('open');
-
-            // Closes all open Rows
-            document.querySelectorAll('.contribution-row.open').forEach(function (el) {
-                el.classList.remove('open');
-            });
-
-            // Toggles clicked Row
-            if (!wasOpen) {
-                row.classList.add('open');
-
-                // Loads Map Preview if not already loaded
-                const mapDiv = row.querySelector('.detail-map');
-                if (mapDiv && !mapDiv.dataset.loaded) {
-                    loadMapPreview(mapDiv);
-                }
-            }
-        }
-
-
-        // =============================================================
-        // Map Preview (Leaflet Mini Map per Contribution)
-        // =============================================================
-
-        function loadMapPreview(mapDiv) {
-            const contributionId = mapDiv.dataset.contributionId;
-
-            // Fetches all Contributions to find the Geometry
-            const formData = new FormData();
-            formData.append('action', 'read');
-            formData.append('municipality_id', MUNICIPALITY_ID);
-            formData.append('status', 'all');
-
-            fetch(API_URL, { method: 'POST', body: formData })
-                .then(function (r) { return r.json(); })
-                .then(function (data) {
-                    if (!data.features) return;
-
-                    // Finds specific Contribution
-                    const feature = data.features.find(function (f) {
-                        return f.properties.contribution_id == contributionId;
-                    });
-
-                    if (!feature) {
-                        mapDiv.innerHTML = '<div style="padding:20px;color:#999;text-align:center;font-size:0.8rem;">Geometrie nicht gefunden.</div>';
-                        return;
-                    }
-
-                    // Creates Leaflet Mini Map
-                    const miniMap = L.map(mapDiv, {
-                        zoomControl: false,
-                        attributionControl: false,
-                        dragging: true,
-                        scrollWheelZoom: false
-                    });
-
-                    L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
-                        maxZoom: 20
-                    }).addTo(miniMap);
-
-                    // Adds Geometry to Mini Map
-                    const geojsonLayer = L.geoJSON(feature, {
-                        style: { color: PRIMARY_COLOR, weight: 3, fillOpacity: 0.2 },
-                        pointToLayer: function (f, latlng) {
-                            return L.circleMarker(latlng, {
-                                radius: 8, color: '#ffffff', weight: 2,
-                                fillColor: PRIMARY_COLOR, fillOpacity: 0.9
-                            });
-                        }
-                    }).addTo(miniMap);
-
-                    // Fits Map to Geometry Bounds
-                    const bounds = geojsonLayer.getBounds();
-                    if (bounds.isValid()) {
-                        miniMap.fitBounds(bounds, { padding: [25, 25], maxZoom: 17 });
-                    } else {
-                        miniMap.setView(MUNICIPALITY_CENTER, 15);
-                    }
-
-                    mapDiv.dataset.loaded = 'true';
-                })
-                .catch(function () {
-                    mapDiv.innerHTML = '<div style="padding:20px;color:#999;text-align:center;font-size:0.8rem;">Karte nicht verfügbar.</div>';
-                });
-        }
-
-
-        // =============================================================
-        // Status Filter
-        // =============================================================
-
-        function filterByStatus(status, tabButton) {
-            currentFilter = status;
-
-            // Updates active Tab
-            document.querySelectorAll('.filter-tab').forEach(function (el) {
-                el.classList.remove('active');
-            });
-            tabButton.classList.add('active');
-
-            // Shows/Hides Contribution Rows
-            let visibleCount = 0;
-            document.querySelectorAll('.contribution-row').forEach(function (row) {
-                if (status === 'all' || row.dataset.status === status) {
-                    row.style.display = '';
-                    visibleCount++;
-                } else {
-                    row.style.display = 'none';
-                }
-            });
-
-            // Updates Count Display
-            document.getElementById('visible-count').textContent = visibleCount + ' Beiträge';
-        }
-
-
-        // =============================================================
-        // Sort Contributions
-        // =============================================================
-
-        function sortContributions(sortBy) {
-            const container = document.getElementById('contributions-container');
-            const rows = Array.from(container.querySelectorAll('.contribution-row'));
-
-            rows.sort(function (a, b) {
-                if (sortBy === 'date-desc') {
-                    return new Date(b.dataset.date) - new Date(a.dataset.date);
-                } else if (sortBy === 'date-asc') {
-                    return new Date(a.dataset.date) - new Date(b.dataset.date);
-                } else if (sortBy === 'category') {
-                    return a.dataset.category.localeCompare(b.dataset.category);
-                }
-                return 0;
-            });
-
-            // Reappends sorted Rows
-            rows.forEach(function (row) {
-                container.appendChild(row);
-            });
-        }
-
-
-        // =============================================================
-        // API Helper
-        // =============================================================
-
-        function apiCall(data) {
-            const formData = new FormData();
-            for (const key in data) {
-                formData.append(key, data[key]);
-            }
-            return fetch(API_URL, { method: 'POST', body: formData })
-                .then(function (r) { return r.json(); });
-        }
-
-
-        // =============================================================
-        // Change Contribution Status
-        // =============================================================
-
-        function changeStatus(contributionId, newStatus) {
-            const labels = { approved: 'freigeben', rejected: 'ablehnen', pending: 'zurücksetzen' };
-
-            Swal.fire({
-                title: 'Beitrag ' + labels[newStatus] + '?',
-                showCancelButton: true,
-                confirmButtonText: 'Ja',
-                cancelButtonText: 'Abbrechen',
-                confirmButtonColor: PRIMARY_COLOR
-            }).then(function (result) {
-                if (!result.isConfirmed) return;
-
-                apiCall({
-                    action: 'update',
-                    contribution_id: contributionId,
-                    status: newStatus
-                }).then(function (response) {
-                    if (response.error) {
-                        Swal.fire('Fehler', response.error, 'error');
-                        return;
-                    }
-                    // Reloads Page to reflect Changes
-                    location.reload();
-                });
-            });
-        }
-
-
-        // =============================================================
-        // Edit Contribution (Title and Description)
-        // =============================================================
-
-        function editContribution(contributionId, currentTitle, currentDescription) {
-            Swal.fire({
-                title: 'Beitrag bearbeiten',
-                html:
-                    '<div style="text-align:left;">' +
-                        '<div style="margin-bottom:12px;">' +
-                            '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Titel</label>' +
-                            '<input id="swal-title" class="swal2-input" style="margin:0;width:100%;" value="' + currentTitle + '">' +
-                        '</div>' +
-                        '<div>' +
-                            '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Beschreibung</label>' +
-                            '<textarea id="swal-description" class="swal2-textarea" style="margin:0;width:100%;">' + currentDescription + '</textarea>' +
-                        '</div>' +
-                    '</div>',
-                showCancelButton: true,
-                confirmButtonText: 'Speichern',
-                cancelButtonText: 'Abbrechen',
-                confirmButtonColor: PRIMARY_COLOR,
-                preConfirm: function () {
-                    return {
-                        title: document.getElementById('swal-title').value.trim(),
-                        description: document.getElementById('swal-description').value.trim()
+        const ADMIN_CONFIG = {
+            id: <?= $municipality['municipality_id'] ?>,
+            name: "<?= htmlspecialchars($municipality['name'], ENT_QUOTES) ?>",
+            slug: "<?= htmlspecialchars($municipality['slug'], ENT_QUOTES) ?>",
+            center: [<?= $municipality['center_lat'] ?>, <?= $municipality['center_lng'] ?>],
+            zoom: <?= $municipality['default_zoom'] ?>,
+            primaryColor: "<?= htmlspecialchars($municipality['primary_color'], ENT_QUOTES) ?>"
        };
-                }
-            }).then(function (result) {
-                if (!result.isConfirmed) return;
-
-                apiCall({
-                    action: 'update',
-                    contribution_id: contributionId,
-                    title: result.value.title,
-                    description: result.value.description
-                }).then(function (response) {
-                    if (response.error) {
-                        Swal.fire('Fehler', response.error, 'error');
-                        return;
-                    }
-                    Swal.fire('Gespeichert!', 'Beitrag wurde aktualisiert.', 'success')
-                        .then(function () { location.reload(); });
-                });
-            });
-        }
-
-
-        // =============================================================
-        // Delete Contribution
-        // =============================================================
-
-        function deleteContribution(contributionId) {
-            Swal.fire({
-                title: 'Beitrag löschen?',
-                text: 'Diese Aktion kann nicht rückgängig gemacht werden.',
-                icon: 'warning',
-                showCancelButton: true,
-                confirmButtonText: 'Beitrag löschen',
-                cancelButtonText: 'Abbrechen',
-                confirmButtonColor: '#c62828'
-            }).then(function (result) {
-                if (!result.isConfirmed) return;
-
-                apiCall({
-                    action: 'delete',
-                    contribution_id: contributionId
-                }).then(function (response) {
-                    if (response.error) {
-                        Swal.fire('Fehler', response.error, 'error');
-                        return;
-                    }
-                    Swal.fire('Gelöscht!', 'Beitrag wurde gelöscht.', 'success')
-                        .then(function () { location.reload(); });
-                });
-            });
-        }
-        
-
-        // =============================================================
-        // Create News Article
-        // =============================================================
-
-        function createNews() {
-            Swal.fire({
-                title: 'Neuigkeit hinzufügen',
-                html:
-                    '<div style="text-align:left;">' +
-                        '<div style="margin-bottom:12px;">' +
-                            '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Titel</label>' +
-                            '<input id="swal-news-title" class="swal2-input" style="margin:0;width:100%;" placeholder="Titel der Neuigkeit">' +
-                        '</div>' +
-                        '<div style="margin-bottom:12px;">' +
-                            '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Inhalt</label>' +
-                            '<textarea id="swal-news-content" class="swal2-textarea" style="margin:0;width:100%;" placeholder="Neuigkeit verfassen..."></textarea>' +
-                        '</div>' +
-                        '<div>' +
-                            '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Autor</label>' +
-                            '<input id="swal-news-author" class="swal2-input" style="margin:0;width:100%;" value="Stadtverwaltung">' +
-                        '</div>' +
-                    '</div>',
-                showCancelButton: true,
-                confirmButtonText: 'Veröffentlichen',
-                cancelButtonText: 'Abbrechen',
-                confirmButtonColor: PRIMARY_COLOR,
-                preConfirm: function () {
-                    const title = document.getElementById('swal-news-title').value.trim();
-                    const content = document.getElementById('swal-news-content').value.trim();
-                    const author = document.getElementById('swal-news-author').value.trim() || 'Stadtverwaltung';
-                    if (!title || !content) {
-                        Swal.showValidationMessage('Titel und Inhalt sind Pflichtfelder.');
-                        return false;
-                    }
-                    return { title: title, content: content, author_name: author };
-                }
-            }).then(function (result) {
-                if (!result.isConfirmed) return;
-
-                const formData = new FormData();
-                formData.append('action', 'create_news');
-                formData.append('municipality_id', MUNICIPALITY_ID);
-                formData.append('title', result.value.title);
-                formData.append('content', result.value.content);
-                formData.append('author_name', result.value.author_name);
-
-                fetch(API_URL, { method: 'POST', body: formData })
-                    .then(function (r) { return r.json(); })
-                    .then(function (response) {
-                        if (response.error) {
-                            Swal.fire('Fehler', response.error, 'error');
-                            return;
-                        }
-                        Swal.fire('Veröffentlicht!', 'Neuigkeit wurde veröffentlicht.', 'success')
-                            .then(function () { location.reload(); });
-                    });
-            });
-        }
-
-
-        // =============================================================
-        // Edit News Article
-        // =============================================================
-        function editNews(newsId, currentTitle, currentContent, currentAuthor) {
-            Swal.fire({
-                title: 'Neuigkeit bearbeiten',
-                html:
-                    '<div style="text-align:left;">' +
-                        '<div style="margin-bottom:12px;">' +
-                            '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Titel</label>' +
-                            '<input id="swal-news-title" class="swal2-input" style="margin:0;width:100%;" value="' + currentTitle + '">' +
-                        '</div>' +
-                        '<div style="margin-bottom:12px;">' +
-                            '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Inhalt</label>' +
-                            '<textarea id="swal-news-content" class="swal2-textarea" style="margin:0;width:100%;">' + currentContent + '</textarea>' +
-                        '</div>' +
-                        '<div>' +
-                            '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Autor</label>' +
-                            '<input id="swal-news-author" class="swal2-input" style="margin:0;width:100%;" value="' + currentAuthor + '">' +
-                        '</div>' +
-                    '</div>',
-                showCancelButton: true,
-                confirmButtonText: 'Speichern',
-                cancelButtonText: 'Abbrechen',
-                confirmButtonColor: PRIMARY_COLOR,
-                preConfirm: function () {
-                    return {
-                        title: document.getElementById('swal-news-title').value.trim(),
-                        content: document.getElementById('swal-news-content').value.trim(),
-                        author_name: document.getElementById('swal-news-author').value.trim() || 'Stadtverwaltung'
-                    };
-                }
-            }).then(function (result) {
-                if (!result.isConfirmed) return;
-
-                const formData = new FormData();
-                formData.append('action', 'update_news');
-                formData.append('news_id', newsId);
-                formData.append('title', result.value.title);
-                formData.append('content', result.value.content);
-                formData.append('author_name', result.value.author_name);
-
-                fetch(API_URL, { method: 'POST', body: formData })
-                    .then(function (r) { return r.json(); })
-                    .then(function (response) {
-                        if (response.error) {
-                            Swal.fire('Fehler', response.error, 'error');
-                            return;
-                        }
-                        Swal.fire('Gespeichert!', 'Neuigkeit wurde aktualisiert.', 'success')
-                            .then(function () { location.reload(); });
-                    });
-            });
-        }
-
-
-        // =============================================================
-        // Create News Article
-        // =============================================================
-        function deleteNews(newsId) {
-            Swal.fire({
-                title: 'Neuigkeit löschen?',
-                text: 'Diese Aktion kann nicht rückgängig gemacht werden.',
-                icon: 'warning',
-                showCancelButton: true,
-                confirmButtonText: 'Löschen',
-                cancelButtonText: 'Abbrechen',
-                confirmButtonColor: '#c62828'
-            }).then(function (result) {
-                if (!result.isConfirmed) return;
-
-                const formData = new FormData();
-                formData.append('action', 'delete_news');
-                formData.append('news_id', newsId);
-
-                fetch(API_URL, { method: 'POST', body: formData })
-                    .then(function (r) { return r.json(); })
-                    .then(function (response) {
-                        if (response.error) {
-                            Swal.fire('Fehler', response.error, 'error');
-                            return;
-                        }
-                        Swal.fire('Gelöscht!', 'Neuigkeit wurde gelöscht.', 'success')
-                            .then(function () { location.reload(); });
-                    });
-            });
-        }
-
    </script>

+    <!-- Application Logic -->
+    <script src="js/admin.js"></script>
+
 </body>
 </html>

@@ -881,7 +576,7 @@ function show_login_page($municipality, $error = null) {
                <input type="password" name="password" placeholder="Passwort" autofocus>
                <button type="submit"><i class="fa-solid fa-right-to-bracket"></i> Anmelden</button>
            </form>
-            <div class="back-link"><i class="fa fa-arrow-left"></i></i> <a href="index.php">Zurück zum Bürgerportal</a></div>
+            <div class="back-link"><i class="fa fa-arrow-left"></i> <a href="index.php">Zurück zum Bürgerportal</a></div>
        </div>
    </div>
 </body>
--- a/public/api/contributions.php
+++ b/public/api/contributions.php
@@ -56,6 +56,9 @@ switch ($action) {
    case 'delete_comment':
        handle_delete_comment($input);
        break;
+    case 'update_comment':
+        handle_update_comment($input);
+        break;
    default:
        error_response('Unknown Action. Supported Actions are read, create, update, delete, vote.');
 }
@@ -576,9 +579,9 @@ function handle_read_comments($input) {

    try {
        $stmt = $pdo->prepare("
-            SELECT comment_id, contribution_id, author_name, browser_id, content, created_at
+            SELECT comment_id, contribution_id, author_name, browser_id, content, status, created_at
            FROM comments
-            WHERE contribution_id = :cid
+            WHERE contribution_id = :cid AND status = 'approved'
            ORDER BY created_at ASC
        ");
        $stmt->execute([':cid' => $input['contribution_id']]);
@@ -662,3 +665,48 @@ function handle_delete_comment($input) {
        error_response('Database Error: ' . $e->getMessage(), 500);
    }
 }
+
+// ---------------------------------------------------------------------
+// UPDATE COMMENT: Changes Comment Status or Content
+// Required: comment_id
+// Optional: status, content
+// ---------------------------------------------------------------------
+function handle_update_comment($input) {
+    $pdo = get_db();
+
+    $missing = validate_required($input, ['comment_id']);
+    if (!empty($missing)) {
+        error_response('Missing Fields: ' . implode(', ', $missing));
+    }
+
+    $set = [];
+    $params = [':id' => $input['comment_id']];
+
+    // Updates Status if provided
+    if (isset($input['status']) && $input['status'] !== '') {
+        $valid = ['pending', 'approved', 'rejected'];
+        if (!in_array($input['status'], $valid)) {
+            error_response('Invalid Status.');
+        }
+        $set[] = "status = :status";
+        $params[':status'] = $input['status'];
+    }
+
+    // Updates Content if provided
+    if (isset($input['content']) && $input['content'] !== '') {
+        $set[] = "content = :content";
+        $params[':content'] = $input['content'];
+    }
+
+    if (empty($set)) {
+        error_response('No Fields to update.');
+    }
+
+    try {
+        $stmt = $pdo->prepare("UPDATE comments SET " . implode(', ', $set) . " WHERE comment_id = :id");
+        $stmt->execute($params);
+        json_response(['message' => 'Comment updated successfully.']);
+    } catch (PDOException $e) {
+        error_response('Database Error: ' . $e->getMessage(), 500);
+    }
+}
--- a/public/assets/lock-solid-off-black.png
+++ b/public/assets/lock-solid-off-black.png
--- a/public/assets/scale-balanced-solid-off-black.png
+++ b/public/assets/scale-balanced-solid-off-black.png
--- a/public/assets/shield-halved-solid-off-black.png
+++ b/public/assets/shield-halved-solid-off-black.png
--- a/public/assets/user-group-solid-off-black.png
+++ b/public/assets/user-group-solid-off-black.png
--- a/public/assets/user-group-solid-off-white.png
+++ b/public/assets/user-group-solid-off-white.png
--- a/public/imprint.php
+++ b/public/imprint.php
@@ -11,7 +11,7 @@ $municipality = $stmt->fetch();
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Impressum — <?= htmlspecialchars($municipality['name']) ?></title>
-    <link rel="icon" href="<?= htmlspecialchars($municipality['logo_path'] ?? 'assets/icon-municipality.png') ?>" type="image/png">
+    <link rel="icon" href="assets/scale-balanced-solid-off-black.png" type="image/png">
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
    <link rel="stylesheet" href="styles.css">
    <style>:root { --color-primary: <?= htmlspecialchars($municipality['primary_color']) ?>; }</style>
--- a/public/index.php
+++ b/public/index.php
@@ -10,8 +10,6 @@ require_once __DIR__ . '/api/auth.php';

 // -----------------------------------------------------------------
 // Loads Municipality Configuration
-// ToDo's: Dynamic Loading via URL Slug once multi-tenant Routing
-// is implemented. Hardcoded Slug for now.
 // -----------------------------------------------------------------
 $pdo = get_db();
 $stmt = $pdo->prepare("SELECT * FROM municipalities WHERE slug = :slug");
@@ -35,8 +33,8 @@ $news_items = $stmt->fetchAll();
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Bürgerbeteiligungsportal <?= htmlspecialchars($municipality['name']) ?></title>
-    <link rel="icon" href="<?= htmlspecialchars($municipality['logo_path'] ?? 'assets/icon-municipality.png') ?>" type="image/png">
+    <title>Mitmachkarte <?= htmlspecialchars($municipality['name']) ?></title>
+    <link rel="icon" href="assets/user-group-solid-off-black.png" type="image/png">
    <meta name="description" content="Bürgerbeteiligungsportal. Hinweise und Vorschläge auf der Karte eintragen.">


@@ -68,6 +66,10 @@ $news_items = $stmt->fetchAll();
    <!-- Application Styles -->
    <link rel="stylesheet" href="styles.css">

+    <!-- Shepherd.js Onboarding Tour -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/shepherd.js@11.2.0/dist/css/shepherd.css">
+
+
    <!-- ============================================================= -->
    <!-- Municipality Theme loaded from Database                       -->
    <!-- ============================================================= -->
@@ -87,7 +89,7 @@ $news_items = $stmt->fetchAll();
    <header id="app-header">
        <div class="header-left">
            <?php if (!empty($municipality['logo_path'])): ?>
-                <img src="<?= htmlspecialchars($municipality['logo_path']) ?>" alt="<?= htmlspecialchars($municipality['name']) ?>" class="header-logo" onerror="this.style.display='none'">
+                <img src="assets/user-group-solid-off-white.png" alt="user-group-solid-off-white" class="header-logo" onerror="this.style.display='none'">
            <?php endif; ?>
            <h1 class="header-title">Mitmachkarte <?= htmlspecialchars($municipality['name']) ?></h1>
        </div>
@@ -129,9 +131,9 @@ $news_items = $stmt->fetchAll();
            <div class="leaflet-sidebar-tabs">
                <ul role="tablist">
                    <li><a href="#tab-home" role="tab"><i class="fa-solid fa-house"></i></a></li>
-                    <li><a href="#tab-help" role="tab"><i class="fa-solid fa-circle-question"></i></a></li>
                    <li><a href="#tab-list" role="tab"><i class="fa-solid fa-list"></i></a></li>
                    <li><a href="#tab-news" role="tab"><i class="fa-solid fa-newspaper"></i></a></li>
+                    <li><a href="#tab-help" role="tab"><i class="fa-solid fa-circle-question"></i></a></li>
                </ul>
            </div>

@@ -146,17 +148,12 @@ $news_items = $stmt->fetchAll();
                    </h2>
                    <div class="sidebar-body">
                        <p>Willkommen beim Bürgerbeteiligungsportal <strong><?= htmlspecialchars($municipality['name']) ?></strong>.</p>
-                        <p>Verwenden Sie die Karte, um Hinweise und Aufgaben für die Stadtverwaltung hinzuzufügen oder bestehende Beiträge der Bürgerschaft zu betrachten.</p>
+                        <p>Verwenden Sie die Karte, um Hinweise für die Stadtverwaltung hinzuzufügen oder bestehende Beiträge zu betrachten, zu bewerten und zu kommentieren.</p>

                        <h3>Kategorien</h3>
                        <div id="category-filter">
                            <!-- Category Filter Checkboxes — populated by app.js -->
                        </div>
-
-                        <h3>Statistik</h3>
-                        <div id="stats-container">
-                            <!-- Contribution Statistics — populated by app.js -->
-                        </div>
                    </div>
                </div>

@@ -176,27 +173,6 @@ $news_items = $stmt->fetchAll();
                    </div>
                </div>            

-                <!-- Help Tab -->
-                <div class="leaflet-sidebar-pane" id="tab-help">
-                    <h2 class="leaflet-sidebar-header">
-                        Hilfe
-                        <span class="leaflet-sidebar-close"><i class="fa-solid fa-xmark"></i></span>
-                    </h2>
-                    <div class="sidebar-body">
-                        <h3><i class="fa-solid fa-map-location-dot"></i> Karte bedienen</h3>
-                        <p>Verschieben Sie die Karte per Mausklick und Ziehen. Zoomen Sie mit dem Mausrad oder den Zoom-Buttons.</p>
-
-                        <h3><i class="fa-solid fa-plus"></i> Beitrag erstellen</h3>
-                        <p>Verwenden Sie die Zeichenwerkzeuge rechts, um Beiträge als Punkte, Linien oder Flächen zu zeichnen. Anschließend können Sie Kategorie und Beschreibung hinzufügen.</p>
-
-                        <h3><i class="fa-solid fa-thumbs-up"></i> Abstimmen</h3>
-                        <p>Klicken Sie auf bestehende Beiträge und nutzen Sie die Like/Dislike Funktion, um Ihre Meinung kundzugeben.</p>
-
-                        <h3><i class="fa-solid fa-magnifying-glass"></i> Suchen</h3>
-                        <p>Verwenden Sie die Adresssuche rechts, um bestimmte Orte auf der Karte zu finden.</p>
-                    </div>
-                </div>
-
                <!-- News Tab -->
                <div class="leaflet-sidebar-pane" id="tab-news">
                    <h2 class="leaflet-sidebar-header">
@@ -212,7 +188,7 @@ $news_items = $stmt->fetchAll();
                        <!-- News Items Container -->
                        <div id="news-list">
                            <?php if (empty($news_items)): ?>
-                                <p style="text-align:center;color:#999;padding:20px;">Noch keine Neuigkeiten veröffentlicht.</p>
+                                <p class="empty-state">Noch keine Neuigkeiten veröffentlicht.</p>
                            <?php else: ?>
                                <?php foreach ($news_items as $news): ?>
                                    <div class="news-item"
@@ -232,6 +208,38 @@ $news_items = $stmt->fetchAll();
                    </div>
                </div>

+                    <!-- Help Tab -->
+                <div class="leaflet-sidebar-pane" id="tab-help">
+                    <h2 class="leaflet-sidebar-header">
+                        Hilfe
+                        <span class="leaflet-sidebar-close"><i class="fa-solid fa-xmark"></i></span>
+                    </h2>
+                    <div class="sidebar-body">
+                        <h3><i class="fa-solid fa-book"></i> Interaktive Anleitung</h3>
+                        <p>Klicken Sie unten auf Tutorial starten um Schritt für Schritt durch die Kernfunktionen der Mitmachkarte geführt zu werden.</p>
+                        <p>
+                            <button class="btn btn-primary" onclick="if(typeof restartOnboarding==='function'){sidebar.close();restartOnboarding()}" style="font-size:0.85rem;">
+                                <i class="fa-solid fa-route"></i> Tutorial starten
+                            </button>
+                        </p>
+
+                        <h3><i class="fa-solid fa-map-location-dot"></i> Karte bedienen</h3>
+                        <p>Verschieben Sie die Karte per Mausklick und Ziehen. Zoomen Sie mit dem Mausrad oder den Zoom-Buttons.</p>
+
+                        <h3><i class="fa-solid fa-location-dot"></i> Beitrag hinzufügen</h3>
+                        <p>Verwenden Sie die Zeichenwerkzeuge rechts, um Hinweise, Anregungen und Vorschläge auf der Mitmachkarte als Punkte, Linien oder Flächen hinzuzufügen.</p>
+
+                        <h3><i class="fa-solid fa-thumbs-up"></i> Bewerten</h3>
+                        <p>Klicken Sie auf bestehende Beiträge und nutzen Sie die Bewertungsfunktion, um Ihre Meinung zu äußern.</p>
+
+                        <h3><i class="fa-solid fa-comments"></i> Kommentieren</h3>
+                        <p>Gerne können Sie Ihre Meinung zu bestehenden Beiträgen auch durch die Kommentarfunktion äußern.</p>
+
+                        <h3><i class="fa-solid fa-magnifying-glass"></i> Suchen</h3>
+                        <p>Verwenden Sie die Adresssuche rechts, um schnell den richtigen Ort auf der Mitmachkarte zu finden.</p>         
+                    </div>
+                </div>
+
            </div>
        </div>

@@ -246,7 +254,7 @@ $news_items = $stmt->fetchAll();
    <!-- ============================================================= -->
    <footer id="app-footer">
        <span class="dev-warning">
-            <i class="fa-solid fa-triangle-exclamation"></i> Pilotprojekt - nicht offiziell von der Stadt Lohne (Oldenburg) beauftragt
+            <i class="fa-solid fa-triangle-exclamation"></i> Demoversion - nicht in Rücksprache mit der Stadt Lohne entwickelt! Alle Beitrage, Kommentare und Personen sind frei erfunden.
        </span>
        <div class="footer-content">
            <span class="footer-text">© <a href="https://endex-geodaten.de" target="_blank" style="color:inherit;">endex GmbH</a></span>
@@ -267,7 +275,7 @@ $news_items = $stmt->fetchAll();
                <li>Bestehende Beiträge der Bürgerschaft betrachten und bewerten</li>
            </ul>
            <p style="background:#fff3cd;padding:10px;border-radius:6px;border:1px solid #ffc107;font-size:0.85rem;color:#856404;">
-                <i class="fa-solid fa-triangle-exclamation"></i> <strong>Hinweis:</strong> Dieses Bürgerbeteiligungsportal befindet sich noch in der Entwicklung und wurde nicht offiziell beauftragt.
+                <i class="fa-solid fa-triangle-exclamation"></i> <strong>Hinweis:</strong> Demoversion - nicht in Rücksprache mit der Stadt Lohne entwickelt! Alle Beitrage, Kommentare und Personen sind frei erfunden.
            </p>
            <p>Zum Hinzufügen von Beiträgen geben Sie bitte zunächst Ihren Namen ein.</p>            <div class="modal-actions">
                <button class="btn btn-primary" onclick="closeWelcomeAndShowLogin()">Loslegen</button>
@@ -301,7 +309,7 @@ $news_items = $stmt->fetchAll();
    <!-- ============================================================= -->
    <div id="create-modal" class="modal-overlay" style="display:none;">
        <div class="modal-content">
-            <h2><i class="fa-solid fa-plus-circle"></i> Beitrag</h2>
+            <h2><i class="fa-solid fa-pencil"></i> Beitrag hinzufügen</h2>
 
            <div class="form-group">
                <label for="create-category">Kategorie</label>
@@ -366,11 +374,18 @@ $news_items = $stmt->fetchAll();
    <!-- SweetAlert2 -->
    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.14.0/dist/sweetalert2.all.min.js"></script>

+    <!-- Shepherd.js Library -->
+    <script src="https://cdn.jsdelivr.net/npm/shepherd.js@11.2.0/dist/js/shepherd.min.js"></script>
+
+    <!-- Onboarding Logic -->
+    <script src="js/onboarding.js"></script>
+
+
    <!-- ============================================================= -->
    <!-- Municipality Configuration passed to JavaScript               -->
    <!-- ============================================================= -->
    <script>
-        // Municipality Configuration from Database — used by app.js
+        // Municipality Configuration from Database
        const MUNICIPALITY = {
            id: <?= $municipality['municipality_id'] ?>,
            name: "<?= htmlspecialchars($municipality['name'], ENT_QUOTES) ?>",
--- a/public/js/admin.js
+++ b/public/js/admin.js
@@ -0,0 +1,637 @@
+// =====================================================================
+// WebGIS Moderation Portal — Application Logic
+// Initializes Map Preview, loads Contributions from the API,
+// handles CRUD Workflow, sorting and filtering for Contributions,
+//  Comments and News, and manages all UI Interactions
+//
+// Depends on: ADMIN_CONFIG Object set in Moderation Page
+// =====================================================================
+
+// =====================================================================
+// Block 0: Configuration and Application State
+// =====================================================================
+
+// API Endpoint as relative Path
+const API_URL = 'api/contributions.php';
+
+// =====================================================================
+// Block 1: Page Tab Navigation
+// =====================================================================
+
+// Restores active Tab after Page Reload
+const savedTab = sessionStorage.getItem('admin_active_tab');
+if (savedTab) {
+    // Delays to ensure DOM is ready
+    setTimeout(function () {
+        const tabBtn = document.querySelector('.page-tab[onclick*="' + savedTab + '"]');
+        if (tabBtn) tabBtn.click();
+    }, 100);
+}
+
+
+// Page Tab Navigation
+function showPageTab(tabName) {
+    // Saves active Tab for Persistence after Reload
+    sessionStorage.setItem('admin_active_tab', tabName);
+
+    document.querySelectorAll('.page-tab-content').forEach(function (el) {
+        el.style.display = 'none';
+    });
+
+    // Deactivates all Tab Buttons
+    document.querySelectorAll('.page-tab').forEach(function (el) {
+        el.classList.remove('active');
+    });
+
+    // Shows selected Tab and activates Button
+    document.getElementById('tab-' + tabName).style.display = 'block';
+    event.currentTarget.classList.add('active');
+}
+
+
+// =====================================================================
+// Block 2: Collapsible Rows for Contributions and Comments
+// =====================================================================
+function toggleRow(row) {
+    const wasOpen = row.classList.contains('open');
+
+    // Closes all open Rows
+    document.querySelectorAll('.contribution-row.open').forEach(function (el) {
+        el.classList.remove('open');
+    });
+
+    // Toggles clicked Row
+    if (!wasOpen) {
+        row.classList.add('open');
+
+        // Loads Map Preview if not already loaded
+        const mapDiv = row.querySelector('.detail-map');
+        if (mapDiv && !mapDiv.dataset.loaded) {
+            loadMapPreview(mapDiv);
+        }
+    }
+}
+
+
+// =====================================================================
+// Block 3: Details Slider for Maps and Photos
+// =====================================================================
+function slideDetail(contributionId, direction) {
+    const slider = document.getElementById('slider-' + contributionId);
+    if (!slider) return;
+
+    const slides = slider.querySelectorAll('.detail-slide');
+    let activeIndex = -1;
+
+    // Finds active Slide
+    slides.forEach(function (slide, i) {
+        if (slide.style.display !== 'none') activeIndex = i;
+    });
+
+    // Calculates next Slide Index
+    const nextIndex = (activeIndex + direction + slides.length) % slides.length;
+
+    // Switches Slides
+    slides.forEach(function (slide) { slide.style.display = 'none'; });
+    slides[nextIndex].style.display = 'block';
+
+    // Loads Map if switching to Map Slide
+    if (slides[nextIndex].dataset.slide === 'map') {
+        const mapDiv = slides[nextIndex].querySelector('.detail-map');
+        if (mapDiv && !mapDiv.dataset.loaded) {
+            loadMapPreview(mapDiv);
+        }
+    }
+}
+
+
+// =====================================================================
+// Block 4: Map Preview (Leaflet Mini Map per Contribution)
+// =====================================================================
+
+// Erstellt eine Leaflet-Mini-Map in einem Beitrags-Detail-Container.
+// Lädt alle Beiträge via API und zeigt die Geometrie des entsprechenden Beitrags.
+// Markiert die Map als geladen (data-loaded="true"), um doppeltes Laden zu verhindern.
+function loadMapPreview(mapDiv) {
+    const contributionId = mapDiv.dataset.contributionId;
+    
+    // Fetches all Contributions to find the Geometry
+    const formData = new FormData();
+    formData.append('action', 'read');
+    formData.append('municipality_id', ADMIN_CONFIG.id);
+    formData.append('status', 'all');
+
+    fetch(API_URL, { method: 'POST', body: formData })
+        .then(function (r) { return r.json(); })
+        .then(function (data) {
+            if (!data.features) return;
+            
+            // Finds specific Contribution
+            const feature = data.features.find(function (f) {
+                return f.properties.contribution_id == contributionId;
+            });
+
+            if (!feature) {
+                mapDiv.innerHTML = '<div style="padding:20px;color:#999;text-align:center;font-size:0.8rem;">Geometrie nicht gefunden.</div>';
+                return;
+            }
+
+            // Creates Leaflet Mini Map
+            const miniMap = L.map(mapDiv, {
+                zoomControl: false,
+                attributionControl: false,
+                dragging: true,
+                scrollWheelZoom: false
+            });
+
+            L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
+                maxZoom: 20
+            }).addTo(miniMap);
+
+            // Adds Geometry to Mini Map
+            const geojsonLayer = L.geoJSON(feature, {
+                style: {
+                    color: ADMIN_CONFIG.primaryColor,
+                    weight: 3,
+                    fillOpacity: 0.2
+                },
+                pointToLayer: function (f, latlng) {
+                    return L.circleMarker(latlng, {
+                        radius: 8,
+                        color: '#ffffff',
+                        weight: 2,
+                        fillColor: ADMIN_CONFIG.primaryColor,
+                        fillOpacity: 0.9
+                    });
+                }
+            }).addTo(miniMap);
+
+            // Fits Map to Geometry Bounds
+            const bounds = geojsonLayer.getBounds();
+            if (bounds.isValid()) {
+                miniMap.fitBounds(bounds, { padding: [25, 25], maxZoom: 17 });
+            } else {
+                miniMap.setView(ADMIN_CONFIG.center, 15);
+            }
+
+            mapDiv.dataset.loaded = 'true';
+        })
+        .catch(function () {
+            mapDiv.innerHTML = '<div style="padding:20px;color:#999;text-align:center;font-size:0.8rem;">Karte nicht verfügbar.</div>';
+        });
+}
+
+
+// =====================================================================
+// Block 5: Contributions Filter and Sorting
+// =====================================================================
+
+// Filters Contributions
+let currentFilter = 'all';
+function filterByStatus(status, tabButton) {
+    currentFilter = status;
+
+    // Updates active Tab
+    document.querySelectorAll('.filter-tab').forEach(function (el) {
+        el.classList.remove('active');
+    });
+    tabButton.classList.add('active');
+
+    // Shows or Hides Contribution Rows
+    let visibleCount = 0;
+    document.querySelectorAll('#contributions-container .contribution-row').forEach(function (row) {
+        if (status === 'all' || row.dataset.status === status) {
+            row.style.display = '';
+            visibleCount++;
+        } else {
+            row.style.display = 'none';
+        }
+    });
+    
+    // Updates Count Display
+    document.getElementById('visible-count').textContent = visibleCount + ' Beiträge';
+}
+
+
+// Sorts Contributions
+function sortContributions(sortBy) {
+    const container = document.getElementById('contributions-container');
+    const rows = Array.from(container.querySelectorAll('.contribution-row'));
+
+    rows.sort(function (a, b) {
+        if (sortBy === 'date-desc') return new Date(b.dataset.date) - new Date(a.dataset.date);
+        if (sortBy === 'date-asc')  return new Date(a.dataset.date) - new Date(b.dataset.date);
+        if (sortBy === 'category')  return a.dataset.category.localeCompare(b.dataset.category);
+        return 0;
+    });
+
+    // Reappends sorted Rows
+    rows.forEach(function (row) { container.appendChild(row); });
+}
+
+
+// =====================================================================
+// Block 6: Comments Filter and Sorting
+// =====================================================================
+
+// Filters Comments
+function filterCommentsByStatus(status, tabButton) {
+
+    // Updates active Tab
+    document.querySelectorAll('#comment-filter-tabs .filter-tab').forEach(function (el) {
+        el.classList.remove('active');
+    });
+    tabButton.classList.add('active');
+    
+    // Shows or Hides Comments Rows
+    let visibleCount = 0;
+    document.querySelectorAll('.comment-mod-row').forEach(function (row) {
+        if (status === 'all' || row.dataset.status === status) {
+            row.style.display = '';
+            visibleCount++;
+        } else {
+            row.style.display = 'none';
+        }
+    });
+    // Updates Count Display
+    document.getElementById('comment-visible-count').textContent = visibleCount + ' Kommentare';
+}
+
+
+// Sorts Comments
+function sortCommentRows(sortBy) {
+    const container = document.getElementById('comments-mod-container');
+    const rows = Array.from(container.querySelectorAll('.comment-mod-row'));
+
+    rows.sort(function (a, b) {
+        if (sortBy === 'date-desc')   return new Date(b.dataset.date) - new Date(a.dataset.date);
+        if (sortBy === 'date-asc')    return new Date(a.dataset.date) - new Date(b.dataset.date);
+        if (sortBy === 'contribution') return a.dataset.contribution.localeCompare(b.dataset.contribution);
+        return 0;
+    });
+    // Reappends sorted Rows
+    rows.forEach(function (row) { container.appendChild(row); });
+}
+
+
+// =====================================================================
+// Block 7: Helper Functions
+// =====================================================================
+
+// Sends a POST request to API
+// promise-based instead of callback-based
+function apiCall(data) {
+    const formData = new FormData();
+    for (const key in data) {
+        formData.append(key, data[key]);
+    }
+
+    return fetch(API_URL, { method: 'POST', body: formData })
+        .then(function (r) { return r.json(); });
+}
+
+
+// Escapes HTML to prevent Cross-Site Scripting (XSS) in Popups and Lists
+function escapeHtml(text) {
+
+    if (!text) return '';
+    const div = document.createElement('div');
+    div.appendChild(document.createTextNode(text));
+    return div.innerHTML;
+}
+
+// =====================================================================
+// Block 8: CRUD Operations for Contributions
+// =====================================================================
+
+// STATUS: Changes Contribution Status
+function changeStatus(contributionId, newStatus) {
+    const labels = { approved: 'freigeben', rejected: 'ablehnen', pending: 'zurücksetzen' };
+
+    Swal.fire({
+        title: 'Beitrag ' + labels[newStatus] + '?',
+        showCancelButton: true,
+        confirmButtonText: 'Ja',
+        cancelButtonText: 'Abbrechen',
+        confirmButtonColor: ADMIN_CONFIG.primaryColor
+    }).then(function (result) {
+        if (!result.isConfirmed) return;
+
+        apiCall({
+            action: 'update',
+            contribution_id: contributionId,
+            status: newStatus
+        }).then(function (response) {
+            if (response.error) {
+                Swal.fire('Fehler', response.error, 'error');
+                return;
+            }
+            // Reloads Page to reflect Changes
+            location.reload();
+        });
+    });
+}
+
+
+// UPDATE: Edits existing Contributions
+function editContribution(contributionId, currentTitle, currentDescription) {
+    Swal.fire({
+        title: 'Beitrag bearbeiten',
+        html:
+            '<div style="text-align:left;">' +
+                '<div style="margin-bottom:12px;">' +
+                    '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Titel</label>' +
+                    '<input id="swal-title" class="swal2-input" style="margin:0;width:100%;" value="' + escapeHtml(currentTitle) + '">' +
+                '</div>' +
+                '<div>' +
+                    '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Beschreibung</label>' +
+                    '<textarea id="swal-description" class="swal2-textarea" style="margin:0;width:100%;">' + escapeHtml(currentDescription) + '</textarea>' +
+                '</div>' +
+            '</div>',
+        showCancelButton: true,
+        confirmButtonText: 'Speichern',
+        cancelButtonText: 'Abbrechen',
+        confirmButtonColor: ADMIN_CONFIG.primaryColor,
+        preConfirm: function () {
+            return {
+                title: document.getElementById('swal-title').value.trim(),
+                description: document.getElementById('swal-description').value.trim()
+            };
+        }
+    }).then(function (result) {
+        if (!result.isConfirmed) return;
+
+        apiCall({
+            action: 'update',
+            contribution_id: contributionId,
+            title: result.value.title,
+            description: result.value.description
+        }).then(function (response) {
+            if (response.error) {
+                Swal.fire('Fehler', response.error, 'error');
+                return;
+            }
+            Swal.fire('Gespeichert!', 'Beitrag wurde aktualisiert.', 'success')
+                .then(function () { location.reload(); });
+        });
+    });
+}
+
+
+// DELETE: Deletes existing Contributions
+function deleteContribution(contributionId) {
+    Swal.fire({
+        title: 'Beitrag löschen?',
+        text: 'Diese Aktion kann nicht rückgängig gemacht werden.',
+        icon: 'warning',
+        showCancelButton: true,
+        confirmButtonText: 'Beitrag löschen',
+        cancelButtonText: 'Abbrechen',
+        confirmButtonColor: '#c62828'
+    }).then(function (result) {
+        if (!result.isConfirmed) return;
+
+        apiCall({
+            action: 'delete',
+            contribution_id: contributionId
+        }).then(function (response) {
+            if (response.error) {
+                Swal.fire('Fehler', response.error, 'error');
+                return;
+            }
+            Swal.fire('Gelöscht!', 'Beitrag wurde gelöscht.', 'success')
+                .then(function () { location.reload(); });
+        });
+    });
+}
+
+// =====================================================================
+// Block 9: CRUD Operations for Comments
+// =====================================================================
+
+// STATUS: Changes Comment Status
+function changeCommentStatus(commentId, newStatus) {
+    const labels = { approved: 'akzeptieren', rejected: 'ablehnen', pending: 'zurücksetzen' };
+
+    Swal.fire({
+        title: 'Kommentar ' + labels[newStatus] + '?',
+        showCancelButton: true,
+        confirmButtonText: 'Ja',
+        cancelButtonText: 'Abbrechen',
+        confirmButtonColor: ADMIN_CONFIG.primaryColor
+    }).then(function (result) {
+        if (!result.isConfirmed) return;
+
+        apiCall({
+            action: 'update_comment',
+            comment_id: commentId,
+            status: newStatus
+        }).then(function (response) {
+            if (response.error) {
+                Swal.fire('Fehler', response.error, 'error');
+                return;
+            }
+            location.reload();
+        });
+    });
+}
+
+
+// UPDATE: Edits existing Comments
+function editModComment(commentId, currentContent) {
+    Swal.fire({
+        title: 'Kommentar bearbeiten',
+        html:
+            '<div style="text-align:left;">' +
+                '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Inhalt</label>' +
+                '<textarea id="swal-comment-content" class="swal2-textarea" style="margin:0;width:100%;">' + escapeHtml(currentContent) + '</textarea>' +
+            '</div>',
+        showCancelButton: true,
+        confirmButtonText: 'Speichern',
+        cancelButtonText: 'Abbrechen',
+        confirmButtonColor: ADMIN_CONFIG.primaryColor,
+        preConfirm: function () {
+            return { content: document.getElementById('swal-comment-content').value.trim() };
+        }
+    }).then(function (result) {
+        if (!result.isConfirmed) return;
+
+        apiCall({
+            action: 'update_comment',
+            comment_id: commentId,
+            content: result.value.content
+        }).then(function (response) {
+            if (response.error) {
+                Swal.fire('Fehler', response.error, 'error');
+                return;
+            }
+            Swal.fire('Gespeichert!', 'Kommentar wurde aktualisiert.', 'success')
+                .then(function () { location.reload(); });
+        });
+    });
+}
+
+
+// DELETE: Deletes existing Comments
+function deleteModComment(commentId) {
+    Swal.fire({
+        title: 'Kommentar löschen?',
+        text: 'Diese Aktion kann nicht rückgängig gemacht werden.',
+        icon: 'warning',
+        showCancelButton: true,
+        confirmButtonText: 'Löschen',
+        cancelButtonText: 'Abbrechen',
+        confirmButtonColor: '#c62828'
+    }).then(function (result) {
+        if (!result.isConfirmed) return;
+
+        apiCall({
+            action: 'delete_comment',
+            comment_id: commentId
+        }).then(function (response) {
+            if (response.error) {
+                Swal.fire('Fehler', response.error, 'error');
+                return;
+            }
+            Swal.fire('Gelöscht!', 'Kommentar wurde entfernt.', 'success')
+                .then(function () { location.reload(); });
+        });
+    });
+}
+
+
+// =====================================================================
+// Block 10: CRUD Operations for News
+// =====================================================================
+
+// CREATE: Submits new News Article
+function createNews() {
+    Swal.fire({
+        title: 'Neuigkeit hinzufügen',
+        html:
+            '<div style="text-align:left;">' +
+                '<div style="margin-bottom:12px;">' +
+                    '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Titel</label>' +
+                    '<input id="swal-news-title" class="swal2-input" style="margin:0;width:100%;" placeholder="Titel der Neuigkeit">' +
+                '</div>' +
+                '<div style="margin-bottom:12px;">' +
+                    '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Inhalt</label>' +
+                    '<textarea id="swal-news-content" class="swal2-textarea" style="margin:0;width:100%;" placeholder="Neuigkeit verfassen..."></textarea>' +
+                '</div>' +
+                '<div>' +
+                    '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Autor</label>' +
+                    '<input id="swal-news-author" class="swal2-input" style="margin:0;width:100%;" value="Stadtverwaltung">' +
+                '</div>' +
+            '</div>',
+        showCancelButton: true,
+        confirmButtonText: 'Veröffentlichen',
+        cancelButtonText: 'Abbrechen',
+        confirmButtonColor: ADMIN_CONFIG.primaryColor,
+        preConfirm: function () {
+            const title   = document.getElementById('swal-news-title').value.trim();
+            const content = document.getElementById('swal-news-content').value.trim();
+            const author  = document.getElementById('swal-news-author').value.trim() || 'Stadtverwaltung';
+            if (!title || !content) {
+                Swal.showValidationMessage('Titel und Inhalt sind Pflichtfelder.');
+                return false;
+            }
+            return { title, content, author_name: author };
+        }
+    }).then(function (result) {
+        if (!result.isConfirmed) return;
+
+        apiCall({
+            action: 'create_news',
+            municipality_id: ADMIN_CONFIG.id,
+            title: result.value.title,
+            content: result.value.content,
+            author_name: result.value.author_name
+        }).then(function (response) {
+            if (response.error) {
+                Swal.fire('Fehler', response.error, 'error');
+                return;
+            }
+            Swal.fire('Veröffentlicht!', 'Neuigkeit wurde veröffentlicht.', 'success')
+                .then(function () { location.reload(); });
+        });
+    });
+}
+
+
+// UPDATE: Edits existing News
+function editNews(newsId, currentTitle, currentContent, currentAuthor) {
+    Swal.fire({
+        title: 'Neuigkeit bearbeiten',
+        html:
+            '<div style="text-align:left;">' +
+                '<div style="margin-bottom:12px;">' +
+                    '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Titel</label>' +
+                    '<input id="swal-news-title" class="swal2-input" style="margin:0;width:100%;" value="' + escapeHtml(currentTitle) + '">' +
+                '</div>' +
+                '<div style="margin-bottom:12px;">' +
+                    '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Inhalt</label>' +
+                    '<textarea id="swal-news-content" class="swal2-textarea" style="margin:0;width:100%;">' + escapeHtml(currentContent) + '</textarea>' +
+                '</div>' +
+                '<div>' +
+                    '<label style="display:block;font-weight:600;font-size:1.15rem;margin-bottom:4px;">Autor</label>' +
+                    '<input id="swal-news-author" class="swal2-input" style="margin:0;width:100%;" value="' + escapeHtml(currentAuthor) + '">' +
+                '</div>' +
+            '</div>',
+        showCancelButton: true,
+        confirmButtonText: 'Speichern',
+        cancelButtonText: 'Abbrechen',
+        confirmButtonColor: ADMIN_CONFIG.primaryColor,
+        preConfirm: function () {
+            return {
+                title:       document.getElementById('swal-news-title').value.trim(),
+                content:     document.getElementById('swal-news-content').value.trim(),
+                author_name: document.getElementById('swal-news-author').value.trim() || 'Stadtverwaltung'
+            };
+        }
+    }).then(function (result) {
+        if (!result.isConfirmed) return;
+
+        apiCall({
+            action: 'update_news',
+            news_id: newsId,
+            title: result.value.title,
+            content: result.value.content,
+            author_name: result.value.author_name
+        }).then(function (response) {
+            if (response.error) {
+                Swal.fire('Fehler', response.error, 'error');
+                return;
+            }
+            Swal.fire('Gespeichert!', 'Neuigkeit wurde aktualisiert.', 'success')
+                .then(function () { location.reload(); });
+        });
+    });
+}
+
+
+// DELETE: Deletes existing News
+function deleteNews(newsId) {
+    Swal.fire({
+        title: 'Neuigkeit löschen?',
+        text: 'Diese Aktion kann nicht rückgängig gemacht werden.',
+        icon: 'warning',
+        showCancelButton: true,
+        confirmButtonText: 'Löschen',
+        cancelButtonText: 'Abbrechen',
+        confirmButtonColor: '#c62828'
+    }).then(function (result) {
+        if (!result.isConfirmed) return;
+
+        apiCall({
+            action: 'delete_news',
+            news_id: newsId
+        }).then(function (response) {
+            if (response.error) {
+                Swal.fire('Fehler', response.error, 'error');
+                return;
+            }
+            Swal.fire('Gelöscht!', 'Neuigkeit wurde gelöscht.', 'success')
+                .then(function () { location.reload(); });
+        });
+    });
+}
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -3,9 +3,7 @@
 // Initializes Leaflet Map, loads Contributions from the API,
 // handles CRUD Workflow, and manages all UI Interactions.
 //
-// Depends on: MUNICIPALITY Object set in Main Page, Leaflet, Geoman,
-//             Sidebar, Geocoder, PolylineMeasure, Fullscreen, 
-//             and SweetAlert2 Plugins.
+// Depends on: MUNICIPALITY Object set in Citizen Portal
 // =====================================================================


@@ -17,7 +15,8 @@
 const API_URL = 'api/contributions.php';

 // Username set via Login Modal stored in sessionStorage
-let currentUser = sessionStorage.getItem('webgis_user') || '';
+let currentUser = sessionStorage.getItem('webgis_user') || 
+    decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)webgis_user\s*=\s*([^;]*).*$)|^.*$/, '$1')) || '';

 // Browser Identification Number for anonymous User Identification stored as Cookie
 let browserId = getBrowserId();
@@ -89,9 +88,9 @@ basemapCartoDB.addTo(map);

 // Layer Control
 const basemaps = {
-    '<i class="fa-solid fa-map" style="color:#404040;"></i> Hintergrundkarte (farbe)': basemapOSM,
-    '<i class="fa-solid fa-map" style="color:#404040;"></i> Hintergrundkarte (grau)': basemapCartoDB,
-    '<i class="fa-solid fa-satellite" style="color:#404040;"></i> Satellitenbild': basemapSatellite,
+    // 'Hintergrundkarte': basemapOSM,
+    'Hintergrundkarte': basemapCartoDB,
+    'Satellitenbild': basemapSatellite,
 };

 const overlays = {};  // Populated later with Contribution Layers
@@ -101,6 +100,16 @@ const layerControl = L.control.layers(basemaps, overlays, {
    collapsed: true
 }).addTo(map);

+// Adds styled Header to Layer Control Dropdown
+var layerControlContainer = layerControl.getContainer();
+var layerList = layerControlContainer.querySelector('.leaflet-control-layers-list');
+if (layerList) {
+    var header = document.createElement('div');
+    header.className = 'layer-control-header';
+    header.innerHTML = '<i class="fa-solid fa-layer-group"></i> Layerauswahl';
+    layerList.parentNode.insertBefore(header, layerList);
+}
+

 // =====================================================================
 // Block 4: Map Controls
@@ -112,11 +121,11 @@ L.control.zoom({
 }).addTo(map);

 // Scale Bar
-L.control.scale({
-    position: 'bottomright',
-    maxWidth: 200,
-    imperial: false
-}).addTo(map);
+// L.control.scale({
+//     position: 'bottomright',
+//     maxWidth: 200,
+//     imperial: false
+// }).addTo(map);

 // Fullscreen Button
 L.control.fullscreen({
@@ -221,6 +230,21 @@ sidebar = L.control.sidebar({
    position: 'left'
 }).addTo(map);

+// Hides Map Controls on Mobile while Sidebar is open
+sidebar.on('content', function () {
+    if (window.innerWidth < 769) {
+        document.querySelectorAll('.leaflet-top.leaflet-right').forEach(function (el) {
+            el.style.display = 'none';
+        });
+    }
+});
+
+sidebar.on('closing', function () {
+    document.querySelectorAll('.leaflet-top.leaflet-right').forEach(function (el) {
+        el.style.display = '';
+    });
+});
+

 // =====================================================================
 // Block 6: Geoman Drawing Tools and CRUD Trigger
@@ -244,6 +268,40 @@ map.pm.addControls({

 map.pm.setLang('de');

+// Overwrites Geoman German Translations for User-friendly Labels
+map.pm.setLang('custom', {
+    tooltips: {
+        placeMarker: 'Punkt setzen mit Klick',
+        firstVertex: 'Ersten Punkt setzen mit Klick',
+        continueLine: 'Nächsten Punkt setzen mit Klick',
+        finishLine: 'Beenden mit Klick auf letzten Punkt',
+        finishPoly: 'Beenden mit Klick auf ersten Punkt',
+        finishRect: 'Beenden mit Klick'
+    },
+    actions: {
+        finish: 'Beenden',
+        cancel: 'Abbrechen',
+        removeLastVertex: 'Letzten Punkt löschen'
+    },
+    buttonTitles: {
+        drawMarkerButton: 'Punkt zeichnen',
+        drawPolyButton: 'Fläche zeichnen',
+        drawLineButton: 'Linie zeichnen',
+        drawCircleButton: 'Kreis zeichnen',
+        drawRectButton: 'Rechteck zeichnen',
+        editButton: 'Objekte bearbeiten',
+        dragButton: 'Objekte verschieben',
+        cutButton: 'Objekte ausschneiden',
+        deleteButton: 'Objekte löschen',
+        drawCircleMarkerButton: 'Kreismarker zeichnen',
+        snappingButton: 'Einrasten',
+        pinningButton: 'Fixieren',
+        rotateButton: 'Objekte drehen',
+        drawTextButton: 'Text zeichnen'
+    }
+});
+
+
 // Captures drawn Geometry and opens the Create Modal
 map.on('pm:create', function (e) {
    const geojson = e.layer.toGeoJSON().geometry;
@@ -344,10 +402,10 @@ function loadContributions() {
            onEachFeature: bindFeaturePopup
        }).addTo(map);

-        layerControl.addOverlay(contributionsLayer, '<i class="fa-solid fa-map-pin" style="color:#C00000;"></i> Beiträge');
+        layerControl.addOverlay(contributionsLayer, 'Bürgerbeiträge');
        // Update Sidebar List and Statistics
        updateContributionsList();
-        updateStatistics();
+        buildCategoryFilter();
    });
 }

@@ -409,11 +467,6 @@ function buildPopupHtml(feature) {
    if (props.photo_path) {
        html += '<div class="popup-photo-container" id="photo-container-' + props.contribution_id + '" style="display:none;">' +
                    '<img src="' + escapeHtml(props.photo_path) + '" alt="Foto" class="popup-photo-img" onclick="window.open(\'' + escapeHtml(props.photo_path) + '\', \'_blank\')">' +
-                '</div>' +
-                '<div class="popup-photo-toggle">' +
-                    '<button class="popup-photo-btn" onclick="togglePhoto(' + props.contribution_id + ')">' +
-                        '<i class="fa-solid fa-camera"></i> <span id="photo-label-' + props.contribution_id + '">Foto anzeigen</span>' +
-                    '</button>' +
                '</div>';
    }

@@ -423,15 +476,23 @@ function buildPopupHtml(feature) {
                ' &middot; <i class="fa-solid fa-calendar"></i> ' + dateStr +
            '</div>';

-    // Vote Buttons
+    // Vote Buttons and Photo Toggle
    html += '<div class="popup-detail-votes">' +
                '<button class="popup-vote-btn' + (userVotes[props.contribution_id] === 'like' ? ' liked' : '') + '" id="vote-like-' + props.contribution_id + '" onclick="voteContribution(' + props.contribution_id + ', \'like\')" title="Gefällt mir">' +
                    '<i class="fa-solid fa-thumbs-up"></i> <span id="likes-' + props.contribution_id + '">' + props.likes_count + '</span>' +
                '</button>' +
                '<button class="popup-vote-btn' + (userVotes[props.contribution_id] === 'dislike' ? ' disliked' : '') + '" id="vote-dislike-' + props.contribution_id + '" onclick="voteContribution(' + props.contribution_id + ', \'dislike\')" title="Gefällt mir nicht">' +
                    '<i class="fa-solid fa-thumbs-down"></i> <span id="dislikes-' + props.contribution_id + '">' + props.dislikes_count + '</span>' +
-                '</button>' +
-            '</div>';
+                '</button>';
+
+    // Photo Toggle Button
+    if (props.photo_path) {
+        html += '<button class="popup-vote-btn" onclick="togglePhoto(' + props.contribution_id + ')" title="Foto">' +
+                    '<i class="fa-solid fa-camera"></i> <span id="photo-label-' + props.contribution_id + '">Foto anzeigen</span>' +
+                '</button>';
+    }
+
+    html += '</div>';

    // Edit and Delete Buttons for Author or Admin
    if (props.browser_id === browserId || (typeof IS_ADMIN !== 'undefined' && IS_ADMIN)) {
@@ -471,11 +532,25 @@ function buildPopupHtml(feature) {
 function bindFeaturePopup(feature, layer) {
    const cat = CATEGORIES[feature.properties.category] || CATEGORIES.other;

-    // Dynamic Popup — rebuilt every Time the Popup opens
-    layer.bindPopup(function () { return buildPopupHtml(feature); }, { maxWidth: 320, minWidth: 240 });
+    // Popup Options — Mobile narrower with Header/Footer Padding
+    var mobile = window.innerWidth < 769;
+    var opts = {
+        maxWidth: mobile ? 280 : 320,
+        minWidth: mobile ? 200 : 240,
+        maxHeight: mobile ? 280 : 400,
+        autoPanPaddingTopLeft:     L.point(mobile ? 50 : 75, mobile ? 75 : 75),
+        autoPanPaddingBottomRight: L.point(mobile ? 60 : 85, mobile ? 50 : 75),
+        className: 'contribution-popup'
+    };

-    // Loads Comments when Popup opens
+    // Dynamic Popup — rebuilt every Time the Popup opens
+    layer.bindPopup(function () { return buildPopupHtml(feature); }, opts);
+
+    // Closes Sidebar on Mobile and loads Comments when Popup opens
    layer.on('popupopen', function () {
+        if (window.innerWidth < 769) {
+            sidebar.close();
+        }
        loadComments(feature.properties.contribution_id);
    });

@@ -764,7 +839,7 @@ function updateContributionsList() {

    // Builds HTML
    if (filtered.length === 0) {
-        container.innerHTML = '<p style="text-align:center;color:#999;padding:20px;">Keine Beiträge gefunden.</p>';
+        container.innerHTML = '<p class="empty-state">Keine Beiträge gefunden.</p>';
        return;
    }

@@ -828,22 +903,33 @@ document.getElementById('list-search-input').addEventListener('input', function
 // Block 12: Sidebar Category Filter and Statistics
 // =====================================================================

-// Builds Category Filter Checkboxes
+// Builds Category Filter Checkboxes with Counts
 function buildCategoryFilter() {
    const container = document.getElementById('category-filter');
+
+    const counts = {};
+    contributionsData.forEach(function (f) {
+        const cat = f.properties.category;
+        counts[cat] = (counts[cat] || 0) + 1;
+    });
+
+    const total = contributionsData.length;
    let html = '';

    for (const key in CATEGORIES) {
        const cat = CATEGORIES[key];
        const checked = activeFilters.indexOf(key) !== -1 ? 'checked' : '';
+        const count = counts[key] || 0;

-        html += '' +
-            '<label style="display:flex;align-items:center;gap:8px;margin-bottom:6px;cursor:pointer;">' +
+        html += '<label style="display:flex;align-items:center;gap:8px;margin-bottom:6px;cursor:pointer;font-size:0.85rem;color:var(--color-text-secondary)">' +
                    '<input type="checkbox" value="' + key + '" ' + checked + ' onchange="toggleCategoryFilter(this)">' +
-                '<span>' + categoryIcon(cat) + ' ' + cat.label + '</span>' +
+                    categoryIcon(cat) +
+                    '<span>' + cat.label + ' (' + count + ')</span>' +
                '</label>';
    }

+    html += '<p style="margin-top:10px;font-size:0.85rem;color:var(--color-text-secondary)"><strong>' + total + '</strong> Beiträge insgesamt</p>';
+
    container.innerHTML = html;
 }

@@ -890,34 +976,6 @@ function toggleCategoryFilter(checkbox) {
    updateContributionsList();
 }

-// Updates Statistics in Home Tab
-function updateStatistics() {
-    const container = document.getElementById('stats-container');
-    const total = contributionsData.length;
-
-    // Counts per Category
-    const counts = {};
-    contributionsData.forEach(function (f) {
-        const cat = f.properties.category;
-        counts[cat] = (counts[cat] || 0) + 1;
-    });
-
-    let html = '<p style="font-size:0.9rem;"><strong>' + total + '</strong> Beiträge insgesamt</p>';
-
-    for (const key in CATEGORIES) {
-        const cat = CATEGORIES[key];
-        const count = counts[key] || 0;
-        if (count > 0) {
-            html += '<div style="display:flex;align-items:center;gap:8px;margin:4px 0;font-size:0.85rem;">' +
-                categoryIcon(cat) + ' ' +
-                cat.label + ': ' + count +
-            '</div>';
-        }
-    }
-
-    container.innerHTML = html;
-}
-

 // =====================================================================
 // Block 13: Modals — Welcome, Login, Info, Privacy, Imprint
@@ -952,8 +1010,14 @@ function submitLogin() {
    }
    currentUser = name;
    sessionStorage.setItem('webgis_user', currentUser);
+    document.cookie = 'webgis_user=' + encodeURIComponent(name) + ';path=/;max-age=31536000;SameSite=Lax';
    document.getElementById('login-modal').style.display = 'none';

+    // Starts Onboarding Tour on first Login
+    if (!localStorage.getItem('webgis_onboarding_done')) {
+        setTimeout(function () { startTour(); }, 500);
+    }
+
    // Open Create Modal if Geometry is pending 
    if (drawnGeometry) {
        document.getElementById('create-geom').value = JSON.stringify(drawnGeometry);
@@ -964,6 +1028,11 @@ function submitLogin() {

 function skipLogin() {
    document.getElementById('login-modal').style.display = 'none';
+
+    // Starts Onboarding Tour on first Login
+    if (!localStorage.getItem('webgis_onboarding_done')) {
+        setTimeout(function () { startTour(); }, 500);
+    }
 }

 // Info Modal
@@ -975,7 +1044,15 @@ function showInfoModal() {
              '<strong>' + MUNICIPALITY.name + '</strong> mitzuwirken.</p>' +
              '<p style="text-align:left;line-height:1.6;">Bitte tragen Sie Hinweise, Anregungen und Vorschläge ' +
              'mithilfe der Zeichenwerkzeuge auf der Karte ein.</p>',
-        confirmButtonColor: MUNICIPALITY.primaryColor
+        showDenyButton: true,
+        confirmButtonText: 'Schließen',
+        denyButtonText: '<i class="fa-solid fa-route"></i> Tutorial starten',
+        confirmButtonColor: MUNICIPALITY.primaryColor,
+        denyButtonColor: '#546E7A'
+    }).then(function (result) {
+        if (result.isDenied && typeof restartOnboarding === 'function') {
+            restartOnboarding();
+        }
    });
 }

@@ -1023,7 +1100,7 @@ function escapeHtml(text) {

 // Returns a colored Font Awesome Icon HTML String for a Category
 function categoryIcon(cat) {
-    return '<i class="fa-solid ' + cat.faIcon + '" style="color:' + cat.color + ';"></i>';
+    return '<i class="fa-solid ' + cat.faIcon + ' fa-fw" style="color:' + cat.color + ';"></i>';
 }

 // Reverse Geocodes Coordinates and saves Address to Contribution via API
@@ -1126,9 +1203,14 @@ function submitComment(contributionId) {
            Swal.fire('Fehler', response.error, 'error');
            return;
        }
-        // Clears Input and reloads Comments
        if (input) input.value = '';
-        loadComments(contributionId);
+        Swal.fire({
+            title: 'Eingereicht!',
+            text: 'Ihr Kommentar wurde erfolgreich eingereicht und wird nach Prüfung durch das Moderationsteam veröffentlicht.',
+            icon: 'success',
+            timer: 3000,
+            showConfirmButton: true
+        });
    });
 }

@@ -1144,7 +1226,24 @@ function deleteComment(commentId, contributionId) {
    });
 }

-// Toggles Photo Visibility in Popup
+// Pans Map if Popup behind Header
+function recenterPopup() {
+    map.eachLayer(function (layer) {
+        if (layer.getPopup && layer.getPopup() && layer.isPopupOpen()) {
+            var popupEl = layer.getPopup().getElement();
+            if (!popupEl) return;
+            var padding = window.innerWidth < 769 ? 75 : 75;
+            var popupTop = popupEl.getBoundingClientRect().top;
+            var mapTop = document.getElementById('map').getBoundingClientRect().top;
+            var diff = popupTop - mapTop - padding;
+            if (diff < 0) {
+                map.panBy([0, diff], { animate: true, duration: 0.3 });
+            }
+        }
+    });
+}
+
+// Toggles Photo Visibility in Popup and updates Popup Position
 function togglePhoto(contributionId) {
    const container = document.getElementById('photo-container-' + contributionId);
    const label = document.getElementById('photo-label-' + contributionId);
@@ -1157,9 +1256,11 @@ function togglePhoto(contributionId) {
        container.style.display = 'none';
        label.textContent = 'Foto anzeigen';
    }
+
+    setTimeout(recenterPopup, 150);
 }

-// Toggles Comments Section Visibility in Popup
+// Toggles Comments Section Visibility in Popup and updates Popup Position
 function toggleComments(contributionId) {
    const section = document.getElementById('comments-section-' + contributionId);
    const toggle = document.getElementById('comments-toggle-' + contributionId);
@@ -1176,6 +1277,8 @@ function toggleComments(contributionId) {
        toggle.classList.remove('fa-chevron-up');
        toggle.classList.add('fa-chevron-down');
    }
+
+    setTimeout(recenterPopup, 150);
 }


--- a/public/js/onboarding.js
+++ b/public/js/onboarding.js
@@ -0,0 +1,304 @@
+// =====================================================================
+// WebGIS Citizen Participation Portal — Onboarding Tour
+// Guides Users through the Participation Portal.
+// On Mobile centered Overlays. On Desktop attached to User Interface.
+// =====================================================================
+
+
+// =================================================================
+// Block 1: Onboarding Configuration
+// =================================================================
+
+// Prevents double Initialization
+let onboardingStarted = false;
+
+// Detects Mobile Viewport
+function isMobile() {
+    return window.innerWidth < 769;
+}
+
+
+// =================================================================
+// Block 2: Tour Definition
+// =================================================================
+
+function startTour(manual) {
+    // Prevents double Start
+    if (onboardingStarted) return;
+    onboardingStarted = true;
+
+    const mobile = isMobile();
+
+    const tour = new Shepherd.Tour({
+        useModalOverlay: !mobile,
+        defaultStepOptions: {
+            cancelIcon: { enabled: false },
+            scrollTo: false,
+            classes: 'onboarding-step',
+            popperOptions: {
+                modifiers: [
+                    { name: 'offset', options: { offset: [0, 14] } }
+                ]
+            }
+        }
+    });
+
+
+// -----------------------------------------------------------------
+    // Step 1: Welcome — Skip Timer at automatic Start
+    // -----------------------------------------------------------------
+    var welcomeButtons = [
+        {
+            text: 'Überspringen',
+            action: tour.cancel,
+            classes: 'shepherd-button-secondary' + (manual ? '' : ' skip-btn-locked')
+        },
+        {
+            text: 'Los geht\'s <i class="fa-solid fa-arrow-right"></i>',
+            action: tour.next,
+            classes: 'shepherd-button-primary'
+        }
+    ];
+
+    tour.addStep({
+        id: 'welcome',
+        title: '<i class="fa-solid fa-hand-wave"></i> Willkommen bei der Mitmachkarte!',
+        text: 'Dieses <strong>interaktive Tutorial</strong> zeigt Ihnen die Kernfunktionen der Mitmachkarte.' +
+              '<br><br><span style="color:var(--color-text-secondary);">Sie können das Tutorial jederzeit über den Hilfe-Tab der Seitenleiste wiederholen.</span>',
+        buttons: welcomeButtons,
+        when: {
+            show: function () {
+                if (manual) return;
+
+                // Locks Skip Button with Progress Bar for 5 Seconds
+                var skipBtn = document.querySelector('.skip-btn-locked');
+                if (!skipBtn) return;
+                skipBtn.disabled = true;
+                skipBtn.style.pointerEvents = 'none';
+
+                setTimeout(function () {
+                    skipBtn.disabled = false;
+                    skipBtn.style.pointerEvents = '';
+                    skipBtn.classList.remove('skip-btn-locked');
+                }, 5000);
+            }
+        }
+    });
+
+
+    // -----------------------------------------------------------------
+    // Step 2: Drawing Tools
+    // -----------------------------------------------------------------
+    var drawingStep = {
+        id: 'drawing-tools',
+        title: '<i class="fa-solid fa-pencil"></i> Beitrag hinzufügen',
+        buttons: [
+            {
+                text: '<i class="fa-solid fa-arrow-left"></i> Zurück',
+                action: tour.back,
+                classes: 'shepherd-button-secondary'
+            },
+            {
+                text: 'Weiter <i class="fa-solid fa-arrow-right"></i>',
+                action: tour.next,
+                classes: 'shepherd-button-primary'
+            }
+        ]
+    };
+
+    if (mobile) {
+        drawingStep.text = 'Verwenden Sie die <strong>Zeichenwerkzeuge</strong> ' +
+            '<i class="fa-solid fa-location-dot"></i> ' +
+            'rechts, um Hinweise als Punkte, Linien oder Flächen hinzuzufügen.';
+    } else {
+        drawingStep.text = 'Verwenden Sie die <strong>Zeichenwerkzeuge</strong>, um Hinweise, Anregungen und Vorschläge auf der Mitmachkarte als Punkte, Linien oder Flächen hinzuzufügen.';
+        drawingStep.attachTo = { element: '.leaflet-pm-toolbar', on: 'left' };
+        drawingStep.beforeShowPromise = function () {
+            return new Promise(function (resolve) {
+                sidebar.close();
+                setTimeout(resolve, 300);
+            });
+        };
+    }
+
+    tour.addStep(drawingStep);
+
+
+    // -----------------------------------------------------------------
+    // Step 3: Address Search
+    // -----------------------------------------------------------------
+    var searchStep = {
+        id: 'address-search',
+        title: '<i class="fa-solid fa-magnifying-glass"></i> Adresssuche',
+        buttons: [
+            {
+                text: '<i class="fa-solid fa-arrow-left"></i> Zurück',
+                action: tour.back,
+                classes: 'shepherd-button-secondary'
+            },
+            {
+                text: 'Weiter <i class="fa-solid fa-arrow-right"></i>',
+                action: tour.next,
+                classes: 'shepherd-button-primary'
+            }
+        ]
+    };
+
+    if (mobile) {
+        searchStep.text = 'Verwenden Sie die <strong>Adresssuche</strong> ' +
+            '<i class="fa-solid fa-magnifying-glass"></i> rechts, um schnell den richtigen Ort auf der Mitmachkarte zu finden.';
+    } else {
+        searchStep.text = 'Verwenden Sie die <strong>Adresssuche</strong>, um schnell den richtigen Ort auf der Mitmachkarte zu finden.';
+        searchStep.attachTo = { element: '.leaflet-control-geocoder', on: 'left' };
+    }
+
+    tour.addStep(searchStep);
+
+
+    // -----------------------------------------------------------------
+    // Step 4: Layer Control
+    // -----------------------------------------------------------------
+    var layerStep = {
+        id: 'layer-control',
+        title: '<i class="fa-solid fa-layer-group"></i> Kartenansicht',
+        buttons: [
+            {
+                text: '<i class="fa-solid fa-arrow-left"></i> Zurück',
+                action: tour.back,
+                classes: 'shepherd-button-secondary'
+            },
+            {
+                text: 'Weiter <i class="fa-solid fa-arrow-right"></i>',
+                action: tour.next,
+                classes: 'shepherd-button-primary'
+            }
+        ]
+    };
+
+    if (mobile) {
+        layerStep.text = 'Wechseln Sie über das <strong>Layer-Symbol</strong> ' +
+            '<i class="fa-solid fa-layer-group"></i> oben rechts zwischen verschiedenen Hintergrundkarten und Satellitenbildern.';
+    } else {
+        layerStep.text = 'Wechseln Sie zwischen verschiedenen <strong>Hintergrundkarten</strong> und <strong>Satellitenbildern</strong>.';
+        layerStep.attachTo = { element: '.leaflet-control-layers', on: 'left' };
+    }
+
+    tour.addStep(layerStep);
+
+
+    // -----------------------------------------------------------------
+    // Step 5: Sidebar
+    // -----------------------------------------------------------------
+    var sidebarStep = {
+        id: 'sidebar',
+        title: '<i class="fa-solid fa-bars"></i> Seitenleiste',
+        buttons: [
+            {
+                text: '<i class="fa-solid fa-arrow-left"></i> Zurück',
+                action: tour.back,
+                classes: 'shepherd-button-secondary'
+            },
+            {
+                text: 'Abschließen <i class="fa-solid fa-check"></i>',
+                action: tour.next,
+                classes: 'shepherd-button-primary'
+            }
+        ]
+    };
+
+    if (mobile) {
+        sidebarStep.text = 'In der <strong>Seitenleiste</strong> ' +
+            '<i class="fa-solid fa-house"></i> ' +
+            'links finden Sie Hilfestellungen, Listenansichten und Neuigkeiten.';
+    } else {
+        sidebarStep.text = 'In der <strong>Seitenleiste</strong> finden Sie Hilfestellungen, Listenansichten und Neuigkeiten.';
+        sidebarStep.attachTo = { element: '#sidebar', on: 'right' };
+        sidebarStep.beforeShowPromise = function () {
+            return new Promise(function (resolve) {
+                sidebar.open('tab-help');
+                setTimeout(resolve, 400);
+            });
+        };
+    }
+
+    tour.addStep(sidebarStep);
+
+
+    // -----------------------------------------------------------------
+    // Completion and Cancellation — shows Drawing Arrow
+    // -----------------------------------------------------------------
+    function onTourEnd() {
+        onboardingStarted = false;
+        if (mobile) sidebar.close();
+
+        // Shows Arrow Hint
+        if (!localStorage.getItem('webgis_onboarding_done')) {
+            localStorage.setItem('webgis_onboarding_done', 'true');
+            showDrawingArrow();
+        }
+    }
+
+    tour.on('complete', onTourEnd);
+    tour.on('cancel', onTourEnd);
+
+    tour.start();
+}
+
+
+// =================================================================
+// Drawing Arrow — Points to Geoman Toolbar after Tour
+// =================================================================
+
+function showDrawingArrow() {
+    var hint = document.createElement('div');
+    hint.id = 'drawing-hint-arrow';
+    hint.innerHTML = '<span class="drawing-hint-label">' +
+                         '<i class="fa-solid fa-pencil"></i> Beitrag hinzufügen' +
+                     '</span>' +
+                     '<span class="drawing-hint-chevrons">' +
+                         '<i class="fa-solid fa-chevron-right"></i>' +
+                         '<i class="fa-solid fa-chevron-right"></i>' +
+                     '</span>';
+    document.body.appendChild(hint);
+
+    // Positions Hint centered on Geoman Toolbar
+    function positionHint() {
+        var toolbar = document.querySelector('.leaflet-pm-toolbar');
+        if (!toolbar) { removeDrawingArrow(); return; }
+
+        var rect = toolbar.getBoundingClientRect();
+        var hintHeight = hint.offsetHeight || 32;
+        hint.style.top = (rect.top + (rect.height / 2) - (hintHeight / 2)) + 'px';
+        hint.style.right = (window.innerWidth - rect.left + 10) + 'px';
+    }
+
+    positionHint();
+    window.addEventListener('resize', positionHint);
+
+    var timeout = setTimeout(removeDrawingArrow, 60000);
+
+    map.on('pm:globaldrawmodetoggled', function onDraw() {
+        clearTimeout(timeout);
+        removeDrawingArrow();
+        map.off('pm:globaldrawmodetoggled', onDraw);
+        window.removeEventListener('resize', positionHint);
+    });
+}
+
+function removeDrawingArrow() {
+    var arrow = document.getElementById('drawing-hint-arrow');
+    if (arrow) {
+        arrow.classList.add('fade-out');
+        setTimeout(function () { arrow.remove(); }, 300);
+    }
+}
+
+
+// =================================================================
+// Manual Tour Restart (from Info Modal or Help Tab)
+// =================================================================
+
+function restartOnboarding() {
+    onboardingStarted = false;
+    startTour(true);
+}
--- a/public/privacy.php
+++ b/public/privacy.php
@@ -11,7 +11,7 @@ $municipality = $stmt->fetch();
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Datenschutz — <?= htmlspecialchars($municipality['name']) ?></title>
-    <link rel="icon" href="<?= htmlspecialchars($municipality['logo_path'] ?? 'assets/icon-municipality.png') ?>" type="image/png">
+    <link rel="icon" href="assets/lock-solid-off-black.png" type="image/png">
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
    <link rel="stylesheet" href="styles.css">
    <style>:root { --color-primary: <?= htmlspecialchars($municipality['primary_color']) ?>; }</style>
--- a/public/styles.css
+++ b/public/styles.css
@@ -263,6 +263,10 @@ select.form-input { cursor: pointer; }
    font-family: var(--font-body) !important;
 }

+.swal2-container {
+    z-index: 3000 !important;
+}
+

 /* -----------------------------------------------------------------
   3.7 Warning Notices
@@ -431,6 +435,69 @@ select.form-input { cursor: pointer; }
    border-radius: 4px;
 }

+/* Layer Control Expanded Dropdown */
+.leaflet-control-layers-expanded {
+    padding: 0 !important;
+    background: var(--color-surface) !important;
+    font-family: var(--font-body) !important;
+    border-radius: 10px !important;
+    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.15) !important;
+    border: 1px solid var(--color-border) !important;
+    min-width: 220px;
+}
+
+.leaflet-control-layers-list {
+    padding: 8px 0;
+}
+
+.leaflet-control-layers-separator {
+    border-top: 1px solid var(--color-border) !important;
+    margin: 4px 12px !important;
+}
+
+.leaflet-control-layers label {
+    display: flex !important;
+    align-items: center !important;
+    gap: 8px !important;
+    padding: 8px 16px !important;
+    margin: 0 !important;
+    cursor: pointer !important;
+    font-size: 0.83rem !important;
+    color: var(--color-text) !important;
+    transition: background var(--transition-fast);
+}
+
+.leaflet-control-layers label:hover {
+    background: var(--color-bg) !important;
+}
+
+.leaflet-control-layers input[type="radio"],
+.leaflet-control-layers input[type="checkbox"] {
+    accent-color: var(--color-primary);
+    width: 16px;
+    height: 16px;
+    cursor: pointer;
+    flex-shrink: 0;
+}
+
+/* Layer Control Header — only visible when expanded */
+.layer-control-header {
+    background: var(--color-primary);
+    color: white;
+    font-family: var(--font-body);
+    font-size: 0.85rem;
+    font-weight: 600;
+    padding: 10px 16px;
+    display: none;
+    align-items: center;
+    gap: 8px;
+    border-radius: 10px 10px 0 0;
+}
+
+.leaflet-control-layers-expanded .layer-control-header {
+    display: flex;
+}
+

 /* -----------------------------------------------------------------
   4.3 Sidebar Overrides
@@ -464,6 +531,7 @@ select.form-input { cursor: pointer; }
    margin-bottom: var(--space-sm);
    line-height: 1.5;
    color: var(--color-text-secondary);
+    font-size: 0.85rem;
 }


@@ -634,10 +702,6 @@ select.form-input { cursor: pointer; }
   ----------------------------------------------------------------- */

 /* Photo Toggle Button */
-.popup-photo-toggle {
-    margin: var(--space-sm) 0;
-}
-
 .popup-photo-btn {
    display: inline-flex;
    align-items: center;
@@ -698,8 +762,6 @@ select.form-input { cursor: pointer; }
 }

 .popup-comments-list {
-    max-height: 150px;
-    overflow-y: auto;
    margin-top: var(--space-sm);
 }

@@ -768,6 +830,214 @@ select.form-input { cursor: pointer; }
 .popup-comment-submit:hover { filter: brightness(1.15); }


+/* -----------------------------------------------------------------
+   4.9 Onboarding Tour (Shepherd.js Overrides)
+   ----------------------------------------------------------------- */
+
+/* Step Container */
+.shepherd-element {
+    max-width: 340px;
+    border-radius: 12px !important;
+    box-shadow: 0 8px 32px rgba(0, 0, 0, 0.2) !important;
+    font-family: var(--font-body) !important;
+    z-index: 2100 !important;
+    overflow: hidden;
+}
+
+.shepherd-element .shepherd-content {
+    border-radius: 12px !important;
+    padding: 0;
+    overflow: hidden;
+}
+
+/* Header */
+.shepherd-element .shepherd-header {
+    background: var(--color-primary) !important;
+    padding: 14px 20px !important;
+    border-radius: 0 !important;
+}
+
+.shepherd-element .shepherd-title {
+    color: white !important;
+    font-size: 1rem !important;
+    font-weight: 600 !important;
+    font-family: var(--font-body) !important;
+    display: flex !important;
+    align-items: center !important;
+    gap: 6px !important;
+}
+
+.shepherd-element .shepherd-cancel-icon {
+    color: white !important;
+    opacity: 0.7;
+    font-size: 1.2rem;
+}
+
+.shepherd-element .shepherd-cancel-icon:hover { opacity: 1; }
+
+/* Body Text */
+.shepherd-element .shepherd-text {
+    padding: 16px 20px !important;
+    font-size: 0.88rem !important;
+    line-height: 1.6 !important;
+    color: var(--color-text) !important;
+}
+
+/* Footer Buttons */
+.shepherd-element .shepherd-footer {
+    padding: 0 20px 16px 20px !important;
+    border-top: none !important;
+    display: flex !important;
+    justify-content: flex-end !important;
+    gap: 8px !important;
+}
+
+.shepherd-element .shepherd-button {
+    border: none !important;
+    border-radius: 6px !important;
+    padding: 8px 16px !important;
+    font-size: 0.85rem !important;
+    font-weight: 600 !important;
+    font-family: var(--font-body) !important;
+    cursor: pointer !important;
+    transition: filter 150ms ease !important;
+}
+
+.shepherd-element .shepherd-button:hover { filter: brightness(1.1); }
+
+/* Primary Button */
+.shepherd-button-primary {
+    background: var(--color-primary) !important;
+    color: white !important;
+}
+
+/* Secondary Button */
+.shepherd-button-secondary {
+    background: var(--color-bg) !important;
+    color: var(--color-text) !important;
+    border: 1px solid var(--color-border) !important;
+}
+
+.shepherd-button-secondary:hover {
+    background: var(--color-border) !important;
+}
+
+/* Modal Overlay */
+.shepherd-modal-overlay-container {
+    z-index: 2050 !important;
+}
+
+/* Arrow Colors  */
+.shepherd-arrow:before {
+    background: var(--color-primary) !important;
+}
+
+/* Welcome Step */
+.shepherd-element:not([data-popper-placement]) {
+    position: fixed !important;
+    top: 50% !important;
+    left: 50% !important;
+    transform: translate(-50%, -50%) !important;
+}
+
+
+/* -----------------------------------------------------------------
+   4.10 Skip Button Progress Bar (Onboarding)
+   ----------------------------------------------------------------- */
+.skip-btn-locked {
+    position: relative;
+    overflow: hidden;
+    opacity: 0.6;
+}
+
+.skip-btn-locked::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 0%;
+    background: rgba(0, 0, 0, 0.12);
+    border-radius: 6px;
+    animation: skip-fill 5s linear forwards;
+    pointer-events: none;
+}
+
+@keyframes skip-fill {
+    from { width: 0%; }
+    to   { width: 100%; opacity: 0; }
+}
+
+
+/* -----------------------------------------------------------------
+   4.11 Drawing Hint Arrow after Onboarding
+   ----------------------------------------------------------------- */
+#drawing-hint-arrow {
+    position: fixed;
+    z-index: 1500;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    pointer-events: none;
+    animation: hint-fade-in 400ms ease;
+    transition: opacity 300ms ease;
+}
+
+#drawing-hint-arrow.fade-out {
+    opacity: 0;
+}
+
+.drawing-hint-label {
+    background: var(--color-primary);
+    color: white;
+    font-family: var(--font-body);
+    font-size: 0.78rem;
+    font-weight: 600;
+    padding: 6px 14px;
+    border-radius: 20px;
+    white-space: nowrap;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+    display: flex;
+    align-items: center;
+    gap: 6px;
+}
+
+.drawing-hint-chevrons {
+    display: flex;
+    gap: 0;
+    color: var(--color-primary);
+    font-size: 1.2rem;
+    font-weight: 900;
+    filter: drop-shadow(0 1px 3px rgba(0, 0, 0, 0.2));
+}
+
+.drawing-hint-chevrons i:nth-child(1) {
+    animation: chevron-pulse 1.2s ease-in-out infinite;
+    opacity: 0.4;
+}
+
+.drawing-hint-chevrons i:nth-child(2) {
+    animation: chevron-pulse 1.2s ease-in-out 0.3s infinite;
+    opacity: 0.7;
+}
+
+@keyframes chevron-pulse {
+    0%, 100% { transform: translateX(0); opacity: 0.3; }
+    50% { transform: translateX(3px); opacity: 1; }
+}
+
+@keyframes hint-fade-in {
+    from { opacity: 0; transform: translateX(-10px); }
+    to   { opacity: 1; transform: translateX(0); }
+}
+
+/* Mobile */
+@media (max-width: 768px) {
+    .shepherd-element { max-width: 300px !important; }
+    .shepherd-element .shepherd-text { font-size: 0.82rem !important; }
+}
+
+
 /* =================================================================
   SECTION 5: Admin-specific Styles (admin.php)
   ================================================================= */
@@ -1036,6 +1306,60 @@ select.form-input { cursor: pointer; }
 .back-link a { color: var(--color-text-secondary); }


+/* -----------------------------------------------------------------
+   5.8 Detail Slider (Map/Photo in Admin)
+   ----------------------------------------------------------------- */
+.detail-slider {
+    width: 220px;
+    height: 170px;
+    flex-shrink: 0;
+    position: relative;
+    border-radius: 6px;
+    overflow: hidden;
+    border: 1px solid var(--color-border);
+    background: #f0f0f0;
+}
+
+.detail-slide { width: 100%; height: 100%; }
+
+.detail-slide-photo {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    cursor: pointer;
+}
+
+.detail-slider .detail-map {
+    width: 100%;
+    height: 100%;
+    border: none;
+    border-radius: 0;
+}
+
+.slider-arrow {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    background: rgba(0, 0, 0, 0.5);
+    color: white;
+    border: none;
+    width: 28px;
+    height: 28px;
+    border-radius: 50%;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 0.7rem;
+    z-index: 1000;
+    transition: background var(--transition-fast);
+}
+
+.slider-arrow:hover { background: rgba(0, 0, 0, 0.7); }
+.slider-arrow-left { left: 4px; }
+.slider-arrow-right { right: 4px; }
+
+
 /* =================================================================
   SECTION 6: Responsive Overrides
   ================================================================= */
@@ -1075,12 +1399,66 @@ select.form-input { cursor: pointer; }
    .action-buttons .btn { justify-content: center; }
    .filter-tabs { overflow-x: auto; }
    .page-tabs { overflow-x: auto; }
+    .detail-slider { width: 100%; height: 200px; }
+

    /* Legal */
    .page-content-box { padding: 20px; }
    .page-container { padding: 0 8px; }
+
+
+/* ---------------------------------------------------------
+       6.1 Prevents iOS Auto-Zoom on Inputs
+   --------------------------------------------------------- */
+    input, textarea, select {
+        font-size: 16px !important;
    }

+
+/* ---------------------------------------------------------
+       6.2 Popup Content Height Limit on Mobile
+    --------------------------------------------------------- */
+    .leaflet-popup-content {
+        max-height: 50vh;
+        max-width: 33vh;
+        overflow-y: auto;
+    }
+
+
+/* ---------------------------------------------------------
+       6.3 Removes Admin Button Offset in Hambueger Menu
+       --------------------------------------------------------- */
+    .nav-btn-admin {
+        margin-left: 0;
+    }
+
+    .header-nav.open .nav-btn {
+        width: 100%;
+        justify-content: flex-start;
+    }
+
+/* ---------------------------------------------------------
+       6.4 Larger Popup Close Button for Touch
+       --------------------------------------------------------- */
+    .leaflet-popup-close-button {
+        font-size: 22px !important;
+        width: 30px !important;
+        height: 30px !important;
+        display: flex !important;
+        align-items: center;
+        justify-content: center;
+        padding: 0 !important;
+        right: 4px !important;
+        top: 4px !important;
+    }
+
+}
+
+
+
+
+
@media (min-width: 769px) {
    :root { --map-side-padding: 8px; }
 }
+    
--- a/README.md
+++ b/README.md
@@ -5,10 +5,8 @@ Citizen Participation Portal for Lohne (Oldenburg).
 ## Project Structure

 - `migrations/` — versioned SQL Schema Migrations
- `api/` — Backend (PHP)
 - `public/` — Frontend (HTML, CSS, JS)
 - `scripts/` — Maintenance Scripts (backup, deployment)
- `legacy/` — Reference Code from Prototype

 ## Local Setup
Author	SHA1	Message	Date
patrickzerhusen	59b9440420	layer control redesign	2026-06-12 13:16:42 +02:00
patrickzerhusen	649a2bab9c	removed scale bar	2026-06-12 12:59:50 +02:00
patrickzerhusen	9f8312b88b	larger close button for popups	2026-06-12 12:49:03 +02:00
patrickzerhusen	e1204cd311	moved sweet alert message above login modal	2026-06-12 12:46:20 +02:00
patrickzerhusen	1ffe2d5d57	removed button offset in menu	2026-06-12 12:42:19 +02:00
patrickzerhusen	f1f503af77	custom germen geoman labels	2026-06-12 12:40:07 +02:00
patrickzerhusen	9b84ff1367	pans map if popup behind header	2026-06-12 12:27:16 +02:00
patrickzerhusen	7be37bd30f	removed cancel icon from onboarding popup	2026-06-12 12:03:44 +02:00
patrickzerhusen	2039f5d03d	fixed popup auto-position with padding	2026-06-11 17:10:19 +02:00
patrickzerhusen	38c48861a9	changed fa-icon in create modal	2026-06-11 16:39:52 +02:00
patrickzerhusen	30044e00e9	progress bar skip button, labeled arrow hint	2026-06-11 16:38:25 +02:00
patrickzerhusen	23027d54d7	optimized onboarding tutorial for mobile screens	2026-06-11 15:58:03 +02:00
patrickzerhusen	5e10d19bbd	hides map controls on mobile screens if sidebar open	2026-06-11 15:36:04 +02:00
patrickzerhusen	1953df262c	prevents auto-zoom on mobile screens	2026-06-11 15:15:50 +02:00
patrickzerhusen	ac40c7d949	updatet sidebar styling and texts, included statistics in category-filter	2026-05-13 14:21:05 +02:00
patrickzerhusen	cc8bdd4ea1	updated folder structure	2026-05-06 15:59:59 +02:00
patrickzerhusen	bbb2e830b3	removed legacy	2026-05-06 15:56:31 +02:00
patrickzerhusen	dbc617ad81	changed favorite and header icons	2026-05-06 15:53:30 +02:00
patrickzerhusen	fa7d83fc36	corrected typos	2026-05-04 15:17:18 +02:00
patrickzerhusen	a062f08ed7	replaced inline javascript in admin.php with admin.js	2026-04-30 17:14:26 +02:00
patrickzerhusen	bd576665c8	replaced inline javascript in admin.php with admin.js	2026-04-30 16:56:05 +02:00
patrickzerhusen	5bfdda2340	restructured admin.js	2026-04-30 16:36:03 +02:00
patrickzerhusen	acfc50a244	added admin.js for javascript refractoring of moderation portal	2026-04-30 15:57:56 +02:00
patrickzerhusen	b4ee8fa6e0	added admin.js for javascript refractoring of moderation portal	2026-04-30 15:57:38 +02:00
patrickzerhusen	e1cf6f21f5	integrated onboarding tutorial for citizen portal	2026-04-30 15:28:45 +02:00
patrickzerhusen	ffc53f23e2	renamed buergerbeteiligungsportal to mitmachkarte	2026-04-30 13:59:38 +02:00
luptmoor	dd15e3468a	disclaimer rephrased	2026-04-29 14:29:40 +02:00
patrickzerhusen	af820b5384	commented admin.php	2026-04-28 16:01:02 +02:00
patrickzerhusen	950ac25828	fixed comment count bug in moderation portal	2026-04-28 15:50:58 +02:00
patrickzerhusen	5b77b0b524	page tab in moderation portal saved for persistence after reload	2026-04-28 15:32:24 +02:00
patrickzerhusen	bc37051619	username now saved in cookie	2026-04-28 15:25:27 +02:00
patrickzerhusen	9463530ee5	changed position of photo toggle button	2026-04-28 15:22:33 +02:00
patrickzerhusen	e68ddd0ccf	changed position of photo toggle button	2026-04-28 15:21:41 +02:00
patrickzerhusen	b18811c453	fixed comments count in citizen portal	2026-04-28 15:15:33 +02:00
patrickzerhusen	879d7c5858	photos section in moderation portal with slider	2026-04-27 15:30:33 +02:00
patrickzerhusen	be7bbfc28b	comment section in moderation portal	2026-04-27 15:17:17 +02:00