Archived
1
0

Holiday changes ;)

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

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>

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

File diff suppressed because it is too large Load Diff

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>