diff --git a/.gitignore b/.gitignore
index 53d05fa2e228e01a74c7c4850feae609fb55f9f1..55a1eae6236460ecf592c3a01492f7588f7d8444 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,12 +14,12 @@ langfiles.zip
/public/js/lib.js
/public/js/scriptStartPage.js
/public/js/scriptResultPage.js
+/public/js/focus-creator.js
/public/js/searchbar.js
/public/js/utility.js
/public/css/beitritt.css
/public/css/themes/default.css
/public/css/utility.css
-/public/js/utility.js
**/*.map
/.buildpath
diff --git a/public/js/focus-creator.js b/public/js/focus-creator.js
deleted file mode 100644
index 30e8739c3e6a84246401b54dd569e2c499b2fc3e..0000000000000000000000000000000000000000
--- a/public/js/focus-creator.js
+++ /dev/null
@@ -1,359 +0,0 @@
-$(function () {
- setFocusCreatorActionListeners();
- loadInitialCustomFocuses();
- loadInitialSelectedFocus();
- focusChanged();
-});
-
-/**
- * Sets all action listeners for this page
- */
-function setFocusCreatorActionListeners () {
- $('.focusCheckbox').click(checkboxCheckListener);
- $('#addFocusBtn').click(() => showFocusCreateDialog(''));
- $('#editFocusBtn').click(editCurrentFocus);
- $('.save-focus-btn').click(saveFocus);
- $('.delete-focus-btn').click(deleteFocus);
- $('#focus-select').change(focusChanged);
- // Save Focus on clicking enter while in the focus name input
- $('#focus-name').keyup(function (event) {
- if (event.keyCode == 13) {
- saveFocus();
- }
- });
- $('#create-focus-modal').on('shown.bs.modal', function () {
- $('#focus-name').focus();
- });
-}
-/**
- * Loads all the custom focuses stored in local storage
- */
-function loadInitialCustomFocuses () {
- for (var key in localStorage) {
- if (key.startsWith('focus_')) {
- var focus = loadFocusById(key);
- addFocus(focus.name);
- }
- }
-}
-
-function loadInitialSelectedFocus () {
- setFocus(getFocusInUrl());
-}
-
-/**
- * Shows the focus create dialog
- * If an id is given it will try to load a focus for the given id
- */
-function showFocusCreateDialog (id) {
- if (id === undefined) {
- id = '';
- }
- document.getElementById('original-id').value = id;
- $('#create-focus-modal').modal('show');
- var storedFocus = loadFocusById(id);
- var focus = {};
- // Try to load a focus for the given id
- $('#focus-name').val('');
- uncheckAll();
- if (storedFocus !== null) {
- try {
- focus = JSON.parse(localStorage.getItem(id));
- $('#focus-name').val(focus.name);
- for (var key in focus) {
- if (key.startsWith('engine_')) {
- $('.focusCheckbox[name=' + key + ']').prop('checked', true);
- }
- }
- } catch (ex) {
- console.error(ex);
- }
- }
- toggleDeleteButton();
-}
-
-/**
- * Shows the focus create dialog for a given id
- */
-function showFocusEditDialog (id) {
- showFocusCreateDialog(id);
-}
-
-function getCurrentFocus () {
- return $('#foki > div.active').attr('id');
-}
-
-/**
- * Shows an edit dialog for the current selected focus
- */
-function editCurrentFocus () {
- var currentFocus = getCurrentFocus();
- if (currentFocus !== undefined) {
- showFocusEditDialog(currentFocus);
- }
-}
-
-/**
- * Shows/Hides the delete button if (no) checkboxes are selected
- */
-function toggleDeleteButton () {
- if (atLeastOneChecked()) {
- $('.delete-focus-btn').show();
- } else {
- $('.delete-focus-btn').hide();
- }
-}
-
-/**
- * Save the current Focus
- * Listens for save button
- */
-function saveFocus () {
- /* Vorprüfungen */
- // Falls keine Suchmaschine ausgewählt wurde
- if (!atLeastOneChecked()) {
- switch (document.documentElement.lang) {
- case 'en':
- alert('Please select at least 1 search engine.');
- break;
- case 'es':
- alert('Por favor, seleccione al menos un motor de búsqueda.');
- break;
- default:
- alert('Bitte mindestens 1 Suchmaschine auswählen.');
- break;
- }
- return;
- }
- // Falls der Name zu kurz ist oder ungültige Zeichen enthält
- var name = document.getElementById('focus-name').value;
- if (!isValidName(name)) {
- switch (document.documentElement.lang) {
- case 'en':
- alert('No characters other than a-z, A-Z, 0-9, ä, ö, ü, ß, -, _ allowed, at least 1 character');
- break;
- case 'es':
- alert('Por favor, introduzca un nombre válido');
- break;
- default:
- alert('Bitte gültigen Namen eingeben:\n* Keine Sonderzeichen\n* Mindestens 1 Buchstabe\n');
- break;
- }
- return;
- }
- // Liest die original-id des aktuellen fokus-dialogs (gesetzt wenn man einen Fokus bearbeitet)
- var oldId = document.getElementById('original-id').value;
- var id = getIdFromName(name);
- var overwrite = true;
- // Wenn bereits ein Fokus mit dem Namen existiert, man diesen aber nicht editiert sondern gerade einen Neuen erstellt
- if (alreadyInUse(name) && oldId !== id) {
- // Fragt den Nutzer ob er den Fokus überschreiben möchte
- if (!confirm('Name bereits genutzt\nüberschreiben?')) {
- // Falls nicht wird das Speichern abgebrochen
- return;
- }
- // Ansonsten wird der andere Fokus gelöscht
- deleteFocusById(id);
- }
- /* Fokus speichern */
- var focus = {};
- // Ausgewählte Suchmaschinen lesen und zu Fokus hinzufügen
- $('input[type=checkbox]:checked').each(function (el) {
- focus[$(this).attr('name')] = $(this).val();
- });
-
- // Name setzen
- focus['name'] = name;
- // Alte Version des Fokus löschen (aus localStorage und von der Webseite, falls eine existiert)
- if (oldId !== '') {
- localStorage.removeItem(oldId);
- removeFocusById(oldId);
- }
- // Neue Version des Fokus hinzufügen (zu localStorage und der Webseite)
- localStorage.setItem(id, JSON.stringify(focus));
- addFocus(name);
- setFocus(id);
- // Fokus-Formular verbergen
- $('#create-focus-modal').modal('hide');
-}
-
-/**
- * Delete current Focus
- * Listens for delete button
- */
-function deleteFocusById (id) {
- localStorage.removeItem(id);
- removeFocusById(id);
- $('#focus-select').change();
-}
-
-/**
- * Delete current Focus
- * Listens for delete button
- */
-function deleteFocus () {
- var oldId = document.getElementById('original-id').value;
- deleteFocusById(oldId);
- $('#create-focus-modal').modal('hide');
- $('#focus-select').change();
-}
-
-/**
- * Is the name valid (in terms of characters)?
- */
-function isValidName (name) {
- // no Characters other then a-z, A-Z, 0-9, ä, ö, ü, ß, -, _ allowed
- // at least 1 character
- return /^[a-zA-Z0-9äöüß\-_ ]+$/.test(name);
-}
-
-/**
- * Is at least one focus selected?
- */
-function atLeastOneChecked () {
- return $('.focusCheckbox:checked').length > 0;
-}
-
-/**
- * Is there already a focus with this name?
- */
-function alreadyInUse (name) {
- return localStorage.hasOwnProperty(getIdFromName(name));
-}
-
-/**
- * Adds an option to the focus selector
- */
-function addFocus (name) {
- var id = getIdFromName(name);
- var customFocus = $('<div id="' + id + '"><a href="#" target="_self">' + name + '</a><a class="edit-focus" data-id="' + id + '" href="#"><i class="fa fa-wrench"></i></div>');
- $(customFocus).find('.edit-focus').click(function () {
- showFocusEditDialog($(this).attr('data-id'));
- });
- $('#foki .search-option-frame').before(customFocus);
-}
-
-/**
- * Remove the focuses html-elements
- */
-function removeFocus (name) {
- removeFocusById(getIdFromName(name));
-}
-
-/**
- * Remove the focuses html-elements
- */
-function removeFocusById (id) {
- if (id == '') {
- return;
- }
- $('#focus-select option[value="' + id + '"]').remove();
-}
-
-/**
- * Turns a name into an id
- * Converts special characters and spaces
- */
-function getIdFromName (name) {
- name = name.toLowerCase();
- name = name.split(' ').join('_');
- name = name.split('ä').join('ae');
- name = name.split('ö').join('oe');
- name = name.split('ü').join('ue');
- return 'focus_' + name;
-}
-
-/**
- * Loads the focus object for the given id from local storage
- */
-function loadFocusById (id) {
- return JSON.parse(localStorage.getItem(id));
-}
-
-/**
- * Unchecks all focuses from the focus creator dialog
- */
-function uncheckAll () {
- $('.focusCheckbox').prop('checked', false);
-}
-
-/**
- * Sets the selected focus to default
- */
-function setFocusToDefault () {
- setFocus(DEFAULT_FOCUS);
-}
-
-/**
- * Sets the selected focus
- * @param {String} focusID The id of the focus, without #
- */
-function setFocus (focusID) {
- $('#focus-select option[value="' + focusID + '"]').prop('selected', true);
- $('#focus-select').change();
-}
-
-function focusChanged () {
- var selectedFocus = getCurrentFocus();
- if (typeof(currentFocus) !== 'undefined') {
- if (focusIsEditable(selectedFocus)) {
- enableEditFocusBtn();
- } else {
- disableEditFocusBtn();
- }
- loadFocusForSearch(selectedFocus);
- }
-}
-
-function focusIsEditable (focus) {
- if (focus.startsWith('focus_')) {
- return true;
- } else {
- return false;
- }
-}
-
-function enableEditFocusBtn () {
- $('#editFocusBtn').removeClass('disabled').click(editCurrentFocus);
-}
-
-function disableEditFocusBtn () {
- $('#editFocusBtn').addClass('disabled').off('click');
-}
-
-function loadFocusForSearch (focus) {
- var focus = loadFocusById(focus);
-
- var url = '/meta/meta.ger3?eingabe=x&focus=';
-
- // clearCustomSearch()
- for (var key in focus) {
- if (key.startsWith('engine_') && focus[key] == 'on') {
- addSumaToCustomSearch(key);
- }
- }
-}
-
-function getFocusInUrl () {
- var url = window.location;
- var focReg = /focus=(focus_\w+)/.exec(url);
- if (focReg && focReg[1]) {
- return focReg[1];
- }
-}
-
-function checkboxCheckListener (event) {
- toggleDeleteButton();
- var elem = event.target;
- if (elem.name) {
- if (elem.checked) {
- setCheckedForAllWithName(elem.name, true);
- } else {
- setCheckedForAllWithName(elem.name, false);
- }
- }
-}
-
-function setCheckedForAllWithName (name, checked) {
- $('.focusCheckbox[name=' + name + ']').prop('checked', checked);
-}
diff --git a/public/js/searchbar.js b/public/js/searchbar.js
deleted file mode 100644
index 16e3a4dd26abe58fa2d8856193fe5bcac9657910..0000000000000000000000000000000000000000
--- a/public/js/searchbar.js
+++ /dev/null
@@ -1,39 +0,0 @@
-$(function () {
- loadLocalStorage();
-});
-
-/**
- * Loads the user theme and stored settings from local storage
- */
-function loadLocalStorage () {
- if (localStorage) {
- setSettings();
- }
-}
-
-function setSettings () {
- var acceptedParams = ['autocomplete', 'key', 'lang', 'newtab', 'sprueche'];
- for (var key in localStorage) {
- var value = localStorage.getItem(key);
- var accepted = false;
- for (var i in acceptedParams) {
- if (key === 'param_' + acceptedParams[i]) {
- accepted = true;
- }
- }
- if (accepted) {
- key = key.substring(6);
- // Check for existing hidden fields for this key
- var existing = $('.search-hidden input[name="' + key + '"]');
- if (existing.length === 0) {
- // if none exist, create a new one
- $('.search-hidden').append('<input type="hidden" name="' + key + '" value="' + value + '">');
- }
- }
- }
- // Change the request method to the given parameter
- var requestMethod = localStorage.getItem('request');
- if (requestMethod !== null && (requestMethod === 'GET' || requestMethod === 'POST')) {
- $('#searchForm').attr('method', requestMethod);
- }
-}
\ No newline at end of file
diff --git a/resources/assets/js/result-saver.js b/resources/assets/js/result-saver.js
index 444fb5dde8b0e210c222a7da5145b86a5efd7683..50706213d8f0945ac32dbf99b7721163360a4cdc 100644
--- a/resources/assets/js/result-saver.js
+++ b/resources/assets/js/result-saver.js
@@ -57,8 +57,8 @@ Results.prototype.sortResults = function () {
break;
case 'alphabetical': // by hostname
this.results.sort(function (a, b) {
- if (b.hostname > a.hostname) return -1;
- if (b.hostname < a.hostname) return 1;
+ if (b.hosterName > a.hosterName) return -1;
+ if (b.hosterName < a.hosterName) return 1;
return 0;
});
break;
@@ -78,7 +78,7 @@ Results.prototype.loadAllResults = function () {
// Remove the prefix
key = key.substr(this.prefix.length);
// Create the result for this key by loading it from localstorage
- var tmpResult = new Result(undefined, undefined, undefined, undefined, undefined, undefined, key);
+ var tmpResult = new Result(undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, key);
// Add the result to the list of results
this.results.push(tmpResult);
}
@@ -117,7 +117,7 @@ Results.prototype.updateResultPageInterface = function () {
// If there is no savedFoki element yet, create it
var tabPanel = $('\
<div id="savedFoki">\
- <h1>Gespeicherte Ergebnisse</h1>\
+ <h1>' + t('result-saver.title') + '</h1>\
</div>\
');
$('#additions-container').append(tabPanel);
@@ -141,19 +141,20 @@ Results.prototype.addToContainer = function (container) {
var options = $('\
<div id="saver-options">\
<div class="saver-option saver-option-filter">\
- <input class="form-control" type="text" placeholder=" Filtern">\
+ <input class="form-control" type="text" placeholder=" ' + t('result-saver.filter') + '">\
</div>\
<div class="saver-option saver-option-sort">\
<select class="form-control" style="font-family: FontAwesome, sans-serif;">\
- <option value="chronological" style="font-family: FontAwesome, sans-serif;"> Chronologisch</option>\
- <option value="rank" style="font-family: FontAwesome, sans-serif;"> MetaGer-Ranking</option>\
- <option value="alphabetical" style="font-family: FontAwesome, sans-serif;"> Alphabetisch (Hostname)</option>\
+ <option value="chronological" style="font-family: FontAwesome, sans-serif;"> ' + t('result-saver.sort.chronological') + '</option>\
+ <option value="rank" style="font-family: FontAwesome, sans-serif;"> ' + t('result-saver.sort.ranking') + '</option>\
+ <option value="alphabetical" style="font-family: FontAwesome, sans-serif;"> ' + t('result-saver.sort.alphabetical') + '</option>\
</select>\
</div>\
<div class="saver-option saver-option-delete">\
<button class="btn btn-danger btn-md" id="saver-options-delete-btn">\
- <i class="fa fa-trash-o" aria-hidden="true"></i>\
- <span class="hidden-xs">Ergebnisse</span> löschen</button>\
+ <i class="fa fa-trash-o" aria-hidden="true"></i>\
+ ' + t('result-saver.deleteAll') + '\
+ </button>\
</div>\
</div>\
');
@@ -217,13 +218,13 @@ Results.prototype.addToContainer = function (container) {
* @param {int} rank The rank of this result
* @param {int} hash The hash value for this result
*/
-function Result (title, link, anzeigeLink, description, anonym, index, hash) {
+function Result (title, link, hosterName, hosterLink, anzeigeLink, description, anonym, index, hash) {
// Set prefix for localstorage
this.prefix = 'result_';
if (hash === null || hash === undefined) {
// Calculate the hash value of this result
- hash = MD5(title + link + anzeigeLink + description + anonym);
+ hash = MD5(title + link + hosterName + hosterLink + anzeigeLink + description + anonym);
}
this.hash = hash;
@@ -233,16 +234,14 @@ function Result (title, link, anzeigeLink, description, anonym, index, hash) {
// Save all important data
this.title = title;
this.link = link;
+ this.hosterName = hosterName;
+ this.hosterLink = hosterLink;
this.anzeigeLink = anzeigeLink;
this.description = description;
this.anonym = anonym;
this.index = index;
this.rank = index;
this.added = new Date().getTime();
- // read the hostname from the displayed link
- // matches everything from after a 'www' to the locality ending ('de', 'com', etc.)
- var matches = /(?:www\.)*((?:[\w\-]+\.)+\w{2,3})(?:$|[/?])/.exec(this.anzeigeLink);
- this.hostname = matches[1];
// Save this result to localstorage
this.save();
@@ -257,25 +256,24 @@ Result.prototype.load = function () {
if (!localStorage) return false;
// Try to load from local storage
- var result = localStorage.getItem(this.prefix + this.hash);
- if (result === null) return false;
+ var encoded = localStorage.getItem(this.prefix + this.hash);
+ if (encoded === null) return false;
// Decode the base64 result into a normal string, then json
- result = b64DecodeUnicode(result);
- result = JSON.parse(result);
+ var decoded = b64DecodeUnicode(encoded);
+ var result = JSON.parse(decoded);
// Load all important data
this.title = result.title;
this.link = result.link;
this.anzeigeLink = result.anzeigeLink;
- this.gefVon = result.gefVon;
- this.hoster = result.hoster;
+ this.hosterName = result.hosterName;
+ this.hosterLink = result.hosterLink;
this.anonym = result.anonym;
this.description = result.description;
this.added = result.added;
this.index = -result.index;
this.rank = result.rank;
- this.hostname = result.hostname;
return true;
};
@@ -291,14 +289,13 @@ Result.prototype.save = function () {
title: this.title,
link: this.link,
anzeigeLink: this.anzeigeLink,
- gefVon: this.gefVon,
- hoster: this.hoster,
+ hosterName: this.hosterName,
+ hosterLink: this.hosterLink,
anonym: this.anonym,
description: this.description,
added: this.added,
index: this.index,
- rank: this.rank,
- hostname: this.hostname
+ rank: this.rank
};
// Encode the result object into a string, then into base64
@@ -356,31 +353,36 @@ Result.prototype.toHtml = function () {
// Create the saved-result element
var result = $('\
<div class="saved-result result" data-count="' + this.index + '">\
- <div class="saved-result-remover remover" title="Ergebnis aus dem Speicher löschen">\
+ <div class="saved-result-remover remover" title="' + t('result-saver.delete') + '">\
<i class="fa fa-trash"></i>\
</div>\
<div class="saved-result-content">\
<div class="result-header">\
- <h2 class="result-title">\
- <a class="title" href="' + this.link + '" target="_blank" data-count="1" rel="noopener">\
- ' + this.title + '\
+ <div class="result-headline">\
+ <h2 class="result-title">\
+ <a href="' + this.link + '" target="_blank" data-count="1" rel="noopener">\
+ ' + this.title + '\
+ </a>\
+ </h2>\
+ <a class="result-hoster" href="' + this.hosterLink + '" target="_blank" data-count="1" rel="noopener">\
+ ' + this.hosterName + '\
</a>\
- <a class="result-link" href="' + this.link + '" target="_blank" data-hoster="' + this.hoster + '" rel="noopener">\
- ' + this.anzeigeLink + '\
- </a>\
- </h2>\
+ </div>\
+ <a class="result-link" href="' + this.link + '" target="_blank" rel="noopener">\
+ ' + this.anzeigeLink + '\
+ </a>\
<div class="result-body">\
<div class="description">' + this.description + '</div>\
</div>\
<div class="result-footer">\
<a class="result-open" href="' + this.link + '" target="_self" rel="noopener">\
- ÖFFNEN\
+ ' + t('result-saver.save.this') + '\
</a>\
<a class="result-open" href="' + this.link + '" target="_blank" rel="noopener">\
- IN NEUEM TAB\
+ ' + t('result-saver.save.newtab') + '\
</a>\
<a class="result-open-proxy" onmouseover="$(this).popover(\'show\');" onmouseout="$(this).popover(\'hide\');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="Der Link wird anonymisiert geöffnet. Ihre Daten werden nicht zum Zielserver übertragen. Möglicherweise funktionieren manche Webseiten nicht wie gewohnt." href="' + this.anonym + '" target="_blank" rel="noopener" data-original-title="" title="">\
- ANONYM ÖFFNEN\
+ ' + t('result-saver.save.anonymous') + '\
</a>\
</div>\
</div>\
@@ -405,12 +407,14 @@ function resultSaver (index) {
// Read the necessary data from the result html
var title = $('.result[data-count=' + index + '] .result-title a').html().trim();
var link = $('.result[data-count=' + index + '] .result-title a').attr('href').trim();
+ var hosterName = $('.result[data-count=' + index + '] .result-hoster').html().trim();
+ var hosterLink = $('.result[data-count=' + index + '] .result-hoster').attr('href').trim();
var anzeigeLink = $('.result[data-count=' + index + '] .result-link').html().trim();
var description = $('.result[data-count=' + index + '] .result-description').html().trim();
var anonym = $('.result[data-count=' + index + '] .result-open-proxy').attr('href').trim();
// Create the result object
- var result = new Result(title, link, anzeigeLink, description, anonym, index, null);
+ var result = new Result(title, link, hosterName, hosterLink, anzeigeLink, description, anonym, index, null);
// Add new result to results
results.addResult(result);
diff --git a/resources/assets/js/translations.js b/resources/assets/js/translations.js
index 0b7c0ae0269b8ead556fce5f856d38a9591f9733..d0ca59cbcefc00be097dd56f8e3b9c44905014a6 100644
--- a/resources/assets/js/translations.js
+++ b/resources/assets/js/translations.js
@@ -1,29 +1,59 @@
+/**
+ * Ãœbersetzt den Key in die aktuelle Sprache.
+ * Die Sprache kann optional auch explizit angegeben werden.
+ * Verwendung: t('KEY')
+ */
+
// Speichert die Ãœbersetzungen
var translations = {
- 'de': {
- 'select-engine': 'Bitte mindestens 1 Suchmaschine auswählen.',
- 'select-valid-name': 'Bitte gültigen Namen eingeben:\n* Keine Sonderzeichen\n* Mindestens 1 Buchstabe\n',
- 'confirm-overwrite-name': 'Name bereits genutzt.\nÃœberschreiben?',
- 'saved-settings': 'Auf der folgenden Startseite sind Ihre Einstellungen nun einmalig gespeichert. Nach Ihrer ersten Suche sind diese wieder verloren. Wenn Sie diese speichern möchten, können Sie sich allerdings ein Lesezeichen für die generierte Startseite einrichten.',
- 'generated-plugin': 'Ihr Browserplugin mit den persönlichen Sucheinstellungen wurde generiert. Folgen Sie bitte der Anleitung auf der folgenden Seite um es zu installieren. Beachten Sie: Zuvor sollten Sie ein eventuell bereits installiertes MetaGer-Plugin entfernen.'
- },
+ 'de': {
+ 'select-engine': 'Bitte mindestens 1 Suchmaschine auswählen.',
+ 'select-valid-name': 'Bitte gültigen Namen eingeben:\n* Keine Sonderzeichen\n* Mindestens 1 Buchstabe\n',
+ 'confirm-overwrite-name': 'Name bereits genutzt.\nÃœberschreiben?',
+ 'saved-settings': 'Auf der folgenden Startseite sind Ihre Einstellungen nun einmalig gespeichert. Nach Ihrer ersten Suche sind diese wieder verloren. Wenn Sie diese speichern möchten, können Sie sich allerdings ein Lesezeichen für die generierte Startseite einrichten.',
+ 'generated-plugin': 'Ihr Browserplugin mit den persönlichen Sucheinstellungen wurde generiert. Folgen Sie bitte der Anleitung auf der folgenden Seite um es zu installieren. Beachten Sie: Zuvor sollten Sie ein eventuell bereits installiertes MetaGer-Plugin entfernen.',
+ 'result-saver.title': 'Gespeicherte Ergebnisse',
+ 'result-saver.filter': 'Filtern',
+ 'result-saver.sort.chronological': 'Chronologisch',
+ 'result-saver.sort.ranking': 'MetaGer-Ranking',
+ 'result-saver.sort.alphabetical': 'Alphabetisch (Hostname)',
+ 'result-saver.delete': 'Ergebnis aus dem Speicher löschen',
+ 'result-saver.deleteAll': '<span class="hidden-xs">Ergebnisse</span> löschen</button>',
+ 'result-saver.save.this': 'ÖFFNEN',
+ 'result-saver.save.newtab': 'IN NEUEM TAB',
+ 'result-saver.save.anonymous': 'ANONYM ÖFFNEN'
+ },
- 'en': {
- 'select-engine' : 'Please select at least 1 search engine.',
- 'select-valid-name': 'No characters other than a-z, A-Z, 0-9, ä, ö, ü, ß, -, _ allowed, at least 1 character',
- 'confirm-overwrite-name': 'Name already in use.\nOverwrite?',
- 'saved-settings': 'On the following startpage your settings are saved one-time. They will be lost after your first search. Though if you want to save them, you can create a bookmark for the generated startpage.',
- 'generated-plugin': 'Your browser plugin with personal settings was generated. Please follow the instructions on the following page to install it. Notice that beforehand you might have to delete a former MetaGer plugin.'
- },
+ 'en': {
+ 'select-engine': 'Please select at least 1 search engine.',
+ 'select-valid-name': 'No characters other than a-z, A-Z, 0-9, ä, ö, ü, ß, -, _ allowed, at least 1 character',
+ 'confirm-overwrite-name': 'Name already in use.\nOverwrite?',
+ 'saved-settings': 'On the following startpage your settings are saved one-time. They will be lost after your first search. Though if you want to save them, you can create a bookmark for the generated startpage.',
+ 'generated-plugin': 'Your browser plugin with personal settings was generated. Please follow the instructions on the following page to install it. Notice that beforehand you might have to delete a former MetaGer plugin.',
+ 'result-saver.title': 'Saved Results',
+ 'result-saver.filter': 'Filter',
+ 'result-saver.sort.chronological': 'Chronological',
+ 'result-saver.sort.ranking': 'MetaGer-Ranking',
+ 'result-saver.sort.alphabetical': 'Alphabetical (Hostname)',
+ 'result-saver.delete': 'Delete saved Result',
+ 'result-saver.deleteAll': 'delete <span class="hidden-xs">results</span>',
+ 'result-saver.save.this': 'OPEN',
+ 'result-saver.save.newtab': 'IN NEW TAB',
+ 'result-saver.save.anonymous': 'OPEN ANONYMOUSLY'
+ },
- 'es': {
- 'select-engine': 'Por favor, seleccione al menos un motor de búsqueda.',
- 'select-valid-name': 'Por favor, introduzca un nombre válido constituido por letras y números.',
- 'confirm-overwrite-name': 'Nombre ya ha sido elegido.\n¿Substituirlo?',
- // 'saved-settings': '',
- // 'generated-plugin': ''
- }
-}
+ 'es': {
+ 'select-engine': 'Por favor, seleccione al menos un motor de búsqueda.',
+ 'select-valid-name': 'Por favor, introduzca un nombre válido constituido por letras y números.',
+ 'confirm-overwrite-name': 'Nombre ya ha sido elegido.\n¿Substituirlo?',
+ // 'saved-settings': '',
+ // 'generated-plugin': ''
+ // 'result-saver.sort.chronological': 'Chronologisch',
+ // 'result-saver.sort.ranking': 'MetaGer-Ranking',
+ // 'result-saver.sort.alphabetical': 'Alphabetisch (Hostname)',
+ // 'result-saver.delete': 'Ergebnis aus dem Speicher löschen',
+ }
+};
/**
* Übersetzt den gegebenen Schlüssel in der gegebenen Sprache
@@ -31,13 +61,13 @@ var translations = {
* @param {string} key Zu übersetzender Schlüssel
* @param {string} lang Zu verwendende Sprache
*/
-function t(key, lang) {
- if (arguments.length == 1) {
- var lang = $('html').attr('lang');
- return translations[lang][key];
- } else if (arguments.length == 2 && translations[lang] && translations[lang][key]) {
- return translations[lang][key];
- } else {
- return translations.de[key];
- }
-}
\ No newline at end of file
+function t (key, lang) {
+ if (arguments.length == 1) {
+ var lang = $('html').attr('lang');
+ return translations[lang][key];
+ } else if (arguments.length == 2 && translations[lang] && translations[lang][key]) {
+ return translations[lang][key];
+ } else {
+ return translations.de[key];
+ }
+}
diff --git a/resources/assets/less/metager/cards.less b/resources/assets/less/metager/cards.less
new file mode 100644
index 0000000000000000000000000000000000000000..9fe7fe80688ef2dd178e5b77be71280f3a970684
--- /dev/null
+++ b/resources/assets/less/metager/cards.less
@@ -0,0 +1,15 @@
+.card, .card-medium {
+ border: 1px solid #ccc;
+ background-color: white;
+ box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
+ margin: 8px;
+ padding: 15px;
+}
+.card-heavy {
+ .card;
+ box-shadow: 0px 4px 5px 0px rgba(0, 0, 0, 0.12), 4px 0px 5px 0px rgba(0, 0, 0, 0.24);
+}
+.card-light {
+ .card;
+ box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.12), 0px 0px 1px 0px rgba(0, 0, 0, 0.24);
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/general.less b/resources/assets/less/metager/general.less
index bfca73acf7b6a6451681d2632ad137c4f7b06746..0dbf3d0fcef8d91d99304f763134d937c750579a 100644
--- a/resources/assets/less/metager/general.less
+++ b/resources/assets/less/metager/general.less
@@ -38,6 +38,60 @@ body {
justify-content: center;
align-items: center;
margin-top: 50px;
+ padding: 0px 8px;
+ overflow: hidden;
+ main {
+ width: 100%;
+ max-width: 1000px;
+ }
+}
+
+.first-last-child-margin-fix() {
+ &:first-child {
+ margin-top: 0px;
+ }
+ &:last-child {
+ margin-bottom: 0px;
+ }
+}
+
+
+/* General font sizing */
+
+@default-font-size: 15px;
+h1 {
+ font-size: @default-font-size * 1.6;
+ .first-last-child-margin-fix;
+}
+
+h2 {
+ font-size: @default-font-size * 1.4;
+ .first-last-child-margin-fix;
+}
+
+h3 {
+ font-size: @default-font-size * 1.2;
+ .first-last-child-margin-fix;
+}
+
+p {
+ font-size: @default-font-size;
+ .first-last-child-margin-fix;
+}
+
+* {
+ font-size: @default-font-size;
+ .first-last-child-margin-fix;
+}
+
+.page-title {
+ font-size: @default-font-size * 3;
+ text-align: center;
+}
+
+.page-subtitle {
+ font-size: @default-font-size;
+ text-align: center;
}
@@ -268,7 +322,15 @@ button {
}
}
-@metager-url: "metager.de";
+.two-col {
+ >* {
+ width: 50%;
+ margin: 0;
+ float: left;
+ @media (max-width: @screen-xs-max) {
+ width: 100%;
+ }
+}
/* Links */
diff --git a/resources/assets/less/metager/metager.less b/resources/assets/less/metager/metager.less
index a2d2732d85a019b970a8b6bf93126bb71259b466..dd9c84da2979358ffb9a1f6d1512e085c74cb957 100644
--- a/resources/assets/less/metager/metager.less
+++ b/resources/assets/less/metager/metager.less
@@ -8,4 +8,5 @@
@import "./foki.less";
@import "./footer.less";
@import "./searchbar.less";
-@import "./aufruf-winter.less";
\ No newline at end of file
+@import "./aufruf-winter.less";
+@import "./cards.less";
\ No newline at end of file
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index bc1ad6a089aec3dab84c166908a533ae4a26d2f0..4ed4d4a471c2deca5d0210e5c1a2f59406bd2b79 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -384,6 +384,9 @@ p.mg-logo {
#results-container {
max-width: @result-width;
width: 100%;
+ .alert {
+ margin: 8px 0px;
+ }
}
#additions-container {
padding-left: 50px;
diff --git a/resources/assets/less/metager/result.less b/resources/assets/less/metager/result.less
index 0ba85f39f6c6f64f1c7e2a9657ad867e73495bfe..6b76b4e665d980187b7ecbe0b0a4b139a4b7e1b0 100644
--- a/resources/assets/less/metager/result.less
+++ b/resources/assets/less/metager/result.less
@@ -4,12 +4,10 @@
@result-font-medium: 16px;
@result-font-small: 14px;
.result {
+ .card;
margin: @resultpage-leftbox-min-dist-top-bottom 0px @resultpage-leftbox-min-dist-top-bottom 0px;
padding: 15px;
width: 100%;
- border: 1px solid #ccc;
- background-color: white;
- box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
.result-header {
.result-headline {
display: flex;
@@ -32,6 +30,7 @@
}
}
.result-hoster {
+ font-size: @result-font-small;
margin-left: 20px;
color: #808080;
white-space: nowrap;
@@ -43,7 +42,8 @@
text-overflow: ellipsis;
white-space: nowrap;
font-size: @result-font-small;
- width: auto;
+ width: fit-content;
+ max-width: 100%;
&,
&:active,
&:hover,
diff --git a/resources/assets/less/metager/searchbar.less b/resources/assets/less/metager/searchbar.less
index 78fe580dea97a7a75a1dbf254f12a7225671fca9..b9d9feaae2d94117b3308118d35a57cf87d43c6d 100644
--- a/resources/assets/less/metager/searchbar.less
+++ b/resources/assets/less/metager/searchbar.less
@@ -5,11 +5,11 @@
display: -ms-flexbox;
display: flex;
-webkit-box-align: stretch;
- -ms-flex-align: stretch;
- align-items: stretch;
+ -ms-flex-align: stretch;
+ align-items: stretch;
-webkit-box-pack: center;
- -ms-flex-pack: center;
- justify-content: center;
+ -ms-flex-pack: center;
+ justify-content: center;
font-size: 16px;
background-color: transparent;
color: #333;
@@ -18,8 +18,8 @@
}
.search-input-submit {
-webkit-box-flex: 1;
- -ms-flex-positive: 1;
- flex-grow: 1;
+ -ms-flex-positive: 1;
+ flex-grow: 1;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
@@ -30,14 +30,14 @@
}
.search-input {
-webkit-box-flex: 1;
- -ms-flex-positive: 1;
- flex-grow: 1;
+ -ms-flex-positive: 1;
+ flex-grow: 1;
input {
border: none;
border-bottom: none;
height: 40px;
-webkit-box-shadow: none;
- box-shadow: none;
+ box-shadow: none;
&:focus {
outline-color: rgb(255, 128, 0);
-webkit-box-shadow: 0px 0px 2px 2px rgba(255, 128, 0, 1);
@@ -65,8 +65,8 @@
@media (max-width: @screen-xs-max) {
-webkit-box-orient: vertical;
-webkit-box-direction: reverse;
- -ms-flex-direction: column-reverse;
- flex-direction: column-reverse;
+ -ms-flex-direction: column-reverse;
+ flex-direction: column-reverse;
}
}
@@ -141,8 +141,8 @@ header {
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
- -ms-flex-direction: column;
- flex-direction: column;
+ -ms-flex-direction: column;
+ flex-direction: column;
position: fixed;
z-index: 100; // Makes the header larger, so it correctly covers the non scrolling parts below
width: @resultpage-leftbox-max-width + @resultpage-leftbox-big-screen-margin-left + 10;
@@ -155,8 +155,8 @@ header {
padding: @resultpage-leftbox-min-dist-top-bottom @resultpage-leftbox-min-dist-left-right 0px @resultpage-leftbox-min-dist-left-right;
-webkit-box-pack: center;
-webkit-box-align: center;
- -ms-flex-align: center;
- align-items: center;
+ -ms-flex-align: center;
+ align-items: center;
}
#research-bar {
width: 100%;
@@ -169,13 +169,13 @@ header {
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
- -ms-flex-align: center;
- align-items: center;
+ -ms-flex-align: center;
+ align-items: center;
-webkit-box-pack: center;
- -ms-flex-pack: center;
- justify-content: center;
+ -ms-flex-pack: center;
+ justify-content: center;
-webkit-box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
- box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
+ box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
@media (max-width: 799px) {
margin: 0px @resultpage-leftbox-min-dist-left-right;
}
@@ -193,8 +193,8 @@ header:nth-child(1) {
display: -ms-flexbox;
display: flex;
-webkit-box-pack: left;
- -ms-flex-pack: left;
- justify-content: left;
+ -ms-flex-pack: left;
+ justify-content: left;
margin-left: @resultpage-leftbox-big-screen-margin-left;
padding-top: 8px;
width: @resultpage-leftbox-max-width;
@@ -205,8 +205,8 @@ header:nth-child(1) {
display: -ms-flexbox;
display: flex;
-webkit-box-pack: center;
- -ms-flex-pack: center;
- justify-content: center;
+ -ms-flex-pack: center;
+ justify-content: center;
padding: @resultpage-leftbox-min-dist-top-bottom @resultpage-leftbox-min-dist-left-right 0px @resultpage-leftbox-min-dist-left-right;
}
#foki-box {
@@ -218,7 +218,7 @@ header:nth-child(1) {
background-color: white;
border: 1px solid #ccc;
-webkit-box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
- box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
+ box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
overflow-x: visible;
padding: 10px;
@media (max-width: 700px) {
@@ -233,6 +233,9 @@ header:nth-child(1) {
border-bottom: 1px solid rgb(255, 128, 0);
color: rgb(255, 128, 0);
}
+ &:last-child {
+ padding-right: 20px
+ }
}
.edit-focus {
margin-left: 7px;
@@ -274,16 +277,14 @@ header:nth-child(1) {
right: 1px;
}
}
-
.search-option-frame {
position: relative;
}
-
}
#research-bar-placeholder {
padding: @resultpage-leftbox-min-dist-top-bottom 0px 0px 50px;
width: 100%;
- max-width: 700px;
+ max-width: 760px;
height: 61px;
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/specific.less b/resources/assets/less/metager/specific.less
index e7de08d82dd265f6dd9c220ef03d9cab29b79f72..03951fb1a4079c0a8c81be55fae0e7b204b9c484 100644
--- a/resources/assets/less/metager/specific.less
+++ b/resources/assets/less/metager/specific.less
@@ -8,10 +8,6 @@ li#info {
white-space: pre-line;
}
-div#top {
- padding-right: 35px;
-}
-
div#expand {
max-height: 0px;
overflow: hidden;
@@ -93,11 +89,6 @@ textarea#message {
font-size: 20px;
}
-.donation-others {
- text-align: center;
- padding: 30px;
-}
-
.checkbox {
margin-top: 5px;
margin-bottom: 5px;
@@ -135,7 +126,6 @@ a.content.hidden-xs {
.dotlist li {
margin-bottom: 5px !important;
- font-size: 16px;
}
.emphasize {
diff --git a/resources/assets/less/metager/start-page.less b/resources/assets/less/metager/start-page.less
index 3602215f68282a2169b32272192b97e1aa0d78cb..1ce0cce704a99bbddb30c1710eeb709317197faf 100644
--- a/resources/assets/less/metager/start-page.less
+++ b/resources/assets/less/metager/start-page.less
@@ -100,7 +100,7 @@
}
#sponsors {
@media(max-width: @screen-xs-max) {
- margin: 0px 5px;
+ margin: 20px 5px;
}
h2 {
font-size: 21px;
@@ -132,4 +132,4 @@
max-width: 770px;
margin-bottom: 10px;
}
-}
+}
\ No newline at end of file
diff --git a/resources/lang/de/fake-result.php b/resources/lang/de/fake-result.php
new file mode 100644
index 0000000000000000000000000000000000000000..bd624e7c61ca005307e84e0cd46d97fb0587650b
--- /dev/null
+++ b/resources/lang/de/fake-result.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+ 'title' => 'Ergebnistitel',
+ 'hoster' => 'Gefunden von',
+ 'link' => 'Ergebnislink',
+ 'description' => 'Zusammenfassung der Ergebnisseite',
+ 'open.this' => 'Ergebnis in diesem Tab öffnen',
+ 'open.newtab' => 'Ergebnis in einem neuen Tab öffnen',
+ 'open.anonymous' => 'Ergebnis anonym (über den MetaGer-Proxy) öffnen',
+ 'options.more' => 'Zusätzliche optionen anzeigen',
+ 'options.save' => 'Ergebnis zum weiteren Filtern speichern',
+ 'options.domain' => 'Neue auf diese Domain beschränkte Suche starten',
+ 'options.subdomain' => 'Neue Suche ohne diese Subdomain starten',
+ 'options.blacklist' => 'Neue Suche ohne diese Domain starten',
+];
diff --git a/resources/lang/de/footer.php b/resources/lang/de/footer.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b1a0833ca2b65eca0a814121b6638718d1384c8
--- /dev/null
+++ b/resources/lang/de/footer.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+ 'sumaev.1' => 'MetaGer wird entwickelt und betrieben vom ',
+ 'sumaev.2' => 'SUMA-EV - Verein für freien Wissenszugang.'
+];
diff --git a/resources/lang/de/sidebar.php b/resources/lang/de/sidebar.php
new file mode 100644
index 0000000000000000000000000000000000000000..48d12a718060986b2a2b4865ca3822d208588464
--- /dev/null
+++ b/resources/lang/de/sidebar.php
@@ -0,0 +1,30 @@
+<?php
+
+return [
+ 'nav1' => 'Suche',
+ 'nav2' => 'Spenden',
+ 'nav3' => 'Datenschutz',
+ 'nav4' => 'Forum',
+ 'nav5' => 'Kontakt',
+ 'nav6' => 'Team',
+ 'nav7' => 'Ãœber uns',
+ 'nav8' => 'Impressum',
+ 'nav9' => 'Hilfe',
+ 'nav10' => 'Widget',
+ 'nav11' => 'Assoziator',
+ 'nav13' => 'URL-Verkürzer',
+ 'nav14' => 'TOR-Hidden-Service',
+ 'nav15' => 'Dienste',
+ 'nav16' => 'Fördern',
+ 'nav17' => 'Einkaufen bei MetaGer-Fördershops',
+ 'nav18' => 'Kontakt',
+ 'nav19' => 'Sprache',
+ 'nav20' => 'Hilfe',
+ 'nav21' => 'FAQ',
+ 'nav22' => 'Zitatsuche',
+ 'nav23' => 'Aufnahmeantrag SUMA-EV',
+ 'nav24' => 'MetaGer Quellcode',
+ 'nav25' => 'MetaGer App',
+ 'nav26' => 'MetaGer-Fanshop',
+ 'navigationToggle' => 'Navigation anzeigen',
+];
diff --git a/resources/lang/de/staticPages.php b/resources/lang/de/staticPages.php
index 5481aac34f29e73a915685c7792a4c4bcef6de27..73069d5ac96f99c0946e37e106b22d34f1f5506d 100644
--- a/resources/lang/de/staticPages.php
+++ b/resources/lang/de/staticPages.php
@@ -2,35 +2,7 @@
return [
'opensearch' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen',
-
- 'nav1' => 'Suche',
- 'nav2' => 'Spenden',
- 'nav3' => 'Datenschutz',
- 'nav4' => 'Forum',
- 'nav5' => 'Kontakt',
- 'nav6' => 'Team',
- 'nav7' => 'Ãœber uns',
- 'nav8' => 'Impressum',
- 'nav9' => 'Hilfe',
- 'nav10' => 'Widget',
- 'nav11' => 'Assoziator',
- 'nav13' => 'URL-Verkürzer',
- 'nav14' => 'TOR-Hidden-Service',
- 'nav15' => 'Dienste',
- 'nav16' => 'Fördern',
- 'nav17' => 'Einkaufen bei MetaGer-Fördershops',
- 'nav18' => 'Kontakt',
- 'nav19' => 'Sprache',
- 'nav20' => 'Hilfe',
- 'nav21' => 'FAQ',
- 'nav22' => 'Zitatsuche',
- 'nav23' => 'Aufnahmeantrag SUMA-EV',
- 'nav24' => 'MetaGer Quellcode',
- 'nav25' => 'MetaGer App',
- 'navigationToggle' => 'Navigation anzeigen',
-
- 'sumaev.1' => 'MetaGer wird entwickelt und betrieben vom ',
- 'sumaev.2' => 'SUMA-EV - Verein für freien Wissenszugang.',
+
'meta.Description' => 'Sicher suchen und finden unter Wahrung der Privatsphäre. Das digitale Wissen der Welt muss ohne Bevormundung durch Staaten oder Konzerne frei zugänglich sein und bleiben.',
'meta.Keywords' => 'Internetsuche, privatsphäre, privacy, Suchmaschine, Datenschutz, Anonproxy, anonym suchen, Bildersuche, Suchmaschine, anonym, MetaGer, metager, metager.de',
'meta.language' => 'de',
diff --git a/resources/lang/de/zitatsuche.php b/resources/lang/de/zitatsuche.php
index 6cc83a6a86248535b043ada04cf8380e0bc5fd5e..5f3890280fd1c35360379451392fea2a12f7d456 100644
--- a/resources/lang/de/zitatsuche.php
+++ b/resources/lang/de/zitatsuche.php
@@ -1,6 +1,8 @@
<?php
return [
- 'head.1' => 'MetaGer - Zitatsuche',
- 'p.1' => 'In dem unten stehenden Textfeld können Sie in unserer Datenbank nach Zitaten oder Autoren suchen.',
+ 'title' => 'MetaGer - Zitatsuche',
+ 'subtitle' => 'In dem unten stehenden Textfeld können Sie in unserer Datenbank nach Zitaten oder Autoren suchen.',
+ 'search-label' => 'Suchworte eingeben',
+ 'results-label' => 'Ergebnisse für die Suche',
];
diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php
index fbfdc78d4f2d8ceb83ca5f06d042ab9dffd7f24d..afea4e713025c56ed0a1575c23bfc187649e67ab 100644
--- a/resources/views/about.blade.php
+++ b/resources/views/about.blade.php
@@ -3,32 +3,38 @@
@section('title', $title )
@section('content')
- <h1>{{ trans('about.head.1') }}</h1>
- <h2>{{ trans('about.head.3') }}</h2>
- <p class="lead">{!! trans('about.3.0') !!}</p>
- <ul class="dotlist">
- <li>{!! trans('about.3.1') !!}</li>
- <li>{!! trans('about.3.2') !!}</li>
- <li>{!! trans('about.3.3') !!}</li>
- <li>{!! trans('about.3.4') !!}</li>
- <li>{!! trans('about.3.5') !!}</li>
- <li>{!! trans('about.3.6') !!}</li>
- <li>{!! trans('about.3.7') !!}</li>
- </ul>
- <h2>{{ trans('about.head.2') }}</h2>
- <ul class="dotlist">
- <li>{!! trans('about.list.1') !!}</li>
- <li>{!! trans('about.list.2') !!}</li>
- <li>{!! trans('about.list.3') !!}</li>
- <li>{!! trans('about.list.4') !!}</li>
- <li>{!! trans('about.list.5') !!}</li>
- <li>{!! trans('about.list.6') !!}</li>
- <li>{!! trans('about.list.7') !!}</li>
- </ul>
+ <h1 class="page-title">{{ trans('about.head.1') }}</h1>
+ <div class="card-heavy">
+ <h2>{{ trans('about.head.3') }}</h2>
+ <p class="lead">{!! trans('about.3.0') !!}</p>
+ <ul class="dotlist">
+ <li>{!! trans('about.3.1') !!}</li>
+ <li>{!! trans('about.3.2') !!}</li>
+ <li>{!! trans('about.3.3') !!}</li>
+ <li>{!! trans('about.3.4') !!}</li>
+ <li>{!! trans('about.3.5') !!}</li>
+ <li>{!! trans('about.3.6') !!}</li>
+ <li>{!! trans('about.3.7') !!}</li>
+ </ul>
+ </div>
+ <div class="card-heavy">
+ <h2>{{ trans('about.head.2') }}</h2>
+ <ul class="dotlist">
+ <li>{!! trans('about.list.1') !!}</li>
+ <li>{!! trans('about.list.2') !!}</li>
+ <li>{!! trans('about.list.3') !!}</li>
+ <li>{!! trans('about.list.4') !!}</li>
+ <li>{!! trans('about.list.5') !!}</li>
+ <li>{!! trans('about.list.6') !!}</li>
+ <li>{!! trans('about.list.7') !!}</li>
+ </ul>
+ </div>
+ <div class="card-heavy">
<h2>{{ trans('about.head.4') }}</h2>
- <ul class="dotlist">
- <li><p>{!! trans('spende.about.3') !!}</p></li>
- <li><p>{!! trans('spende.about.4') !!}</p></li>
- <li><p>{!! trans('spende.about.5') !!}</p></li>
- </ul>
+ <ul class="dotlist">
+ <li><p>{!! trans('spende.about.3') !!}</p></li>
+ <li><p>{!! trans('spende.about.4') !!}</p></li>
+ <li><p>{!! trans('spende.about.5') !!}</p></li>
+ </ul>
+ </div>
@endsection
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index d809c4f51211ad4aead5637847641a2dbfae3b4a..6d570a02bf36a2d467cbafcb02f8edceea04cbda 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -3,29 +3,35 @@
@section('title', $title )
@section('content')
- <h1>{{ trans('app.head.1') }}</h1>
- <p>{{ trans('app.disclaimer.1')}}</p>
- <h2>{{ trans('app.head.2') }}</h2>
- <p>{{ trans('app.metager.1') }}</p>
- <p>{{ trans('app.metager.2') }}</p>
- <p><a href="https://play.google.com/store/apps/details?id=de.metager.metagerapp">{{ trans('app.metager.playstore') }}</a></p>
- <p><a href="{!! url('app/metager') !!}">{{ trans('app.metager.manuell') }}</a></p>
- <h2>{{ trans('app.head.3') }}</h2>
- <p>{!! trans('app.maps.1') !!}</p>
- <p>{{ trans('app.maps.2') }}</p>
- <p><a href="https://play.google.com/store/apps/details?id=de.suma_ev.dominik.metagermaps">{{ trans('app.maps.playstore') }}</a></p>
- <p><a href="{!! url('app/maps') !!}">{{ trans('app.metager.manuell') }}</a></p>
- <p>{{ trans('app.maps.3') }}</p>
- <ul>
- <li>{!! trans('app.maps.list.1') !!}</li>
- <li>{!! trans('app.maps.list.2') !!}</li>
- </ul>
- <h2>{{ trans('app.head.4') }}</h2>
- <p>{{ trans('app.installation.1') }}</p>
- <p>{{ trans('app.installation.2') }}</p>
- <ol>
- <li>{!! trans('app.list.1') !!}</li>
- <li>{!! trans('app.list.2') !!}</li>
- <li>{!! trans('app.list.3') !!}</li>
- </ol>
+ <h1 class="page-title">{{ trans('app.head.1') }}</h1>
+ <p class="page-subtitle">{{ trans('app.disclaimer.1')}}</p>
+ <div class="card-heavy">
+ <h2>{{ trans('app.head.2') }}</h2>
+ <p>{{ trans('app.metager.1') }}</p>
+ <p>{{ trans('app.metager.2') }}</p>
+ <p><a href="https://play.google.com/store/apps/details?id=de.metager.metagerapp">{{ trans('app.metager.playstore') }}</a></p>
+ <p><a href="{!! url('app/metager') !!}">{{ trans('app.metager.manuell') }}</a></p>
+ </div>
+ <div class="card-heavy">
+ <h2>{{ trans('app.head.3') }}</h2>
+ <p>{!! trans('app.maps.1') !!}</p>
+ <p>{{ trans('app.maps.2') }}</p>
+ <p><a href="https://play.google.com/store/apps/details?id=de.suma_ev.dominik.metagermaps">{{ trans('app.maps.playstore') }}</a></p>
+ <p><a href="{!! url('app/maps') !!}">{{ trans('app.metager.manuell') }}</a></p>
+ <p>{{ trans('app.maps.3') }}</p>
+ <ul>
+ <li>{!! trans('app.maps.list.1') !!}</li>
+ <li>{!! trans('app.maps.list.2') !!}</li>
+ </ul>
+ </div>
+ <div class="card-heavy">
+ <h2>{{ trans('app.head.4') }}</h2>
+ <p>{{ trans('app.installation.1') }}</p>
+ <p>{{ trans('app.installation.2') }}</p>
+ <ol>
+ <li>{!! trans('app.list.1') !!}</li>
+ <li>{!! trans('app.list.2') !!}</li>
+ <li>{!! trans('app.list.3') !!}</li>
+ </ol>
+ </div>
@endsection
diff --git a/resources/views/datenschutz.blade.php b/resources/views/datenschutz.blade.php
deleted file mode 100644
index 81ccf2ec61958031cf560e9ad5de6114d5109928..0000000000000000000000000000000000000000
--- a/resources/views/datenschutz.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-@extends('layouts.subPages')
-
-@section('title', $title )
-
-@section('navbarFocus.datenschutz', 'class="active"')
-
-@section('content')
- <h1>{!! trans('datenschutz.head') !!}</h1>
- <p class="emphasize">{!! trans('datenschutz.general.1') !!}</p>
- <p class="emphasize">{!! trans('datenschutz.general.3') !!}</p>
- <h2>{!! trans('datenschutz.policy.1') !!}</h2>
- <ul class="dotlist">
- <li>{!! trans('datenschutz.policy.2') !!}</li>
- <li>{!! trans('datenschutz.policy.5') !!}</li>
- <li>{!! trans('datenschutz.policy.6') !!}</li>
- <li>{!! trans('datenschutz.policy.7') !!}</li>
- <li>{!! trans('datenschutz.policy.9') !!}</li>
- <li>{!! trans('datenschutz.policy.10') !!}</li>
- <li>{!! trans('datenschutz.policy.13') !!}</li>
- <li>{!! trans('datenschutz.policy.17') !!}</li>
- <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
\ No newline at end of file
diff --git a/resources/views/datenschutz/datenschutz.blade.php b/resources/views/datenschutz/datenschutz.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..de2e069f81bf5bd182ccfe9414f90621ef509dbc
--- /dev/null
+++ b/resources/views/datenschutz/datenschutz.blade.php
@@ -0,0 +1,32 @@
+@extends('layouts.subPages')
+
+@section('title', $title )
+
+@section('navbarFocus.datenschutz', 'class="active"')
+
+@section('content')
+ <div class="card-heavy">
+ <h1>{!! trans('datenschutz.head') !!}</h1>
+ <p>{!! trans('datenschutz.general.1') !!}</p>
+ <p>{!! trans('datenschutz.general.3') !!}</p>
+ </div>
+ <div class="card-heavy">
+ <h1>{!! trans('datenschutz.policy.1') !!}</h2>
+ <ul class="dotlist">
+ <li>{!! trans('datenschutz.policy.2') !!}</li>
+ <li>{!! trans('datenschutz.policy.5') !!}</li>
+ <li>{!! trans('datenschutz.policy.6') !!}</li>
+ <li>{!! trans('datenschutz.policy.7') !!}</li>
+ <li>{!! trans('datenschutz.policy.9') !!}</li>
+ <li>{!! trans('datenschutz.policy.10') !!}</li>
+ <li>{!! trans('datenschutz.policy.13') !!}</li>
+ <li>{!! trans('datenschutz.policy.17') !!}</li>
+ <li>{!! trans('datenschutz.policy.18') !!}</li>
+ <li>{!! trans('datenschutz.policy.19') !!}</li>
+ </ul>
+ </div>
+ <div class="card-heavy">
+ <h1>{!! trans('datenschutz.twitter') !!}</h2>
+ <pre>@include('datenschutz/twitter-comments')</pre>
+ </div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/datenschutz/twitter-comments.blade.php b/resources/views/datenschutz/twitter-comments.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..591e0cfb9bf78b8ad2b6a354b0bd3a9ba457df7f
--- /dev/null
+++ b/resources/views/datenschutz/twitter-comments.blade.php
@@ -0,0 +1,15 @@
+<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>
\ No newline at end of file
diff --git a/resources/views/faq.blade.php b/resources/views/faq.blade.php
index 02fb52660426457e968e092e0804281ac3e0d416..3261a89bd6e8f5802ee498c74e1b715b09df0978 100644
--- a/resources/views/faq.blade.php
+++ b/resources/views/faq.blade.php
@@ -4,7 +4,7 @@
@section('content')
<div class="alert alert-warning" role="alert">{!! trans('faq.achtung') !!}</div>
- <h1>{!! trans('faq.title') !!}</h1>
+ <h1 class="page-title">{!! trans('faq.title') !!}</h1>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{!! trans('faq.faq.1.h') !!}</h3>
diff --git a/resources/views/hilfe.blade.php b/resources/views/hilfe.blade.php
index 459dce8715682a6df024ace6688a50c7d8c1deb3..86b79b02bf80120dbd5ab0d464e9439d1674c48b 100644
--- a/resources/views/hilfe.blade.php
+++ b/resources/views/hilfe.blade.php
@@ -4,7 +4,7 @@
@section('content')
<div class="alert alert-warning" role="alert">{!! trans('hilfe.achtung') !!}</div>
- <h1>{!! trans('hilfe.title') !!}</h1>
+ <h1 class="page-title">{!! trans('hilfe.title') !!}</h1>
<h2>{!! trans('hilfe.einstellungen') !!}</h2>
<div class="panel panel-default">
<div class="panel-heading">
diff --git a/resources/views/impressum.blade.php b/resources/views/impressum.blade.php
index 7096e589e37f7cbbb9ec5d97070a3b9032516168..87d874c8046658fe34113682ff8a6c4ba74e8e06 100644
--- a/resources/views/impressum.blade.php
+++ b/resources/views/impressum.blade.php
@@ -3,17 +3,22 @@
@section('title', $title )
@section('content')
- <h1>{!! trans('impressum.title') !!}</h1>
- <h2 class="subheading">{!! trans('impressum.headline.1') !!}
- </h2>
- <p>{!! trans('impressum.info.1') !!}</p>
- <address>{!! trans('impressum.info.2') !!}</address>
- <address>{!! trans('impressum.info.3') !!}</address>
- <p>{!! trans('impressum.info.4') !!}</p>
- <p>{!! trans('impressum.info.5') !!}</p>
- <p>{!! trans('impressum.info.6') !!}</p>
- <p>{!! trans('impressum.info.7') !!}</p>
- <p>{!! trans('impressum.info.8') !!}</p>
- <h2>{!! trans('impressum.info.9') !!}</h2>
- <p>{!! trans('impressum.info.10') !!}</p>
+ <h1 class="page-title">{!! trans('impressum.title') !!}</h1>
+ <div class="card-heavy">
+ <h2 class="subheading">{!! trans('impressum.headline.1') !!}</h2>
+ <p>{!! trans('impressum.info.1') !!}</p>
+ <address>{!! trans('impressum.info.2') !!}</address>
+ <address>{!! trans('impressum.info.3') !!}</address>
+ </div>
+ <div class="card-heavy">
+ <p>{!! trans('impressum.info.4') !!}</p>
+ <p>{!! trans('impressum.info.5') !!}</p>
+ <p>{!! trans('impressum.info.6') !!}</p>
+ <p>{!! trans('impressum.info.7') !!}</p>
+ <p>{!! trans('impressum.info.8') !!}</p>
+ </div>
+ <div class="card-heavy">
+ <h2>{!! trans('impressum.info.9') !!}</h2>
+ <p>{!! trans('impressum.info.10') !!}</p>
+ </div>
@endsection
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 07350606a49a31de71db92105ec53752f78f6475..eafc2bada0ec3a49703e9325c7c2338d58140cb3 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -11,7 +11,6 @@
@include('parts.searchbar', ['class' => 'startpage-searchbar'])
<script type="text/javascript" src="{{ elixir('js/scriptStartPage.js') }}"></script>
<script type="text/javascript" src="{{ elixir('js/searchbar.js') }}"></script>
- <script src="{{ elixir('js/translations.js') }}"></script>
@endsection
@section('optionalContent')
diff --git a/resources/views/kontakt/kontakt.blade.php b/resources/views/kontakt/kontakt.blade.php
index d995f1323dca4279259c25911395b2ed9c13641c..9ed0fe595fbe1b63ed93cebd4f735d0379e3c2bd 100644
--- a/resources/views/kontakt/kontakt.blade.php
+++ b/resources/views/kontakt/kontakt.blade.php
@@ -3,105 +3,47 @@
@section('title', $title )
@section('content')
- <h1>{!! trans('kontakt.headline.1') !!}</h1>
- <h2>{!! trans('kontakt.form.1') !!}</h2>
- <p>{!! trans('kontakt.form.2') !!}</p>
- @if(isset($formerrors))
- @foreach($formerrors->errors()->all() as $errormessage)
- <div class="alert alert-danger" role="alert">{{$errormessage}}</div>
- @endforeach
- @endif
-
-
- <form class="contact" name="contact" method="post" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt") }}">
- {{ csrf_field() }}
- <div class="form-group kontakt-form-group">
- <input class="form-control" name="name" placeholder="{!!trans('kontakt.form.name')!!}" type="text" required @if(isset($formerrors) && Request::has('name'))value="{{Request::input('name')}}"@endif>
- </div>
- <div class="form-group kontakt-form-group">
- <input class="form-control" name="email" placeholder="{!! trans('kontakt.form.5') !!}" type="email" required @if(isset($formerrors) && Request::has('email'))value="{{Request::input('email')}}"@endif>
- </div>
- <div class="form-group kontakt-form-group">
- <input class="form-control" name="subject" placeholder="{!! trans('kontakt.form.7') !!}" type="text" required @if(isset($formerrors) && Request::has('subject'))value="{{Request::input('subject')}}"@endif>
- </div>
+ <div class="card-heavy">
+ <h1>{!! trans('kontakt.headline.1') !!}</h1>
+ <h2>{!! trans('kontakt.form.1') !!}</h2>
+ <p>{!! trans('kontakt.form.2') !!}</p>
+ @if(isset($formerrors))
+ @foreach($formerrors->errors()->all() as $errormessage)
+ <div class="alert alert-danger" role="alert">{{$errormessage}}</div>
+ @endforeach
+ @endif
+ <form class="contact" name="contact" method="post" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt") }}">
+ {{ csrf_field() }}
<div class="form-group kontakt-form-group">
- @if(isset($url) && $url !== "")
- <label for="message">Wenn MetaGer bestimmte Webseiten nicht angezeigt hat, von denen Sie wissen, dass es sie gibt: Bitte nennen Sie deren Adresse/n (http:// ...???...). Wir werden das detailliert untersuchen.</label>
- @endif
- <textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}" required>@if(isset($formerrors) && Request::has('message')){{Request::input('message')}}@endif</textarea>
+ <input class="form-control" name="name" placeholder="{!!trans('kontakt.form.name')!!}" type="text" required @if(isset($formerrors) && Request::has('name'))value="{{Request::input('name')}}"@endif>
</div>
<div class="form-group kontakt-form-group">
- <button title="" data-original-title="" class="btn btn-default encrypt-btn" type="submit">{!! trans('kontakt.form.8') !!}</button>
- </div>
- </form>
- <h2>{!! trans('kontakt.mail.1') !!}</h2>
- <p>{!! trans('kontakt.mail.2') !!}</p>
- <p>{!! trans('kontakt.mail.3') !!}</p>
- <textarea id="pubkey" style="width:50%" rows="8" readonly>-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-=LZAA
------END PGP PUBLIC KEY BLOCK-----</textarea>
-<h2>{!! trans('kontakt.letter.1') !!}</h2>
-<p>{!! trans('kontakt.letter.2') !!}</p>
-<address>{!! trans('kontakt.letter.3') !!}</address>
-<script type="text/javascript" src="{{ elixir('js/lib.js') }}"></script>
+ <input class="form-control" name="email" placeholder="{!! trans('kontakt.form.5') !!}" type="email" required @if(isset($formerrors) && Request::has('email'))value="{{Request::input('email')}}"@endif>
+ </div>
+ <div class="form-group kontakt-form-group">
+ <input class="form-control" name="subject" placeholder="{!! trans('kontakt.form.7') !!}" type="text" required @if(isset($formerrors) && Request::has('subject'))value="{{Request::input('subject')}}"@endif>
+ </div>
+ <div class="form-group kontakt-form-group">
+ @if(isset($url) && $url !== "")
+ <label for="message">Wenn MetaGer bestimmte Webseiten nicht angezeigt hat, von denen Sie wissen, dass es sie gibt: Bitte nennen Sie deren Adresse/n (http:// ...???...). Wir werden das detailliert untersuchen.</label>
+ @endif
+ <textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}" required>@if(isset($formerrors) && Request::has('message')){{Request::input('message')}}@endif</textarea>
+ </div>
+ <div class="form-group kontakt-form-group">
+ <button title="" data-original-title="" class="btn btn-default encrypt-btn" type="submit">{!! trans('kontakt.form.8') !!}</button>
+ </div>
+ </form>
+ </div>
+ <div class="card-heavy">
+ <h2>{!! trans('kontakt.mail.1') !!}</h2>
+ <p>{!! trans('kontakt.mail.2') !!}</p>
+ <p>{!! trans('kontakt.mail.3') !!}</p>
+ <textarea id="pubkey" style="width:50%" rows="8" readonly>@include('kontakt/pgp')</textarea>
+ </div>
+ <div class="card-heavy">
+ <h2>{!! trans('kontakt.letter.1') !!}</h2>
+ <p>{!! trans('kontakt.letter.2') !!}</p>
+ <address>{!! trans('kontakt.letter.3') !!}</address>
+ </div>
+ <script type="text/javascript" src="{{ elixir('js/lib.js') }}"></script>
@endsection
diff --git a/resources/views/kontakt/pgp.blade.php b/resources/views/kontakt/pgp.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..51c0ff671b13cfed78138960ebeeb76d2e3e8b9d
--- /dev/null
+++ b/resources/views/kontakt/pgp.blade.php
@@ -0,0 +1,63 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+=LZAA
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 7c6b159083a54b04d3d8b0991a4db1c038475bb9..6d1a1b1da82952091f53846ffa2ed9f55948282a 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -38,7 +38,7 @@
</header>
@include('parts.sidebar', ['id' => 'staticPagesSideBar'])
<div class="wrapper">
- <main class="mg-panel container">
+ <main class="mg-panel">
@if (isset($success))
<div class="alert alert-success" role="alert">{{ $success }}</div>
@endif
diff --git a/resources/views/parts/fake-result.blade.php b/resources/views/parts/fake-result.blade.php
index cff45daf7705bdf88ca54fe60d1b2d17eb3e1b4a..2cbec8980cecb8f3a1c888fa70aabae0894104dc 100644
--- a/resources/views/parts/fake-result.blade.php
+++ b/resources/views/parts/fake-result.blade.php
@@ -1,31 +1,34 @@
<div class="result fake-result" data-count="1">
<div class="result-header">
- <h2 class="result-title">
- <a href="javascript:void(0);" data-tooltip="Ergebnistitel">
- Wikipedia – Die freie Enzyklopädie
- </a>
- </h2>
- <a class="result-link" href="javascript:void(0);" data-tooltip="Ergebnislink">
+ <div class="result-headline">
+ <h2 class="result-title">
+ <a href="javascript:void(0);" data-tooltip="{{ trans('fake-result.title') }}">
+ Wikipedia – Die freie Enzyklopädie
+ </a>
+ </h2>
+ <a class="result-hoster" href="javascript:void(0);" data-tooltip="{{ trans('fake-result.link') }}">MetaGer</a>
+ </div>
+ <a class="result-link" href="javascript:void(0);" data-tooltip="{{ trans('fake-result.link') }}">
de.wikipedia.org
</a>
</div>
<div class="result-body">
- <div class="result-description" data-tooltip="Zusammenfassung der Ergebnisseite">
+ <div class="result-description" data-tooltip="{{ trans('fake-result.description') }}">
Wikipedia ist ein Projekt zum Aufbau einer Enzyklopädie aus freien Inhalten, zu denen du sehr gern beitragen kannst. Seit Mai 2001 sind 2.150.918 Artikel in ...
</div>
</div>
<div class="result-footer">
- <a class="result-open" href="javascript:void(0);" data-tooltip="Ergebnis in diesem Tab öffnen">
+ <a class="result-open" href="javascript:void(0);" data-tooltip="{{ trans('fake-result.open.this') }}">
ÖFFNEN
</a>
- <a class="result-open-newtab" href="javascript:void(0);" data-tooltip="Ergebnis in einem neuen Tab öffnen">
+ <a class="result-open-newtab" href="javascript:void(0);" data-tooltip="{{ trans('fake-result.open.newtab') }}">
IN NEUEM TAB
</a>
- <a class="result-open-proxy" href="javascript:void(0);" data-tooltip="Ergebnis anonym (über den MetaGer-Proxy) öffnen">
+ <a class="result-open-proxy" href="javascript:void(0);" data-tooltip="{{ trans('fake-result.open.anonymous') }}">
ANONYM ÖFFNEN
</a>
<div class="open-result-options">
- <label for="result-toggle-1" role="button" data-tooltip="Zusätzliche optionen anzeigen">
+ <label for="result-toggle-1" role="button" data-tooltip="{{ trans('fake-result.options.more') }}">
MEHR
</label>
</div>
@@ -35,22 +38,22 @@
<div class="options">
<ul class="option-list list-unstyled small">
<li class="">
- <a class="saver" href="javascript:setDummySearch('wikipedia site:de.wikipedia.org wurde zum weiteren Filtern gespeichert')" data-tooltip="Ergebnis zum weiteren Filtern speichern">
+ <a class="saver" href="javascript:setDummySearch('wikipedia site:de.wikipedia.org wurde zum weiteren Filtern gespeichert')" data-tooltip="{{ trans('fake-result.options.save') }}">
<i class="fa fa-floppy-o"></i> Ergebnis in Tab speichern.
</a>
</li>
<li>
- <a href="javascript:setDummySearch('wikipedia site:de.wikipedia.org')" data-tooltip="Neue auf diese Domain beschränkte Suche starten">
+ <a href="javascript:setDummySearch('wikipedia site:de.wikipedia.org')" data-tooltip="{{ trans('fake-result.options.domain') }}">
Auf dieser Domain neu suchen
</a>
</li>
<li>
- <a href="javascript:setDummySearch('wikipedia -site:de.wikipedia.org')" data-tooltip="Neue Suche ohne diese Subdomain starten">
+ <a href="javascript:setDummySearch('wikipedia -site:de.wikipedia.org')" data-tooltip="{{ trans('fake-result.options.subdomain') }}">
de.wikipedia.org ausblenden
</a>
</li>
<li>
- <a href="javascript:setDummySearch('wikipedia -site:*.wikipedia.org')" data-tooltip="Neue Suche ohne diese Domain starten">
+ <a href="javascript:setDummySearch('wikipedia -site:*.wikipedia.org')" data-tooltip="{{ trans('fake-result.options.blacklist') }}">
*.wikipedia.org ausblenden
</a>
</li>
diff --git a/resources/views/parts/footer.blade.php b/resources/views/parts/footer.blade.php
index f7d3d5bd5a54b887d54a171fb8069af0009221ed..b1e488662cd3bd915c3c4fb27970cc41336d5b1f 100644
--- a/resources/views/parts/footer.blade.php
+++ b/resources/views/parts/footer.blade.php
@@ -1,8 +1,8 @@
@if ($type === 'startpage' || $type === 'subpage' || $type === 'resultpage')
<footer class="{{ $id }} noprint">
<div id="info">
- <span><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>@if(LaravelLocalization::getCurrentLocale() == "de") - <a href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">Fanshop</a>@endif</span>
- <span class="hidden-xs">{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a></span>
+ <span><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('sidebar.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('sidebar.nav8') }}</a>@if(LaravelLocalization::getCurrentLocale() == "de") - <a href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">{{ trans('sidebar.nav26') }}</a>@endif</span>
+ <span class="hidden-xs">{{ trans('footer.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('footer.sumaev.2') }}</a></span>
</div>
</footer>
@endif
\ No newline at end of file
diff --git a/resources/views/parts/sidebar.blade.php b/resources/views/parts/sidebar.blade.php
index 7a5265d795332510234a602972f96938407ab894..4ce31dff1e4bc63cb10ab0195dc7cc81e54c306d 100644
--- a/resources/views/parts/sidebar.blade.php
+++ b/resources/views/parts/sidebar.blade.php
@@ -9,62 +9,62 @@
<li @if ( !isset($navbarFocus) || $navbarFocus === 'suche') class="active" @endif >
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" tabindex="200" id="navigationSuche">
<i class="fa fa-search" aria-hidden="true"></i>
- <span> {{ trans('staticPages.nav1') }}</span>
+ <span> {{ trans('sidebar.nav1') }}</span>
</a>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'dienste') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<input id="servicesToggle" class="sideBarCheckbox" type="checkbox">
<label for="servicesToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" tabindex="225">
<i class="fa fa-wrench" aria-hidden="true"></i>
- <span> {{ trans('staticPages.nav15') }}</span>
+ <span> {{ trans('sidebar.nav15') }}</span>
<span class="caret"></span>
</label>
<ul class="metager-dropdown-menu">
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}" tabindex="226">{{ trans('staticPages.nav10') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}" tabindex="226">{{ trans('sidebar.nav10') }}</a>
</li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/zitat-suche/") }}" tabindex="227">{{ trans('staticPages.nav22') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/zitat-suche/") }}" tabindex="227">{{ trans('sidebar.nav22') }}</a>
</li>
<li>
- <a class="inlink" href="https://metager.de/klassik/asso/" tabindex="228">{{ trans('staticPages.nav11') }}</a>
+ <a class="inlink" href="https://metager.de/klassik/asso/" tabindex="228">{{ trans('sidebar.nav11') }}</a>
</li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/app/") }}" tabindex="230">@lang('staticPages.nav25')</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/app/") }}" tabindex="230">@lang('sidebar.nav25')</a>
</li>
<li>
- <a class="inlink" href="https://metager.to/" tabindex="231">{{ trans('staticPages.nav13') }}</a>
+ <a class="inlink" href="https://metager.to/" tabindex="231">{{ trans('sidebar.nav13') }}</a>
</li>
<li>
<a class="inlink" href="https://maps.metager.de" target="_blank" tabindex="232">Maps.MetaGer.de</a>
</li>
<li>
- <a class="outlink" href="https://gitlab.metager3.de/open-source/MetaGer" tabindex="233">{{ trans('staticPages.nav24') }}</a>
+ <a class="outlink" href="https://gitlab.metager3.de/open-source/MetaGer" tabindex="233">{{ trans('sidebar.nav24') }}</a>
</li>
<li>
- <a class="outlink" href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43" tabindex="234">{{ trans('staticPages.nav14') }}</a>
+ <a class="outlink" href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43" tabindex="234">{{ trans('sidebar.nav14') }}</a>
</li>
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'datenschutz') class="active" @endif >
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy" tabindex="215">
<i class="fa fa-user-secret" aria-hidden="true"></i>
- <span> {{ trans('staticPages.nav3') }}</span>
+ <span> {{ trans('sidebar.nav3') }}</span>
</a>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'hilfe') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<input id="helpToggle" class="sideBarCheckbox" type="checkbox">
<label for="helpToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationHilfe" tabindex="216">
<i class="fa fa-info-circle" aria-hidden="true"></i>
- <span> {{ trans('staticPages.nav20') }}</span>
+ <span> {{ trans('sidebar.nav20') }}</span>
<span class="caret"></span>
</label>
<ul class="metager-dropdown-menu">
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}" tabindex="217">{{ trans('staticPages.nav20') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}" tabindex="217">{{ trans('sidebar.nav20') }}</a>
</li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq/") }}" tabindex="218">{{ trans('staticPages.nav21') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq/") }}" tabindex="218">{{ trans('sidebar.nav21') }}</a>
</li>
</ul>
</li>
@@ -72,23 +72,23 @@
<input id="donationToggle" class="sideBarCheckbox" type="checkbox">
<label for="donationToggle" class="metager-dropdown-toggle" role="button" aria-expanded="false" tabindex="201">
<i class="fa fa-money" aria-hidden="true"></i>
- <span> {{ trans('staticPages.nav16') }}</span>
+ <span> {{ trans('sidebar.nav16') }}</span>
<span class="caret"></span>
</label>
<ul class="metager-dropdown-menu">
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}" tabindex="202">{{ trans('staticPages.nav2') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}" tabindex="202">{{ trans('sidebar.nav2') }}</a>
</li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/beitritt/") }}" tabindex="203">{{ trans('staticPages.nav23') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/beitritt/") }}" tabindex="203">{{ trans('sidebar.nav23') }}</a>
</li>
@if(LaravelLocalization::getCurrentLocale() == "de")
<li>
- <a class="outlink" href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">MetaGer-Fanshop</a>
+ <a class="outlink" href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">{{ trans('sidebar.nav26') }}</a>
</li>
@endif
<li>
- <a class="outlink" href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl" tabindex="204">{{ trans('staticPages.nav17') }}</a>
+ <a class="outlink" href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl" tabindex="204">{{ trans('sidebar.nav17') }}</a>
</li>
</ul>
</li>
@@ -96,24 +96,24 @@
<input id="contactToggle" class="sideBarCheckbox" type="checkbox">
<label for="contactToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt" tabindex="219">
<i class="fa fa-comments-o" aria-hidden="true"></i>
- <span> {{ trans('staticPages.nav18') }}</span>
+ <span> {{ trans('sidebar.nav18') }}</span>
<span class="caret"></span>
</label>
<ul class="metager-dropdown-menu">
<li>
- <a class="outlink" href="http://forum.suma-ev.de/" tabindex="220">{{ trans('staticPages.nav4') }}</a>
+ <a class="outlink" href="http://forum.suma-ev.de/" tabindex="220">{{ trans('sidebar.nav4') }}</a>
</li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}" tabindex="221">{{ trans('staticPages.nav5') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}" tabindex="221">{{ trans('sidebar.nav5') }}</a>
</li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}" tabindex="222">{{ trans('staticPages.nav6') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}" tabindex="222">{{ trans('sidebar.nav6') }}</a>
</li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}" tabindex="223">{{ trans('staticPages.nav7') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}" tabindex="223">{{ trans('sidebar.nav7') }}</a>
</li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}" tabindex="224">{{ trans('staticPages.nav8') }}</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}" tabindex="224">{{ trans('sidebar.nav8') }}</a>
</li>
</ul>
</li>
@@ -121,7 +121,7 @@
<input id="languagesToggle" class="sideBarCheckbox" type="checkbox">
<label for="languagesToggle" class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache" tabindex="235">
<i class="fa fa-globe" aria-hidden="true"></i>
- <span> {{ trans('staticPages.nav19') }} ({{ LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'] }})</span>
+ <span> {{ trans('sidebar.nav19') }} ({{ LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'] }})</span>
<span class="caret"></span>
</label>
<ul class="metager-dropdown-menu">
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
index 92dcc3b594e7dd54e3600bd1439240d62f4959bd..4b0a6e62f30e143e94435b0a61ecd489323460cd 100644
--- a/resources/views/settings.blade.php
+++ b/resources/views/settings.blade.php
@@ -56,6 +56,5 @@
<input id="plugin" class="btn btn-primary" type="submit" value="{!! trans('settings.speichern.3') !!}">
</div>
</form>
- <script src="{{ elixir('js/translations.js') }}"></script>
<script src="{{ elixir('js/settings.js') }}"></script>
@endsection
diff --git a/resources/views/spende/beitritt.blade.php b/resources/views/spende/beitritt.blade.php
index 74705ff432ec2250e413625601b085531cb34626..da885085e840e25f1397a6dccc42b83a8fe8ec62 100644
--- a/resources/views/spende/beitritt.blade.php
+++ b/resources/views/spende/beitritt.blade.php
@@ -6,96 +6,100 @@
@section('content')
<link type="text/css" rel="stylesheet" href="{{ elixir('/css/beitritt.css') }}" />
- <form id="donation-form">
+ <div class="card-heavy">
<h1>{{ trans('beitritt.heading.1') }}</h1>
- <div class="beitritt-inputs">
- <div>
- <label for="name">{{ trans('beitritt.beitritt.1') }}</label>
- <input type="text" class="form-control beitritt-input" name="name" placeholder="{{trans('beitritt.placeholder.1')}}" required>
- </div>
- <div>
- <label for="firma">{{ trans('beitritt.beitritt.2') }}</label>
- <input type="text" class="form-control beitritt-input" name="firma" placeholder="{{trans('beitritt.placeholder.2')}}">
- </div>
- <div>
- <label for="funktion">{{ trans('beitritt.beitritt.3') }}</label>
- <input type="text" class="form-control beitritt-input" name="funktion" placeholder="{{trans('beitritt.placeholder.3')}}">
+ <form id="donation-form">
+ <div class="beitritt-inputs">
+ <div>
+ <label for="name">{{ trans('beitritt.beitritt.1') }}</label>
+ <input type="text" class="form-control beitritt-input" name="name" placeholder="{{trans('beitritt.placeholder.1')}}" required>
+ </div>
+ <div>
+ <label for="firma">{{ trans('beitritt.beitritt.2') }}</label>
+ <input type="text" class="form-control beitritt-input" name="firma" placeholder="{{trans('beitritt.placeholder.2')}}">
+ </div>
+ <div>
+ <label for="funktion">{{ trans('beitritt.beitritt.3') }}</label>
+ <input type="text" class="form-control beitritt-input" name="funktion" placeholder="{{trans('beitritt.placeholder.3')}}">
+ </div>
+ <div>
+ <label for="adresse">{{ trans('beitritt.beitritt.4') }}</label>
+ <input type="text" class="form-control beitritt-input" name="adresse" placeholder="{{trans('beitritt.placeholder.4')}}" required>
+ </div>
+ <div>
+ <label for="email">{{ trans('beitritt.beitritt.5') }}</label>
+ <input type="email" class="form-control beitritt-input" name="email" placeholder="">
+ </div>
+ <div>
+ <label for="homepage">{{ trans('beitritt.beitritt.6') }}</label>
+ <input type="text" class="form-control beitritt-input" name="homepage" placeholder="http://">
+ </div>
+ <div>
+ <label for="telefon">{{ trans('beitritt.beitritt.7') }}</label>
+ <input type="text" class="form-control beitritt-input" name="telefon" placeholder="{{trans('beitritt.placeholder.7')}}">
+ </div>
</div>
<div>
- <label for="adresse">{{ trans('beitritt.beitritt.4') }}</label>
- <input type="text" class="form-control beitritt-input" name="adresse" placeholder="{{trans('beitritt.placeholder.4')}}" required>
+ <p>{{ trans('beitritt.beitritt.8') }}</p>
+ <input type="text" class="form-control" name="betrag" required>
+ <p> {{ trans('beitritt.beitritt.9') }}</p>
</div>
<div>
- <label for="email">{{ trans('beitritt.beitritt.5') }}</label>
- <input type="email" class="form-control beitritt-input" name="email" placeholder="">
+ <p>{{ trans('beitritt.beitritt.10') }}</p>
+ <p>{{ trans('beitritt.beitritt.11') }}</p>
</div>
<div>
- <label for="homepage">{{ trans('beitritt.beitritt.6') }}</label>
- <input type="text" class="form-control beitritt-input" name="homepage" placeholder="http://">
+ <input type="radio" name="veröffentlichung" checked> {{ trans('beitritt.beitritt.12') }}
+ <input type="radio" name="veröffentlichung"> {{ trans('beitritt.beitritt.13') }}
</div>
<div>
- <label for="telefon">{{ trans('beitritt.beitritt.7') }}</label>
- <input type="text" class="form-control beitritt-input" name="telefon" placeholder="{{trans('beitritt.placeholder.7')}}">
+ <div>
+ <label for="ort">{{ trans('beitritt.beitritt.14') }}</label>
+ <input type="text" class="form-control beitritt-input" id="ort" placeholder="">
+ </div>
+ <p class="signature">{{ trans('beitritt.unterschrift') }}</p>
</div>
</div>
- <div>
- <p>{{ trans('beitritt.beitritt.8') }}</p>
- <input type="text" class="form-control" name="betrag" required>
- <p> {{ trans('beitritt.beitritt.9') }}</p>
- </div>
- <div>
- <p>{{ trans('beitritt.beitritt.10') }}</p>
- <p>{{ trans('beitritt.beitritt.11') }}</p>
- </div>
- <div>
- <input type="radio" name="veröffentlichung" checked> {{ trans('beitritt.beitritt.12') }}
- <input type="radio" name="veröffentlichung"> {{ trans('beitritt.beitritt.13') }}
- </div>
- <div>
- <div>
- <label for="ort">{{ trans('beitritt.beitritt.14') }}</label>
- <input type="text" class="form-control beitritt-input" id="ort" placeholder="">
+ <div class="card-heavy">
+ <div class="newpage"></div>
+ <h1>{{ trans('beitritt.abbuchung.2') }}</h1>
+ <p>{{ trans('beitritt.abbuchung.3') }}</p>
+ <div class="beitritt-inputs">
+ <div>
+ <label for="kontoname">{{ trans('beitritt.abbuchung.4') }}</label>
+ <input type="text" class="form-control" name="kontoname" placeholder="">
+ </div>
+ <div>
+ <label for="bankverbindung">{{ trans('beitritt.abbuchung.5') }}</label>
+ <input type="text" class="form-control" name="bankverbindung" placeholder="">
+ </div>
+ <div>
+ <label for="iban">{{ trans('beitritt.abbuchung.6') }}</label>
+ <input type="text" class="form-control" name="iban" maxlength="22" placeholder="">
+ </div>
+ <div>
+ <label for="bic">{{ trans('beitritt.abbuchung.7') }}</label>
+ <input type="text" class="form-control" name="bic" placeholder="">
+ </div>
</div>
- <p class="signature">{{ trans('beitritt.unterschrift') }}</p>
- </div>
- <div class="newpage"></div>
- <h1>{{ trans('beitritt.abbuchung.2') }}</h1>
- <p>{{ trans('beitritt.abbuchung.3') }}</p>
- <div class="beitritt-inputs">
- <div>
- <label for="kontoname">{{ trans('beitritt.abbuchung.4') }}</label>
- <input type="text" class="form-control" name="kontoname" placeholder="">
- </div>
- <div>
- <label for="bankverbindung">{{ trans('beitritt.abbuchung.5') }}</label>
- <input type="text" class="form-control" name="bankverbindung" placeholder="">
- </div>
- <div>
- <label for="iban">{{ trans('beitritt.abbuchung.6') }}</label>
- <input type="text" class="form-control" name="iban" maxlength="22" placeholder="">
- </div>
- <div>
- <label for="bic">{{ trans('beitritt.abbuchung.7') }}</label>
- <input type="text" class="form-control" name="bic" placeholder="">
- </div>
- </div>
- <div>
<div>
- <label for="ort2">{{ trans('beitritt.abbuchung.8') }}</label>
- <input type="text" class="form-control beitritt-input" id="ort2" placeholder="">
+ <div>
+ <label for="ort2">{{ trans('beitritt.abbuchung.8') }}</label>
+ <input type="text" class="form-control beitritt-input" id="ort2" placeholder="">
+ </div>
+ <p class="signature">{{ trans('beitritt.unterschrift') }}</p>
</div>
- <p class="signature">{{ trans('beitritt.unterschrift') }}</p>
+ </form>
+ <div class="beitritt-formular-info">
+ <p>{{ trans('beitritt.anweisung.1') }}</p>
+ <ul class="dotlist">
+ <li>{{ trans('beitritt.anweisung.2') }}</li>
+ <li>{{ trans('beitritt.anweisung.3') }}</li>
+ <li>{{ trans('beitritt.anweisung.4') }}</li>
+ </ul>
+ <p>{{ trans('beitritt.anweisung.5') }}</p>
+ <p>{{ trans('beitritt.anweisung.6') }}</p>
</div>
- </form>
- <div class="beitritt-formular-info">
- <p>{{ trans('beitritt.anweisung.1') }}</p>
- <ul class="dotlist">
- <li>{{ trans('beitritt.anweisung.2') }}</li>
- <li>{{ trans('beitritt.anweisung.3') }}</li>
- <li>{{ trans('beitritt.anweisung.4') }}</li>
- </ul>
- <p>{{ trans('beitritt.anweisung.5') }}</p>
- <p>{{ trans('beitritt.anweisung.6') }}</p>
</div>
<button type="button" class="btn btn-lg btn-primary noprint" onclick="window.print();">{{ trans('beitritt.anweisung.7') }}</button>
<!-- <script src="{{ elixir('js/scriptJoinPage.js') }}"></script> -->
diff --git a/resources/views/spende/spende.blade.php b/resources/views/spende/spende.blade.php
index f8764288bac907b6775508b8f17bfeb67b47a0d4..3c139f105aa5c746fcde0a9f64041cc75b41754a 100644
--- a/resources/views/spende/spende.blade.php
+++ b/resources/views/spende/spende.blade.php
@@ -5,74 +5,84 @@
@section('navbarFocus.donate', 'class="dropdown active"')
@section('content')
-<h1>{!! trans('spende.headline.1') !!}</h1>
-<h2 class="subheading">{!! trans('spende.headline.2') !!}</h2>
-<p>{!! trans('spende.about.2') !!}</p>
-<p><i class="fa fa-info fa-fw fa-lg" aria-hidden="true"></i><u>{!! trans('spende.bankinfo.3') !!}</u></p>
-<div id="top" >
- <div class="col-lg-6 col-md-12 col-sm-12 others">
- <h3 id="lastschrift">{!! trans('spende.lastschrift.1') !!}</h3>
- <p>{!! trans('spende.lastschrift.2') !!}</p>
- <form id="donate" role="form" method="POST">
- <input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}">
- <div class="form-group donation-form-group">
- <label for="Name">{!! trans('spende.lastschrift.3') !!}</label>
- <input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{!! trans('spende.lastschrift.3.placeholder') !!}" value="{{ old('Name') }}" />
- </div>
- <div class="form-group donation-form-group">
- <label for="email">{!! trans('spende.lastschrift.4') !!}</label>
- <input type="email" class="form-control" id="email" name="email" placeholder="Email" value="{{ old('email') }}">
- </div>
- <div class="form-group donation-form-group">
- <label for="iban">{!! trans('spende.lastschrift.6') !!}</label>
- <input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN" value="{{ old('Kontonummer') }}">
+ <div class="card-heavy">
+ <h1>{!! trans('spende.headline.1') !!}</h1>
+ <h2 class="subheading">{!! trans('spende.headline.2') !!}</h2>
+ <p>{!! trans('spende.about.2') !!}</p>
+ <p><i class="fa fa-info fa-fw fa-lg" aria-hidden="true"></i><u>{!! trans('spende.bankinfo.3') !!}</u></p>
+ </div>
+ <div class="two-col">
+ <div>
+ <div class="card-medium">
+ <h3 id="lastschrift">{!! trans('spende.lastschrift.1') !!}</h3>
+ <p>{!! trans('spende.lastschrift.2') !!}</p>
+ <form id="donate" role="form" method="POST">
+ <input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}">
+ <div class="form-group donation-form-group">
+ <label for="Name">{!! trans('spende.lastschrift.3') !!}</label>
+ <input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{!! trans('spende.lastschrift.3.placeholder') !!}" value="{{ old('Name') }}" />
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="email">{!! trans('spende.lastschrift.4') !!}</label>
+ <input type="email" class="form-control" id="email" name="email" placeholder="Email" value="{{ old('email') }}">
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="iban">{!! trans('spende.lastschrift.6') !!}</label>
+ <input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN" value="{{ old('Kontonummer') }}">
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="bic">{!! trans('spende.lastschrift.7') !!}</label>
+ <input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC" value="{{ old('Bankleitzahl') }}">
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="value">{!! trans('spende.lastschrift.8.value')!!} </label>
+ <input type="number" class="form-control" id="value" required="" name="Betrag" placeholder="{!! trans('spende.lastschrift.8.value.placeholder') !!}" value="{{ old('Bankleitzahl') }}">
+ </div>
+ <div class="form-group donation-form-group">
+ <label for="msg">{!! trans('spende.lastschrift.8.message')!!}</label>
+ <label for="msg"><u>{!! trans('spende.bankinfo.3')!!}</u></label>
+ <textarea class="form-control" id="msg" name="Nachricht" placeholder="{!! trans('spende.lastschrift.8.message.placeholder') !!}">{{ old('Nachricht') }}</textarea>
+ </div>
+ <button type="submit" form="donate" class="btn btn-default">{!! trans('spende.lastschrift.9') !!}</button>
+ </form>
</div>
- <div class="form-group donation-form-group">
- <label for="bic">{!! trans('spende.lastschrift.7') !!}</label>
- <input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC" value="{{ old('Bankleitzahl') }}">
+ </div>
+ <div>
+ <div class="card-medium">
+ <h3>{!! trans('spende.bankinfo.1') !!}</h3>
+ <p>{!! trans('spende.bankinfo.2') !!}</p>
</div>
- <div class="form-group donation-form-group">
- <label for="value">{!! trans('spende.lastschrift.8.value')!!} </label>
- <input type="number" class="form-control" id="value" required="" name="Betrag" placeholder="{!! trans('spende.lastschrift.8.value.placeholder') !!}" value="{{ old('Bankleitzahl') }}">
+ </div>
+ <div>
+ <div class="card-medium">
+ <h3>{!! trans('spende.paypal.1') !!}</h3>
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input name="cmd" value="_xclick" type="hidden">
+ <input name="business" value="wsb@suma-ev.de" type="hidden">
+ <input name="item_name" value="SuMa-eV Spende" type="hidden">
+ <input name="buyer_credit_promo_code" value="" type="hidden">
+ <input name="buyer_credit_product_category" value="" type="hidden">
+ <input name="buyer_credit_shipping_method" value="" type="hidden">
+ <input name="buyer_credit_user_address_change" value="" type="hidden">
+ <input name="no_shipping" value="0" type="hidden">
+ <input name="no_note" value="1" type="hidden">
+ <input name="currency_code" value="EUR" type="hidden">
+ <input name="tax" value="0" type="hidden">
+ <input name="lc" value="DE" type="hidden">
+ <input name="bn" value="PP-DonationsBF" type="hidden">
+ <input src="/img/paypalspenden.gif" name="submit" width="120px" alt="{!! trans('spende.paypal.2') !!}" type="image">
+ </form>
</div>
- <div class="form-group donation-form-group">
- <label for="msg">{!! trans('spende.lastschrift.8.message')!!}</label>
- <label for="msg"><u>{!! trans('spende.bankinfo.3')!!}</u></label>
- <textarea class="form-control" id="msg" name="Nachricht" placeholder="{!! trans('spende.lastschrift.8.message.placeholder') !!}">{{ old('Nachricht') }}</textarea>
+ </div>
+ <div>
+ <div class="card-medium">
+ <h3>{!! trans('spende.bitcoins.1') !!}</h3>
+ {!! trans('spende.bitcoins.2') !!}<br/>
+ <a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V">174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V</a>
</div>
- <button type="submit" form="donate" class="btn btn-default">{!! trans('spende.lastschrift.9') !!}</button>
- </form>
- </div>
- <div class="col-lg-6 col-md-12 col-sm-12 donation-others">
- <h3>{!! trans('spende.bankinfo.1') !!}</h3>
- <p>{!! trans('spende.bankinfo.2') !!}</p>
- </div>
- <div class="col-lg-6 col-md-12 col-sm-12 donation-others">
- <h3>{!! trans('spende.paypal.1') !!}</h3>
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input name="cmd" value="_xclick" type="hidden">
- <input name="business" value="wsb@suma-ev.de" type="hidden">
- <input name="item_name" value="SuMa-eV Spende" type="hidden">
- <input name="buyer_credit_promo_code" value="" type="hidden">
- <input name="buyer_credit_product_category" value="" type="hidden">
- <input name="buyer_credit_shipping_method" value="" type="hidden">
- <input name="buyer_credit_user_address_change" value="" type="hidden">
- <input name="no_shipping" value="0" type="hidden">
- <input name="no_note" value="1" type="hidden">
- <input name="currency_code" value="EUR" type="hidden">
- <input name="tax" value="0" type="hidden">
- <input name="lc" value="DE" type="hidden">
- <input name="bn" value="PP-DonationsBF" type="hidden">
- <input src="/img/paypalspenden.gif" name="submit" width="120px" alt="{!! trans('spende.paypal.2') !!}" type="image">
- </form>
+ </div>
</div>
- <div class="col-lg-6 col-md-12 col-sm-12 donation-others">
- <h3>{!! trans('spende.bitcoins.1') !!}</h3>
- {!! trans('spende.bitcoins.2') !!}<br/>
- <a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V">174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V</a>
+ <div class="card-heavy">
+ <p>{!! trans('spende.lastschrift.10') !!}</p>
</div>
- <div class="clearfix"></div>
-</div>
-<p>{!! trans('spende.lastschrift.10') !!}</p>
-<div class="clearfix"></div>
@endsection
diff --git a/resources/views/team/team.blade.php b/resources/views/team/team.blade.php
index a8df709098f3f250a84b6643f9e39cc5659cf5f8..0c8894c2ae8c1acc545a17585ba23b556e6a04aa 100644
--- a/resources/views/team/team.blade.php
+++ b/resources/views/team/team.blade.php
@@ -3,43 +3,47 @@
@section('title', $title )
@section('content')
- <h1>Team</h1>
- <ul class="dotlist">
- <li>
- <p><a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank" rel="noopener">Sander-Beuermann, Wolfgang</a>, Dr.-Ing. - {!! trans('team.role.1') !!} -
- <a href="mailto:wsb@suma-ev.de">wsb@suma-ev.de</a> -
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/pubkey-wsb") }}">Public Key</a></p>
- </li>
- <li>
- <p>Becker, Georg - {!! trans('team.role.2') !!} -
- <a href="mailto:georg.becker@suma-ev.de">georg.becker@suma-ev.de</a></p>
- </li>
- <li>
- <p>Branz, Manuela - {!! trans('team.role.3') !!} -
- <a href="mailto:manuela.branz@suma-ev.de">manuela.branz@suma-ev.de</a></p>
- </li>
- <li>
- <p>Pfennig, Dominik - {!! trans('team.role.4') !!} -
- <a href="mailto:dominik@suma-ev.de">dominik@suma-ev.de</a></p>
- </li>
- <li>
- <p>Höfer, Phil - {!! trans('team.role.5') !!} -
- <a href="mailto:phil@suma-ev.de">phil@suma-ev.de</a></p>
- </li>
- <li>
- <p>Hasselbring, Karl - {!! trans('team.role.6') !!} -
- <a href="mailto:karl@suma-ev.de">karl@suma-ev.de</a></p>
- </li>
- <li>
- <p>Givi, Aria - {!! trans('team.role.6') !!} -
- <a href="mailto:aria@suma-ev.de">aria@suma-ev.de</a></p>
- </li>
- <li>
- <p>Riel, Carsten - {!! trans('team.role.7') !!} -
- <a href="carsten@suma-ev.de">carsten@suma-ev.de</a></p>
- </li>
- </ul>
- <p>{!! trans('team.contact.1') !!}</p>
- <p>{!! trans('team.contact.2') !!}</p>
- <p>{!! trans('team.contact.3') !!}</p>
+ <div class="card-heavy">
+ <h1>Team</h1>
+ <ul class="dotlist">
+ <li>
+ <p><a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank" rel="noopener">Sander-Beuermann, Wolfgang</a>, Dr.-Ing. - {!! trans('team.role.1') !!} -
+ <a href="mailto:wsb@suma-ev.de">wsb@suma-ev.de</a> -
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/pubkey-wsb") }}">Public Key</a></p>
+ </li>
+ <li>
+ <p>Becker, Georg - {!! trans('team.role.2') !!} -
+ <a href="mailto:georg.becker@suma-ev.de">georg.becker@suma-ev.de</a></p>
+ </li>
+ <li>
+ <p>Branz, Manuela - {!! trans('team.role.3') !!} -
+ <a href="mailto:manuela.branz@suma-ev.de">manuela.branz@suma-ev.de</a></p>
+ </li>
+ <li>
+ <p>Pfennig, Dominik - {!! trans('team.role.4') !!} -
+ <a href="mailto:dominik@suma-ev.de">dominik@suma-ev.de</a></p>
+ </li>
+ <li>
+ <p>Höfer, Phil - {!! trans('team.role.5') !!} -
+ <a href="mailto:phil@suma-ev.de">phil@suma-ev.de</a></p>
+ </li>
+ <li>
+ <p>Hasselbring, Karl - {!! trans('team.role.6') !!} -
+ <a href="mailto:karl@suma-ev.de">karl@suma-ev.de</a></p>
+ </li>
+ <li>
+ <p>Givi, Aria - {!! trans('team.role.6') !!} -
+ <a href="mailto:aria@suma-ev.de">aria@suma-ev.de</a></p>
+ </li>
+ <li>
+ <p>Riel, Carsten - {!! trans('team.role.7') !!} -
+ <a href="carsten@suma-ev.de">carsten@suma-ev.de</a></p>
+ </li>
+ </ul>
+ </div>
+ <div class="card-heavy">
+ <p>{!! trans('team.contact.1') !!}</p>
+ <p>{!! trans('team.contact.2') !!}</p>
+ <p>{!! trans('team.contact.3') !!}</p>
+ </div>
@endsection
diff --git a/resources/views/widget.blade.php b/resources/views/widget.blade.php
deleted file mode 100644
index fa8cdcb2e4e3bff6cd7cba140b4c4abed86fa860..0000000000000000000000000000000000000000
--- a/resources/views/widget.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-@extends('layouts.subPages')
-
-@section('title', $title )
-
-@section('content')
- <h1>{{ trans('widget.head') }}</h1>
- <p>{{ trans('widget.body.1') }}</p>
- <p id="widgetLinks" class="btn-group"><a class="btn btn-default" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
- <p>{{ trans('widget.body.4') }}</p>
-@endsection
\ No newline at end of file
diff --git a/resources/views/widget/sitesearch.blade.php b/resources/views/widget/sitesearch.blade.php
index 835081eb1acc99791078be55cdde8947e343bc0f..4dee33b7efbc87f4c4ff390ebf2d76db8cf9c4ea 100644
--- a/resources/views/widget/sitesearch.blade.php
+++ b/resources/views/widget/sitesearch.blade.php
@@ -3,17 +3,18 @@
@section('title', $title )
@section('content')
- <h1>{{ trans('sitesearch.head.1') }}</h1>
- <p>{{ trans('sitesearch.head.2') }}</p>
- <h2>{{ trans('sitesearch.head.3') }}</h2>
- <form method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/sitesearch/") }}" accept-charset="UTF-8">
- <div class="input-group">
- <input type="text" class="form-control" name="site" placeholder="{{ trans('sitesearch.head.4') }}" required="" value="{{ $site }}">
- <span class="input-group-btn">
- <button class="btn btn-default" type="submit">{{ trans('sitesearch.head.5') }}</button>
- </span>
- </div>
- </form>
+ <div class="card-medium">
+ <h1>{{ trans('sitesearch.head.1') }}</h1>
+ <p>{{ trans('sitesearch.head.2') }}</p>
+ <h2>{{ trans('sitesearch.head.3') }}</h2>
+ <form method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/sitesearch/") }}" accept-charset="UTF-8">
+ <div class="input-group">
+ <input type="text" class="form-control" name="site" placeholder="{{ trans('sitesearch.head.4') }}" required="" value="{{ $site }}">
+ <span class="input-group-btn">
+ <button class="btn btn-default" type="submit">{{ trans('sitesearch.head.5') }}</button>
+ </span>
+ </div>
+ </form>
@if ($site !== '')
<h2>{{ trans('sitesearch.generated.1') }}</h2>
<form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="GET">
@@ -24,6 +25,7 @@
<input type="hidden" name="encoding" value="utf8">
<input type="hidden" name="site" value="{{ $site }}">
</form>
+ </div>
<h2>{{ trans('sitesearch.generated.5') }} <button id="copyButton" class="btn btn-default" type="button"><i class="fa fa-paperclip" aria-hidden="true"></i> {{ trans('websearch.head.copy') }}</button></h2>
<textarea id="codesnippet" readonly style="width:100%;height:500px">
<form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="get" accept-charset="UTF-8">
@@ -72,6 +74,8 @@
<input type="hidden" name="wdgt-version" value="1">
</form>
</textarea>
+ @else
+ </div>
@endif
<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 7ab50d8935a1d2da9c3040219baad1d910fe5860..0f93898e54d3d9d3f1be8c5a653894890c8867d7 100644
--- a/resources/views/widget/websearch.blade.php
+++ b/resources/views/widget/websearch.blade.php
@@ -3,16 +3,18 @@
@section('title', $title )
@section('content')
- <h1>{{ trans('websearch.head.1') }}</h1>
- <p>{{ trans('websearch.head.2') }}</p>
- <h2>{{ trans('websearch.head.3') }}</h2>
- <form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="GET" accept-charset="UTF-8" >
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('websearch.head.4') }}" alt="MetaGer" src=" data:image/jpeg;base64,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"></a>
- <input class="metager-searchinput" name="eingabe" placeholder="{{ trans('websearch.head.5') }}" required="">
- <input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}">
- <input type="hidden" name="encoding" value="utf8">
- <button class="metager-searchbutton" type="submit">{{ trans('websearch.head.8') }}</button>
- </form>
+ <div class="card-medium">
+ <h1>{{ trans('websearch.head.1') }}</h1>
+ <p>{{ trans('websearch.head.2') }}</p>
+ <h2>{{ trans('websearch.head.3') }}</h2>
+ <form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="GET" accept-charset="UTF-8" >
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('websearch.head.4') }}" alt="MetaGer" src=" data:image/jpeg;base64,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"></a>
+ <input class="metager-searchinput" name="eingabe" placeholder="{{ trans('websearch.head.5') }}" required="">
+ <input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}">
+ <input type="hidden" name="encoding" value="utf8">
+ <button class="metager-searchbutton" type="submit">{{ trans('websearch.head.8') }}</button>
+ </form>
+ </div>
<h2>{{ trans('websearch.head.7') }} <button id="copyButton" class="btn btn-default" type="button"><i class="fa fa-paperclip" aria-hidden="true"></i> {{ trans('websearch.head.copy') }}</button></h2>
<textarea id="codesnippet" readonly style="width:100%;height:500px">
<form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="get" accept-charset="UTF-8" >
diff --git a/resources/views/widget/widget.blade.php b/resources/views/widget/widget.blade.php
index e9ff45093dff49b93c11ef9cf10305527fbcc485..64fbb43fa6982753c0a3d0e669ad9fb2425fc1f8 100644
--- a/resources/views/widget/widget.blade.php
+++ b/resources/views/widget/widget.blade.php
@@ -3,8 +3,10 @@
@section('title', $title )
@section('content')
- <h1>{{ trans('widget.head') }}</h1>
- <p>{{ trans('widget.body.1') }}</p>
- <p id="widgetLinks" class="btn-group"><a class="btn btn-default mutelink" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default mutelink" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
- <p>{{ trans('widget.body.4') }}</p>
+ <h1 class="page-title">{{ trans('widget.head') }}</h1>
+ <div class="card-medium">
+ <p>{{ trans('widget.body.1') }}</p>
+ <p id="widgetLinks" class="btn-group"><a class="btn btn-default mutelink" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default mutelink" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
+ <p>{{ trans('widget.body.4') }}</p>
+ </div>
@endsection
diff --git a/resources/views/zitatsuche.blade.php b/resources/views/zitatsuche.blade.php
index f5f98b15a8276a7b423a2f3fe5f9d19cebdd4036..78e5d978bfb6841739138b6736d7acf094d719b1 100644
--- a/resources/views/zitatsuche.blade.php
+++ b/resources/views/zitatsuche.blade.php
@@ -3,27 +3,29 @@
@section('title', $title )
@section('content')
- <h1>{{ trans('zitatsuche.head.1') }}</h1>
- <p>{{ trans('zitatsuche.p.1') }}</p>
- <form id="searchForm" class="form-inline" accept-charset="UTF-8">
- <div class="form-group">
- <label class="sr-only" for="q">Suchworte eingeben</label>
- <div class="input-group">
- <input type="text" class="form-control" id="q" name="q" placeholder="Suchworte" value="{{ $q }}">
- <div class="input-group-addon"><button type="submit"><i class="fa fa-search" aria-hidden="true"></i></button></div>
+ <h1 class="page-title">{{ trans('zitatsuche.title') }}</h1>
+ <div class="card-light">
+ <p>{{ trans('zitatsuche.subtitle') }}</p>
+ <form id="searchForm" class="form-inline" accept-charset="UTF-8">
+ <div class="form-group">
+ <label class="sr-only" for="q">{{ trans('zitatsuche.search-label') }}</label>
+ <div class="input-group">
+ <input type="text" class="form-control" id="q" name="q" placeholder="Suchworte" value="{{ $q }}">
+ <div class="input-group-addon"><button type="submit"><i class="fa fa-search" aria-hidden="true"></i></button></div>
+ </div>
</div>
- </div>
- </form>
- @if($q !== "")
- <hr />
- <h3>Ergebnisse für die Suche "{{$q}}":</h3>
- @foreach($results as $author => $quotes)
- <b><a href="{{ action('MetaGerSearch@search', ['eingabe' => $author, 'focus' => 'web', 'encoding' => 'utf8', 'lang' => 'all']) }}" target="_blank">{{$author}}</a>:</b>
- <ul class="list-unstyled">
- @foreach($quotes as $quote)
- <li><quote>"{{ $quote }}"</quote></li>
- @endforeach
- </ul>
- @endforeach
- @endif
+ </form>
+ @if($q !== "")
+ <hr />
+ <h3>{{ trans('zitatsuche.results-label') }} "{{$q}}":</h3>
+ @foreach($results as $author => $quotes)
+ <b><a href="{{ action('MetaGerSearch@search', ['eingabe' => $author, 'focus' => 'web', 'encoding' => 'utf8', 'lang' => 'all']) }}" target="_blank">{{$author}}</a>:</b>
+ <ul class="list-unstyled">
+ @foreach($quotes as $quote)
+ <li><quote>"{{ $quote }}"</quote></li>
+ @endforeach
+ </ul>
+ @endforeach
+ @endif
+ </div>
@endsection
diff --git a/routes/web.php b/routes/web.php
index 5d9e984b19ea17775910ddbc609d4b4407b08c0f..7cf901bc957a72911c664c76387ba78988d2a39d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -92,7 +92,7 @@ Route::group(
Route::post('spende', 'MailController@donation');
Route::get('datenschutz', function () {
- return view('datenschutz')
+ return view('datenschutz/datenschutz')
->with('title', trans('titles.datenschutz'))
->with('navbarFocus', 'datenschutz');
});
diff --git a/webpack.mix.js b/webpack.mix.js
index 101389bc29a68f055fba09e757b9f79593bfba8f..239afd2898f2c805a125a8e40f5d1d849d797ef4 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -11,16 +11,18 @@ let mix = require('laravel-mix');
|
*/
-mix.less('resources/assets/less/default.less', 'public/css/themes/default.css')
+mix
+ .less('resources/assets/less/default.less', 'public/css/themes/default.css')
.less('resources/assets/less/metager/beitritt.less', 'public/css/beitritt.css')
.less('resources/assets/less/utility.less', 'public/css/utility.css')
// js
.scripts(['resources/assets/js/lib/jquery.js', 'resources/assets/js/lib/jquery-ui.min.js', 'resources/assets/js/lib/bootstrap.js', 'resources/assets/js/lib/lightslider.js',
'resources/assets/js/lib/masonry.js', 'resources/assets/js/lib/imagesloaded.js', 'resources/assets/js/lib/openpgp.min.js', 'resources/assets/js/lib/iframeResizer.min.js',
- 'resources/assets/js/lib/md5.js'], 'public/js/lib.js')
- .scripts(['resources/assets/js/scriptStartPage.js', 'resources/assets/js/result-saver.js'], 'public/js/scriptStartPage.js')
- .scripts(['resources/assets/js/scriptResultPage.js', 'resources/assets/js/result-saver.js'], 'public/js/scriptResultPage.js')
- .scripts(['resources/assets/js/searchbar.js'], 'public/js/searchbar.js')
- .scripts(['resources/assets/js/focus-creator.js'], 'public/js/focus-creator.js')
+ 'resources/assets/js/lib/md5.js', 'resources/assets/js/translations.js'], 'public/js/lib.js')
+ .scripts(['resources/assets/js/scriptStartPage.js', 'resources/assets/js/result-saver.js', 'resources/assets/js/translations.js'], 'public/js/scriptStartPage.js')
+ .scripts(['resources/assets/js/scriptResultPage.js', 'resources/assets/js/result-saver.js', 'resources/assets/js/translations.js'], 'public/js/scriptResultPage.js')
+ .scripts(['resources/assets/js/searchbar.js', 'resources/assets/js/translations.js'], 'public/js/searchbar.js')
+ .scripts(['resources/assets/js/focus-creator.js', 'resources/assets/js/translations.js'], 'public/js/focus-creator.js')
// utility
- .scripts(['resources/assets/js/utility.js'], 'public/js/utility.js').version();
+ .scripts(['resources/assets/js/utility.js', 'resources/assets/js/translations.js'], 'public/js/utility.js')
+ .version();