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

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

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>

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>