Commit fb92bdb8 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '846-laravel-update' into 'development'

Resolve "Laravel Update"

Closes #846

See merge request !1355
parents fe1de194 b6569097
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
@endif @endif
</td> </td>
@foreach($langs as $lang => $value) @foreach($langs as $lang => $value)
<td>{!! $langValues[$lang] or "" !!}</td> <td>{!! $langValues[$lang] ?? "" !!}</td>
@endforeach @endforeach
</tr> </tr>
@endif @endif
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</header> </header>
@include('parts.sidebar', ['id' => 'staticPagesSideBar']) @include('parts.sidebar', ['id' => 'staticPagesSideBar'])
@include('parts.sidebar-opener', ['class' => 'fixed']) @include('parts.sidebar-opener', ['class' => 'fixed'])
<div class="wrapper {{$page or ''}}"> <div class="wrapper {{$page ?? ''}}">
<main id="main-content"> <main id="main-content">
@if (isset($success)) @if (isset($success))
<div class="alert alert-success" role="alert">{{ $success }}</div> <div class="alert alert-success" role="alert">{{ $success }}</div>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{{-- Don't forget <script src="{{ mix('js/searchbar.js') }}"></script> --}} {{-- Don't forget <script src="{{ mix('js/searchbar.js') }}"></script> --}}
<fieldset> <fieldset>
<form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8"> <form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8">
<div class="searchbar {{$class or ''}}"> <div class="searchbar {{$class ?? ''}}">
<div class="search-input-submit"> <div class="search-input-submit">
<div id="search-lang"> <div id="search-lang">
<select id="input-lang" name="lang"> <select id="input-lang" name="lang">
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</label> </label>
</div> </div>
<div class="search-input"> <div class="search-input">
<input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if(\Request::is('/')) autofocus @endif autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="2"> <input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if(\Request::is('/')) autofocus @endif autocomplete="{{$autocomplete ?? 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="2">
<button class="hidden" id="search-delete-btn" type="button"> <button class="hidden" id="search-delete-btn" type="button">
&#xd7; &#xd7;
</button> </button>
......
<label class="sidebar-opener navigation-element {{$class or ''}}" for="sidebarToggle"></label> <label class="sidebar-opener navigation-element {{$class ?? ''}}" for="sidebarToggle"></label>
...@@ -18,64 +18,64 @@ mix ...@@ -18,64 +18,64 @@ mix
@import "./bootstrap/bootstrap.less"; @import "./bootstrap/bootstrap.less";
*/ */
// css // css
.less("resources/assets/less/metager/metager.less", "public/css/themes/metager.css", { .less("resources/less/metager/metager.less", "public/css/themes/metager.css", {
strictMath: true strictMath: true
}) })
.less("resources/assets/less/font-awesome/fontawesome.less", "public/css/fontawesome.css", { .less("resources/less/font-awesome/fontawesome.less", "public/css/fontawesome.css", {
strictMath: true strictMath: true
}) })
.less("resources/assets/less/font-awesome/solid.less", "public/css/fontawesome-solid.css", { .less("resources/less/font-awesome/solid.less", "public/css/fontawesome-solid.css", {
strictMath: true strictMath: true
}) })
.less("resources/assets/less/bootstrap/bootstrap.less", "public/css/bootstrap.css", { .less("resources/less/bootstrap/bootstrap.less", "public/css/bootstrap.css", {
strictMath: true strictMath: true
}) })
.less( .less(
"resources/assets/less/metager/pages/beitritt.less", "resources/less/metager/pages/beitritt.less",
"public/css/beitritt.css", { "public/css/beitritt.css", {
strictMath: true strictMath: true
} }
) )
.less("resources/assets/less/utility.less", "public/css/utility.css", { .less("resources/less/utility.less", "public/css/utility.css", {
strictMath: true strictMath: true
}) })
// js // js
.babel( .babel(
[ [
"resources/assets/js/lib/jquery.js", "resources/js/lib/jquery.js",
"resources/assets/js/lib/jquery-ui.min.js", "resources/js/lib/jquery-ui.min.js",
"resources/assets/js/lib/bootstrap.js", "resources/js/lib/bootstrap.js",
"resources/assets/js/lib/iframeResizer.min.js", "resources/js/lib/iframeResizer.min.js",
"resources/assets/js/lib/md5.js" "resources/js/lib/md5.js"
], ],
"public/js/lib.js" "public/js/lib.js"
) )
.babel( .babel(
[ [
"resources/assets/js/scriptStartPage.js", "resources/js/scriptStartPage.js",
"resources/assets/js/result-saver.js" "resources/js/result-saver.js"
], ],
"public/js/scriptStartPage.js" "public/js/scriptStartPage.js"
) )
.babel( .babel(
[ [
"resources/assets/js/scriptResultPage.js", "resources/js/scriptResultPage.js",
"resources/assets/js/result-saver.js", "resources/js/result-saver.js",
"resources/assets/js/translations.js" "resources/js/translations.js"
], ],
"public/js/scriptResultPage.js" "public/js/scriptResultPage.js"
) )
.babel("resources/assets/js/searchbar.js", "public/js/searchbar.js") .babel("resources/js/searchbar.js", "public/js/searchbar.js")
.babel("resources/assets/js/focus-creator.js", "public/js/focus-creator.js") .babel("resources/js/focus-creator.js", "public/js/focus-creator.js")
.babel("resources/assets/js/focus-creator.js", "public/js/focus-creator.js") .babel("resources/js/focus-creator.js", "public/js/focus-creator.js")
.babel("resources/assets/js/editLanguage.js", "public/js/editLanguage.js") .babel("resources/js/editLanguage.js", "public/js/editLanguage.js")
// utility // utility
.babel( .babel(
["resources/assets/js/utility.js", "resources/assets/js/translations.js"], ["resources/js/utility.js", "resources/js/translations.js"],
"public/js/utility.js" "public/js/utility.js"
) )
.babel("resources/assets/js/widgets.js", "public/js/widgets.js") .babel("resources/js/widgets.js", "public/js/widgets.js")
.babel("resources/assets/js/scriptJoinPage.js", "public/js/scriptJoinPage.js") .babel("resources/js/scriptJoinPage.js", "public/js/scriptJoinPage.js")
// source maps // source maps
.sourceMaps(false, "inline-source-map") .sourceMaps(false, "inline-source-map")
// versioning // versioning
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment