Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/app/Http/Controllers/UserEventController.php
This commit is contained in:
Anders
2020-08-07 10:52:25 +02:00
8 changed files with 112 additions and 11 deletions
@@ -11,11 +11,16 @@
@section("content")
<style>
.toggle__label::before, .toggle__label::after {
border-color: black;
}
.toggle__text::before {
border-color: black;
}
.ck-editor__main {
margin-bottom: 1rem;
}
</style>
<script src="https://cdn.ckeditor.com/ckeditor5/21.0.0/classic/ckeditor.js"></script>
<h1>Opret Aktivitet:</h1>
<form method="post" action="{{ route("events.store") }}">
@csrf
@@ -27,6 +32,12 @@
<textarea name="description" id="editor"></textarea>
<label for="date">Event dato:</label>
<input type="datetime-local" name="date" id="date" required>
<label class="toggle">
<input class="toggle__input" type="checkbox" name="newsoption">
<span class="toggle__label">
<span class="toggle__text">Opret som nyhed</span>
</span>
</label>
<input type="submit" class="btn btn-dark text-white" value="Opret">
</form>
@@ -10,6 +10,14 @@
@endsection
@section("content")
<style>
.toggle__label::before, .toggle__label::after {
border-color: black;
}
.toggle__text::before {
border-color: black;
}
</style>
<h1>Rediger Link:</h1>
<form method="post" action="{{route("events.update", ["event" => $event])}}">
@csrf
@@ -22,7 +30,12 @@
<input value="{!! $event->description !!}" type="text" name="description" id="description" required>
<label for="date">Beskrivelse</label>
<input value="{{$event->date}}" type="datetime-local" name="date" id="date" required>
<label class="toggle">
<input class="toggle__input" type="checkbox" name="newsoption">
<span class="toggle__label">
<span class="toggle__text">Opret som nyhed</span>
</span>
</label>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
@endsection
@@ -14,6 +14,12 @@
.ck-editor__main {
margin-bottom: 1rem;
}
.toggle__label::before, .toggle__label::after {
border-color: black;
}
.toggle__text::before {
border-color: black;
}
</style>
<script src="https://cdn.ckeditor.com/ckeditor5/21.0.0/classic/ckeditor.js"></script>
<h1>Opret Vejledning</h1>
@@ -22,6 +28,12 @@
<label for="title">Titel guiden</label>
<input type="text" name="name" id="title" required>
<textarea name="guide_articles" id="editor"></textarea>
<label class="toggle">
<input class="toggle__input" type="checkbox" name="newsoption">
<span class="toggle__label">
<span class="toggle__text">Opret som nyhed</span>
</span>
</label>
<input type="submit" class="btn btn-dark text-white" value="Opret">
</form>
@@ -14,6 +14,12 @@
.ck-editor__main {
margin-bottom: 1rem;
}
.toggle__label::before, .toggle__label::after {
border-color: black;
}
.toggle__text::before {
border-color: black;
}
</style>
<script src="https://cdn.ckeditor.com/ckeditor5/21.0.0/classic/ckeditor.js"></script>
<h1>Rediger vejledning:</h1>
@@ -24,6 +30,12 @@
<input value="{{$guide->name}}" type="text" name="name" id="title" required>
<label for="editor">Vejledning</label>
<textarea name="guide_articles" id="editor">{{$guide->guide_articles}}</textarea>
<label class="toggle">
<input class="toggle__input" type="checkbox" name="newsoption">
<span class="toggle__label">
<span class="toggle__text">Opret som nyhed</span>
</span>
</label>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
</form>