From fc1cb6549a0dc61e1001610fde9916d675eaf0f9 Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Mon, 30 Oct 2017 10:45:01 +0100 Subject: [PATCH 1/5] =?UTF-8?q?Die=20Felder=20wurden=20in=20die=20Suchleis?= =?UTF-8?q?te=20eingebaut,=20ein=20gew=C3=A4hlter=20eigener=20Fokus=20ist?= =?UTF-8?q?=20aber=20noch=20nicht=20funktional=20und=20man=20kann=20eigene?= =?UTF-8?q?=20Foki=20nicht=20entfernen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/scriptStartPage.js | 76 ++----------- resources/assets/less/metager/settings.less | 17 ++- resources/assets/less/metager/start-page.less | 34 +++++- .../assets/less/metager/static-pages.less | 4 - resources/views/index.blade.php | 68 ++--------- resources/views/settings.blade.php | 107 +++++++++--------- 6 files changed, 111 insertions(+), 195 deletions(-) diff --git a/resources/assets/js/scriptStartPage.js b/resources/assets/js/scriptStartPage.js index 32893b82..254343f1 100644 --- a/resources/assets/js/scriptStartPage.js +++ b/resources/assets/js/scriptStartPage.js @@ -341,79 +341,20 @@ function alreadyInUse (name) { return localStorage.hasOwnProperty(getIdFromName(name)); } /** - * Adds a focus html-element to the focus selection - * - * - * + * Adds an option to the focus selector */ function addFocus (name) { var id = getIdFromName(name); - var foki = document.getElementById('foki'); - // create
to wrap all Elements - var wrapper = document.createElement('div'); - wrapper.classList.add('focus'); - // create - var newFocus = document.createElement('input'); - newFocus.id = id; - newFocus.classList.add('focus-radio'); - newFocus.classList.add('custom-focus'); - newFocus.classList.add('hide'); - newFocus.type = 'radio'; - newFocus.name = 'focus'; - newFocus.value = id; - newFocus.setAttribute('Form', 'searchForm'); - newFocus.checked = true; - newFocus.required = true; - // create

- -
- @@ -274,6 +216,14 @@
+
+ +
+
+ + + +
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php index 1bfa47e0..5b7b976a 100644 --- a/resources/views/settings.blade.php +++ b/resources/views/settings.blade.php @@ -7,62 +7,59 @@

{!! trans('settings.head.1') !!}

{!! trans('settings.head.2') !!}

{!! trans('settings.allgemein.1') !!}

- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
+
+
+ +
- -
- @lang('settings.abort') - - - +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ -- GitLab From 8e432b91d6b204b831a6edec3d7aaaa118ff41a9 Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Mon, 6 Nov 2017 08:31:15 +0100 Subject: [PATCH 2/5] =?UTF-8?q?Fokus-Dialoge=20funktionieren=20bis=20auf?= =?UTF-8?q?=20dass=20sie=20nach=20dem=20erstellen=20nicht=20automatisch=20?= =?UTF-8?q?ausgew=C3=A4hlt=20sind?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/scriptStartPage.js | 135 +++++++++++++----- resources/assets/less/metager/start-page.less | 12 ++ resources/assets/less/utility.less | 2 + resources/views/index.blade.php | 7 +- resources/views/layouts/staticPages.blade.php | 2 + 5 files changed, 120 insertions(+), 38 deletions(-) diff --git a/resources/assets/js/scriptStartPage.js b/resources/assets/js/scriptStartPage.js index 254343f1..80c96c08 100644 --- a/resources/assets/js/scriptStartPage.js +++ b/resources/assets/js/scriptStartPage.js @@ -12,6 +12,7 @@ $(document).ready(function () { setActionListeners(); loadInitialCustomFocuses(); loadSavedResults(); + checkFocusEditable(); }); /** @@ -60,8 +61,10 @@ function setActionListeners () { } $('.focusCheckbox').click(toggleDeleteButton); $('#addFocusBtn').click(() => showFocusCreateDialog('')); + $('#editFocusBtn').click(editCurrentFocus); $('.save-focus-btn').click(saveFocus); $('.delete-focus-btn').click(deleteFocus); + $('#focus-select').change(checkFocusEditable); // Save Focus on clicking enter while in the focus name input $('#focus-name').keyup(function (event) { if (event.keyCode == 13) { @@ -85,7 +88,7 @@ function setSettings () { if (key === 'param_' + acceptedParams[i]) { accepted = true; } - } + } if (accepted) { key = key.substring(6); // Check for existing hidden fields for this key @@ -242,8 +245,8 @@ function showFocusCreateDialog (id) { } } toggleDeleteButton(); - } + /** * Shows the focus create dialog for a given id */ @@ -251,11 +254,25 @@ function showFocusEditDialog (id) { showFocusCreateDialog(id); } +function getCurrentFocus () { + return document.getElementById('focus-select').value; +} + +/** + * Shows an edit dialog for the current selected focus + */ +function editCurrentFocus () { + console.log('hi'); + var currentFocus = getCurrentFocus(); + console.log(currentFocus); + showFocusEditDialog(currentFocus); +} + /** * Shows/Hides the delete button if (no) checkboxes are selected */ -function toggleDeleteButton() { - if(atLeastOneChecked()) { +function toggleDeleteButton () { + if (atLeastOneChecked()) { $('.delete-focus-btn').show(); } else { $('.delete-focus-btn').hide(); @@ -267,34 +284,10 @@ function toggleDeleteButton() { * Listens for save button */ function saveFocus () { - var name = document.getElementById('focus-name').value; - if (isValidName(name) && atLeastOneChecked()) { - var oldId = document.getElementById('original-id').value; - var id = getIdFromName(name); - var overwrite = true; - if (alreadyInUse(name) && oldId !== id) { - overwrite = confirm('Name bereits genutzt\nüberschreiben?'); - if (overwrite) { - localStorage.removeItem(id); - removeFocusById(id); - } - } - if (overwrite) { - var focus = {}; - $('input[type=checkbox]:checked').each(function (el) { - focus[$(this).attr('name')] = $(this).val(); - }); - focus['name'] = name; - if (oldId !== '') { - localStorage.removeItem(oldId); - removeFocusById(oldId); - } - localStorage.setItem(id, JSON.stringify(focus)); - addFocus(name); - $('#create-focus-modal').modal('hide'); - } - } else { - switch(document.documentElement.lang) { + /* 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; @@ -304,9 +297,58 @@ function saveFocus () { 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 then a-z, A-Z, 0-9, ä, ö, ü, ß, -, _ allowed, at least 1 character'); + break; + case 'es': + alert(''); // TODO + break; + default: + alert(''); // TODO + 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, aber keine original-id gesetzt war + 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; + } + } + /* 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) + 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 @@ -319,7 +361,9 @@ function deleteFocus () { localStorage.removeItem(oldId); removeFocusById(oldId); $('#create-focus-modal').modal('hide'); + $('#focus-select').change(); } + /** * Is the name valid (in terms of characters)? */ @@ -328,24 +372,27 @@ function isValidName (name) { // at least 1 character return /^[a-zA-Z0-9äöüß\-_ ]*$/.test(name); } + /** * Is at least one focus selected? */ function atLeastOneChecked () { return $('input[type=checkbox]: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); - $('#focus-select').append('') + $('#focus-select').append(''); } /** @@ -359,7 +406,7 @@ function removeFocus (name) { * Remove the focuses html-elements */ function removeFocusById (id) { - if(id == '') { + if (id == '') { return; } var focus = $('#focus-select option[value="' + id + '"]').remove(); @@ -422,7 +469,23 @@ function setFocusToDefault () { * @param {String} focusID The id of the focus, without # */ function setFocus (focusID) { - $('#' + focusID).prop('checked', true); + document.getElementById('focus-select').value = focusID; +} + +function checkFocusEditable () { + if (getCurrentFocus().startsWith('focus_')) { + enableEditFocusBtn(); + } else { + disableEditFocusBtn(); + } +} + +function enableEditFocusBtn () { + $('#editFocusBtn').removeClass('disabled').click(editCurrentFocus); +} + +function disableEditFocusBtn () { + $('#editFocusBtn').addClass('disabled').off('click'); } function loadSavedResults () { diff --git a/resources/assets/less/metager/start-page.less b/resources/assets/less/metager/start-page.less index e1cfaaed..cc84b563 100644 --- a/resources/assets/less/metager/start-page.less +++ b/resources/assets/less/metager/start-page.less @@ -46,6 +46,18 @@ } } } + .search-edit-focus { + display: flex; + button { + background-color: white; + border: none; + padding: 0px 8px; + font-size: 16px; + &:hover { + background-color: #e6e6e6; + } + } + } .search-settings { display: flex; a.btn { diff --git a/resources/assets/less/utility.less b/resources/assets/less/utility.less index 4e5270e0..bc6208bc 100644 --- a/resources/assets/less/utility.less +++ b/resources/assets/less/utility.less @@ -32,3 +32,5 @@ max-height: 1000px; } } + + diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index b0c302d8..b2d591e8 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -216,8 +216,11 @@
-
- +
+ +
+
+
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php index c79425ec..7ba67be1 100644 --- a/resources/views/layouts/staticPages.blade.php +++ b/resources/views/layouts/staticPages.blade.php @@ -16,9 +16,11 @@ + + @if (isset($css)) @if(is_array($css)) @foreach($css as $el) -- GitLab From a26337dd8d26850877bc24532d02a0f92de1722e Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Mon, 6 Nov 2017 09:29:43 +0100 Subject: [PATCH 3/5] =?UTF-8?q?Improved:=20Neue=20Foki=20werden=20jetzt=20?= =?UTF-8?q?automatisch=20ausgew=C3=A4hlt=20und=20l=C3=B6schen=20=C3=BCbers?= =?UTF-8?q?chriebene=20Foki?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/scriptStartPage.js | 35 ++++++++++++++++---------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/resources/assets/js/scriptStartPage.js b/resources/assets/js/scriptStartPage.js index 80c96c08..10cc5fdf 100644 --- a/resources/assets/js/scriptStartPage.js +++ b/resources/assets/js/scriptStartPage.js @@ -68,7 +68,7 @@ function setActionListeners () { // Save Focus on clicking enter while in the focus name input $('#focus-name').keyup(function (event) { if (event.keyCode == 13) { - $('.save-focus-btn').click(); + saveFocus(); } }); $('#create-focus-modal').on('shown.bs.modal', function () { @@ -286,7 +286,7 @@ function toggleDeleteButton () { function saveFocus () { /* Vorprüfungen */ // Falls keine Suchmaschine ausgewählt wurde - if (atLeastOneChecked()) { + if (!atLeastOneChecked()) { switch (document.documentElement.lang) { case 'en': alert('Please select at least 1 search engine.'); @@ -320,13 +320,15 @@ function saveFocus () { var oldId = document.getElementById('original-id').value; var id = getIdFromName(name); var overwrite = true; - // Wenn bereits ein Fokus mit dem Namen existiert, aber keine original-id gesetzt war + // 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 = {}; @@ -336,7 +338,7 @@ function saveFocus () { }); // Name setzen focus['name'] = name; - // Alte Version des Fokus löschen (aus localStorage und von der Webseite) + // Alte Version des Fokus löschen (aus localStorage und von der Webseite, falls eine existiert) if (oldId !== '') { localStorage.removeItem(oldId); removeFocusById(oldId); @@ -349,17 +351,23 @@ function saveFocus () { $('#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; - if ($('#' + oldId).prop('checked')) { - setFocusToDefault(); - } - localStorage.removeItem(oldId); - removeFocusById(oldId); + deleteFocusById(oldId) $('#create-focus-modal').modal('hide'); $('#focus-select').change(); } @@ -370,14 +378,14 @@ function deleteFocus () { 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); + return /^[a-zA-Z0-9äöüß\-_ ]+$/.test(name); } /** * Is at least one focus selected? */ function atLeastOneChecked () { - return $('input[type=checkbox]:checked').length > 0; + return $('.focusCheckbox:checked').length > 0; } /** @@ -409,7 +417,7 @@ function removeFocusById (id) { if (id == '') { return; } - var focus = $('#focus-select option[value="' + id + '"]').remove(); + $('#focus-select option[value="' + id + '"]').remove(); } /** @@ -469,7 +477,8 @@ function setFocusToDefault () { * @param {String} focusID The id of the focus, without # */ function setFocus (focusID) { - document.getElementById('focus-select').value = focusID; + $('#focus-select option[value="' + focusID + '"]').prop('selected', true); + $('#focus-select').change(); } function checkFocusEditable () { -- GitLab From c821a4648d2793aabc0a360b5f197491ca2037ab Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Mon, 6 Nov 2017 09:51:53 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Added:=20Tooltips=20per=20title=20f=C3=BCr?= =?UTF-8?q?=20die=20Custom-Fokus-Kn=C3=B6pfe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/lang/de/index.php | 3 +++ resources/views/index.blade.php | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/de/index.php b/resources/lang/de/index.php index bf65082e..debd2d0e 100644 --- a/resources/lang/de/index.php +++ b/resources/lang/de/index.php @@ -113,4 +113,7 @@ return [ 'plugin.vivaldi.8' => 'MetaGer als Startseite im :browser einrichten', 'plugin.vivaldi.9' => 'Klicken Sie in Ihrem Browser oben links auf das rote Vivaldi Logo und wählen Sie zuerst "Werkzeuge", dann im Untermenü "Einstellungen".', 'plugin.vivaldi.10' => 'Tragen Sie im Feld "Startseite" "https://metager.de" ein.', + + 'add-focus' => 'Eigenen Fokus hinzufügen', + 'edit-focus' => 'Fokus bearbeiten', ]; diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index b2d591e8..cb881635 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -217,10 +217,10 @@
- +
- +
-- GitLab From 940b493be7991e7c24804a5c43a592995b48158a Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Mon, 6 Nov 2017 10:01:20 +0100 Subject: [PATCH 5/5] =?UTF-8?q?Bootstrap=20entfernt=20und=20fehlende=20Var?= =?UTF-8?q?iablen=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/less/default.less | 1 - resources/assets/less/variables-default.less | 42 +++++++++++++------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/resources/assets/less/default.less b/resources/assets/less/default.less index f64afa38..39c99ac3 100644 --- a/resources/assets/less/default.less +++ b/resources/assets/less/default.less @@ -1,4 +1,3 @@ -@import "./bootstrap/bootstrap.less"; @import "./metager/metager.less"; @import "./variables-default.less"; diff --git a/resources/assets/less/variables-default.less b/resources/assets/less/variables-default.less index d7466d4f..dae35def 100644 --- a/resources/assets/less/variables-default.less +++ b/resources/assets/less/variables-default.less @@ -5,25 +5,37 @@ @brand-danger: #d9534f; @body-bg: rgb(250, 250, 250); @input-border-focus: rgb(255, 128, 0); -@font-family-sans-serif: "Liberation Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; - +@font-family-sans-serif: "Liberation Sans", +"Helvetica Neue", +Helvetica, +Arial, +sans-serif; //** Global textual link color. -@link-color: #2A2ADE; +@link-color: #2A2ADE; //@link-color: rgb(255, 128, 0); //** Link hover color set via `darken()` function. -@link-hover-color: darken(@link-color, 15%); +@link-hover-color: darken(@link-color, 15%); //** Link hover decoration. @link-hover-decoration: underline; +@font-size-base: 14px; +@screen-md: 992px; +@container-desktop: (920px + @grid-gutter-width); +@screen-lg: 1440px; +@container-large-desktop: (1370px + @grid-gutter-width); +//** Point at which the navbar becomes uncollapsed. +@grid-float-breakpoint: 865px; +/* Screen sizes */ -@font-size-base: 14px; - - -@screen-md: 992px; -@container-desktop: (920px + @grid-gutter-width); - -@screen-lg: 1440px; -@container-large-desktop: (1370px + @grid-gutter-width); - -//** Point at which the navbar becomes uncollapsed. -@grid-float-breakpoint: 865px; \ No newline at end of file +@screen-xs: 480px; +@screen-sm: 768px; +@screen-md: 992px; +@screen-lg: 1200px; +@screen-xs-min: @screen-xs; +@screen-sm-min: @screen-sm; +@screen-md-min: @screen-md; +@screen-lg-min: @screen-lg; +@screen-xs-max: (@screen-sm-min - 1); +@screen-sm-max: (@screen-md-min - 1); +@screen-md-max: (@screen-lg-min - 1); +@grid-gutter-width: 30px; \ No newline at end of file -- GitLab