From 2a1904ab60d700be071f9ae8af83bf9899228eb2 Mon Sep 17 00:00:00 2001
From: Aria <aria@suma-ev.de>
Date: Mon, 5 Mar 2018 11:58:44 +0100
Subject: [PATCH] Alles auf-/zuklappen label, andere kleinere Aenderungen
---
public/js/translations.js | 44 ---
resources/assets/js/focus-creator.js | 350 ------------------
resources/assets/js/translations.js | 2 +-
resources/assets/less/metager/foki.less | 7 +-
.../views/modals/create-focus-modal.blade.php | 2 +
5 files changed, 8 insertions(+), 397 deletions(-)
delete mode 100644 public/js/translations.js
diff --git a/public/js/translations.js b/public/js/translations.js
deleted file mode 100644
index 53dcd970c..000000000
--- a/public/js/translations.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// 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.'
- },
-
- '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.'
- },
-
- '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': ''
- }
-}
-
-/**
- * Übersetzt den gegebenen Schlüssel in der gegebenen Sprache
- * Gibt standardmäßig deutsche Sprachstrings zurück, da davon ausgegangen werden kann, dass diese immer vorhanden sind
- * @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];
- }
-}
-//# sourceMappingURL=translations.js.map
diff --git a/resources/assets/js/focus-creator.js b/resources/assets/js/focus-creator.js
index c394c65b6..776e0797b 100644
--- a/resources/assets/js/focus-creator.js
+++ b/resources/assets/js/focus-creator.js
@@ -1,29 +1,11 @@
$(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();
- }); */
$(document).keydown(function(event) {
if ($("input#show-create-focus").is(':checked')) {
if (event.keyCode == 27) {
@@ -33,337 +15,5 @@ function setFocusCreatorActionListeners () {
}
}
});
-
-}
-/**
- * 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/resources/assets/js/translations.js b/resources/assets/js/translations.js
index d0ca59cbc..ec535a423 100644
--- a/resources/assets/js/translations.js
+++ b/resources/assets/js/translations.js
@@ -64,7 +64,7 @@ var translations = {
function t (key, lang) {
if (arguments.length == 1) {
var lang = $('html').attr('lang');
- return translations[lang][key];
+ return t(key, lang);
} else if (arguments.length == 2 && translations[lang] && translations[lang][key]) {
return translations[lang][key];
} else {
diff --git a/resources/assets/less/metager/foki.less b/resources/assets/less/metager/foki.less
index f280ae9e9..0b0efc584 100644
--- a/resources/assets/less/metager/foki.less
+++ b/resources/assets/less/metager/foki.less
@@ -12,8 +12,8 @@
display: none;
position: fixed;
-webkit-box-pack: center;
- -ms-flex-pack: center;
- justify-content: center;
+ -ms-flex-pack: center;
+ justify-content: center;
min-height: 100%;
width: 100%;
background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .7)), to(rgba(0, 0, 0, .7)));
@@ -38,6 +38,9 @@
content: "×";
}
}
+ }
+ #toggle-dropdowns {
+
}
.focus-dropdown-toggle {
display: none;
diff --git a/resources/views/modals/create-focus-modal.blade.php b/resources/views/modals/create-focus-modal.blade.php
index 52d81837c..0795ea2ed 100644
--- a/resources/views/modals/create-focus-modal.blade.php
+++ b/resources/views/modals/create-focus-modal.blade.php
@@ -17,6 +17,8 @@
</div>
</div>
<div class="modal-body">
+ <input type="hidden" id="toggle-dropdowns">
+ <label for="toggle=dropdowns" class="js-only"></label>
<form id="customSearchForm" method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8">
<input type="hidden" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif">
<input type="hidden" name="encoding" value="utf8">
--
GitLab