18.45 [patch #729]

webmin · May 5, 2017 · aed4cfe · aed4cfe
1 parent 14bd6d6
commit aed4cfe
Show file tree

Hide file tree

Showing 28 changed files with 145 additions and 74 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## Changelog
 
-#### Version 18.46-beta7 (25 April, 2017)
-* Fixed bugs [#685](https://github.com/qooob/authentic-theme/issues/685) [#723](https://github.com/qooob/authentic-theme/issues/723) [#726](https://github.com/qooob/authentic-theme/issues/726) [#727](https://github.com/qooob/authentic-theme/issues/727) [#728](https://github.com/qooob/authentic-theme/issues/728) [#51917](https://www.virtualmin.com/node/51917)
+#### Version 18.46-beta8 (25 April, 2017)
+* Fixed bugs [#685](https://github.com/qooob/authentic-theme/issues/685) [#723](https://github.com/qooob/authentic-theme/issues/723) [#726](https://github.com/qooob/authentic-theme/issues/726) [#727](https://github.com/qooob/authentic-theme/issues/727) [#728](https://github.com/qooob/authentic-theme/issues/728) [#729](https://github.com/qooob/authentic-theme/issues/729) [#51917](https://www.virtualmin.com/node/51917)
 
 #### Version 18.45 (21 April, 2017)
 * 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)

diff --git a/extensions/csf/csf.css b/extensions/csf/csf.css
@@ -1109,7 +1109,7 @@ html[data-module='csf'][data-background-style='nightRider'] [style*='background:
 
 html[data-post='logtail'][data-background-style='nightRider'] .panel .panel-body .panel,
 html[data-post='loggrep'][data-background-style='nightRider'] .panel .panel-body .panel {
-    border: 1px solid #424449
+    border: 1px solid #424449 !important
 }
 
 html[data-module='csf'][data-post="allow"] .panel-body>form>.panel.panel-default>.panel-body>.panel-heading,

diff --git a/extensions/csf/csf.js b/extensions/csf/csf.js
@@ -11,17 +11,11 @@ var b = window,
     html = $("html"),
     r = $('link[href*="configserver"]'),
     empty = $("style"),
-    __isNR = ($('link[href*="nightrider"]').length ? 1 : 0);
+    __isNR = (($('html[data-background-style="nightRider"]').length && $('link[href*="nightrider"]').length) ? 1 : 0);
 f.$___________initial = 0;
 html.attr("data-background-style", f.$("html").attr("data-background-style")).attr("data-module", "csf");
 empty.empty();
 r.remove();
-$("body").tooltip({
-    selector: 'a[data-toggle="tooltip"]',
-    container: "body",
-    placement: "auto top",
-    html: true
-});
 
 function csf_init() {
     function w(d) {
@@ -224,7 +218,7 @@ function csf_init() {
 
     function q() {
         setTimeout(function() {
-            z.find(".panel-heading").prepend('			<div class="btn-group pull-right" style="position: absolute; right: 15px; top: 17px;">			<a class="btn btn-link text-lighter btn-filter-top-right text-decoration-none pull-left" data-toggle="tooltip" data-title="' + ($is_lang ? f.lang("theme_xhred_datatable_filter_visible_tables") : "") + '" data-container="body">				<label style="font-weight: 400">					<input type="text" class="dataTable-mirror" placeholder="' + ($is_lang ? f.lang("theme_xhred_datatable_filter") : "") + '">				</label>				<i class="fa fa-filter"></i>			</a>			</div>		');
+            z.find(".panel-heading").prepend('			<div class="btn-group pull-right" style="position: absolute; right: 15px; top: 17px;">			<a class="btn btn-link text-lighter btn-filter-top-right text-decoration-none pull-left" data-toggle="tooltip" data-title="' + ($is_lang ? f.lang("theme_xhred_datatable_filter") : "") + '" data-container="body">				<label style="font-weight: 400">					<input type="text" class="dataTable-mirror" placeholder="' + ($is_lang ? f.lang("theme_xhred_datatable_filter") : "") + '">				</label>				<i class="fa fa-filter"></i>			</a>			</div>		');
             var d = z.find(".dataTables_filter");
             d.hide();
             z.find(".btn-filter-top-right").click(function(g) {
@@ -597,7 +591,7 @@ function csf_init() {
         }
     }
     var c = $("#csfreturn").length;
-    $('#csfreturn, 		   html[data-post="rblcheckedit"] input[value="rblcheck"] + input,		   html[data-post="serverchecksave"] input[value="servercheck"] + input,		   html[data-post="temprm"] input[value="temp"] + input,		   html[data-post="temptoperm"] input[value="temp"] + input		').replaceWith('<button type="submit" class="btn btn-' + (c ? "primary" : "default margined-top-10") + ' page_footer_submit"><i class="fa fa-fw fa-arrow-left">&nbsp;</i> Return' + (c ? " to module index" : "") + "</button>");
+    $('#csfreturn, 		   html[data-post="rblcheckedit"] input[value="rblcheck"] + input,		   html[data-post="serverchecksave"] input[value="servercheck"] + input,		   html[data-post="temprm"] input[value="temp"] + input,		   html[data-post="temptoperm"] input[value="temp"] + input		').replaceWith('<button type="submit" class="btn btn-' + (c ? "primary" : "default margined-top-10") + ' page_footer_submit"><i class="fa fa-fw fa-arrow-left">&nbsp;</i> ' + (c ? ($is_lang ? f.lang("theme_xhred_global_return_to_module_index") : "Return to module index") : ($is_lang ? f.lang("theme_xhred_global_return") : "Return")) + "</button>");
     var J = $('html input[value="lfdrestart"] + input, html input[value="restart"] + input, html input[value="restartboth"] + input'),
         P = "Save",
         A = "fa-circle-check";
@@ -628,7 +622,7 @@ function csf_init() {
     if ($("html").attr("data-post") !== "") {
         var j = z.find(".btn-primary.page_footer_submit");
         if (j.length) {
-            z.find(".panel-heading font").before('<a data-tooltip="tooltip" data-container="body" data-html="true" data-placement="auto top" title="' + $(".page_footer_submit").text() + '"  href="/csf" class="btn btn-link footer_module_index_top"><i class="fa fa-arrow-left"></i></a>');
+            z.find(".panel-heading font").before('<a data-tooltip="tooltip" data-container="body" data-html="true" data-placement="auto top" title="' + $.trim($(".page_footer_submit.btn-primary:first").text()) + '"  href="/csf" class="btn btn-link footer_module_index_top"><i class="fa fa-arrow-left"></i></a>');
             $("body").on("click", ".footer_module_index_top", function(d) {
                 d.preventDefault();
                 $("body").find(".btn.btn-primary.page_footer_submit").before('<input type="submit" class="submit_tmp_index hidden">');
@@ -640,7 +634,7 @@ function csf_init() {
             h = C.text();
         conf_row = C.parent("form").parent("td").parent("tr").addClass("hidden").detach(), info_button = z.find('button[value="readme"]'), title_help = info_button.text(), info_row = info_button.parent("td").parent("tr").addClass("hidden").detach();
         $("#csf > table > tbody").append(conf_row);
-        z.find(".panel-heading font").before('<div class="btn-group btn-group-csf-home"><a href="/" data-tooltip="tooltip" data-container="body" data-html="true" data-placement="auto top" title="' + h + '" class="btn btn-link text-lighter ported_module_csf_conf"><i class="fa fa-cog"></i></a><a href="/" data-tooltip="tooltip" data-container="body" data-html="true" data-placement="auto top" title="' + title_help + '" class="btn btn-link text-lighter ported_module_csf_help"><i class="fa fa-question-circle"></i></a></div>');
+        z.find(".panel-heading font").before('<div class="btn-group btn-group-csf-home"><a href="/" data-tooltip="tooltip" data-container="body" data-html="true" data-placement="auto top" title="' + ($is_lang ? f.lang("theme_xhred_global_module_config") : "Module config") + '" class="btn btn-link text-lighter ported_module_csf_conf"><i class="fa fa-cog"></i></a><a href="/" data-tooltip="tooltip" data-container="body" data-html="true" data-placement="auto top" title="' + ($is_lang ? f.lang("theme_xhred_global_help") : "Module help") + '" class="btn btn-link text-lighter ported_module_csf_help"><i class="fa fa-question-circle"></i></a></div>');
         $("body").on("click", 'a[href="/"].ported_module_csf_conf', function(d) {
             d.preventDefault();
             C.trigger("click")
@@ -652,6 +646,12 @@ function csf_init() {
         })
     }
     setTimeout(function() {
-        o(B, f, with_frame)
+        o(B, f, with_frame);
+        $("body").tooltip({
+            selector: 'a[data-toggle="tooltip"]',
+            container: "body",
+            placement: "auto top",
+            html: true
+        })
     }, 100)
 };
diff --git a/extensions/csf/csf.min.css b/extensions/csf/csf.min.css
diff --git a/extensions/csf/csf.min.js b/extensions/csf/csf.min.js
diff --git a/extensions/file-manager/file-manager.js b/extensions/file-manager/file-manager.js
@@ -1526,6 +1526,7 @@ function ___f__tw() {
             f__dt()
         }
         $("#headln2l .help_popup").css("padding", "6px 12px");
+        $("#headln2l .btn-group > a.btn:first-child > i").attr("data-title", lang("theme_xhred_global_dir_up")).attr("data-toggle", "tooltip");
         $('ul > li > a[href^="bookmark.cgi?path="]').parents("ul").addClass("at-o__f_m-favorites-dropdown").find(".fa-bookmark-o").removeClass("fa-bookmark-o").addClass("fa-fw fa-star-o");
         $('div button[onclick="removeDialog()"]').addClass("disabled o__f_m-button-delete").removeAttr("onclick");
         $('a[onclick="chmodDialog()"]').removeAttr("onclick").parent("li").addClass("disabled o__f_m-button-chmod");

diff --git a/extensions/file-manager/file-manager.min.js b/extensions/file-manager/file-manager.min.js
diff --git a/lang/ca.UTF-8 b/lang/ca.UTF-8
@@ -680,3 +680,7 @@ theme_xhred_filemanager_link_to_clipboard=El nom de l'enllaç `<strong><em>%valu
 theme_left_mail_prefs=Mail Preferences
 theme_left_mail_change_password=Change Password
 theme_left_mail_account_functions=Account Functions
+theme_xhred_global_dir_up=Go to previous directory (Backspace)
+theme_xhred_global_module_config=Module config
+theme_xhred_global_return=Return
+theme_xhred_global_return_to_module_index=Return to module index
diff --git a/lang/cz.UTF-8 b/lang/cz.UTF-8
@@ -497,7 +497,7 @@ theme_xhred_global_none=None
 theme_xhred_global_yes=Yes
 theme_xhred_global_no=No
 
-theme_xhred_filemanager_new_tab=Add New Tab (Ctrl+Space)
+theme_xhred_filemanager_new_tab=Add new tab (Ctrl+Space)
 theme_xhred_datatable_no_search_results=<span class="h5">No results found</span><br>Try a different search
 
 theme_xhred_filemanager_buffer_error=Failed to paste files to the buffer - permission denied.
@@ -555,7 +555,7 @@ theme_xhred_filemanager_context_open_new_tab=Open in new tab
 theme_xhred_xsql_fit_content_screen_height=Fit database table content in screen height
 
 theme_xhred_datatable_filter_visible_tables=Filter Visible Table(s)
-theme_xhred_module_help=Module Help
+theme_xhred_module_help=Module help
 
 theme_xhred_server_process_running=Server process is still running!? Are you sure that you want to navigate away and have no access to output information? Even if you leave now the process will not be terminated.
 
@@ -668,7 +668,7 @@ theme_git_patch_update_success_message=Theme upgrade for Webmin was successful.
 theme_git_patch_update_success_message2=Theme upgrade for both Webmin and Usermin was successful. Currently installed version is <tt>$1</tt>. Reloading...
 theme_xhred_git_patch_update=Theme upgrade has failed. Try using console to do it manually.
 theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
-theme_xhred_global_prev_page=Previous Page
+theme_xhred_global_prev_page=Go back one page
 theme_xhred_global_help=Help
 settings_right_soft_updates_page_options_title=Software updates
 theme_xhred_git_compare_changes=Compare changes
@@ -680,3 +680,7 @@ theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%val
 theme_left_mail_prefs=Mail Preferences
 theme_left_mail_change_password=Change Password
 theme_left_mail_account_functions=Account Functions
+theme_xhred_global_dir_up=Go to previous directory (Backspace)
+theme_xhred_global_module_config=Module config
+theme_xhred_global_return=Return
+theme_xhred_global_return_to_module_index=Return to module index
diff --git a/lang/da.UTF-8 b/lang/da.UTF-8
@@ -190,7 +190,7 @@ settings_sysinfo_theme_updates=Check for Authentic Theme updates
 settings_sysinfo_csf_updates=Check for ConfigServer Security & Firewall updates
 settings_sysinfo_drive_status_on_new_line=Show CPU and drives status each on new line
 settings_sysinfo_expand_all_accordions=Make all accordions expanded
-settings_sysinfo_link_mini=Show system information link as button
+settings_sysinfo_link_mini=Show dashboard link as button
 settings_leftmenu_singlelink_icons=Show icons for single links on navigation menu
 
 settings_right_page_defaults_title=Default pages
@@ -497,7 +497,7 @@ theme_xhred_global_none=None
 theme_xhred_global_yes=Yes
 theme_xhred_global_no=No
 
-theme_xhred_filemanager_new_tab=Add New Tab (Ctrl+Space)
+theme_xhred_filemanager_new_tab=Add new tab (Ctrl+Space)
 theme_xhred_datatable_no_search_results=<span class="h5">No results found</span><br>Try a different search
 
 theme_xhred_filemanager_buffer_error=Failed to paste files to the buffer - permission denied.
@@ -555,7 +555,7 @@ theme_xhred_filemanager_context_open_new_tab=Open in new tab
 theme_xhred_xsql_fit_content_screen_height=Fit database table content in screen height
 
 theme_xhred_datatable_filter_visible_tables=Filter Visible Table(s)
-theme_xhred_module_help=Module Help
+theme_xhred_module_help=Module help
 
 theme_xhred_server_process_running=Server process is still running!? Are you sure that you want to navigate away and have no access to output information? Even if you leave now the process will not be terminated.
 
@@ -668,7 +668,7 @@ theme_git_patch_update_success_message=Theme upgrade for Webmin was successful.
 theme_git_patch_update_success_message2=Theme upgrade for both Webmin and Usermin was successful. Currently installed version is <tt>$1</tt>. Reloading...
 theme_xhred_git_patch_update=Theme upgrade has failed. Try using console to do it manually.
 theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
-theme_xhred_global_prev_page=Previous Page
+theme_xhred_global_prev_page=Go back one page
 theme_xhred_global_help=Help
 settings_right_soft_updates_page_options_title=Software updates
 theme_xhred_git_compare_changes=Compare changes
@@ -680,3 +680,7 @@ theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%val
 theme_left_mail_prefs=Mail Preferences
 theme_left_mail_change_password=Change Password
 theme_left_mail_account_functions=Account Functions
+theme_xhred_global_dir_up=Go to previous directory (Backspace)
+theme_xhred_global_module_config=Module config
+theme_xhred_global_return=Return
+theme_xhred_global_return_to_module_index=Return to module index
diff --git a/lang/de.UTF-8 b/lang/de.UTF-8
@@ -190,7 +190,7 @@ settings_sysinfo_theme_updates=Check for Authentic Theme updates
 settings_sysinfo_csf_updates=Check for ConfigServer Security & Firewall updates
 settings_sysinfo_drive_status_on_new_line=Show CPU and drives status each on new line
 settings_sysinfo_expand_all_accordions=Make all accordions expanded
-settings_sysinfo_link_mini=Show system information link as button
+settings_sysinfo_link_mini=Show dashboard link as button
 settings_leftmenu_singlelink_icons=Show icons for single links on navigation menu
 
 settings_right_page_defaults_title=Default pages
@@ -496,7 +496,7 @@ theme_xhred_global_none=None
 theme_xhred_global_yes=Yes
 theme_xhred_global_no=No
 
-theme_xhred_filemanager_new_tab=Add New Tab (Ctrl+Space)
+theme_xhred_filemanager_new_tab=Add new tab (Ctrl+Space)
 theme_xhred_datatable_no_search_results=<span class="h5">No results found</span><br>Try a different search
 
 theme_xhred_filemanager_buffer_error=Failed to paste files to the buffer - permission denied.
@@ -554,7 +554,7 @@ theme_xhred_filemanager_context_open_new_tab=Open in new tab
 theme_xhred_xsql_fit_content_screen_height=Fit database table content in screen height
 
 theme_xhred_datatable_filter_visible_tables=Filter Visible Table(s)
-theme_xhred_module_help=Module Help
+theme_xhred_module_help=Module help
 
 theme_xhred_server_process_running=Server process is still running!? Are you sure that you want to navigate away and have no access to output information? Even if you leave now the process will not be terminated.
 
@@ -667,7 +667,7 @@ theme_git_patch_update_success_message=Theme upgrade for Webmin was successful.
 theme_git_patch_update_success_message2=Theme upgrade for both Webmin and Usermin was successful. Currently installed version is <tt>$1</tt>. Reloading...
 theme_xhred_git_patch_update=Theme upgrade has failed. Try using console to do it manually.
 theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
-theme_xhred_global_prev_page=Previous Page
+theme_xhred_global_prev_page=Go back one page
 theme_xhred_global_help=Help
 settings_right_soft_updates_page_options_title=Software updates
 theme_xhred_git_compare_changes=Compare changes
@@ -679,3 +679,7 @@ theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%val
 theme_left_mail_prefs=Mail Preferences
 theme_left_mail_change_password=Change Password
 theme_left_mail_account_functions=Account Functions
+theme_xhred_global_dir_up=Go to previous directory (Backspace)
+theme_xhred_global_module_config=Module config
+theme_xhred_global_return=Return
+theme_xhred_global_return_to_module_index=Return to module index
diff --git a/lang/en.UTF-8 b/lang/en.UTF-8
@@ -189,7 +189,7 @@ settings_sysinfo_theme_updates=Check for Authentic Theme updates
 settings_sysinfo_csf_updates=Check for ConfigServer Security & Firewall updates
 settings_sysinfo_drive_status_on_new_line=Show CPU and drives status each on new line
 settings_sysinfo_expand_all_accordions=Make all accordions expanded
-settings_sysinfo_link_mini=Show system information link as button
+settings_sysinfo_link_mini=Show dashboard link as button
 settings_leftmenu_singlelink_icons=Show icons for single links on navigation menu
 
 settings_right_page_defaults_title=Default pages
@@ -495,7 +495,7 @@ theme_xhred_global_none=None
 theme_xhred_global_yes=Yes
 theme_xhred_global_no=No
 
-theme_xhred_filemanager_new_tab=Add New Tab (Ctrl+Space)
+theme_xhred_filemanager_new_tab=Add new tab (Ctrl+Space)
 theme_xhred_datatable_no_search_results=<span class="h5">No results found</span><br>Try a different search
 
 theme_xhred_filemanager_buffer_error=Failed to paste files to the buffer - permission denied.
@@ -553,7 +553,7 @@ theme_xhred_filemanager_context_open_new_tab=Open in new tab
 theme_xhred_xsql_fit_content_screen_height=Fit database table content in screen height
 
 theme_xhred_datatable_filter_visible_tables=Filter Visible Table(s)
-theme_xhred_module_help=Module Help
+theme_xhred_module_help=Module help
 
 theme_xhred_server_process_running=Server process is still running!? Are you sure that you want to navigate away and have no access to output information? Even if you leave now the process will not be terminated.
 
@@ -666,15 +666,18 @@ theme_git_patch_update_success_message=Theme upgrade for Webmin was successful.
 theme_git_patch_update_success_message2=Theme upgrade for both Webmin and Usermin was successful. Currently installed version is <tt>$1</tt>. Reloading...
 theme_xhred_git_patch_update=Theme upgrade has failed. Try using console to do it manually.
 theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
-theme_xhred_global_prev_page=Previous Page
+theme_xhred_global_prev_page=Go back one page
 theme_xhred_global_help=Help
 settings_right_soft_updates_page_options_title=Software updates
 theme_xhred_git_compare_changes=Compare changes
 theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.
 
 
-
 #18.46
 theme_left_mail_prefs=Mail Preferences
 theme_left_mail_change_password=Change Password
 theme_left_mail_account_functions=Account Functions
+theme_xhred_global_dir_up=Go to previous directory (Backspace)
+theme_xhred_global_module_config=Module config
+theme_xhred_global_return=Return
+theme_xhred_global_return_to_module_index=Return to module index