diff --git a/gulpfile.js b/gulpfile.js index 4ac2ffad32531d57d7bad9705f7cc4ab6298467c..aa6dd399b201e0a78293cf66945fd4004c6f570e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -26,6 +26,7 @@ elixir(function (mix) { mix.scripts(['lib/jquery.js', 'lib/iframeResizer.contentWindow.min.js'], 'public/js/quicktips.js') mix.scripts(['scriptStartPage.js', 'results.js'], 'public/js/scriptStartPage.js'); mix.scripts(['scriptResultPage.js', 'results.js'], 'public/js/scriptResultPage.js'); + mix.scripts(['scriptSubpages.js'], 'public/js/scriptSubpages.js'); mix.version(['css/themes/default.css', 'js/lib.js', 'js/quicktips.js']); mix.less('metager/beitritt.less', 'public/css/beitritt.css') mix.version(['css/beitritt.css']) diff --git a/public/js/scriptSubPages.js b/public/js/scriptSubPages.js new file mode 100644 index 0000000000000000000000000000000000000000..c95bece6c2a76e7729867b59605cdb13e5498df7 --- /dev/null +++ b/public/js/scriptSubPages.js @@ -0,0 +1,13 @@ +$(document).ready(function () { + if (localStorage) { + var theme = localStorage.getItem('theme'); + if (theme != null) { + if ((theme.match(/,/g) || []).length != 3) { + localStorage.removeItem('theme'); + } else { + theme = theme.split(','); + $('#theme').attr('href', '/css/theme.css.php?r=' + theme[0] + '&g=' + theme[1] + '&b=' + theme[2] + '&a=' + theme[3]); + } + } + } +}); \ No newline at end of file diff --git a/resources/views/datenschutz.blade.php b/resources/views/datenschutz.blade.php index 0e02a93e66a885607bec99dcbe7c147755e3de6d..680a6f0382843416a6544f27e0d01e7699eaaf8b 100644 --- a/resources/views/datenschutz.blade.php +++ b/resources/views/datenschutz.blade.php @@ -21,20 +21,20 @@ <li>{!! trans('datenschutz.policy.18') !!}</li> <li>{!! trans('datenschutz.policy.19') !!}</li> </ul> - <h2>{!! trans('datenschutz.twitter') !!}</h2> -<pre><p>> 7.4.2014 C. Schulzki-Haddouti @kooptech -> MetaGer dürfte im Moment die sicherste Suchmaschine weltweit sein</p> -<p>> 8.4.2014 Stiftung Datenschutz @DS_Stiftung -> Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinnützige -> Suchmaschine aus #Hannover</p> -<p>> 8.4.2014 Markus Käkenmeister @markus2009 -> Suchmaschine ohne Tracking</p> -<p>> 8.4.2014 Marko [~sHaKaL~] @mobilef0rensics -> Nice; anonymous Search and find with MetaGer</p> -<p>> 7.4.2014 Anfahrer @anfahrer -> Websuche mit #Datenschutz dank #MetaGer : Anonyme Suche und -> Ergebnisse via Proxy</p> -<p>> 8.4.2014 stupidité pue @dummheitstinkt -> wow, is this the MetaGer I used in the end 90s in internet cafes??? -> "Anonymes Suchen und Finden mit MetaGer | heise"</p></pre> -@endsection + <h2>{!! trans('datenschutz.twitter') !!}</h2> + <pre><p>> 7.4.2014 C. Schulzki-Haddouti @kooptech + > MetaGer dürfte im Moment die sicherste Suchmaschine weltweit sein</p> + <p>> 8.4.2014 Stiftung Datenschutz @DS_Stiftung + > Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinnützige + > Suchmaschine aus #Hannover</p> + <p>> 8.4.2014 Markus Käkenmeister @markus2009 + > Suchmaschine ohne Tracking</p> + <p>> 8.4.2014 Marko [~sHaKaL~] @mobilef0rensics + > Nice; anonymous Search and find with MetaGer</p> + <p>> 7.4.2014 Anfahrer @anfahrer + > Websuche mit #Datenschutz dank #MetaGer : Anonyme Suche und + > Ergebnisse via Proxy</p> + <p>> 8.4.2014 stupidité pue @dummheitstinkt + > wow, is this the MetaGer I used in the end 90s in internet cafes??? + > "Anonymes Suchen und Finden mit MetaGer | heise"</p></pre> +@endsection \ No newline at end of file diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 68560785268b6a83378f30a4df778bdb817109fb..65c91e8622aba0c775fe661ccb3fe54005f1bd86 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -316,7 +316,6 @@ </a> </li> </ul> - <script src="{{ elixir('js/lib.js') }}"></script> <script src="{{ elixir('js/scriptStartPage.js') }}"></script> @endsection diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php index 08f861706fbf70ce1e98a6c253a982d2457810a6..e2ee0882bd7fff643e0fc7cdea14cd15fbc70d77 100644 --- a/resources/views/layouts/staticPages.blade.php +++ b/resources/views/layouts/staticPages.blade.php @@ -222,4 +222,6 @@ <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" /> </div> </body> + <script src="{{ elixir('js/lib.js') }}"></script> + <script src="{{ elixir('js/scriptSubPages.js') }}"></script> </html> diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php index 44287c8ab8002503fadb16f6cd50aacd6272e821..4a0b993e7ffbfd941dc3abdfd81976c0ca950b84 100644 --- a/resources/views/settings.blade.php +++ b/resources/views/settings.blade.php @@ -65,6 +65,5 @@ <input id="plugin" class="btn btn-primary settings-btn" type="submit" value="{!! trans('settings.speichern.3') !!}"> </div> </form> - <script src="{{ elixir('js/lib.js') }}"></script> <script src="{{ elixir('js/settings.js') }}"></script> @endsection diff --git a/resources/views/widget/sitesearch.blade.php b/resources/views/widget/sitesearch.blade.php index 8ab6a204a19842f04be4ed8b6e08c7d573a9153d..0f296bb23a2d00b80406c91657191ee07086e6b7 100644 --- a/resources/views/widget/sitesearch.blade.php +++ b/resources/views/widget/sitesearch.blade.php @@ -77,6 +77,5 @@ </form>; </textarea> @endif - <script src="{{ elixir('js/lib.js') }}"></script> <script src="{{ elixir('js/widgets.js') }}"></script> @endsection diff --git a/resources/views/widget/websearch.blade.php b/resources/views/widget/websearch.blade.php index 3c2afce820ec8eb42e2d432a7d20152ba4f2f772..62920bae88ffdaf24cd40837f058cd8d7845f1f6 100644 --- a/resources/views/widget/websearch.blade.php +++ b/resources/views/widget/websearch.blade.php @@ -65,6 +65,5 @@ <input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}"> </form> </textarea> - <script src="{{ elixir('js/lib.js') }}"></script> <script src="{{ elixir('js/widgets.js') }}"></script> @endsection