Commit 3d6eb001 authored by Karl's avatar Karl

JS Dateien laufen jetzt üebr Gulp

parent d0b9fb7f
......@@ -154,7 +154,6 @@ class LanguageController extends Controller
->with('langTexts', $langTexts)
->with('sum', $sum)
->with('css', 'editLanguage.css')
->with('js', ['editLanguage.js'])
->with('new', $ex["new"]);
}
......
......@@ -12,4 +12,5 @@ require('laravel-elixir-vue-2');
*/
elixir(function(mix) {
mix.less('default.less', 'public/css/themes/default.css');
mix.scripts(['jquery.js', 'bootstrap.js', 'widgets.js', 'editLanguage.js', 'kontakt.js', 'lightslider.js', 'masonry.js', 'openpgp.min.js', 'scriptResultPage.js', 'scriptStartPage.js', 'settings.js', '/vue/app.js', '/vue/bootstrap.js']);
});
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
$(document).ready(function() {
$(".hint").tooltip();
$("textarea").each(function() {
$(".language-text-area").each(function() {
auto_grow(this);
});
$("textarea").keyup(function() {
$(".language-text-area").keyup(function() {
auto_grow(this);
});
});
......
......@@ -39,9 +39,9 @@ function encrypt() {
}
$(document).ready(function() {
if (isEnglish()) {
$("button[type=submit]").html("encrypt and send");
$(".encrypt-btn").html("encrypt and send");
} else {
$("button[type=submit]").html("Verschlüsseln und senden");
$(".encrypt-btn").html("Verschlüsseln und senden");
}
$(".contact").submit(function() {
return encrypt(this);
......
......@@ -26,7 +26,7 @@ function tabs() {
});
}
function getDocumentReadyForUse(fokus = "") {
function getDocumentReadyForUse(fokus) {
clickLog();
popovers();
if (fokus === "bilder") imageLoader();
......
window._ = require('lodash');
/**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
* for JavaScript based Bootstrap features such as modals and tabs. This
* code may be modified to fit the specific needs of your application.
*/
window.$ = window.jQuery = require('jquery');
require('bootstrap-sass');
/**
* Vue is a modern JavaScript library for building interactive web interfaces
* using reactive data binding and reusable components. Vue's API is clean
* and simple, leaving you to focus on building your next great project.
*/
window.Vue = require('vue');
require('vue-resource');
/**
* We'll register a HTTP interceptor to attach the "CSRF" header to each of
* the outgoing requests issued by this application. The CSRF middleware
* included with Laravel will automatically verify the header's value.
*/
Vue.http.interceptors.push((request, next) => {
request.headers.set('X-CSRF-TOKEN', Laravel.csrfToken);
next();
});
/**
* Echo exposes an expressive API for subscribing to channels and listening
* for events that are broadcast by Laravel. Echo and event broadcasting
* allows your team to easily build robust real-time web applications.
*/
// import Echo from "laravel-echo"
// window.Echo = new Echo({
// broadcaster: 'pusher',
// key: 'your-pusher-key'
// });
......@@ -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');
});
......
Markdown is supported
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