Skip to content

Commit 938339c

Browse files
author
Ilia Rostovtsev
committed
Version 18.40 [hot-fix #676]
1 parent 3256b61 commit 938339c

15 files changed

+115
-57
lines changed

‎CHANGELOG.md

+36-38
Large diffs are not rendered by default.

‎authentic-init.pm

+17
Original file line numberDiff line numberDiff line change
@@ -1084,6 +1084,23 @@ sub theme_version
10841084
return $sh__ln__c___version;
10851085
}
10861086

1087+
sub theme_git_version
1088+
{
1089+
my $git_version = undef;
1090+
my $git_version_file = $root_directory . "/authentic-theme/version";
1091+
if (-e $git_version_file) {
1092+
$git_version = read_file_lines( $git_version_file, 1 );
1093+
$git_version = $git_version->[0];
1094+
}
1095+
return $git_version;
1096+
}
1097+
1098+
sub get_version
1099+
{
1100+
my ($version) = @_;
1101+
return $version =~ /([0-9]+[.][0-9]+)/;
1102+
}
1103+
10871104
sub get_env
10881105
{
10891106
my ($key) = @_;

‎authentic-lib.pm

+21-10
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ sub get_sysinfo_vars
11511151
$authentic_theme_version =
11521152
'<a href="https://github.com/qooob/authentic-theme" target="_blank">'
11531153
. $Atext{'theme_name'} . '</a> '
1154-
. $installed_version
1154+
. ($installed_git_version ? $installed_git_version : $installed_version)
11551155
. '<div class="btn-group margined-left-4"><a href="'
11561156
. $gconfig{'webprefix'}
11571157
. '/webmin/edit_themes.cgi" data-href="'
@@ -1853,8 +1853,11 @@ sub get_authentic_version
18531853
{
18541854

18551855
# Get local version
1856-
my $installed_version = read_file_lines( $root_directory . "/authentic-theme/VERSION.txt", 1 );
1857-
our $installed_version = $installed_version->[0];
1856+
our $installed_version = read_file_lines( $root_directory . "/authentic-theme/VERSION.txt", 1 );
1857+
$installed_version = $installed_version->[0];
1858+
1859+
our $installed_git_version = theme_git_version();
1860+
18581861
our $remote_version;
18591862

18601863
$installed_version =~ s/^\s+|\s+$//g;
@@ -3376,7 +3379,15 @@ sub content
33763379
sub changelog()
33773380
{
33783381
my $changelog_data = ( read_file_contents( $root_directory . '/' . $current_theme . "/CHANGELOG.md" ) =~
3379-
/#### Version(.*?)#### Version/s )[0];
3382+
/#### Version(.*?)<!--- separator --->/s )[0];
3383+
if ($changelog_data) {
3384+
$changelog_data =~
3385+
s/###(.*?)\)/<\/ul><a href="https:\/\/github.com\/qooob\/authentic-theme\/releases\/tag\/@{[get_version($1)]}$2" class="version_separator">@{[get_version($1)]}$2<\/a><hr><ul>/g;
3386+
}
3387+
else {
3388+
$changelog_data = ( read_file_contents( $root_directory . '/' . $current_theme . "/CHANGELOG.md" ) =~
3389+
/### Version(.*?)<!--- separator --->/s )[0];
3390+
}
33803391
my @changelog_version = split /\n/, $changelog_data;
33813392

33823393
$changelog_data =~ s/^[^\n]*\n/\n/s;
@@ -3404,13 +3415,13 @@ sub changelog()
34043415
<hr>
34053416
<h4 style="margin-top:20px;">'
34063417
. $Atext{'theme_development_support'}
3407-
. '&nbsp;&nbsp;<i class="fa fa-fw fa-lg fa-heartbeat" style="color: #c9302c"></i></h4>
3408-
Follow theme\'s
3409-
<a target="_blank" class="badge background-info fa fa-twitter" href="https://twitter.com/authentic_theme">
3410-
<span class="font-family-default">Twitter</span></a>
3411-
channel for the latest updates. Please don\'t forget nor be lazy reporting bugs to
3418+
. '&nbsp;&nbsp;<i class="fa fa-fw fa-lg faa-pulse animated-hover fa-heartbeat" style="color: #c9302c"></i></h4>
3419+
Please be kind reporting bugs to
34123420
<a class="badge fa fa-github" target="_blank" href="https://github.com/qooob/authentic-theme/issues">
3413-
<span class="font-family-default">GitHub</span></a>
3421+
<span class="font-family-default">GitHub</span></a> repository. Follow theme\'s
3422+
<a target="_blank" class="badge background-info fa fa-twitter" href="https://twitter.com/authentic_theme">
3423+
<span class="font-family-default">Twitter</span></a>
3424+
channel for the latest updates.
34143425
</div>
34153426
</div>
34163427
</div>

‎authentic.pm

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ sub theme_header
3030
. $__settings{'settings_navigation_color'}
3131
. '" data-theme-version="'
3232
. theme_version('version')
33+
. '" data-theme-git-version="'
34+
. theme_git_version()
3335
. '" data-level="'
3436
. $get_user_level
3537
. '" data-user="'

‎unauthenticated/css/authentic.css

+21-1
Original file line numberDiff line numberDiff line change
@@ -9011,6 +9011,14 @@ form input[style*='height: 28px']+.btn:not(.heighter-34-force) span,
90119011
font-size: 11px
90129012
}
90139013

9014+
.badge.fa.fa-github:hover {
9015+
background-color: rgba(22, 22, 22, .73)
9016+
}
9017+
9018+
.badge.background-info.fa.fa-twitter:hover {
9019+
background-color: #4193aa
9020+
}
9021+
90149022
.panel-title {
90159023
line-height: 16px;
90169024
margin-top: -1px;
@@ -9929,9 +9937,21 @@ screen and (max-height:600px) {
99299937
margin: -1px
99309938
}
99319939

9940+
.modal-dialog-update .version_separator {
9941+
float: right;
9942+
font-size: 10px;
9943+
display: inline-block;
9944+
margin-top: -14px
9945+
}
9946+
9947+
.modal-dialog-update .version_separator+hr {
9948+
margin-top: 13px;
9949+
margin-bottom: 10px
9950+
}
9951+
99329952
@media(min-width:768px) {
99339953
.modal-dialog.modal-dialog-update {
9934-
width: 650px;
9954+
width: 680px;
99359955
margin: 30px auto
99369956
}
99379957
}

‎unauthenticated/css/authentic.min.css

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

‎unauthenticated/css/bundle.min.css

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

‎unauthenticated/css/fontawesome-animation.min.css

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

‎unauthenticated/css/palettes/nightrider.css

+8
Original file line numberDiff line numberDiff line change
@@ -1004,10 +1004,18 @@ html[data-background-style='nightRider'] .badge.fa.fa-github {
10041004
background-color: rgba(28, 28, 28, .73)
10051005
}
10061006

1007+
html[data-background-style='nightRider'] .badge.fa.fa-github:hover {
1008+
background-color: rgba(230, 230, 230, .08)
1009+
}
1010+
10071011
html[data-background-style='nightRider'] .badge.background-info.fa.fa-twitter {
10081012
color: rgba(255, 255, 255, .58)
10091013
}
10101014

1015+
html[data-background-style='nightRider'] .badge.background-info.fa.fa-twitter:hover {
1016+
background-color: rgba(78, 212, 251, 0.4)
1017+
}
1018+
10111019
html[data-background-style='nightRider'] a.label,
10121020
html[data-background-style='nightRider'] a.badge {
10131021
color: #8e8f92

‎unauthenticated/css/palettes/nightrider.min.css

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

‎unauthenticated/js/parent.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if ($access_level == 0) {
1010
}
1111
}
1212
if (t__wi_p.$___________initial === 1) {
13-
console.log("Welcome to Authentic Theme " + $g__t__ver + "\nhttps://github.com/qooob/authentic-theme")
13+
console.log("Welcome to Authentic Theme " + ($g__t__gver ? $g__t__gver : $g__t__ver) + "\nhttps://github.com/qooob/authentic-theme")
1414
}
1515
typeof t__wi_p.t___p__xhr_l == "undefined" ? t__wi_p.t___p__xhr_l = 0 : false;
1616
typeof t__wi_p.t___p__ll == "undefined" ? t__wi_p.t___p__ll = 0 : false;

‎unauthenticated/js/parent.min.js

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

‎unauthenticated/js/postinit.js

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ var $_url = URI(t___wi.location),
4141
$g__user__ = $("body").data("user"),
4242
$g__m__name = $("body").data("module"),
4343
$g__t__ver = $("body").data("theme-version").toString(),
44+
$g__t__gver = $("body").data("theme-git-version").toString(),
4445
$g__t__ver_str = $g__t__ver.replace(".", ""),
4546
__isNR = (typeof settings_background_color != "undefined" && settings_background_color === "nightRider" ? 1 : __isNM);
4647
const __ua__ = window.navigator.userAgent,

‎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
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18.40-git-201703261846

0 commit comments

Comments
 (0)