D3Public/oxid_patches
8
0
Fork 0
Code Pull Requests Projects Releases Activity

Compare commits

base: D3Public:composer-install
Branches Tags
D3Public:composer-install
D3Public:sessionid
D3Public:unifiedIssuesInVagrant
D3Public:symlinksInSource
D3Public:adminloadingindicator
..
compare: D3Public:adminloadingindicator
Branches Tags
D3Public:sessionid
D3Public:unifiedIssuesInVagrant
D3Public:symlinksInSource
D3Public:adminloadingindicator
D3Public:composer-install

No commits in common. "composer-install" and "adminloadingindicator" have entirely different histories.
composer-i ... adminloadi

6 changed files with 156 additions and 34 deletions
Show Stats Expand all files Collapse all files

56
10310_adminLoadingIndicator_6.1.patch Normal file
View File

@ -0,0 +1,56 @@
From 6b1b9acedf9c16fb09b08c141aea87e067ee3470 Mon Sep 17 00:00:00 2001
From: Daniel Seifert <ds@shopmodule.com>
Date: Tue, 11 Jan 2022 14:28:10 +0100
Subject: [PATCH 1/1] add reload in progress marker on admin edit windows
# Conflicts:
# source/out/admin/src/oxid.js
---
source/out/admin/src/oxid.js | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/source/out/admin/src/oxid.js b/source/out/admin/src/oxid.js
index 508fe8acd..302e372d3 100644
--- a/source/out/admin/src/oxid.js
+++ b/source/out/admin/src/oxid.js
@@ -37,6 +37,8 @@ var oxid = {
editThis : function( sID )
{
+ top.oxid.admin.d3ShowProgressElement();
+
var oTransfer = top.basefrm.edit.document.getElementById( "transfer" );
oTransfer.oxid.value = sID;
oTransfer.cl.value = top.oxid.admin.getClass( sID );
@@ -99,6 +101,8 @@ var oxid = {
changeEditBar : function( sLocation, sPos, sFunction)
{
+ top.oxid.admin.d3ShowProgressElement();
+
var oSearch = top.basefrm.list.document.getElementById( "search" );
oSearch.actedit.value = sPos;
oSearch.submit();
@@ -200,6 +204,18 @@ var oxid = {
// appending..
oForm.appendChild( oFormField );
+ },
+
+ d3ShowProgressElement : function () {
+ var targetDocument = top.basefrm.edit.document;
+ var marker = targetDocument.createElement("div");
+ marker.style.cssText = "position: absolute; top: -30px; left: -30px; width: 0; height: 0; background-color: transparent; border: 30px solid transparent; border-top-color: red; transform:rotate(135deg)";
+ var hourglass = targetDocument.createElement("div");
+ hourglass.style.cssText = "position: absolute; top: -26px; left: -6px; width: 16px; height: 16px; transform:rotate(45deg); background-size: 16px; background-repeat: no-repeat";
+ hourglass.style.backgroundImage = 'url("data:image/svg+xml;base64,PHN2ZyBpZD0iU3ZnanNTdmcxMDA2IiB3aWR0aD0iMjg4IiBoZWlnaHQ9IjI4OCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWxuczpzdmdqcz0iaHR0cDovL3N2Z2pzLmNvbS9zdmdqcyI+PGRlZnMgaWQ9IlN2Z2pzRGVmczEwMDciPjwvZGVmcz48ZyBpZD0iU3ZnanNHMTAwOCIgdHJhbnNmb3JtPSJtYXRyaXgoMSwwLDAsMSwwLDApIj48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjI4OCIgaGVpZ2h0PSIyODgiIHZpZXdCb3g9IjAgMCAxNzkyIDE3OTIiPjxwYXRoIGQ9Ik0xNTM2IDEyOHEwIDI2MS0xMDYuNSA0NjEuNXQtMjY2LjUgMzA2LjVxMTYwIDEwNiAyNjYuNSAzMDYuNXQxMDYuNSA0NjEuNWg5NnExNCAwIDIzIDl0OSAyM3Y2NHEwIDE0LTkgMjN0LTIzIDloLTE0NzJxLTE0IDAtMjMtOXQtOS0yM3YtNjRxMC0xNCA5LTIzdDIzLTloOTZxMC0yNjEgMTA2LjUtNDYxLjV0MjY2LjUtMzA2LjVxLTE2MC0xMDYtMjY2LjUtMzA2LjV0LTEwNi41LTQ2MS41aC05NnEtMTQgMC0yMy05dC05LTIzdi02NHEwLTE0IDktMjN0MjMtOWgxNDcycTE0IDAgMjMgOXQ5IDIzdjY0cTAgMTQtOSAyM3QtMjMgOWgtOTZ6bS0xMjggMGgtMTAyNHEwIDIwNiA4NSAzODRoODU0cTg1LTE3OCA4NS0zODR6bS01NyAxMjE2cS01NC0xNDEtMTQ1LjUtMjQxLjV0LTE5NC41LTE0Mi41aC0yMzBxLTEwMyA0Mi0xOTQuNSAxNDIuNXQtMTQ1LjUgMjQxLjVoOTEweiIgZmlsbD0iI2ZmZmZmZiIgY2xhc3M9ImNvbG9yMDAwIHN2Z1NoYXBlIj48L3BhdGg+PC9zdmc+PC9nPjwvc3ZnPg==")';
+
+ marker.appendChild(hourglass);
+ targetDocument.body.appendChild(marker);
}
}
};
\ No newline at end of file
--
2.26.1.windows.1

54
10310_adminLoadingIndicator_6.3.patch Normal file
View File

@ -0,0 +1,54 @@
From 591c09d68bb285e602da12c76788c3e3f0dd775a Mon Sep 17 00:00:00 2001
From: Daniel Seifert <ds@shopmodule.com>
Date: Tue, 11 Jan 2022 14:28:10 +0100
Subject: [PATCH 1/1] add reload in progress marker on admin edit windows
---
source/out/admin/src/oxid.js | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/source/out/admin/src/oxid.js b/source/out/admin/src/oxid.js
index 5bee2b147..ff4ab205a 100644
--- a/source/out/admin/src/oxid.js
+++ b/source/out/admin/src/oxid.js
@@ -35,6 +35,8 @@ var oxid = {
},
editThis : function ( sID ) {
+ top.oxid.admin.d3ShowProgressElement();
+
var oTransfer = top.basefrm.edit.document.getElementById("transfer");
oTransfer.oxid.value = sID;
oTransfer.cl.value = top.oxid.admin.getClass(sID);
@@ -92,6 +94,8 @@ var oxid = {
},
changeEditBar : function ( sLocation, sPos, sFunction) {
+ top.oxid.admin.d3ShowProgressElement();
+
var oSearch = top.basefrm.list.document.getElementById("search");
oSearch.actedit.value = sPos;
oSearch.submit();
@@ -184,6 +188,18 @@ var oxid = {
// appending..
oForm.appendChild(oFormField);
+ },
+
+ d3ShowProgressElement : function () {
+ var targetDocument = top.basefrm.edit.document;
+ var marker = targetDocument.createElement("div");
+ marker.style.cssText = "position: absolute; top: -30px; left: -30px; width: 0; height: 0; background-color: transparent; border: 30px solid transparent; border-top-color: red; transform:rotate(135deg)";
+ var hourglass = targetDocument.createElement("div");
+ hourglass.style.cssText = "position: absolute; top: -26px; left: -6px; width: 16px; height: 16px; transform:rotate(45deg); background-size: 16px; background-repeat: no-repeat";
+ hourglass.style.backgroundImage = 'url("data:image/svg+xml;base64,PHN2ZyBpZD0iU3ZnanNTdmcxMDA2IiB3aWR0aD0iMjg4IiBoZWlnaHQ9IjI4OCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWxuczpzdmdqcz0iaHR0cDovL3N2Z2pzLmNvbS9zdmdqcyI+PGRlZnMgaWQ9IlN2Z2pzRGVmczEwMDciPjwvZGVmcz48ZyBpZD0iU3ZnanNHMTAwOCIgdHJhbnNmb3JtPSJtYXRyaXgoMSwwLDAsMSwwLDApIj48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjI4OCIgaGVpZ2h0PSIyODgiIHZpZXdCb3g9IjAgMCAxNzkyIDE3OTIiPjxwYXRoIGQ9Ik0xNTM2IDEyOHEwIDI2MS0xMDYuNSA0NjEuNXQtMjY2LjUgMzA2LjVxMTYwIDEwNiAyNjYuNSAzMDYuNXQxMDYuNSA0NjEuNWg5NnExNCAwIDIzIDl0OSAyM3Y2NHEwIDE0LTkgMjN0LTIzIDloLTE0NzJxLTE0IDAtMjMtOXQtOS0yM3YtNjRxMC0xNCA5LTIzdDIzLTloOTZxMC0yNjEgMTA2LjUtNDYxLjV0MjY2LjUtMzA2LjVxLTE2MC0xMDYtMjY2LjUtMzA2LjV0LTEwNi41LTQ2MS41aC05NnEtMTQgMC0yMy05dC05LTIzdi02NHEwLTE0IDktMjN0MjMtOWgxNDcycTE0IDAgMjMgOXQ5IDIzdjY0cTAgMTQtOSAyM3QtMjMgOWgtOTZ6bS0xMjggMGgtMTAyNHEwIDIwNiA4NSAzODRoODU0cTg1LTE3OCA4NS0zODR6bS01NyAxMjE2cS01NC0xNDEtMTQ1LjUtMjQxLjV0LTE5NC41LTE0Mi41aC0yMzBxLTEwMyA0Mi0xOTQuNSAxNDIuNXQtMTQ1LjUgMjQxLjVoOTEweiIgZmlsbD0iI2ZmZmZmZiIgY2xhc3M9ImNvbG9yMDAwIHN2Z1NoYXBlIj48L3BhdGg+PC9zdmc+PC9nPjwvc3ZnPg==")';
+
+ marker.appendChild(hourglass);
+ targetDocument.body.appendChild(marker);
}
}
};
\ No newline at end of file
--
2.26.1.windows.1

12
LICENSE → LICENSE.md
View File

@ -1,6 +1,6 @@
MIT License
The MIT License (MIT)
Copyright (c) 2021 fleurami
Copyright (c) 2021 D3 Data Development (Inh. Thomas Dartsch)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

13
OxidAskYes.patch
View File

@ -1,13 +0,0 @@
--- src/Installer/Package/AbstractPackageInstaller_Original.php 2021-04-12 16:59:26.000000000 +0200
+++ src/Installer/Package/AbstractPackageInstaller.php 2021-04-29 16:16:31.000000000 +0200
@@ -198,9 +198,7 @@
*/
protected function askQuestion($messageToAsk)
{
- $userInput = $this->getIO()->ask($messageToAsk, 'N');
-
- return $this->isPositiveUserInput($userInput);
+ return true;
}
/**

55
README.md
View File

@ -1,22 +1,47 @@
# oxid_patches
How many times you have thought about OXID and "Do you want to ..." -> YES
Don't do it again!
# Admin Ladeindikator für OXID eShop
# first add this to your main composer file
composer require cweagans/composer-patches
Abhängig vom Shop dauert es im Adminbereich einen Moment, bis die gewünschte Tabansicht eines Objektes (z.B. einer Bestellung) geladen ist. Wenn dies länger dauert, bearbeitet man eventuell die bisherige Auswahl. Um dies zu vermeiden, fügt dieses Patch beim Eintragswechsel und auch beim Tabwechsel einen kleinen Ladehinweis hinzu, der erst wieder verschwindet, wenn die Seite komplett aktualisiert wurde.
# add this to your main composer file
![Ladeindikator](screenshot.jpg "Ladeindikator")
## Installation
Auf der Konsole im Shoproot (oberhalb von source und vendor) folgende Befehle ausführen:
```bash
php composer require cweagans/composer-patches
php composer config extra.enable-patching true
```
Diesen Abschnitt bitte der composer.json (oder der verwendeten Patchdatei) hinzufügen bzw. ergänzen:
```
"extra": {
"patches": {
"oxid-esales/oxideshop-composer-plugin": {
"Don't ask, simple install all new":
"https://git.d3data.de/D3Public/oxid_patches/raw/branch/composer-install/OxidAskYes.patch"
"oxid-esales/oxideshop-ce": {
"Admin Loading Indicator":
"https://raw.githubusercontent.com/d3datadevelopment/oxid_patches/adminloadingindicator/10310_adminLoadingIndicator_6.1.patch"
}
},
"enable-patching": true
},
}
}
```
# run this command
composer install
Es stehen folgende Patches für unterschiedliche Shopversionen bereit:
Enjoy!
* OXID 6.1.x -> https://raw.githubusercontent.com/d3datadevelopment/oxid_patches/adminloadingindicator/10310_adminLoadingIndicator_6.1.patch
* ab OXID 6.2.x -> https://raw.githubusercontent.com/d3datadevelopment/oxid_patches/adminloadingindicator/10310_adminLoadingIndicator_6.3.patch
Passen Sie den Pfad an die von Ihnen eingesetzte Shopversion an.
Diesen Befehl ausführen:
```bash
php composer update --lock
```
Laden Sie den Adminbereich bitte komplett neu.
## Lizenz
Die vollständigen Copyright- und Lizenzinformationen entnehmen Sie bitte der [LICENSE](LICENSE.md)-Datei, die mit diesem Quellcode verteilt wurde.

BIN
screenshot.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB