Merge branch 'fix-projects-backend' of KingOfDog/kingofdog-website into master

application/controllers/admin/Projects.php

@@ -32,7 +32,8 @@
 
             if ($edit) {
                 if ($this->ProjectsModel->checkIfExists($id)) {
-                    $content = $this->ProjectsModel->getEntry($id)[0];
+                    $content = $this->ProjectsModel->getEntry($id);
+                    $content = $this->ProjectsModel->mergeFullTranslationData($content)[0];
                     $projectCategories = $this->ProjectsModel->getEntryCategories($id);
                 } else {
                     redirect(base_url('admin/projects/edit'));
@@ -42,7 +43,7 @@
             $categories = $this->ProjectsModel->getCategories();
 
             $this->load->view('admin/sidebar', ['title' => 'Projekt erstellen', 'additionalStyles' => ['lib/content-tools/content-tools.min.css', 'project-edit.css']]);
-            $this->load->view('admin/project_edit', ['edit' => -1, 'categories' => $categories, 'content' => $content, 'pCategories' => $projectCategories]);
+            $this->load->view('admin/project_edit', ['edit' => $id === NULL ? -1 : $id, 'categories' => $categories, 'content' => $content, 'pCategories' => $projectCategories]);
             $this->load->view('admin/footer', ['additionalScripts' => ['lib/content-tools/content-tools.min.js', 'project-edit.js']]);
         }
 
@@ -58,6 +59,12 @@
             $translations['de']['title'] = $this->input->post('titleDE');
             $translations['de']['description'] = $this->input->post('headlineDE');
             $translations['de']['content'] = $this->input->post('contentDE');
+            $translations['en']['title'] = $this->input->post('titleEN');
+            $translations['en']['description'] = $this->input->post('headlineEN');
+            $translations['en']['content'] = $this->input->post('contentEN');
+            $translations['fr']['title'] = $this->input->post('titleFR');
+            $translations['fr']['description'] = $this->input->post('headlineFR');
+            $translations['fr']['content'] = $this->input->post('contentFR');
 
             $url = $this->input->post('url');
 

application/models/PostsModel.php

@@ -229,10 +229,18 @@
         }
 
         private function mergeReplyData($post) {
-            $data = $this->db->query('SELECT uuid, username, displayname FROM user_posts LEFT JOIN users ON users.ID = user_posts.user_id WHERE user_posts.ID = ?', [$post['reply_to']])->result_array();
+            $data = $this->db->query('SELECT p.*, username, displayname FROM user_posts p LEFT JOIN users ON users.ID = p.user_id WHERE p.ID = ?', [$post['reply_to']])->result_array();
-            $post['replyToUuid'] = $data[0]['uuid'];
+            $data = $this->preparePostList($data);
-            $post['replyToUsername'] = $data[0]['username'];
+            if(!empty($data)) {
-            $post['replyToDisplayname'] = $data[0]['displayname'];
+                $post['replyToPost'] = $data[0];
+            } else {
+                $post['replyToPost'] = [
+                    'username' => '',
+                    'displayname' => '',
+                    'content' => 'Nicht existent',
+                    'date' => '',
+                ];
+            }
 
             return $post;
         }

application/models/ProjectsModel.php

@@ -1,14 +1,17 @@
 <?php
     defined('BASEPATH') OR exit('No direct script access allowed');
 
-class ProjectsModel extends CI_Model {
+    class ProjectsModel extends CI_Model
+    {
 
-    public function __construct() {
+        public function __construct()
+        {
             parent::__construct();
             $this->load->model('projectsModel', '', TRUE);
         }
 
-    public function getEntries($category) {
+        public function getEntries($category)
+        {
             if ($category !== 'all') {
                 $content = $this->db->query('SELECT *, (SELECT (SELECT COUNT(*) FROM projects_entry_votes WHERE projectID = p.ID AND type = 1) - (SELECT COUNT(*) FROM projects_entry_votes WHERE projectID = p.ID AND type = -1)) voteCount FROM projects p WHERE ID IN (SELECT projectID FROM projects_entry_categories WHERE categoryID = ?) ORDER BY datetime DESC', [$category])->result_array();
             } else {
@@ -20,32 +23,60 @@ class ProjectsModel extends CI_Model {
             return $content;
         }
 
-    public function getCategories() {
+        public function mergeTranslationData($postList, $lang = 'de')
+        {
+            foreach ($postList as $i => $post) {
+                $data = $this->db->query('SELECT * FROM projects_translations WHERE projectID = ? AND (lang = ? OR lang = ?) ORDER BY lang', [$post['ID'], 'de', $lang])->result_array();
+                if (sizeof($data) == 1) {
+                    $postList[$i] = array_merge($post, $data[0]);
+                    continue;
+                }
+
+                $merged = [];
+                foreach ($data[0] as $key => $value) {
+                    if (($value == NULL && $data[1][$key] == NULL) || ($value != NULL && $data[1][$key] == NULL)) {
+                        $merged[$key] = $value;
+                    } else {
+                        $merged[$key] = $data[1][$key];
+                    }
+                }
+
+                $postList[$i] = array_merge($post, $merged);
+            }
+            return $postList;
+        }
+
+        public function getCategories()
+        {
             $collections = $this->db->query('SELECT c.*, count(p.projectID) count FROM projects_categories c LEFT JOIN projects_entry_categories p ON c.ID = p.categoryID GROUP BY c.ID ORDER BY c.collection')->result_array();
             return $collections;
         }
 
-    public function editEntry($data, $id) {
+        public function editEntry($data, $id)
+        {
             $this->db->update('projects', $data, ['id' => $id]);
             $this->db->cache_delete('projects', 'index');
             $this->db->cache_delete('projects', 'entry');
             $this->db->cache_delete('admin', 'projects');
         }
 
-    public function addEntry($data) {
+        public function addEntry($data)
+        {
             $this->db->insert('projects', $data);
             $this->db->cache_delete('projects', 'index');
             $this->db->cache_delete('admin', 'projects');
         }
 
-    public function delete($id) {
+        public function delete($id)
+        {
             $this->db->query('DELETE FROM projects WHERE ID = ? LIMIT 1', [$id]);
             $this->db->cache_delete('projects', 'index');
             $this->db->cache_delete('projects', 'entry');
             $this->db->cache_delete('admin', 'projects');
         }
 
-    public function deleteCategory($id) {
+        public function deleteCategory($id)
+        {
             $this->db->query('DELETE FROM projects_entry_categories WHERE categoryID = ?', [$id]);
             $this->db->query('DELETE FROM projects_categories WHERE ID = ? LIMIT 1', [$id]);
             $this->db->cache_delete('projects', 'index');
@@ -53,7 +84,8 @@ class ProjectsModel extends CI_Model {
             $this->db->cache_delete('admin', 'projects');
         }
 
-    public function checkIfExists($id) {
+        public function checkIfExists($id)
+        {
             $result = $this->db->query('SELECT ID FROM projects WHERE ID = ? LIMIT 1', [$id])->result_array();
             if (!empty($result)) {
                 return true;
@@ -62,7 +94,8 @@ class ProjectsModel extends CI_Model {
             }
         }
 
-    public function checkIfNameExists($name) {
+        public function checkIfNameExists($name)
+        {
             $result = $this->db->query('SELECT ID FROM projects WHERE name = ? LIMIT 1', [$name])->result_array();
             if (!empty($result)) {
                 return true;
@@ -71,11 +104,13 @@ class ProjectsModel extends CI_Model {
             }
         }
 
-    public function getEntry($id) {
+        public function getEntry($id)
+        {
             return $this->db->query('SELECT * FROM projects WHERE ID = ? LIMIT 1', [$id])->result_array();
         }
 
-    public function getEntryByName($name, $lang = 'de') {
+        public function getEntryByName($name, $lang = 'de')
+        {
             $result = $this->db->query('SELECT * FROM projects WHERE name = ? LIMIT 1', [$name])->result_array();
 
             $result = $this->mergeTranslationData($result, $lang);
@@ -83,37 +118,43 @@ class ProjectsModel extends CI_Model {
             return !empty($result) ? $result[0] : null;
         }
 
-    public function getEntryCategories($id) {
+        public function getEntryCategories($id)
+        {
             return $this->db->query('SELECT * FROM projects_categories WHERE ID IN (SELECT categoryID FROM projects_entry_categories WHERE projectID = ?)', [$id])->result_array();
         }
 
-    public function resetEntryCategories($postID) {
+        public function updateCategories($postID, $categories)
-        $this->db->query('DELETE FROM projects_entry_categories WHERE projectID = ?', $postID);
+        {
-        $this->db->cache_delete('projects', 'index');
-        $this->db->cache_delete('projects', 'entry');
-        $this->db->cache_delete('admin', 'projects');
-    }
-
-    public function addCategoryToEntryID($postID, $categoryID) {
-        $this->db->query('INSERT INTO projects_entry_categories (projectID, categoryID) VALUES (?, ?)', [$postID, $categoryID]);
-        $this->db->cache_delete('projects', 'index');
-        $this->db->cache_delete('projects', 'entry');
-        $this->db->cache_delete('admin', 'projects');
-    }
-
-    public function updateCategories($postID, $categories) {
             $this->resetEntryCategories($postID);
             foreach ($categories as $category) {
                 $this->addCategoryToEntryID($postID, $category);
             }
         }
 
-    public function addCategoryToEntryName($name, $categoryID) {
+        public function resetEntryCategories($postID)
+        {
+            $this->db->query('DELETE FROM projects_entry_categories WHERE projectID = ?', $postID);
+            $this->db->cache_delete('projects', 'index');
+            $this->db->cache_delete('projects', 'entry');
+            $this->db->cache_delete('admin', 'projects');
+        }
+
+        public function addCategoryToEntryID($postID, $categoryID)
+        {
+            $this->db->query('INSERT INTO projects_entry_categories (projectID, categoryID) VALUES (?, ?)', [$postID, $categoryID]);
+            $this->db->cache_delete('projects', 'index');
+            $this->db->cache_delete('projects', 'entry');
+            $this->db->cache_delete('admin', 'projects');
+        }
+
+        public function addCategoryToEntryName($name, $categoryID)
+        {
             $id = $this->db->query('SELECT ID FROM projects WHERE name = ? LIMIT 1', [$name])->result_array()[0];
             $this->addCategoryToEntryID(intval($id['ID']), $categoryID);
         }
 
-    public function getPrevProject($id) {
+        public function getPrevProject($id)
+        {
             $result = $this->db->query('SELECT * FROM projects WHERE datetime < (SELECT datetime FROM projects WHERE ID = ?) ORDER BY datetime DESC LIMIT 1', [$id])->result_array();
 
             $result = $this->mergeTranslationData($result, $_SESSION['site_lang']);
@@ -121,7 +162,8 @@ class ProjectsModel extends CI_Model {
             return $result;
         }
 
-    public function getNextProject($id) {
+        public function getNextProject($id)
+        {
             $result = $this->db->query('SELECT * FROM projects WHERE datetime > (SELECT datetime FROM projects WHERE ID = ?) ORDER BY datetime ASC LIMIT 1', [$id])->result_array();
 
             $result = $this->mergeTranslationData($result, $_SESSION['site_lang']);
@@ -129,7 +171,8 @@ class ProjectsModel extends CI_Model {
             return $result;
         }
 
-    public function addVote($projectID, $userID, $voteType) {
+        public function addVote($projectID, $userID, $voteType)
+        {
             $this->db->query('DELETE FROM projects_entry_votes WHERE projectID = ? AND userID = ?', [$projectID, $userID]);
             $this->db->query('INSERT INTO projects_entry_votes (projectID, userID, type) VALUES (?, ?, ?)', [$projectID, $userID, $voteType]);
             $this->db->cache_delete('projects', 'index');
@@ -138,19 +181,22 @@ class ProjectsModel extends CI_Model {
             $this->db->cache_delete('admin', 'projects');
         }
 
-    public function getVoteCount($projectID) {
+        public function getVoteCount($projectID)
+        {
             $result = $this->db->query('SELECT (SELECT COUNT(*) FROM projects_entry_votes WHERE projectID = ? AND type = 1) - (SELECT COUNT(*) FROM projects_entry_votes WHERE projectID = ? AND type = -1) voteCount', [$projectID, $projectID])->result_array();
             return $result[0]['voteCount'];
         }
 
-    public function getUserVoteType($projectID, $userID) {
+        public function getUserVoteType($projectID, $userID)
+        {
             $result = $this->db->query('SELECT type FROM projects_entry_votes WHERE projectID = ? AND userID = ?', [$projectID, $userID])->result_array();
             if (empty($result))
                 return 0;
             return $result[0]['type'];
         }
 
-    public function createNewProjectDraft() {
+        public function createNewProjectDraft()
+        {
             $this->db->query('INSERT INTO projects () VALUES ()');
 
             $this->db->cache_delete('admin', 'projects');
@@ -159,7 +205,8 @@ class ProjectsModel extends CI_Model {
             return $data[0]['ID'];
         }
 
-    public function updateProject($id, $translations, $url, $download, $openSource, $customLink, $date, $image) {
+        public function updateProject($id, $translations, $url, $download, $openSource, $customLink, $date, $image)
+        {
             $this->db->query('UPDATE projects SET name = ?, isDownloadable = ?, downloadLink = ?, isOpenSource = ?, openSourceLink = ?, customLink = ?, datetime = ?, source = ? WHERE ID = ?', [$url, $download['available'], $download['link'], $openSource['available'], $openSource['link'], $customLink['link'], $date, $image, $id]);
 
             $this->db->cache_off();
@@ -183,24 +230,13 @@ class ProjectsModel extends CI_Model {
             $this->db->cache_delete('projects', 'entry');
         }
 
-    public function mergeTranslationData($postList, $lang = 'de') {
+        public function mergeFullTranslationData($postList)
+        {
             foreach ($postList as $i => $post) {
-            $data = $this->db->query('SELECT * FROM projects_translations WHERE projectID = ? AND (lang = ? OR lang = ?) ORDER BY lang', [$post['ID'], 'de', $lang])->result_array();
+                $data = $this->db->query('SELECT * FROM projects_translations WHERE projectID = ? ORDER BY lang', [$post['ID']])->result_array();
-            if(sizeof($data) == 1) {
+                foreach ($data as $lang) {
-                $postList[$i] = array_merge($post, $data[0]);
+                    $postList[$i]['translations'][$lang['lang']] = $lang;
-                continue;
                 }
-
-            $merged = [];
-            foreach ($data[0] as $key => $value) {
-                if(($value == NULL && $data[1][$key] == NULL) || ($value != NULL && $data[1][$key] == NULL)) {
-                    $merged[$key] = $value;
-                } else {
-                    $merged[$key] = $data[1][$key];
-                }
-            }
-
-            $postList[$i] = array_merge($post, $merged);
             }
             return $postList;
         }

application/views/admin/footer.php

@@ -12,10 +12,13 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 </div>
 </div>
 
+<script src="/assets/js/lib/jquery.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+
 <?php
     $scripts = [
         'lib/jquery.min.js',
-        'lib/bootstrap.min.js',
+        'lib/bootstrap-3.3.7.min.js',
         'lib/typeahead.bundle.min.js',
         'lib/datatables.js',
         'lib/jquery.tagsinput.min.js',
@@ -28,7 +31,6 @@ defined('BASEPATH') OR exit('No direct script access allowed');
         'custom.js'
     ];
     if(isset($additionalScripts)) {
-//        $scripts[] = $additionalScripts;
         foreach ($additionalScripts as $additionalScript) {
             $scripts[] = $additionalScript;
         }

application/views/admin/project_edit.php

@@ -154,7 +154,7 @@
                                             <div class="form-group">
                                                 <label for="title">Titel (Deutsch)</label>
                                                 <input type="text" class="form-control" name="title" id="title" placeholder="Titel auf Deutsch"
-                                                       required value="<?= isset($content) ? $content['title'] : '' ?>">
+                                                       required value="<?= isset($content) && isset($content['translations']['de']) ? $content['translations']['de']['title'] : '' ?>">
                                             </div>
                                             <!-- Headline input -->
                                             <div class="form-group">
@@ -162,13 +162,13 @@
                                                 <textarea name="headline" id="headline" rows="2"
                                                           placeholder="Headline auf Deutsch"
                                                           class="form-control"
-                                                          required><?= isset($content) ? $content['headline'] : '' ?></textarea>
+                                                          required><?= isset($content) && isset($content['translations']['de']) ? $content['translations']['de']['description'] : '' ?></textarea>
                                             </div>
                                             <!-- Description input -->
                                             <div class="form-group">
                                                 <label for="description">Beschreibung (Deutsch)</label>
                                                 <div data-editable data-name="content-german" id="content">
-                                                    <?= isset($content) ? $content['description'] : '' ?>
+                                                    <?= isset($content) && isset($content['translations']['de']) ? $content['translations']['de']['content'] : '' ?>
                                                 </div>
                                             </div>
                                         </div>
@@ -177,20 +177,20 @@
                                             <div class="form-group">
                                                 <label for="titleEnglish">Titel (Englisch)</label>
                                                 <input type="text" class="form-control" name="titleEnglish" id="titleEnglish" placeholder="Titel auf Englisch"
-                                                       value="<?= isset($content) ? $content['titleEnglish'] : '' ?>">
+                                                       value="<?= isset($content) && isset($content['translations']['en']) ? $content['translations']['en']['title'] : '' ?>">
                                             </div>
                                             <!-- Headline English input -->
                                             <div class="form-group">
                                                 <label for="headlineEnglish">Headline (Englisch)</label>
                                                 <textarea name="headlineEnglish" id="headlineEnglish" rows="2"
                                                           placeholder="Headline auf Englisch"
-                                                          class="form-control"><?= isset($content) ? $content['headlineEnglish'] : '' ?></textarea>
+                                                          class="form-control"><?= isset($content) && isset($content['translations']['en']) ? $content['translations']['en']['description'] : '' ?></textarea>
                                             </div>
                                             <!-- Description English input -->
                                             <div class="form-group">
                                                 <label for="descriptionEnglish">Beschreibung (Englisch)</label>
                                                 <div data-editable data-name="content-english" id="contentEnglish">
-                                                    <?= isset($content) ? $content['descriptionEnglish'] : '' ?>
+                                                    <?= isset($content) && isset($content['translations']['en']) ? $content['translations']['en']['content'] : '' ?>
                                                 </div>
                                             </div>
                                         </div>
@@ -199,20 +199,20 @@
                                             <div class="form-group">
                                                 <label for="titleFrench">Titel (Französisch)</label>
                                                 <input type="text" class="form-control" name="titleFrench" id="titleFrench" placeholder="Titel auf Französisch"
-                                                       value="<?= isset($content) ? $content['titleFrench'] : '' ?>">
+                                                       value="<?= isset($content) && isset($content['translations']['fr']) ? $content['translations']['fr']['title'] : '' ?>">
                                             </div>
                                             <!-- Headline French input -->
                                             <div class="form-group">
                                                 <label for="headlineFrench">Headline (Französisch)</label>
                                                 <textarea name="headlineFrench" id="headlineFrench" rows="2"
                                                           placeholder="Headline auf Französisch"
-                                                          class="form-control"><?= isset($content) ? $content['headlineFrench'] : '' ?></textarea>
+                                                          class="form-control"><?= isset($content) && isset($content['translations']['fr']) ? $content['translations']['fr']['description'] : '' ?></textarea>
                                             </div>
                                             <!-- Description French input -->
                                             <div class="form-group">
                                                 <label for="descriptionFrench">Beschreibung (Französisch)</label>
                                                 <div data-editable data-name="content-french" id="contentFrench">
-                                                    <?= isset($content) ? $content['descriptionFrench'] : '' ?>
+                                                    <?= isset($content) && isset($content['translations']['fr']) ? $content['translations']['fr']['content'] : '' ?>
                                                 </div>
                                             </div>
                                         </div>

application/views/admin/projects.php

@@ -117,8 +117,8 @@
                             <?php } ?>
                             </tbody>
                         </table>
-                        <div class="modal fade" id="deleteModal" tabindex="-1" role="dialog"
+
-                             aria-labelledby="deleteModalTitle">
+                        <div class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="deleteModalTitle">
                             <div class="modal-dialog" role="document">
                                 <div class="modal-content">
                                     <div class="modal-header">
@@ -147,3 +147,4 @@
         </div>
     </div>
 </div>
+

application/views/footer.php

@@ -102,12 +102,10 @@
     </div>
 </footer>
 <!--/#footer-->
-<script src="/assets/js/lib/jquery.min.js"></script>
-<script src="/assets/js/lib/popper.min.js"></script>
-<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>-->
-<!--<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>-->
 <?php
     $scripts = [
+        'lib/jquery.min.js',
+        'lib/popper.min.js',
         'lib/bootstrap.min.js',
         'lib/jquery.PageScroll2id.min.js',
         'lib/jquery.mobile.custom.min.js',

application/views/header.php

@@ -302,6 +302,11 @@
 <div class="side-navigation-background"></div>
 <div class="btn-floating">
     <ul class="btn-floating-list">
+        <li>
+            <a href="#" data-title="Dark Theme" id="switchDarkmode">
+                <i class="fa fa-moon"></i>
+            </a>
+        </li>
         <li>
             <a data-title="<?= lang('header_contact') ?>" href="#" data-toggle="modal" data-target="#contactModal">
                 <i class="fa fa-envelope"></i>

application/views/home.php

@@ -227,8 +227,7 @@
     </div>
 </section>
 
-<section class="dark">
+<section class="container">
-    <div class="container">
     <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
             <h2><?= lang('home_active_users') ?></h2>
@@ -273,7 +272,6 @@
             </ul>
         </div>
     </div>
-    </div>
 </section>
 
 <section class="section-parallax section-orange">
@@ -282,7 +280,8 @@
             <div class="col-md-6">
                 <h1>Portfolio</h1>
                 <p class="lead">
-                    Seit ich angefangen habe YouTube-Videos hochzuladen, bin ich auch langsam in Richtung Design, Programmieren, Fotografie, Videoschnitt, Animation etc. hineingeraten. Mit der Zeit haben sich einige mehr oder weniger gute Projekte angehäuft, die ihr in meinem Portfolio betrachten könnt.
+                    Seit ich angefangen habe YouTube-Videos hochzuladen, bin ich auch langsam in Richtung Design, Programmieren, Fotografie, Videoschnitt, Animation etc. hineingeraten. Mit der Zeit haben sich einige mehr oder weniger gute Projekte angehäuft,
+                    die ihr in meinem Portfolio betrachten könnt.
                 </p>
                 <a href="<?= base_url('projects') ?>" class="btn btn-default round">Projekte ansehen</a>
             </div>
@@ -413,7 +412,8 @@
             <div class="col-md-6">
                 <h1>Blog</h1>
                 <p class="lead">
-                    Seid ihr an Programmierung, Design, Technik, Internet, Aktuellem, Gaming, zufälligem Kram und mehr interessiert? Dann ist mein Blog zwar nicht die erste Anlaufstelle, dennoch könnte man ihn eventuell ein-zwei Mal berücksichtigen. Schaut doch einfach mal vorbei und lasst euch selbst überraschen.
+                    Seid ihr an Programmierung, Design, Technik, Internet, Aktuellem, Gaming, zufälligem Kram und mehr interessiert? Dann ist mein Blog zwar nicht die erste Anlaufstelle, dennoch könnte man ihn eventuell ein-zwei Mal berücksichtigen. Schaut
+                    doch einfach mal vorbei und lasst euch selbst überraschen.
                 </p>
                 <a href="<?= base_url('blog') ?>" class="btn btn-default round">Zum Blog</a>
             </div>

application/views/network/posts/post_item.php

@@ -4,8 +4,8 @@
     use Coduo\PHPHumanizer\DateTimeHumanizer;
 
 ?>
-<li class="post-item my-2" data-uuid="<?= $uuid ?>" data-username="<?= $username ?>">
+<li class="post-item is-reply% my-2" data-uuid="<?= $uuid ?>" data-username="<?= $username ?>">
-    <div class="comment-well">
+    <div class="comment-well" <?= isset($hideShadows) && $hideShadows ? 'style="box-shadow: none;padding:0"' : '' ?>>
         <div class="post-non-content">
             <a href="<?= base_url('user/' . $username) ?>" target="_blank">
                 <img src="<?= $profile_picture ?>?w=100" class="img-fluid">
@@ -24,7 +24,7 @@
                         <small>
                             <i class="fa fa-reply"></i>
                             als Antwort an
-                            <a href="#" onclick="showFullPost('<?= $replyToUuid ?>', '<?= $replyToUsername ?>')">@<?= $replyToDisplayname ?></a>
+                            <a href="#" onclick="showFullPost('<?= $replyToPost['uuid'] ?>', '<?= $replyToPost['username'] ?>')">@<?= $replyToPost['displayname'] ?></a>
                         </small>
                     <?php endif; ?>
                 </h3>

application/views/network/posts/user_post_content.php

@@ -7,14 +7,23 @@
 
 <?= $message; ?>
 
+<div class="row justify-content-center">
+    <ul class="comment-list">
+        <?php
+            $post['replyToPost']['hideShadows'] = true;
+            $this->load->view('network/posts/post_item', $post['replyToPost'])
+        ?>
+    </ul>
+</div>
+
 <div class="row">
-    <div class="col-sm-2">
+    <div class="post-non-content">
         <a href="<?= base_url('user/' . $post['username']) ?>">
             <img src="<?= $post['profile_picture'] ?>?w=75" alt="" class="img-fluid rounded-circle">
         </a>
     </div>
 
-    <div class="col-sm-10">
+    <div class="col">
         <h4>
             <a href="<?= base_url('user/' . $post['username']) ?>">
                 <?= $post['displayname'] ?>

assets/css/main.css

@@ -20,6 +20,30 @@ body > section {
     padding: 50px 0;
 }
 
+.dark {
+    background: #222222;
+    color: #FAFAFA;
+}
+
+.dark h1, .dark h2, .dark h3 {
+    color: #fafafa;
+}
+
+
+.dark .btn.btn-default {
+    background: #222222;
+    color: #FAFAFA;
+    border: 2px solid #FAFAFA;
+}
+
+.dark .btn.btn-default:hover,
+.dark .btn.btn-default:focus,
+.dark .btn.btn-default:active,
+.dark .btn.btn-default.active {
+    background: #FAFAFA;
+    color: #222222;
+}
+
 .primary p, .secondary p, .turquoise p, .green-sea p, .sun-flower p, .section-orange p, .section-green p, .nephrits p, .carrot p, .pumkin p, .peter-river p, .belize-hole p, .section-red p, .pomegranate p, .amethyst p, .wisteria p, .clouds .silver p, .wet-asphalt p, .midnight-blue p, .concrete p, .asbestos p, .primary h2, .secondary h2, .turquoise h2, .green-sea h2, .sun-flower h2, .section-orange h2, .section-green h2, .nephrits h2, .carrot h2, .pumkin h2, .peter-river h2, .belize-hole h2, .section-red h2, .pomegranate h2, .amethyst h2, .wisteria h2, .clouds .silver h2, .wet-asphalt h2, .midnight-blue h2, .concrete h2, .asbestos h2, .primary h3, .secondary h3, .turquoise h3, .green-sea h3, .sun-flower h3, .section-orange h3, .section-green h3, .nephrits h3, .carrot h3, .pumkin h3, .peter-river h3, .belize-hole h3, .section-red h3, .pomegranate h3, .amethyst h3, .wisteria h3, .clouds .silver h3, .wet-asphalt h3, .midnight-blue h3, .concrete h3, .asbestos h3, .primary h4, .secondary h4, .turquoise h4, .green-sea h4, .sun-flower h4, .section-orange h4, .section-green h4, .nephrits h4, .carrot h4, .pumkin h4, .peter-river h4, .belize-hole h4, .section-red h4, .pomegranate h4, .amethyst h4, .wisteria h4, .clouds .silver h4, .wet-asphalt h4, .midnight-blue h4, .concrete h4, .asbestos h4, .primary h5, .secondary h5, .turquoise h5, .green-sea h5, .sun-flower h5, .section-orange h5, .section-green h5, .nephrits h5, .carrot h5, .pumkin h5, .peter-river h5, .belize-hole h5, .section-red h5, .pomegranate h5, .amethyst h5, .wisteria h5, .clouds .silver h5, .wet-asphalt h5, .midnight-blue h5, .concrete h5, .asbestos h5, .primary h6, .secondary h6, .turquoise h6, .green-sea h6, .sun-flower h6, .section-orange h6, .section-green h6, .nephrits h6, .carrot h6, .pumkin h6, .peter-river h6, .belize-hole h6, .section-red h6, .pomegranate h6, .amethyst h6, .wisteria h6, .clouds .silver h6, .wet-asphalt h6, .midnight-blue h6, .concrete h6, .asbestos h6 {
     color: #fff;
 }
@@ -143,30 +167,6 @@ body > section {
     margin: 0;
 }
 
-section.dark {
-    background: #222222;
-    color: #FAFAFA;
-}
-
-section.dark h1, section.dark h2, section.dark h3 {
-    color: #fafafa;
-}
-
-
-section.dark .btn.btn-default {
-    background: #222222;
-    color: #FAFAFA;
-    border: 2px solid #FAFAFA;
-}
-
-section.dark .btn.btn-default:hover,
-section.dark .btn.btn-default:focus,
-section.dark .btn.btn-default:active,
-section.dark .btn.btn-default.active {
-    background: #FAFAFA;
-    color: #222222;
-}
-
 #title h1 {
     margin: 0;
     font-size: 36px;
@@ -1116,7 +1116,8 @@ ul#downloadSlider a.active .overlay {
     border-radius: 50%;
 }
 
-.comment-list .comment-well .post-non-content {
+.comment-list .comment-well .post-non-content,
+.postFullviewModal .post-non-content {
     display: inline-block;
     width: 100px;
     padding: 10px;
@@ -1560,6 +1561,7 @@ ul#downloadSlider a.active .overlay {
     transition: 0.4s ease;
     visibility: hidden;
     opacity: 0;
+    white-space: nowrap;
 }
 
 .btn-floating .btn-floating-shadow {

assets/js/custom.js

@@ -204,7 +204,6 @@ $(function () {
     } else {
         defaultDate = new Date();
     }
-    console.log('lteasdf');
     $('#datetimepicker').datetimepicker({
         format: 'DD.MM.YYYY HH:mm',
         stepping: '10',

assets/js/main.js

@@ -343,3 +343,15 @@ function loadNotificationsAsync() {
 }
 
 loadNotificationsAsync();
+
+$('#switchDarkmode').click(function (event) {
+    event.preventDefault();
+    $('body').toggleClass('dark');
+    if($('body').hasClass('dark')) {
+        $(this).find('.fa-moon').removeClass('fa').addClass('far');
+        $(this).attr('data-title', 'Light Theme')
+    } else {
+        $(this).find('.fa-moon').removeClass('far').addClass('fa');
+        $(this).attr('data-title', 'Dark Theme')
+    }
+});