Skip to content

Commit a23c2c3

Browse files
author
Ilia Rostovtsev
committed
18.40 [patch #714]
1 parent f981f33 commit a23c2c3

20 files changed

+49
-36
lines changed

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Changelog
22

3-
#### Version 18.41-beta35 (16 April, 2017)
3+
#### Version 18.41-beta36 (17 April, 2017)
44
* 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)
55
* Added console script for updating the theme [#703](https://github.com/qooob/authentic-theme/issues/703)
66
* Added error handler for saving files in background calls [#689](https://github.com/qooob/authentic-theme/issues/689)

‎README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
[![ScreenShot](https://raw.githubusercontent.com/qooob/authentic-theme/master/images/screenshot.png)](http://youtu.be/f_oy3qX2GXo)
1515
![](https://rostovtsev.ru/pub/media/screenshots/screenshot-pallets-1710.png)
16-
![](https://rostovtsev.ru/pub/media/screenshots/screenshot-content-page-18.40-final.png)
16+
![](https://rostovtsev.ru/pub/media/screenshots/screenshot-content-page-1840.png)
1717

1818
#### Principles
1919
* Make the theme fully support all _Webmin/Usermin_ modules
@@ -51,7 +51,6 @@
5151

5252
###### ![](https://rostovtsev.ru/pub/media/icons/edge-16.png) Edge 20+
5353

54-
###### ![](https://rostovtsev.ru/pub/media/icons/internet-explorer-16.png) IE 11
5554

5655
### FAQ
5756

‎authentic-init.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1097,7 +1097,7 @@ sub theme_version
10971097
my $sh__ln__g___version = theme_git_version('uncond');
10981098
( ( !$switch ) && ( $sh__ln__c___version =~ s/\.//ig ) );
10991099
( ( !$switch && $sh__ln__g___version )
1100-
&& ( $sh__ln__c___version = $sh__ln__g___version, ( $sh__ln__c___version =~ s/\.|-|git//ig ) ) );
1100+
&& ( $sh__ln__c___version = $sh__ln__g___version, ( $sh__ln__c___version =~ s/\.|-|git//ig ), $sh__ln__c___version .= time() ) );
11011101

11021102
return $sh__ln__c___version;
11031103
}

‎lang/ca.UTF-8

+1-1
Original file line numberDiff line numberDiff line change
@@ -672,4 +672,4 @@ theme_xhred_global_prev_page=Pàgina anterior
672672
theme_xhred_global_help=Ajuda
673673
settings_right_soft_updates_page_options_title=Actualitzacions de programari
674674
theme_xhred_git_compare_changes=Compara els canvis
675-
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.
675+
theme_xhred_filemanager_link_to_clipboard=El nom de l'enllaç `<strong><em>%value</em></strong>` s'ha copiat correctament al porta-retalls.

‎lang/cz.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
671671
theme_xhred_global_prev_page=Previous Page
672672
theme_xhred_global_help=Help
673673
settings_right_soft_updates_page_options_title=Software updates
674+
theme_xhred_git_compare_changes=Compare changes
674675
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/da.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
671671
theme_xhred_global_prev_page=Previous Page
672672
theme_xhred_global_help=Help
673673
settings_right_soft_updates_page_options_title=Software updates
674+
theme_xhred_git_compare_changes=Compare changes
674675
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/de.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -670,4 +670,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
670670
theme_xhred_global_prev_page=Previous Page
671671
theme_xhred_global_help=Help
672672
settings_right_soft_updates_page_options_title=Software updates
673+
theme_xhred_git_compare_changes=Compare changes
673674
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/en.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -669,4 +669,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
669669
theme_xhred_global_prev_page=Previous Page
670670
theme_xhred_global_help=Help
671671
settings_right_soft_updates_page_options_title=Software updates
672+
theme_xhred_git_compare_changes=Compare changes
672673
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/es.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
671671
theme_xhred_global_prev_page=Previous Page
672672
theme_xhred_global_help=Help
673673
settings_right_soft_updates_page_options_title=Software updates
674+
theme_xhred_git_compare_changes=Compare changes
674675
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/fr.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
671671
theme_xhred_global_prev_page=Previous Page
672672
theme_xhred_global_help=Help
673673
settings_right_soft_updates_page_options_title=Software updates
674+
theme_xhred_git_compare_changes=Compare changes
674675
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/it.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
671671
theme_xhred_global_prev_page=Previous Page
672672
theme_xhred_global_help=Help
673673
settings_right_soft_updates_page_options_title=Software updates
674+
theme_xhred_git_compare_changes=Compare changes
674675
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/nl.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
671671
theme_xhred_global_prev_page=Previous Page
672672
theme_xhred_global_help=Help
673673
settings_right_soft_updates_page_options_title=Software updates
674+
theme_xhred_git_compare_changes=Compare changes
674675
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/no.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
671671
theme_xhred_global_prev_page=Previous Page
672672
theme_xhred_global_help=Help
673673
settings_right_soft_updates_page_options_title=Software updates
674+
theme_xhred_git_compare_changes=Compare changes
674675
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/pl.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
671671
theme_xhred_global_prev_page=Previous Page
672672
theme_xhred_global_help=Help
673673
settings_right_soft_updates_page_options_title=Software updates
674+
theme_xhred_git_compare_changes=Compare changes
674675
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/pt.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
671671
theme_xhred_global_prev_page=Previous Page
672672
theme_xhred_global_help=Help
673673
settings_right_soft_updates_page_options_title=Software updates
674+
theme_xhred_git_compare_changes=Compare changes
674675
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/ro_RO.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
671671
theme_xhred_global_prev_page=Previous Page
672672
theme_xhred_global_help=Help
673673
settings_right_soft_updates_page_options_title=Software updates
674+
theme_xhred_git_compare_changes=Compare changes
674675
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎lang/ru.UTF-8

+1
Original file line numberDiff line numberDiff line change
@@ -674,4 +674,5 @@ theme_xhred_git_patch_initiated=Theme upgrade has been initiated.
674674
theme_xhred_global_prev_page=Previous Page
675675
theme_xhred_global_help=Help
676676
settings_right_soft_updates_page_options_title=Software updates
677+
theme_xhred_git_compare_changes=Compare changes
677678
theme_xhred_filemanager_link_to_clipboard=Symbolic link's name `<strong><em>%value</em></strong>` has been copied to clipboard.

‎unauthenticated/js/postinit.js

+30-29
Original file line numberDiff line numberDiff line change
@@ -1198,61 +1198,62 @@ function __p__pe_sm() {
11981198
return
11991199
}
12001200
$(".ui_reset").remove();
1201-
var c = $('textarea[name="data"], textarea[name="text"], textarea[name="directives"], textarea[name="manual"]').parents("form"),
1202-
i = c.find('button[type="button"]').length ? c.find('button[type="button"]') : c.find('input[type="submit"]'),
1203-
d = '<i class="fa fa-fw fa-floppy-o">&nbsp;&nbsp;</i>',
1201+
var d = (__ie__() > 5 && __ie__() <= 11),
1202+
c = $('textarea[name="data"], textarea[name="text"], textarea[name="directives"], textarea[name="manual"]').parents("form"),
1203+
j = c.find('button[type="button"]').length ? c.find('button[type="button"]') : c.find('input[type="submit"]'),
1204+
e = '<i class="fa fa-fw fa-floppy-o">&nbsp;&nbsp;</i>',
12041205
b = ($('textarea[name="directives"]').length ? "-12px" : "0"),
1205-
f = ($("select").val() ? $("select").val() : ($(".table-title").text() ? $(".table-title").text() : ($(".panel-body tt:first").text() ? $(".panel-body tt:first").text() : ($("#headln2c tt:first").text() ? $("#headln2c tt:first").text() : "")))),
1206-
h = '<span class="cspinner_container" style="position: absolute; width: 18px; height: 14px; display: inline-block;"><span class="cspinner" style="margin-top: -0.5px; margin-left: -28px;"><span class="cspinner-icon white small"></span></span></span>',
1207-
g = '<span class="cspinner_container" style="position: absolute; width: 18px; height: 14px; display: inline-block;"><span class="cspinner" style="margin-top: -0.5px; margin-left: -28px;"><span class="cspinner-icon dark small"></span></span></span>';
1208-
i.parents("table.ui_form_end_buttons").prev("br").remove();
1209-
i.parents("table.ui_form_end_buttons").prev("div.table-responsive").attr("style", "margin-bottom: -4px !important");
1210-
i.replaceWith(' <span class="btn-group" style="margin-top: ' + b + '"> <button type="button" class="btn btn-success btn-34 margined-top-5" data-form="submitter" data-form-onbeforeunload="0">' + d + lang("theme_xhred_global_save") + '&nbsp;</button> <button type="submit" class="btn btn-default btn-34 margined-top-5"><i class="fa fa-fw fa-arrow-circle-o-left">&nbsp;&nbsp;</i>' + lang("theme_xhred_global_save_and_close") + "&nbsp;</button> </span> ");
1206+
g = ($("select").val() ? $("select").val() : ($(".table-title").text() ? $(".table-title").text() : ($(".panel-body tt:first").text() ? $(".panel-body tt:first").text() : ($("#headln2c tt:first").text() ? $("#headln2c tt:first").text() : "")))),
1207+
i = '<span class="cspinner_container" style="position: absolute; width: 18px; height: 14px; display: inline-block;"><span class="cspinner" style="margin-top: -0.5px; margin-left: -28px;"><span class="cspinner-icon white small"></span></span></span>',
1208+
h = '<span class="cspinner_container" style="position: absolute; width: 18px; height: 14px; display: ' + (d ? "none" : "inline-block;") + '"><span class="cspinner" style="margin-top: -0.5px; margin-left: -28px;"><span class="cspinner-icon dark small"></span></span></span>';
1209+
j.parents("table.ui_form_end_buttons").prev("br").remove();
1210+
j.parents("table.ui_form_end_buttons").prev("div.table-responsive").attr("style", "margin-bottom: -4px !important");
1211+
j.replaceWith(' <span class="btn-group" style="margin-top: ' + b + '"> <button type="button" class="btn btn-success btn-34 margined-top-5' + (d ? " hidden" : "") + '" data-form="submitter" data-form-onbeforeunload="0">' + e + lang("theme_xhred_global_save") + '&nbsp;</button> <button type="submit" class="btn btn-' + (d ? "success" : "default") + ' btn-34 margined-top-5"><i class="fa fa-fw fa-arrow-circle-o-left">&nbsp;&nbsp;</i>' + lang("theme_xhred_global_save_and_close") + "&nbsp;</button> </span> ");
12111212
var a = $('button[type="button"]:not(.ui_form_end_submit)'),
1212-
e = $('button[type="submit"]:not(.ui_form_end_submit)');
1213-
window.__cm_editor_static.on("change", function(k, j) {
1213+
f = $('button[type="submit"]:not(.ui_form_end_submit)');
1214+
window.__cm_editor_static.on("change", function(l, k) {
12141215
__cm_editor_static.save();
12151216
a.addClass("btn-warning").removeClass("btn-success").attr("data-form-onbeforeunload", 1)
12161217
});
1217-
$("body").on("keydown", function(j) {
1218-
if (j.keyCode == 13 && j.ctrlKey && !j.shiftKey) {
1218+
$("body").on("keydown", function(k) {
1219+
if (k.keyCode == 13 && k.ctrlKey && !k.shiftKey) {
12191220
a.trigger("click")
12201221
} else {
1221-
if (j.keyCode == 13 && j.ctrlKey && j.shiftKey) {
1222-
e.trigger("click")
1222+
if (k.keyCode == 13 && k.ctrlKey && k.shiftKey) {
1223+
f.trigger("click")
12231224
}
12241225
}
12251226
});
1226-
$("body").on("click", 'button[type="submit"]:not(.disabled)', function(j) {
1227-
$("button").addClass("disabled").find(".fa.fa-arrow-circle-o-left").addClass("invisible").after(g);
1227+
$("body").on("click", 'button[type="submit"]:not(.disabled)', function(k) {
1228+
$("button").addClass("disabled").find(".fa.fa-arrow-circle-o-left").addClass((d ? "visible" : "invisible")).after(h);
12281229
a.attr("data-form-onbeforeunload", 0)
12291230
});
1230-
$("body").on("click", 'button[data-form="submitter"]:not(.disabled)', function(l) {
1231-
l.preventDefault();
1232-
var k = $(this),
1233-
m = (k.parents("form").attr("enctype") && k.parents("form").attr("enctype").indexOf("form-data") > -1 ? 0 : 1),
1234-
j = (m ? k.parents("form").serialize() : (new FormData(k.parents("form")[0])));
1235-
$("button").addClass("disabled").find(".fa.fa-floppy-o").addClass("invisible").after(h);
1231+
$("body").on("click", 'button[data-form="submitter"]:not(.disabled)', function(m) {
1232+
m.preventDefault();
1233+
var l = $(this),
1234+
n = (l.parents("form").attr("enctype") && l.parents("form").attr("enctype").indexOf("form-data") > -1 ? 0 : 1),
1235+
k = (n ? l.parents("form").serialize() : (new FormData(l.parents("form")[0])));
1236+
$("button").addClass("disabled").find(".fa.fa-floppy-o").addClass("invisible").after(i);
12361237
setTimeout(function() {
12371238
$.ajax({
12381239
type: "POST",
12391240
url: $__current_directory + c.attr("action"),
1240-
data: j,
1241+
data: k,
12411242
dataType: "text",
12421243
cache: false,
12431244
contentType: false,
12441245
processData: false,
1245-
success: function(n) {
1246+
success: function(o) {
12461247
a.removeClass("btn-warning").addClass("btn-success").attr("data-form-onbeforeunload", 0);
12471248
$("button").removeClass("disabled").find(".fa").removeClass("invisible").parent().find(".cspinner_container").remove();
1248-
if ($(n).find(".panel-body > hr + h3").length) {
1249-
messenger('<i class="fa fa-lg fa-fw fa-exclamation-triangle"></i>' + $(n).find(".panel-body hr + h3").html(), 60, "error", "magic_save_error");
1249+
if ($(o).find(".panel-body > hr + h3").length) {
1250+
messenger('<i class="fa fa-lg fa-fw fa-exclamation-triangle"></i>' + $(o).find(".panel-body hr + h3").html(), 60, "error", "magic_save_error");
12501251
a.removeClass("btn-success").addClass("btn-warning").attr("data-form-onbeforeunload", 1);
12511252
return
12521253
}
1253-
messenger('<i class="fa fa-fw fa-check-circle"></i>' + lang("theme_xhred_filemanager_file_saved").replace("%value", f), 3, "success")
1254+
messenger('<i class="fa fa-fw fa-check-circle"></i>' + lang("theme_xhred_filemanager_file_saved").replace("%value", g), 3, "success")
12541255
},
1255-
error: function(n) {}
1256+
error: function(o) {}
12561257
})
12571258
}, 300)
12581259
})

‎unauthenticated/js/postinit.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.40-git-201704162056
1+
18.40-git-201704171237

0 commit comments

Comments
 (0)