From 3e31020ecb9d2e8ebc9af1dc06ea2a0a496731d0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 2 Oct 2022 21:58:43 +0200 Subject: [PATCH] y-web: minor reworks and fixes in extension handling Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/997d75203900f004a97f318ed1d24195f10554ab Author: vanhofen Date: 2022-10-02 (Sun, 02 Oct 2022) Origin message was: ------------------ - y-web: minor reworks and fixes in extension handling --- data/y-web/Y_Ext_Settings.yhtm | 7 +++-- data/y-web/Y_Ext_Uninstall.yhtm | 35 +++++++++++++++++------- data/y-web/Y_Ext_Update.yhtm | 40 +++++++++++++++++++--------- data/y-web/Y_Ext_Update_refresh.yhtm | 8 +++--- data/y-web/extensions.txt | 3 +-- data/y-web/languages/Deutsch | 1 + data/y-web/languages/English | 3 ++- 7 files changed, 67 insertions(+), 30 deletions(-) diff --git a/data/y-web/Y_Ext_Settings.yhtm b/data/y-web/Y_Ext_Settings.yhtm index 071ff8adf..3cb48cb3e 100644 --- a/data/y-web/Y_Ext_Settings.yhtm +++ b/data/y-web/Y_Ext_Settings.yhtm @@ -16,8 +16,11 @@ function do_submit(){ {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
-
- {=var-set:menu={=L:main.settings=}=}{=include-block:Y_Blocks.txt;work_menu=}
+
+
+ {=var-set:menu={=L:main.settings=}=}{=include-block:Y_Blocks.txt;work_menu=} +
+
diff --git a/data/y-web/Y_Ext_Uninstall.yhtm b/data/y-web/Y_Ext_Uninstall.yhtm index 5f6b862b3..3e076cec9 100644 --- a/data/y-web/Y_Ext_Uninstall.yhtm +++ b/data/y-web/Y_Ext_Uninstall.yhtm @@ -20,11 +20,16 @@ function init(){ {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
-
- {=var-set:menu={=L:ext.uninstaller=}=}{=include-block:Y_Blocks.txt;work_menu=}
+
+
+ {=var-set:menu={=L:ext.uninstaller=}=}{=include-block:Y_Blocks.txt;work_menu=} +
+
-
wait - {=L:ext.search_for_ext=}
+
+ wait + {=L:ext.search_for_ext=} +

@@ -32,12 +37,19 @@ function init(){
- - + + + + + + + - + + +
{=L:ext.type=}{=L:ext.extension=}{=L:ext.tag=}{=L:ext.version=}{=L:ext.size=}{=L:ext.uninstall=}{=L:ext.info=}{=L:ext.type=}{=L:ext.extension=}{=L:ext.tag=}{=L:ext.version=}{=L:ext.size=}{=L:ext.uninstall=}{=L:ext.info=}
@@ -49,11 +61,15 @@ function init(){ - + + + - + + +
 {=L:ext.action=}{=L:ext.status=} {=L:ext.action=}{=L:ext.status=}

@@ -75,4 +91,3 @@ function init(){ {=include-block:Y_Blocks.txt;management_check_bottom=} - diff --git a/data/y-web/Y_Ext_Update.yhtm b/data/y-web/Y_Ext_Update.yhtm index ff9dd158c..0f3664aaa 100644 --- a/data/y-web/Y_Ext_Update.yhtm +++ b/data/y-web/Y_Ext_Update.yhtm @@ -8,11 +8,16 @@ {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
-
- {=var-set:menu={=L:ext.installer_updater=}=}{=include-block:Y_Blocks.txt;work_menu=}
-
-
wait - {=L:ext.search_for_ext=}
+
+
+ {=var-set:menu={=L:ext.installer_updater=}=}{=include-block:Y_Blocks.txt;work_menu=} +
+
+
+
+ wait + {=L:ext.search_for_ext=} +

@@ -21,13 +26,21 @@   - {=L:ext.site=}{=L:ext.type=}{=L:ext.extension=} - {=L:ext.tag=}{=L:ext.your=}
{=L:ext.version=}{=L:ext.update=}
{=L:ext.version=} - yWeb{=L:ext.size=}{=L:ext.info=} + {=L:ext.site=} + {=L:ext.type=} + {=L:ext.extension=} + {=L:ext.tag=} + {=L:ext.your=}
{=L:ext.version=} + {=L:ext.update=}
{=L:ext.version=} + yWeb + {=L:ext.size=} + {=L:ext.info=} - + + +   @@ -40,11 +53,15 @@ - + + + - + + +
 {=L:ext.action=}{=L:ext.status=} {=L:ext.action=}{=L:ext.status=}

@@ -72,4 +89,3 @@ {=include-block:Y_Blocks.txt;management_check_bottom=} - diff --git a/data/y-web/Y_Ext_Update_refresh.yhtm b/data/y-web/Y_Ext_Update_refresh.yhtm index 440b25f4f..0ae21d900 100644 --- a/data/y-web/Y_Ext_Update_refresh.yhtm +++ b/data/y-web/Y_Ext_Update_refresh.yhtm @@ -15,12 +15,14 @@ function do_onload() { {=var-set:wait_text={=L:refreshing=}=}{=include-block:Y_Blocks.txt;snip_wait=}
-
- {=var-set:menu={=L:ext.ext_saved=}=}{=include-block:Y_Blocks.txt;work_menu=}
+
+
+ {=var-set:menu={=L:ext.ext_saved=}=}{=include-block:Y_Blocks.txt;work_menu=} +
+
{=L:ext.refresh_now=}
- diff --git a/data/y-web/extensions.txt b/data/y-web/extensions.txt index 2a34a9359..9748acfd5 100644 --- a/data/y-web/extensions.txt +++ b/data/y-web/extensions.txt @@ -1,2 +1 @@ -type:u,site:Neutrino-Images,desc:yWeb Extensions,url:https://raw.githubusercontent.com/neutrino-images/ni-neutrino-plugins/master/yWeb-Extensions/Y_Extensions.txt - +type:u,site:Neutrino-Images,desc:NI yWeb Extensions,url:https://raw.githubusercontent.com/neutrino-images/ni-neutrino-plugins/master/y-extensions/y-extensions.txt diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index a8d6f7022..885eceb2e 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -152,6 +152,7 @@ ext.update_install=Aktualisierung / Installation ext.site=Site ext.refresh_now=Einstellungen gespeichert. Menues werden aktualisiert. ext.ext_saved=Erweiterungseinstellungen gespeichert +ext.tag=Markierung # ===== Bouquet bou.bouquet=Bouquet diff --git a/data/y-web/languages/English b/data/y-web/languages/English index 0783d0879..feb9fb5e5 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -134,7 +134,7 @@ bc.channels=Channels ext.installer_updater=Installer/Updater ext.uninstaller=Extensions Uninstaller ext.search_for_ext=Search for Extensions ... -ext.installed_extensions=installed extensions +ext.installed_extensions=Installed extensions ext.type=Type ext.extension=Extension ext.version=Version @@ -152,6 +152,7 @@ ext.update_install=update/install ext.site=Site ext.refresh_now=Settings saved. Refreshing Menue now. ext.ext_saved=Extensions Settings saved +ext.tag=Tag # ===== Bouquet bou.bouquet=Bouquet