Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • sebastian/MetaGer
  • cpietsch/MetaGer
  • kossow/MetaGer
  • jens/MetaGer
  • open-source/MetaGer
5 results
Select Git revision
Show changes
Commits on Source (10)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 622 additions and 307 deletions
app/Http/Controllers/MetaGerSearch.php
View file @ 056efb8b
...@@ -6,8 +6,7 @@ use App; ...@@ -6,8 +6,7 @@ use App;
use App\MetaGer; use App\MetaGer;
use Illuminate\Http\Request; use Illuminate\Http\Request;
const TIP_SERVER = 'https://quicktips.metager3.de/tips.xml'; const TIP_SERVER = 'http://localhost:63825/tips.xml';
#const TIP_SERVER = 'http://localhost:63825/tips.xml';
class MetaGerSearch extends Controller class MetaGerSearch extends Controller
{ {
...@@ -77,7 +76,7 @@ class MetaGerSearch extends Controller ...@@ -77,7 +76,7 @@ class MetaGerSearch extends Controller
public function tips(Request $request) public function tips(Request $request)
{ {
$tips_text = file_get_contents(TIP_SERVER); $tips_text = file_get_contents(TIP_SERVER);
$tips = []; $tips = [];
try { try {
$tips_xml = simplexml_load_string($tips_text); $tips_xml = simplexml_load_string($tips_text);
......
app/Models/Quicktips/Quicktips.php
View file @ 056efb8b
...@@ -12,7 +12,6 @@ class Quicktips ...@@ -12,7 +12,6 @@ class Quicktips
{ {
use DispatchesJobs; use DispatchesJobs;
//const QUICKTIP_URL = "https://quicktips.metager3.de/quicktips.xml";
const QUICKTIP_URL = "http://localhost:63825/quicktips.xml"; const QUICKTIP_URL = "http://localhost:63825/quicktips.xml";
const QUICKTIP_NAME = "quicktips"; const QUICKTIP_NAME = "quicktips";
const CACHE_DURATION = 60; const CACHE_DURATION = 60;
......
resources/lang/de/hilfe.php
View file @ 056efb8b
This diff is collapsed.
resources/lang/de/sidebar.php
View file @ 056efb8b
<?php <?php
return [ return [
'nav1' => 'Suche', 'nav1' => 'Suche',
'nav2' => 'Spenden', 'nav2' => 'Spenden',
'nav3' => 'Datenschutz', 'nav3' => 'Datenschutz',
'nav4' => 'Forum', 'nav4' => 'Forum',
'nav5' => 'Kontakt', 'nav5' => 'Kontakt',
'nav6' => 'Team', 'nav6' => 'Team',
'nav7' => 'Über uns', 'nav7' => 'Über uns',
'nav8' => 'Impressum', 'nav8' => 'Impressum',
'nav9' => 'Hilfe', 'nav9' => 'Hilfe',
'nav10' => 'Widget', 'nav10' => 'Widget',
'nav11' => 'Assoziator', 'nav11' => 'Assoziator',
'nav13' => 'URL-Verkürzer', 'nav14' => 'TOR-Hidden-Service',
'nav14' => 'TOR-Hidden-Service', 'nav15' => 'Dienste',
'nav15' => 'Dienste', 'nav16' => 'Fördern',
'nav16' => 'Fördern', 'nav17' => 'Einkaufen bei MetaGer-Fördershops',
'nav17' => 'Einkaufen bei MetaGer-Fördershops', 'nav18' => 'Kontakt',
'nav18' => 'Kontakt', 'nav19' => 'Sprache',
'nav19' => 'Sprache', 'nav20' => 'Hilfe',
'nav20' => 'Hilfe', 'nav21' => 'FAQ',
'nav21' => 'FAQ', 'nav22' => 'Zitatsuche',
'nav22' => 'Zitatsuche', 'nav23' => 'Aufnahmeantrag SUMA-EV',
'nav23' => 'Aufnahmeantrag SUMA-EV', 'nav24' => 'MetaGer Quellcode',
'nav24' => 'MetaGer Quellcode', 'nav25' => 'MetaGer App',
'nav25' => 'MetaGer App', 'nav26' => 'MetaGer-Fanshop',
'nav26' => 'MetaGer-Fanshop',
'navigationToggle' => 'Navigation anzeigen', 'navigationToggle' => 'Navigation anzeigen',
'titles.tips' => 'Tips', 'titles.tips' => 'Tips',
]; ];
resources/lang/en/hilfe.php
View file @ 056efb8b
This diff is collapsed.
resources/lang/en/sidebar.php
View file @ 056efb8b
<?php <?php
return [ return [
"nav1" => "Search", "nav1" => "Search",
"nav2" => "Donate", "nav2" => "Donate",
"nav3" => "Privacy", "nav3" => "Privacy",
"nav4" => "Board", "nav4" => "Board",
"nav5" => "Contact", "nav5" => "Contact",
"nav6" => "Team", "nav6" => "Team",
"nav7" => "About us", "nav7" => "About us",
"nav8" => "Legal information", "nav8" => "Legal information",
"nav9" => "Help", "nav9" => "Help",
"nav10" => "Widget", "nav10" => "Widget",
"nav11" => "Associator", "nav11" => "Associator",
"nav13" => "URL-Shortener", "nav14" => "TOR-Hidden-Service",
"nav14" => "TOR-Hidden-Service", "nav15" => "Tools",
"nav15" => "Tools", "nav16" => "Support Us",
"nav16" => "Support Us", "nav17" => "Purchase at affiliate shops",
"nav17" => "Purchase at affiliate shops", "nav18" => "Contact",
"nav18" => "Contact", "nav19" => "Language",
"nav19" => "Language", "nav20" => "Help",
"nav20" => "Help", "nav21" => "FAQ",
"nav21" => "FAQ", "nav22" => "Citation Search",
"nav22" => "Citation Search", "nav23" => "Admitting formular SUMA-EV",
"nav23" => "Admitting formular SUMA-EV", "nav24" => "MetaGer source code",
"nav24" => "MetaGer source code", "nav25" => "MetaGer App",
"nav25" => "MetaGer App", 'nav26' => 'MetaGer-Fanshop',
'nav26' => 'MetaGer-Fanshop',
"navigationToggle" => "show navigation", "navigationToggle" => "show navigation",
]; ];
resources/lang/es/sidebar.php
View file @ 056efb8b
<?php <?php
return [ return [
"nav1" => "Búsqueda", "nav1" => "Búsqueda",
"nav2" => "Donaciones", "nav2" => "Donaciones",
"nav3" => "Protección de datos", "nav3" => "Protección de datos",
"nav4" => "Foro", "nav4" => "Foro",
"nav5" => "Contacto", "nav5" => "Contacto",
"nav6" => "Equipo", "nav6" => "Equipo",
"nav7" => "Sobre nosotros", "nav7" => "Sobre nosotros",
"nav8" => "Aviso legal", "nav8" => "Aviso legal",
"nav9" => "Ayuda", "nav9" => "Ayuda",
"nav10" => "Widget", "nav10" => "Widget",
"nav11" => "Asociador", "nav11" => "Asociador",
"nav13" => "Cortador de URL", "nav14" => "TOR-Hidden-Service",
"nav14" => "TOR-Hidden-Service", "nav15" => "Servicios",
"nav15" => "Servicios", "nav16" => "Patrocinar",
"nav16" => "Patrocinar", "nav17" => "Comprar en tiendas que patrocinan a MetaGer",
"nav17" => "Comprar en tiendas que patrocinan a MetaGer", "nav18" => "Contacto",
"nav18" => "Contacto", "nav19" => "Idioma",
"nav19" => "Idioma", "nav20" => "Ayuda",
"nav20" => "Ayuda", "nav21" => "FAQ",
"nav21" => "FAQ", "nav22" => "Búsqueda de citas",
"nav22" => "Búsqueda de citas", "nav23" => "Formulario de afiliación SUMA-EV",
"nav23" => "Formulario de afiliación SUMA-EV", "nav24" => "Codigo fuente MetaGer",
"nav24" => "Codigo fuente MetaGer", "nav25" => "MetaGer App",
"nav25" => "MetaGer App",
"navigationToggle" => "Mostrar navegación", "navigationToggle" => "Mostrar navegación",
]; ];
resources/views/assoziator/asso.blade.php
View file @ 056efb8b
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</style> </style>
<h1 class="page-title">{{ trans('asso.head.1') }}</h1> <h1 class="page-title">{{ trans('asso.head.1') }}</h1>
<div class="card-heavy"> <div class="card-heavy">
<p>{{ trans('asso.1.1') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/') }}" target="_blank">{{ trans('asso.1.2') }}</a>.</p> <p>{{ trans('asso.1.1') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/datenschutz') }}" target="_blank">{{ trans('asso.1.2') }}</a>.</p>
<form method="post"> <form method="post">
<div class="input-group"> <div class="input-group">
......
resources/views/datenschutz/datenschutz.blade.php
View file @ 056efb8b
...@@ -5,24 +5,63 @@ ...@@ -5,24 +5,63 @@
@section('navbarFocus.datenschutz', 'class="active"') @section('navbarFocus.datenschutz', 'class="active"')
@section('content') @section('content')
<div class="card-heavy"> <style>
<h1>{!! trans('datenschutz.head') !!}</h1> main {
<p>{!! trans('datenschutz.general.1') !!}</p> font-size: 10pt;
<p>{!! trans('datenschutz.general.3') !!}</p> hyphens:auto;
</div> counter-reset: kontext 0 datum 0;
<div class="card-heavy"> text-align: justify;
<h1>{!! trans('datenschutz.policy.1') !!}</h1> }
<ul class="dotlist">
<li>{!! trans('datenschutz.policy.2') !!}</li> h1 {
<li>{!! trans('datenschutz.policy.5') !!}</li> font-size: 18pt;
<li>{!! trans('datenschutz.policy.6') !!}</li> }
<li>{!! trans('datenschutz.policy.7') !!}</li>
<li>{!! trans('datenschutz.policy.9') !!}</li> .kontext > h1::before {
<li>{!! trans('datenschutz.policy.10') !!}</li> counter-increment: kontext;
<li>{!! trans('datenschutz.policy.13') !!}</li> content: "K" counter(kontext) " ";
<li>{!! trans('datenschutz.policy.17') !!}</li> font-weight: normal;
<li>{!! trans('datenschutz.policy.18') !!}</li> }
<li>{!! trans('datenschutz.policy.19') !!}</li>
</ul> .datum > h1::before {
</div> counter-increment: datum;
@endsection content: "D" counter(datum) " ";
\ No newline at end of file font-weight: normal;
}
.kontext h1 {
font-size: 16pt;
margin-bottom: inherit;
}
.kontext h2 {
font-size: 14pt;
margin-bottom: inherit;
}
.datum h1 {
font-size: 12pt;
margin-bottom: inherit;
}
.datum h2 {
font-size: 11pt;
margin-bottom: inherit;
margin-top: 5pt;
}
.kontext-list {
list-style: none;
}
.datum-list {
list-style: none;
}
samp {
hyphens:none;
font-size: 8pt;
}
</style>
@if (LaravelLocalization::getCurrentLocale() == "de")
@include('datenschutz.german')
@else
@include('datenschutz.english')
@endif
@endsection
resources/views/datenschutz/english.blade.php 0 → 100644
View file @ 056efb8b
english
resources/views/datenschutz/german.blade.php 0 → 100644
View file @ 056efb8b
This diff is collapsed.
resources/views/hilfe.blade.php
View file @ 056efb8b
...@@ -140,12 +140,6 @@ ...@@ -140,12 +140,6 @@
<p>{!! trans('hilfe.widget.1') !!}</p> <p>{!! trans('hilfe.widget.1') !!}</p>
</div> </div>
</section> </section>
<section>
<h3>{!! trans('hilfe.urlshort.title') !!}</h3>
<div>
<p>{!! trans('hilfe.urlshort.1') !!}</p>
</div>
</section>
<h2>{!! trans('hilfe.datenschutz.title') !!}</h2> <h2>{!! trans('hilfe.datenschutz.title') !!}</h2>
<section> <section>
<h3>{!! trans('hilfe.datenschutz.faktencheck.heading') !!}</h3> <h3>{!! trans('hilfe.datenschutz.faktencheck.heading') !!}</h3>
......
resources/views/resultpages/metager3resultsatom10.blade.php
View file @ 056efb8b
<?xmlversion = "1.0"encoding = "UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<feed xmlns="http://www.w3.org/2005/Atom" <feed xmlns="http://www.w3.org/2005/Atom"
xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
xmlns:mg="http://metager.de/opensearch/" xmlns:mg="http://metager.de/opensearch/"
......