KingOfDog.de/old
Archived
1
0
Fork 0
Code Releases Activity

Holiday changes ;)

Browse Source
This commit is contained in:
Marcel
2018-10-27 12:08:54 +02:00
parent 23a79c98df
commit 774dbc3388
39 changed files with 2931 additions and 2332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/views/admin/footer.php
View File

@@ -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;
}

18
application/views/admin/project_edit.php
View File

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

7
application/views/admin/projects.php
View File

@@ -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">
@@ -146,4 +146,5 @@
</div>
</div>
</div>
</div>
</div>

6
application/views/footer.php
View File

@@ -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',

8
application/views/header.php
View File

@@ -25,6 +25,7 @@
<link rel="stylesheet" href="<?= base_url('/assets/css/lib/bootstrap.min.css') ?>">
<?php
$styles = [
'fonts.css',
'fix-bootstrap-4.css',
'custom-buttons.css',
'custom-alerts.css',
@@ -56,7 +57,7 @@
</head>
<!--/head-->
<body>
<header class="navbar navbar-expand-lg navbar-dark bg-primary fixed-top" role="banner">
<header class="navbar navbar-expand-lg navbar-dark bg-primary fixed-top <?= isset($active) && $active == 'profile' ? 'bg-custom' : '' ?>" role="banner">
<a data-track-content data-content-name="Header Logo Link" class="navbar-brand"
href="<?= base_url(); ?>">
<div class="logo-container">
@@ -302,6 +303,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>

82
application/views/home.php
View File

@@ -227,51 +227,49 @@
</div>
</section>
<section class="dark">
<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>
<?php foreach ($currentlyActiveUsers as $activeUser):
$loginTime = strtotime($activeUser['lastLogin']); ?>
<section 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>
<?php foreach ($currentlyActiveUsers as $activeUser):
$loginTime = strtotime($activeUser['lastLogin']); ?>
<div class="user-item">
<img src="<?= $activeUser['profile_picture'] ?>?w=50" alt="" class="img-fluid rounded-circle">
<div class="user-info">
<a href="<?= base_url('user/' . $activeUser['username']) ?>">
<h2><?= $activeUser['displayname'] ?></h2>
</a>
<small><?= $activeUser['follower_count'] ?> Followers | online
seit <?= str_replace(['vor ', ' ago', 'il y a '], ['', '', ''], DateTimeHumanizer::difference(new \DateTime(), new \DateTime("@$loginTime"), $_SESSION['site_lang'])) ?></small>
</div>
</div>
<?php endforeach; ?>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
<h2><?= lang('home_newest_users') ?></h2>
<?php
foreach ($newestUsers as $newestUser):
$registeredDate = strtotime($newestUser['date_created']); ?>
<div class="user-item">
<img src="<?= $activeUser['profile_picture'] ?>?w=50" alt="" class="img-fluid rounded-circle">
<img src="<?= $newestUser['profile_picture'] ?>?w=50" alt="" class="img-fluid rounded-circle">
<div class="user-info">
<a href="<?= base_url('user/' . $activeUser['username']) ?>">
<h2><?= $activeUser['displayname'] ?></h2>
<a href="<?= base_url('user/' . $newestUser['username']) ?>">
<h2><?= $newestUser['displayname'] ?></h2>
</a>
<small><?= $activeUser['follower_count'] ?> Followers | online
seit <?= str_replace(['vor ', ' ago', 'il y a '], ['', '', ''], DateTimeHumanizer::difference(new \DateTime(), new \DateTime("@$loginTime"), $_SESSION['site_lang'])) ?></small>
<small><?= $newestUser['follower_count'] ?> Followers |
registriert
seit <?= str_replace(['vor ', ' ago', 'il y a '], ['', '', ''], DateTimeHumanizer::difference(new \DateTime(), new \DateTime("@$registeredDate"), $_SESSION['site_lang'])) ?></small>
</div>
</div>
<?php endforeach; ?>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
<h2><?= lang('home_newest_users') ?></h2>
<?php
foreach ($newestUsers as $newestUser):
$registeredDate = strtotime($newestUser['date_created']); ?>
<div class="user-item">
<img src="<?= $newestUser['profile_picture'] ?>?w=50" alt="" class="img-fluid rounded-circle">
<div class="user-info">
<a href="<?= base_url('user/' . $newestUser['username']) ?>">
<h2><?= $newestUser['displayname'] ?></h2>
</a>
<small><?= $newestUser['follower_count'] ?> Followers |
registriert
seit <?= str_replace(['vor ', ' ago', 'il y a '], ['', '', ''], DateTimeHumanizer::difference(new \DateTime(), new \DateTime("@$registeredDate"), $_SESSION['site_lang'])) ?></small>
</div>
</div>
<?php endforeach; ?>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
<h2><?= lang('home_newest_posts') ?></h2>
<ul class="comment-list">
<?php foreach ($newestPosts as $newestPost):
$this->load->view('network/posts/post_item', $newestPost);
endforeach; ?>
</ul>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
<h2><?= lang('home_newest_posts') ?></h2>
<ul class="comment-list">
<?php foreach ($newestPosts as $newestPost):
$this->load->view('network/posts/post_item', $newestPost);
endforeach; ?>
</ul>
</div>
</div>
</section>
@@ -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>

6
application/views/network/posts/post_item.php
View File

@@ -4,8 +4,8 @@
use Coduo\PHPHumanizer\DateTimeHumanizer;
?>
<li class="post-item my-2" data-uuid="<?= $uuid ?>" data-username="<?= $username ?>">
<div class="comment-well">
<li class="post-item is-reply% my-2" data-uuid="<?= $uuid ?>" data-username="<?= $username ?>">
<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>

13
application/views/network/posts/user_post_content.php
View File

@@ -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'] ?>

2371
application/views/network/user/profile_edit.php
View File

File diff suppressed because it is too large Load Diff

40
application/views/network/user/profile_page_header.php
View File

@@ -18,46 +18,46 @@
</div>
<div class="col-xs-9 col-sm-10 col-md-8 col-lg-8">
<div class="row">
<div class="profile-stats">
<div class="item <?= isset($active) && $active == 'profile' ? 'active' : '' ?>">
<div class="profile-stats border-custom">
<div class="item border-custom <?= isset($active) && $active == 'profile' ? 'active' : '' ?>">
<a href="<?= base_url('user/' . $data['username']) ?>">
<span class="label"><?= lang('profile_contributions') ?></span>
<span class="count"
<span class="count <?= isset($active) && $active == 'profile' ? 'text-custom' : '' ?>"
data-count="<?= $stats['postCount'] + $stats['blogCount'] + $stats['commentCount'] ?>"><?= $stats['postCount'] + $stats['blogCount'] + $stats['commentCount'] ?></span>
</a>
</div>
<div class="item <?= isset($active) && $active == 'posts' ? 'active' : '' ?>">
<div class="item border-custom <?= isset($active) && $active == 'posts' ? 'active' : '' ?>">
<a href="<?= base_url('user/' . $data['username'] . '/posts') ?>">
<span class="label"><?= lang('profile_posts') ?></span>
<span class="count"
<span class="count <?= isset($active) && $active == 'posts' ? 'text-custom' : '' ?>"
data-count="<?= $stats['postCount'] ?>"><?= $stats['postCount'] ?></span>
</a>
</div>
<div class="item <?= isset($active) && $active == 'blog-posts' ? 'active' : '' ?>">
<div class="item border-custom <?= isset($active) && $active == 'blog-posts' ? 'active' : '' ?>">
<a href="<?= base_url('user/' . $data['username'] . '/blogposts') ?>">
<span class="label"><?= lang('profile_blog_posts') ?></span>
<span class="count"
<span class="count <?= isset($active) && $active == 'blog-posts' ? 'text-custom' : '' ?>"
data-count="<?= $stats['blogCount'] ?>"><?= $stats['blogCount'] ?></span>
</a>
</div>
<div class="item <?= isset($active) && $active == 'blog-comments' ? 'active' : '' ?>">
<div class="item border-custom <?= isset($active) && $active == 'blog-comments' ? 'active' : '' ?>">
<a href="<?= base_url('user/' . $data['username'] . '/comments') ?>">
<span class="label"><?= lang('profile_blog_comments') ?></span>
<span class="count"
<span class="count <?= isset($active) && $active == 'blog-comments' ? 'text-custom' : '' ?>"
data-count="<?= $stats['commentCount'] ?>"><?= $stats['commentCount'] ?></span>
</a>
</div>
<div class="item <?= isset($active) && $active == 'followers' ? 'active' : '' ?>">
<div class="item border-custom <?= isset($active) && $active == 'followers' ? 'active' : '' ?>">
<a href="<?= base_url('user/' . $data['username'] . '/followers') ?>">
<span class="label"><?= lang('profile_followers') ?></span>
<span class="count"
<span class="count <?= isset($active) && $active == 'followers' ? 'text-custom' : '' ?>"
data-count="<?= $stats['followerCount'] ?>"><?= $stats['followerCount'] ?></span>
</a>
</div>
<div class="item <?= isset($active) && $active == 'following' ? 'active' : '' ?>">
<div class="item border-custom <?= isset($active) && $active == 'following' ? 'active' : '' ?>">
<a href="<?= base_url('user/' . $data['username'] . '/following') ?>">
<span class="label"><?= lang('profile_followed_users') ?></span>
<span class="count"
<span class="count <?= isset($active) && $active == 'followers' ? 'text-custom' : '' ?>"
data-count="<?= $stats['followedCount'] ?>"><?= $stats['followedCount'] ?></span>
</a>
</div>
@@ -118,3 +118,17 @@
</div>
</div>
</div>
<style id="customColor">
.text-custom {
color: #2272ff;
}
.bg-custom {
background-color: #2272ff;
}
.border-custom {
border-color: #2272ff;
}
</style>