Version 18.40 [hot-fix #721]

webmin · Apr 21, 2017 · 326f365 · 326f365
1 parent 743c192
commit 326f365
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,14 @@
 ## Changelog
 
-#### Version 18.41-beta41 (20 April, 2017)
+#### Version 18.41-beta42 (21 April, 2017)
 * Added PGP signature to verify authenticity of the package
 * Added ability to install patched version of the theme directly from GitHub, to get early access on the new features [#707](https://github.com/qooob/authentic-theme/issues/707)
 * Added console script for updating the theme [#703](https://github.com/qooob/authentic-theme/issues/703)
 * Added ability to display version patch number [#676](https://github.com/qooob/authentic-theme/issues/676)
 * Added error handler for saving files in background calls [#689](https://github.com/qooob/authentic-theme/issues/689)
 * Added controls for operations in icon mode [#684](https://github.com/qooob/authentic-theme/issues/684)
 * Added buttons instead of having plain links [#719](https://github.com/qooob/authentic-theme/issues/719)
-* Fixed bugs [#687](https://github.com/qooob/authentic-theme/issues/687) [#688](https://github.com/qooob/authentic-theme/issues/688) [#692](https://github.com/qooob/authentic-theme/issues/692) [#693](https://github.com/qooob/authentic-theme/issues/693) [#695](https://github.com/qooob/authentic-theme/issues/695) [#696](https://github.com/qooob/authentic-theme/issues/696) [#697](https://github.com/qooob/authentic-theme/issues/697) [#698](https://github.com/qooob/authentic-theme/issues/698) [#699](https://github.com/qooob/authentic-theme/issues/699) [#700](https://github.com/qooob/authentic-theme/issues/700) [#701](https://github.com/qooob/authentic-theme/issues/701) [#702](https://github.com/qooob/authentic-theme/issues/702) [#704](https://github.com/qooob/authentic-theme/issues/704) [#706](https://github.com/qooob/authentic-theme/issues/706) [#710](https://github.com/qooob/authentic-theme/issues/710) [#711](https://github.com/qooob/authentic-theme/issues/711) [#713](https://github.com/qooob/authentic-theme/issues/713) [#714](https://github.com/qooob/authentic-theme/issues/714) [#716](https://github.com/qooob/authentic-theme/issues/716) [#718](https://github.com/qooob/authentic-theme/issues/718) [#720](https://github.com/qooob/authentic-theme/issues/720) [#51526](https://www.virtualmin.com/node/51526) [#51807](https://www.virtualmin.com/node/51807)
+* Fixed bugs [#687](https://github.com/qooob/authentic-theme/issues/687) [#688](https://github.com/qooob/authentic-theme/issues/688) [#692](https://github.com/qooob/authentic-theme/issues/692) [#693](https://github.com/qooob/authentic-theme/issues/693) [#695](https://github.com/qooob/authentic-theme/issues/695) [#696](https://github.com/qooob/authentic-theme/issues/696) [#697](https://github.com/qooob/authentic-theme/issues/697) [#698](https://github.com/qooob/authentic-theme/issues/698) [#699](https://github.com/qooob/authentic-theme/issues/699) [#700](https://github.com/qooob/authentic-theme/issues/700) [#701](https://github.com/qooob/authentic-theme/issues/701) [#702](https://github.com/qooob/authentic-theme/issues/702) [#704](https://github.com/qooob/authentic-theme/issues/704) [#706](https://github.com/qooob/authentic-theme/issues/706) [#710](https://github.com/qooob/authentic-theme/issues/710) [#711](https://github.com/qooob/authentic-theme/issues/711) [#713](https://github.com/qooob/authentic-theme/issues/713) [#714](https://github.com/qooob/authentic-theme/issues/714) [#716](https://github.com/qooob/authentic-theme/issues/716) [#718](https://github.com/qooob/authentic-theme/issues/718) [#720](https://github.com/qooob/authentic-theme/issues/720) [#721](https://github.com/qooob/authentic-theme/issues/721) [#51526](https://www.virtualmin.com/node/51526) [#51807](https://www.virtualmin.com/node/51807)
 
 ### Version 18.40 (21 March, 2017)
 * Added ability to use theme configuration for all users [#640](https://github.com/qooob/authentic-theme/issues/640#issuecomment-287572703)

diff --git a/lang/ca.UTF-8 b/lang/ca.UTF-8
@@ -178,7 +178,7 @@ settings_hotkey_toggle_key_cloudmin=Drecera per Cloudmin
 settings_hotkey_toggle_key_usermin=Drecera per Usermin
 settings_hotkey_toggle_key_webmail=Drecera pel Correu
 settings_hotkey_sysinfo=Drecera del tauler
-settings_hotkey_shell=Drecera pel shell
+settings_hotkey_shell=Drecera pel terminal
 settings_hotkey_favorites=Drecera pels favorits
 settings_hotkey_focus_search=Drecera per cerques
 settings_hotkey_reload=Drecera per recarregar pàgina

diff --git a/lang/cz.UTF-8 b/lang/cz.UTF-8
@@ -177,7 +177,7 @@ settings_hotkey_toggle_key_cloudmin=Klávesová zkratka pro Cloudmin
 settings_hotkey_toggle_key_usermin=Klávesová zkratka pro Usermin
 settings_hotkey_toggle_key_webmail=Klávesová zkratka pro Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Klávesová zkratka pro hledání
 settings_hotkey_reload=Klávesová zkratka pro opetovné načtení stránky

diff --git a/lang/da.UTF-8 b/lang/da.UTF-8
@@ -178,7 +178,7 @@ settings_hotkey_toggle_key_cloudmin=Hotkey for Cloudmin
 settings_hotkey_toggle_key_usermin=Hotkey for Usermin
 settings_hotkey_toggle_key_webmail=Hotkey for Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Hotkey for search field
 settings_hotkey_reload=Hotkey for page reload

diff --git a/lang/de.UTF-8 b/lang/de.UTF-8
@@ -178,7 +178,7 @@ settings_hotkey_toggle_key_cloudmin=Hotkey for Cloudmin
 settings_hotkey_toggle_key_usermin=Hotkey for Usermin
 settings_hotkey_toggle_key_webmail=Hotkey for Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Hotkey for search field
 settings_hotkey_reload=Hotkey for page reload

diff --git a/lang/en.UTF-8 b/lang/en.UTF-8
@@ -177,7 +177,7 @@ settings_hotkey_toggle_key_cloudmin=Hotkey for Cloudmin
 settings_hotkey_toggle_key_usermin=Hotkey for Usermin
 settings_hotkey_toggle_key_webmail=Hotkey for Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Hotkey for search field
 settings_hotkey_reload=Hotkey for page reload

diff --git a/lang/es.UTF-8 b/lang/es.UTF-8
@@ -178,7 +178,7 @@ settings_hotkey_toggle_key_cloudmin=Hotkey for Cloudmin
 settings_hotkey_toggle_key_usermin=Hotkey for Usermin
 settings_hotkey_toggle_key_webmail=Hotkey for Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Hotkey for search field
 settings_hotkey_reload=Hotkey for page reload

diff --git a/lang/fr.UTF-8 b/lang/fr.UTF-8
@@ -178,7 +178,7 @@ settings_hotkey_toggle_key_cloudmin=Hotkey for Cloudmin
 settings_hotkey_toggle_key_usermin=Hotkey for Usermin
 settings_hotkey_toggle_key_webmail=Hotkey for Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Hotkey for search field
 settings_hotkey_reload=Hotkey for page reload

diff --git a/lang/it.UTF-8 b/lang/it.UTF-8
@@ -178,7 +178,7 @@ settings_hotkey_toggle_key_cloudmin=Hotkey for Cloudmin
 settings_hotkey_toggle_key_usermin=Hotkey for Usermin
 settings_hotkey_toggle_key_webmail=Hotkey for Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Hotkey for search field
 settings_hotkey_reload=Hotkey for page reload

diff --git a/lang/nl.UTF-8 b/lang/nl.UTF-8
@@ -178,7 +178,7 @@ settings_hotkey_toggle_key_cloudmin=Hotkey for Cloudmin
 settings_hotkey_toggle_key_usermin=Hotkey for Usermin
 settings_hotkey_toggle_key_webmail=Hotkey for Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Hotkey for search field
 settings_hotkey_reload=Hotkey for page reload

diff --git a/lang/no.UTF-8 b/lang/no.UTF-8
@@ -178,7 +178,7 @@ settings_hotkey_toggle_key_cloudmin=Hotkey for Cloudmin
 settings_hotkey_toggle_key_usermin=Hotkey for Usermin
 settings_hotkey_toggle_key_webmail=Hotkey for Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Hotkey for search field
 settings_hotkey_reload=Hotkey for page reload

diff --git a/lang/pl.UTF-8 b/lang/pl.UTF-8
@@ -178,7 +178,7 @@ settings_hotkey_toggle_key_cloudmin=Hotkey for Cloudmin
 settings_hotkey_toggle_key_usermin=Hotkey for Usermin
 settings_hotkey_toggle_key_webmail=Hotkey for Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Hotkey for search field
 settings_hotkey_reload=Hotkey for page reload

diff --git a/lang/pt.UTF-8 b/lang/pt.UTF-8
@@ -178,7 +178,7 @@ settings_hotkey_toggle_key_cloudmin=Hotkey for Cloudmin
 settings_hotkey_toggle_key_usermin=Hotkey for Usermin
 settings_hotkey_toggle_key_webmail=Hotkey for Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Hotkey for search field
 settings_hotkey_reload=Hotkey for page reload

diff --git a/lang/ro_RO.UTF-8 b/lang/ro_RO.UTF-8
@@ -178,7 +178,7 @@ settings_hotkey_toggle_key_cloudmin=Tastă Rapidă pentru Cloudmin
 settings_hotkey_toggle_key_usermin=Tastă Rapidă pentru Usermin
 settings_hotkey_toggle_key_webmail=Tastă Rapidă pentru Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Tastă Rapidă pentru Favorite
 settings_hotkey_focus_search=Tastă Rapidă pentru câmpul de căutare
 settings_hotkey_reload=Tastă Rapidă pentru reîncărcarea paginii

diff --git a/lang/ru.UTF-8 b/lang/ru.UTF-8
@@ -181,7 +181,7 @@ settings_hotkey_toggle_key_cloudmin=Hotkey for Cloudmin
 settings_hotkey_toggle_key_usermin=Hotkey for Usermin
 settings_hotkey_toggle_key_webmail=Hotkey for Mail
 settings_hotkey_sysinfo=Hotkey for dashboard
-settings_hotkey_shell=Hotkey for shell
+settings_hotkey_shell=Hotkey for terminal
 settings_hotkey_favorites=Hotkey for favorites
 settings_hotkey_focus_search=Hotkey for search field
 settings_hotkey_reload=Hotkey for page reload

diff --git a/unauthenticated/js/parent.js b/unauthenticated/js/parent.js
@@ -1059,10 +1059,14 @@ $(window).keyup(function(D) {
 });
 $("body").on("submit", "#webmin_search_form", function(c) {
     var e = $(this),
-        d = !e.find("input.sidebar-search").val().trim().startsWith("!"),
+        g = e.find("input.sidebar-search"),
+        d = !g.val().trim().startsWith("!"),
         f = t__wi_p.$(".form-control.sidebar-search");
     if (!d || !$.trim(f.val())) {
-        c.preventDefault()
+        c.preventDefault();
+        if (ported_shell_available()) {
+            ported_shell_open(shell, g.val())
+        }
     }
     setTimeout(function() {
         t__wi_p.$(".navigation > li:not('.has-sub')").removeClass("sub_active").find("span.current-large").remove();

diff --git a/unauthenticated/js/parent.min.js b/unauthenticated/js/parent.min.js
diff --git a/unauthenticated/js/postinit.js b/unauthenticated/js/postinit.js
@@ -436,12 +436,22 @@ function ported_shell_clear_cmd(a) {
     a.focus()
 }
 
-function ported_shell_open(a) {
+function ported_shell_open(a, b) {
+    var d = (typeof b == "undefined" ? d = false : d = (b.startsWith("!") ? b.substr(1) : b)),
+        f = t__wi_p.$("body").find(".-shell-port- input");
+    if (d) {
+        f.val(d);
+        var c = $.Event("keydown");
+        c.which = 13;
+        f.trigger(c)
+    }
     a.css("bottom", "0vh").addClass("opened");
     t__wi_p.ported_shell_size();
     setTimeout(function() {
-        t__wi_p.focus();
-        t__wi_p.$("body").find(".-shell-port- input").focus()
+        if (!d) {
+            t__wi_p.focus();
+            f.focus()
+        }
     }, 20)
 }
 

diff --git a/unauthenticated/js/postinit.min.js b/unauthenticated/js/postinit.min.js
diff --git a/version b/version
@@ -1 +1 @@
-18.40-git-201704201806
+18.40-git-201704211006