diff --git a/application/controllers/admin/Projects.php b/application/controllers/admin/Projects.php index d42391d..878074b 100644 --- a/application/controllers/admin/Projects.php +++ b/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'); diff --git a/application/models/PostsModel.php b/application/models/PostsModel.php index c614d04..ba38ffa 100644 --- a/application/models/PostsModel.php +++ b/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(); - $post['replyToUuid'] = $data[0]['uuid']; - $post['replyToUsername'] = $data[0]['username']; - $post['replyToDisplayname'] = $data[0]['displayname']; + $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(); + $data = $this->preparePostList($data); + if(!empty($data)) { + $post['replyToPost'] = $data[0]; + } else { + $post['replyToPost'] = [ + 'username' => '', + 'displayname' => '', + 'content' => 'Nicht existent', + 'date' => '', + ]; + } return $post; } diff --git a/application/models/ProjectsModel.php b/application/models/ProjectsModel.php index 2365921..a8ac722 100644 --- a/application/models/ProjectsModel.php +++ b/application/models/ProjectsModel.php @@ -1,207 +1,243 @@ load->model('projectsModel', '', TRUE); - } - - 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 { - $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 ORDER BY datetime DESC')->result_array(); + public function __construct() + { + parent::__construct(); + $this->load->model('projectsModel', '', TRUE); } - $content = $this->mergeTranslationData($content, $_SESSION['site_lang']); + 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 { + $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 ORDER BY datetime DESC')->result_array(); + } - return $content; - } + $content = $this->mergeTranslationData($content, $_SESSION['site_lang']); - 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) { - $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) { - $this->db->insert('projects', $data); - $this->db->cache_delete('projects', 'index'); - $this->db->cache_delete('admin', 'projects'); - } - - 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) { - $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'); - $this->db->cache_delete('projects', 'entry'); - $this->db->cache_delete('admin', 'projects'); - } - - public function checkIfExists($id) { - $result = $this->db->query('SELECT ID FROM projects WHERE ID = ? LIMIT 1', [$id])->result_array(); - if(!empty($result)) { - return true; - } else { - return false; + return $content; } - } - public function checkIfNameExists($name) { - $result = $this->db->query('SELECT ID FROM projects WHERE name = ? LIMIT 1', [$name])->result_array(); - if(!empty($result)) { - return true; - } else { - return false; + 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 getEntry($id) { - return $this->db->query('SELECT * FROM projects WHERE ID = ? LIMIT 1', [$id])->result_array(); - } - - 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); - - return !empty($result) ? $result[0] : null; - } - - 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) { - $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 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 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 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 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(); + public function addEntry($data) + { + $this->db->insert('projects', $data); + $this->db->cache_delete('projects', 'index'); + $this->db->cache_delete('admin', 'projects'); + } - $result = $this->mergeTranslationData($result, $_SESSION['site_lang']); + 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'); + } - return $result; - } + 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'); + $this->db->cache_delete('projects', 'entry'); + $this->db->cache_delete('admin', 'projects'); + } - 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(); + public function checkIfExists($id) + { + $result = $this->db->query('SELECT ID FROM projects WHERE ID = ? LIMIT 1', [$id])->result_array(); + if (!empty($result)) { + return true; + } else { + return false; + } + } - $result = $this->mergeTranslationData($result, $_SESSION['site_lang']); + public function checkIfNameExists($name) + { + $result = $this->db->query('SELECT ID FROM projects WHERE name = ? LIMIT 1', [$name])->result_array(); + if (!empty($result)) { + return true; + } else { + return false; + } + } - return $result; - } + public function getEntry($id) + { + return $this->db->query('SELECT * FROM projects WHERE ID = ? LIMIT 1', [$id])->result_array(); + } - 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'); - $this->db->cache_delete('projects', 'entry'); - $this->db->cache_delete('projects', 'addVote'); - $this->db->cache_delete('admin', 'projects'); - } + public function getEntryByName($name, $lang = 'de') + { + $result = $this->db->query('SELECT * FROM projects WHERE name = ? LIMIT 1', [$name])->result_array(); - 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']; - } + $result = $this->mergeTranslationData($result, $lang); - 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']; - } + return !empty($result) ? $result[0] : null; + } - public function createNewProjectDraft() { - $this->db->query('INSERT INTO projects () VALUES ()'); + 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(); + } - $this->db->cache_delete('admin', 'projects'); + public function updateCategories($postID, $categories) + { + $this->resetEntryCategories($postID); + foreach ($categories as $category) { + $this->addCategoryToEntryID($postID, $category); + } + } - $data = $this->db->query('SELECT ID FROM projects ORDER BY ID DESC LIMIT 1')->result_array(); - return $data[0]['ID']; - } + 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 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]); + 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'); + } - $this->db->cache_off(); - foreach($translations as $lang => $translation) { - $data = $this->db->query('SELECT translationID FROM projects_translations WHERE projectID = ? AND lang = ?', [$id, $lang])->result_array(); + 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); + } - if(empty($data)) { - $this->db->query('INSERT INTO projects_translations (projectID, lang) VALUES (?, ?)', [$id, $lang]); + 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']); + + return $result; + } + + 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']); + + return $result; + } + + 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'); + $this->db->cache_delete('projects', 'entry'); + $this->db->cache_delete('projects', 'addVote'); + $this->db->cache_delete('admin', 'projects'); + } + + 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) + { + $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() + { + $this->db->query('INSERT INTO projects () VALUES ()'); + + $this->db->cache_delete('admin', 'projects'); + + $data = $this->db->query('SELECT ID FROM projects ORDER BY ID DESC LIMIT 1')->result_array(); + return $data[0]['ID']; + } + + 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(); + foreach ($translations as $lang => $translation) { $data = $this->db->query('SELECT translationID FROM projects_translations WHERE projectID = ? AND lang = ?', [$id, $lang])->result_array(); + + if (empty($data)) { + $this->db->query('INSERT INTO projects_translations (projectID, lang) VALUES (?, ?)', [$id, $lang]); + + $data = $this->db->query('SELECT translationID FROM projects_translations WHERE projectID = ? AND lang = ?', [$id, $lang])->result_array(); + } + + $translationID = $data[0]['translationID']; + + $this->db->query('UPDATE projects_translations SET title = ?, description = ?, content = ?, downloadName = ?, openSourceName = ?, customLinkName = ? WHERE translationID = ?', array_merge($translation, [$download['name'], $openSource['name'], $customLink['name'], $translationID])); } + $this->db->cache_on(); - $translationID = $data[0]['translationID']; - - $this->db->query('UPDATE projects_translations SET title = ?, description = ?, content = ?, downloadName = ?, openSourceName = ?, customLinkName = ? WHERE translationID = ?', array_merge($translation, [$download['name'], $openSource['name'], $customLink['name'], $translationID])); + $this->db->cache_delete('admin', 'projects'); + $this->db->cache_delete('projects', 'index'); + $this->db->cache_delete('projects', 'entry'); } - $this->db->cache_on(); - $this->db->cache_delete('admin', 'projects'); - $this->db->cache_delete('projects', 'index'); - $this->db->cache_delete('projects', 'entry'); - } - - 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]; + public function mergeFullTranslationData($postList) + { + foreach ($postList as $i => $post) { + $data = $this->db->query('SELECT * FROM projects_translations WHERE projectID = ? ORDER BY lang', [$post['ID']])->result_array(); + foreach ($data as $lang) { + $postList[$i]['translations'][$lang['lang']] = $lang; } } - - $postList[$i] = array_merge($post, $merged); + return $postList; } - return $postList; } -} diff --git a/application/views/admin/footer.php b/application/views/admin/footer.php index ab2bdb6..af8c476 100644 --- a/application/views/admin/footer.php +++ b/application/views/admin/footer.php @@ -12,10 +12,13 @@ defined('BASEPATH') OR exit('No direct script access allowed'); + + + + required value="">
@@ -162,13 +162,13 @@ + required>
- +
@@ -177,20 +177,20 @@
+ value="">
+ class="form-control">
- +
@@ -199,20 +199,20 @@
+ value="">
+ class="form-control">
- +
diff --git a/application/views/admin/projects.php b/application/views/admin/projects.php index ad4eac5..9adb8f4 100644 --- a/application/views/admin/projects.php +++ b/application/views/admin/projects.php @@ -117,8 +117,8 @@ - + diff --git a/application/views/footer.php b/application/views/footer.php index a121f15..dfd0d03 100644 --- a/application/views/footer.php +++ b/application/views/footer.php @@ -102,12 +102,10 @@ - - - -
-
-
-
-
-

- +
+
+
+

+ +
+ + +
+ +
+
+

+
- +
-
-
-

- -
- - -
- -
-
-

-
    - load->view('network/posts/post_item', $newestPost); - endforeach; ?> -
-
+
+
+

+
    + load->view('network/posts/post_item', $newestPost); + endforeach; ?> +
@@ -282,7 +280,8 @@

Portfolio

- 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.

Projekte ansehen
@@ -413,7 +412,8 @@

Blog

- 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.

Zum Blog
diff --git a/application/views/network/posts/post_item.php b/application/views/network/posts/post_item.php index 74f8061..42438eb 100644 --- a/application/views/network/posts/post_item.php +++ b/application/views/network/posts/post_item.php @@ -4,8 +4,8 @@ use Coduo\PHPHumanizer\DateTimeHumanizer; ?> -
  • -
    +
  • +
    >
    @@ -24,7 +24,7 @@ als Antwort an - @ + @ diff --git a/application/views/network/posts/user_post_content.php b/application/views/network/posts/user_post_content.php index 33f873c..8f1ea90 100644 --- a/application/views/network/posts/user_post_content.php +++ b/application/views/network/posts/user_post_content.php @@ -7,14 +7,23 @@ +
    +
      + load->view('network/posts/post_item', $post['replyToPost']) + ?> +
    +
    +
    -
    +
    -
    +

    diff --git a/assets/css/main.css b/assets/css/main.css index bd97800..0dcdea9 100644 --- a/assets/css/main.css +++ b/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 { diff --git a/assets/js/custom.js b/assets/js/custom.js index 28b4c09..69b53a6 100644 --- a/assets/js/custom.js +++ b/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', diff --git a/assets/js/main.js b/assets/js/main.js index 3700d93..38acea9 100644 --- a/assets/js/main.js +++ b/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') + } +}); \ No newline at end of file