-
-
Notifications
You must be signed in to change notification settings - Fork 163
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Ilia Rostovtsev
committed
Mar 21, 2017
1 parent
fa0f24a
commit 25331c8
Showing
108 changed files
with
1,085 additions
and
374 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
18.32 | ||
18.40 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# | ||
# Authentic Theme 18.32 (https://github.com/qooob/authentic-theme) | ||
# Authentic Theme 18.40 (https://github.com/qooob/authentic-theme) | ||
# Copyright 2014-2017 Ilia Rostovtsev <[email protected]> | ||
# Licensed under MIT (https://github.com/qooob/authentic-theme/blob/master/LICENSE) | ||
# | ||
|
@@ -27,9 +27,41 @@ sub settings | |
} | ||
} | ||
sub settings_filter | ||
{ | ||
my (%in_data) = @_; | ||
delete @in_data{ grep( !/^config_portable_|^settings_/, keys %in_data ) }; | ||
delete @in_data{ grep( !m/^\w*$/, keys %in_data ) }; | ||
for ( values %in_data ) { s/(.*)/'$1';/ } | ||
for ( values %in_data ) { s/\$|`*//g } | ||
for ( values %in_data ) { s/<<//g } | ||
for ( values %in_data ) { s/"/'/g } | ||
for ( values %in_data ) { s/\/\/////g } | ||
for ( values %in_data ) { s/'true'/true/g } | ||
for ( values %in_data ) { s/'false'/false/g } | ||
for ( values %in_data ) { s/'1'/1/g } | ||
for ( values %in_data ) { s/'0'/0/g } | ||
for ( values %in_data ) { | ||
s/ | ||
\G | ||
( | ||
(?: ^ [^']* ' | (?!^) ) | ||
(?: [^'\\]+ | \\. )* | ||
) | ||
' | ||
(?! [^']* \z ) | ||
/ | ||
$1 . "\\'" | ||
/xseg; | ||
} | ||
return %in_data; | ||
} | ||
sub settings_default | ||
{ | ||
my %c; | ||
$c{'settings_window_autoscroll'} = 'true'; | ||
$c{'settings_font_family'} = '0'; | ||
$c{'settings_navigation_color'} = 'blue'; | ||
$c{'settings_background_color'} = 'gainsboro'; | ||
|
@@ -363,17 +395,11 @@ sub embed_css_content | |
|
||
sub embed_css_content_palette | ||
{ | ||
if ( | ||
( length $__settings{'settings_background_color'} | ||
&& $__settings{'settings_background_color'} ne 'undefined' | ||
&& $__settings{'settings_background_color'} ne 'gainsboro' ) | ||
|| theme_night_mode() ) | ||
{ | ||
if ( theme_night_mode() ) { | ||
print '<link href="' | ||
. $gconfig{'webprefix'} | ||
. '/unauthenticated/css/palettes/' | ||
. ( theme_night_mode() ? 'nightrider' : lc( $__settings{'settings_background_color'} ) ) . '.' | ||
. ( theme_mode() eq 'debug' ? 'src' : 'min' ) . '.css?' | ||
. '/unauthenticated/css/palettes/nightrider.' | ||
. ( theme_mode() eq 'debug' ? 'src' : 'min' ) . '.css?' | ||
. theme_version() | ||
. '" rel="stylesheet" data-palette>' . "\n"; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# | ||
# Authentic Theme 18.32 (https://github.com/qooob/authentic-theme) | ||
# Authentic Theme 18.40 (https://github.com/qooob/authentic-theme) | ||
# Copyright 2014-2017 Ilia Rostovtsev <[email protected]> | ||
# Licensed under MIT (https://github.com/qooob/authentic-theme/blob/master/LICENSE) | ||
# | ||
|
@@ -1479,13 +1479,11 @@ sub csf_mod | |
. theme_version() | ||
. '" rel="stylesheet">' . "\n"; | ||
|
||
if ( length $__settings{'settings_background_color'} | ||
&& $__settings{'settings_background_color'} ne 'gainsboro' ) | ||
if ( theme_night_mode() ) | ||
{ | ||
print $fh '<link href="' | ||
. $gconfig{'webprefix'} | ||
. '/unauthenticated/css/palettes/' | ||
. lc( $__settings{'settings_background_color'} ) . '.' | ||
. '/unauthenticated/css/palettes/nightrider.' | ||
. $ext . '.css?' | ||
. theme_version() | ||
. '" rel="stylesheet">' . "\n"; | ||
|
@@ -2119,8 +2117,6 @@ sub _settings | |
'true', | ||
'settings_right_reload', | ||
'true', | ||
'settings_window_autoscroll', | ||
'true', | ||
'settings_global_passgen_format', | ||
'12|a-z,A-Z,0-9,#', | ||
'__', | ||
|
@@ -2778,30 +2774,10 @@ sub _settings | |
__config_dir_available(); | ||
|
||
if ( $t eq 'save' ) { | ||
|
||
!foreign_available("webmin") | ||
&& error( $Atext{'theme_error_access_not_root'} ); | ||
|
||
delete @in{ grep( !/^settings_/, keys %in ) }; | ||
for ( values %in ) { s/(.*)/'$1';/ } | ||
for ( values %in ) { s/"/'/g } | ||
for ( values %in ) { s/\/\/////g } | ||
for ( values %in ) { s/'true'/true/g } | ||
for ( values %in ) { s/'false'/false/g } | ||
for ( values %in ) { | ||
s/ | ||
\G | ||
( | ||
(?: ^ [^']* ' | (?!^) ) | ||
(?: [^'\\]+ | \\. )* | ||
) | ||
' | ||
(?! [^']* \z ) | ||
/ | ||
$1 . "\\'" | ||
/xseg; | ||
} | ||
write_file( $config_directory . "/authentic-theme/settings.js", \%in ); | ||
my %i = settings_filter(%in, $t); | ||
write_file( $config_directory . "/authentic-theme/settings.js", \%i ); | ||
} | ||
if ( $t eq 'restore' ) { | ||
|
||
|
@@ -3400,7 +3376,7 @@ sub content | |
sub changelog() | ||
{ | ||
my $changelog_data = ( read_file_contents( $root_directory . '/' . $current_theme . "/CHANGELOG.md" ) =~ | ||
/####Version(.*?)####Version/s )[0]; | ||
/#### Version(.*?)#### Version/s )[0]; | ||
my @changelog_version = split /\n/, $changelog_data; | ||
|
||
$changelog_data =~ s/^[^\n]*\n/\n/s; | ||
|
@@ -3512,14 +3488,14 @@ sub manage_theme_config | |
my %atconfig; | ||
|
||
if ( $action eq 'save' ) { | ||
delete @in{ grep( !/^config_portable_|^settings_/, keys %in ) }; | ||
&write_file( get_user_home() . "/.atconfig", \%in ); | ||
my %i = settings_filter(%in); | ||
write_file( get_user_home() . "/.atconfig", \%i ); | ||
} | ||
elsif ( $action eq 'load' ) { | ||
my $atconfig_file = ( get_user_home() . "/.atconfig" ); | ||
if ( -f $atconfig_file ) { | ||
$atconfig = &read_file_contents($atconfig_file); | ||
%atconfig = $atconfig =~ /(.*?)=(.*)/g; | ||
my %atconfig = ( settings( get_user_home() . "/.atconfig" ) ); | ||
|
||
delete @atconfig{ grep( !/^config_portable_/, keys %atconfig ) }; | ||
get_json( \%atconfig ); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# | ||
# Authentic Theme 18.32 (https://github.com/qooob/authentic-theme) | ||
# Authentic Theme 18.40 (https://github.com/qooob/authentic-theme) | ||
# Copyright 2014-2017 Ilia Rostovtsev <[email protected]> | ||
# Licensed under MIT (https://github.com/qooob/authentic-theme/blob/master/LICENSE) | ||
# | ||
|
@@ -61,8 +61,9 @@ sub theme_header | |
. '" data-module="' | ||
. &get_module_name() | ||
. '" data-ovo="1"' | ||
: undef | ||
) . '>' . "\n"; | ||
: undef ) | ||
. '' | ||
. ( index( get_env('request_uri'), '/config.cgi?' ) gt "-1" ? ' id="configCGI"' : '' ) . '>' . "\n"; | ||
|
||
if ( @_ > 1 && $_[1] ne 'stripped' ) { | ||
print '<div class="container-fluid col-lg-10 col-lg-offset-1">' . "\n"; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# | ||
# Authentic Theme 18.32 (https://github.com/qooob/authentic-theme) | ||
# Authentic Theme 18.40 (https://github.com/qooob/authentic-theme) | ||
# Copyright 2014-2017 Ilia Rostovtsev <[email protected]> | ||
# Licensed under MIT (https://github.com/qooob/authentic-theme/blob/master/LICENSE) | ||
# | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,4 +5,3 @@ framed=1 | |
cs_table=feffff | ||
cs_header=ffffff class='thead' | ||
cs_link=376ebd | ||
|
Oops, something went wrong.