Commit 33a80cbc authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Merge branch '296-gulp-fur-js' into 'development'

Resolve "Gulp für JS"

Closes #296

See merge request !488
parents ff923f98 9bcec3d8
......@@ -20,7 +20,7 @@
<div class="form-group kontakt-form-group">
<p><span class="bold">{!! trans('kontakt.form.7') !!} <a href="http://openpgpjs.org/.">OpenPGP.js</a> {!! trans('kontakt.form.8') !!}</span>
<span>{!! trans('kontakt.form.9') !!}</span></p>
<button title="" data-original-title="" class="btn btn-default" type="submit">{!! trans('kontakt.form.10') !!}</button></div></form>
<button title="" data-original-title="" class="btn btn-default encrypt-btn" type="submit">{!! trans('kontakt.form.10') !!}</button></div></form>
<h2>{!! trans('kontakt.mail.1') !!}</h2>
<p>{!! trans('kontakt.mail.2') !!}
{!! trans('kontakt.mail.3') !!}</p>
......
......@@ -3,6 +3,7 @@
@section('title', $title )
@section('content')
<script type="text/javascript" src="/js/all.js"></script>
<h1>{{ trans('languages.header') }}</h1>
<p>{{ trans('languages.beschreibung.1') }}</p>
<p>{{ trans('languages.beschreibung.2') }}</p>
......
......@@ -36,12 +36,6 @@
</div>
</footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
<script src="/js/jquery.js" type="text/javascript"></script>
<script src="/js/bootstrap.js" type="text/javascript"></script>
<script src="/js/masonry.js" type="text/javascript"></script>
<script src="/js/imagesloaded.js" type="text/javascript"></script>
<script src="/js/scriptResultPage.js" type="text/javascript"></script>
<script src="/js/lightslider.js"></script>
<!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
<script type="text/javascript" src="/js/all.js"></script>
</body>
</html>
......@@ -128,15 +128,7 @@
</ul>
</footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
<script type="text/javascript" src="/js/jquery.js"></script>
<script type="text/javascript" src="/js/bootstrap.js"></script>
<script type="text/javascript" src="/js/scriptStartPage.js"></script>
@if (isset($js))
@foreach ($js as $script)
<script type="text/javascript" src="/js/{{ $script }}"></script>
@endforeach
@endif
<!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
<script type="text/javascript" src="/js/all.js"></script>
</div>
</body>
</html>
......@@ -3,7 +3,6 @@
@section('title', $title )
@section('content')
<script type="text/javascript" src="/js/widgets.js"></script>
<h1>{{ trans('sitesearch.head.1') }}</h1>
<p>{{ trans('sitesearch.head.2') }}</p>
<h2>{{ trans('sitesearch.head.3') }}</h2>
......
......@@ -3,7 +3,6 @@
@section('title', $title )
@section('content')
<script type="text/javascript" src="/js/widgets.js"></script>
<h1>{{ trans('websearch.head.1') }}</h1>
<p>{{ trans('websearch.head.2') }}</p>
<h2>{{ trans('websearch.head.3') }}</h2>
......
......@@ -51,8 +51,6 @@ Route::group(
Route::get('kontakt', function () {
return view('kontakt.kontakt')
->with('title', trans('titles.kontakt'))
->with('css', 'kontakt.css')
->with('js', ['openpgp.min.js', 'kontakt.js'])
->with('navbarFocus', 'kontakt');
});
......
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