18.40 [patch-2 #707]

Author: Ilia Rostovtsev

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Changelog
 
-#### Version 18.41-beta20 (02 April, 2017)
+#### Version 18.41-beta21 (03 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)
 * Added console script for updating the theme [#703](https://github.com/qooob/authentic-theme/issues/703)
 * Added error handler for saving files in background calls [#689](https://github.com/qooob/authentic-theme/issues/689)

authentic-init.pm

@@ -1077,9 +1077,12 @@ sub theme_night_mode
 
 sub theme_git_version
 {
+    my ($force)          = @_;
     my $git_version      = undef;
     my $git_version_file = $root_directory . "/authentic-theme/version";
-    if ( -e $git_version_file && $__settings{'settings_sysinfo_theme_patched_updates'} eq 'true' ) {
+    if ( -e $git_version_file
+         && ( $__settings{'settings_sysinfo_theme_patched_updates'} eq 'true' || $force ) )
+    {
         $git_version = read_file_lines( $git_version_file, 1 );
         $git_version = $git_version->[0];
     }
@@ -1091,7 +1094,7 @@ sub theme_version
     my ($switch)            = @_;
     my $sh__ln__p___version = '18.32';
     my $sh__ln__c___version = '18.40';
-    my $sh__ln__g___version = theme_git_version();
+    my $sh__ln__g___version = theme_git_version('uncond');
     ( ( !$switch ) && ( $sh__ln__c___version =~ s/\.//ig ) );
     (     ( !$switch && $sh__ln__g___version )
        && ( $sh__ln__c___version = $sh__ln__g___version, ( $sh__ln__c___version =~ s/\.|-|git//ig ) ) );

authentic-lib.pm

@@ -1121,7 +1121,7 @@ sub get_sysinfo_vars
             $authentic_theme_version =
                 '<a href="https://github.com/qooob/authentic-theme" target="_blank">'
               . $Atext{'theme_name'} . '</a> '
-              . $installed_version . '. '
+              . ($git_version_local ? $git_version_local : $installed_version) . '. '
               . (
                  $git_version_remote ? $Atext{'theme_git_patch_available'} : $Atext{'theme_update_available'} )
               . ' '
@@ -1164,7 +1164,7 @@ sub get_sysinfo_vars
             $authentic_theme_version =
                 '<a href="https://github.com/qooob/authentic-theme" target="_blank">'
               . $Atext{'theme_name'} . '</a> '
-              . $installed_version
+              . ($git_version_local ? $git_version_local : $installed_version)
               . '<div class="btn-group margined-left-4"><a href="'
               . $gconfig{'webprefix'}
               . '/webmin/edit_themes.cgi" data-href="'
@@ -1863,6 +1863,7 @@ sub get_authentic_version
 {
 
     our $remote_version;
+    our $git_version_local = theme_git_version('uncond');
 
     # Get local version
     our $installed_version = read_file_lines( $root_directory . "/authentic-theme/VERSION.txt", 1 );

authentic.pm

@@ -30,6 +30,8 @@ sub theme_header
       . $__settings{'settings_navigation_color'}
       . '" data-theme-version="'
       . (theme_git_version() ? theme_git_version() : theme_version('version'))
+      . '" data-theme-git-version="'
+      . theme_git_version('uncond')
       . '" data-level="'
       . $get_user_level
       . '" data-user-home="'

sysinfo.cgi

@@ -243,7 +243,7 @@ elsif ( $get_user_level eq '1' || $get_user_level eq '2' ) {
       $authentic_theme_version =
           '<a href="https://github.com/qooob/authentic-theme" target="_blank">'
         . $Atext{'theme_name'} . '</a> '
-        . $installed_version
+        . ($git_version_local ? $git_version_local : $installed_version)
         . '<div class="btn-group margined-left-4"><a href="'
         . $gconfig{'webprefix'}
         . '/settings-user.cgi" data-href="'
@@ -256,7 +256,7 @@ elsif ( $get_user_level eq '1' || $get_user_level eq '2' ) {
     else {
         $authentic_theme_version = ''
           . $Atext{'theme_name'} . ' '
-          . $installed_version . '. '
+          . ($git_version_local ? $git_version_local : $installed_version) . '. '
           . $Atext{'theme_update_available'} . ' '
           . $remote_version
           . '&nbsp;&nbsp;<a class="btn btn-xs btn-info" style="padding:0 6px; line-height: 12px; height:15px;font-size:11px" target="_blank" href="https://github.com/qooob/authentic-theme/blob/master/CHANGELOG.md"><i class="fa fa-fw fa-pencil-square-o" style="padding-top:1px">&nbsp;</i>'
@@ -400,7 +400,7 @@ elsif ( $get_user_level eq '3' ) {
       $authentic_theme_version =
           '<a href="https://github.com/qooob/authentic-theme" target="_blank">'
         . $Atext{'theme_name'} . '</a> '
-        . $installed_version
+        . ($git_version_local ? $git_version_local : $installed_version)
         . '<div class="btn-group margined-left-4"><a href="'
         . $gconfig{'webprefix'}
         . '/settings-user.cgi" data-href="'
@@ -413,7 +413,7 @@ elsif ( $get_user_level eq '3' ) {
     else {
         $authentic_theme_version = ''
           . $Atext{'theme_name'} . ' '
-          . $installed_version . '. '
+          . ($git_version_local ? $git_version_local : $installed_version) . '. '
           . $Atext{'theme_update_available'} . ' '
           . $remote_version
           . '&nbsp;&nbsp;<a class="btn btn-xs btn-info" style="padding:0 6px; line-height: 12px; height:15px;font-size:11px" target="_blank" href="https://github.com/qooob/authentic-theme/blob/master/CHANGELOG.md"><i class="fa fa-fw fa-pencil-square-o" style="padding-top:1px">&nbsp;</i>'

unauthenticated/js/parent.js

@@ -10,7 +10,7 @@ if ($access_level == 0) {
     }
 }
 if (t__wi_p.$___________initial === 1) {
-    console.log("Welcome to Authentic Theme " + $g__t__ver + "\nhttps://github.com/qooob/authentic-theme")
+    console.log("Welcome to Authentic Theme " + ($g__t__gver ? $g__t__gver : $g__t__ver) + "\nhttps://github.com/qooob/authentic-theme")
 }
 typeof t__wi_p.t___p__xhr_l == "undefined" ? t__wi_p.t___p__xhr_l = 0 : false;
 typeof t__wi_p.t___p__ll == "undefined" ? t__wi_p.t___p__ll = 0 : false;

unauthenticated/js/parent.min.js

@@ -43,6 +43,7 @@ var $_url = URI(t___wi.location),
     $g__user__home = $("body").data("user-home"),
     $g__m__name = $("body").data("module"),
     $g__t__ver = $("body").data("theme-version").toString(),
+    $g__t__gver = $("body").data("theme-git-version").toString(),
     $g__t__ver_str = $g__t__ver.replace(".", ""),
     __isNR = (typeof settings_background_color != "undefined" && settings_background_color === "nightRider" ? 1 : __isNM);
 const __ua__ = window.navigator.userAgent,

unauthenticated/js/postinit.js

@@ -1 +1 @@
-18.40-git-201704022116
+18.40-git-201704031120