vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.4.2 - Fixed QL Editor 

Added Feedback to menu bar
This commit is contained in:
Anders 2020-10-07 11:59:58 +02:00
parent 233bc2b35e
commit 491ecc9d6e
11 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
skolehjem/public/css/admin.css vendored
View File

@ -6878,3 +6878,8 @@ div.dataTables_wrapper div.dataTables_paginate ul.pagination {
outline: unset !important;
}
/* QL-Editor */
.ql-tooltip {
z-index: 3 !important;
}

9
skolehjem/public/css/webappdark.css vendored
View File

@ -80,15 +80,6 @@ select {
margin-bottom: 1rem;
}
.select2-container--default, .select2-search, .selection, .select2-selection--single, .select2-results__options * {
color: white !important;
background-color: #2F3136 !important;
}
.select2-selection__rendered {
color: white !important;
}
input.appinput {
border: none;
border-bottom: white solid 2px;

3
skolehjem/resources/views/admin/events/create.blade.php
View File

@ -32,6 +32,7 @@
<label for="accountable">Aktivitet Ansvarlig:</label>
<input type="text" name="accountable" id="accountable" required>
<label for="description">Aktivitet Beskrivelse:</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor"></div>
<textarea name="description" class="d-none" id="hiddenArea"></textarea>
<label for="date">Aktivitet dato:</label>
@ -59,7 +60,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

3
skolehjem/resources/views/admin/events/edit.blade.php
View File

@ -33,6 +33,7 @@
<label for="accountable">Aktivitet Ansvarlig:</label>
<input value="{{$event->accountable}}" type="text" name="accountable" id="accountable" required>
<label for="description">Aktivitet Beskrivelse:</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor">{!! $event->description !!}</div>
<textarea name="description" class="d-none" id="hiddenArea"></textarea>
<label for="date">Aktivitet Dato:</label>
@ -58,7 +59,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

4
skolehjem/resources/views/admin/guides/create.blade.php
View File

@ -38,6 +38,8 @@
</select> <label>Vælg en kategori</label>
<a class="btn btn-inline btn-sde-blue mb-0 ml-1" href="{{ route('guides-category.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret kategori</a>
</div>
<label for="editor">Vejledning</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor"></div>
<textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea>
<label class="toggle">
@ -63,7 +65,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link', 'video' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

3
skolehjem/resources/views/admin/guides/edit.blade.php
View File

@ -44,6 +44,7 @@
<a class="btn btn-inline btn-sde-blue mb-0 ml-1" href="{{ route('guides-category.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret kategori</a>
</div>
<label for="editor">Vejledning</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor">{!! $guide->guide_articles !!}</div>
<textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea>
<label class="toggle">
@ -67,7 +68,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link', 'video' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

2
skolehjem/resources/views/admin/layout/base.blade.php
View File

@ -105,7 +105,7 @@
align-items: center;
margin-bottom: auto;
position: absolute;
z-index: 1;
z-index: 3;
top: 0px;
left: 100%;
font-size: 25px;

3
skolehjem/resources/views/admin/news/create.blade.php
View File

@ -22,6 +22,7 @@
<label for="title">Titel på nyheden:</label>
<label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
<input type="text" name="subname" id="title" placeholder="OBS: Menuplanen er ændret" required>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor"></div>
<textarea name="content" class="d-none" id="hiddenArea"></textarea>
<input type="submit" id="disable" class="btn btn-dark text-white" value="Opret">
@ -39,7 +40,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

3
skolehjem/resources/views/admin/news/edit.blade.php
View File

@ -23,6 +23,7 @@
<label for="title">Navn</label>
<label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
<input value="{{$news->subname}}" type="text" name="subname" id="title" required>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor">{!! $news->content !!}</div>
<textarea name="content" class="d-none" id="hiddenArea"></textarea>
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
@ -40,7 +41,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

2
skolehjem/resources/views/app/contacts/index.blade.php
View File

@ -23,7 +23,5 @@
@else
<p class="text-center">{{__('msg.dereringenkontakter')}}!</p>
@endif
<span class="text-center sde-black-20 mt-1">{{__('msg.sendfeedback')}}</span>
<a class="btn text-center btn-sde-blue mt-1" href="{{ route('feedbacks.create') }}">{{__('msg.givfeedback')}}</a>
</main>
@endsection

6
skolehjem/resources/views/app/layout/base.blade.php
View File

@ -67,6 +67,12 @@
{{ __('msg.vejledning') }}
</a>
@endif
@if(auth()->user()->can('feedback.create'))
<a href="{{ route('feedbacks.create') }}">
<img src="{{URL::asset('/images/icons/feedback.svg')}}" alt="Feedback">
{{__('msg.givfeedback')}}
</a>
@endif
<a href="{{ route("users.account") }}">
<img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
{{ __('msg.konto') }}