Fix #5 - Project Edit Page isn't working and more
This commit is contained in:
Marcel
@@ -15,6 +15,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
<?php
|
||||
$scripts = [
|
||||
'lib/jquery.min.js',
|
||||
'lib/popper.min.js',
|
||||
'lib/bootstrap.min.js',
|
||||
'lib/typeahead.bundle.min.js',
|
||||
'lib/datatables.js',
|
||||
@@ -28,7 +29,6 @@ defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
'custom.js'
|
||||
];
|
||||
if(isset($additionalScripts)) {
|
||||
// $scripts[] = $additionalScripts;
|
||||
foreach ($additionalScripts as $additionalScript) {
|
||||
$scripts[] = $additionalScript;
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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'] ?>
|
||||
|
||||
Reference in New Issue
Block a user