ussr/ussr-hubzilla-themes
2
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

fixes according to rebasic 11.2 - 1265

Browse Source
This commit is contained in:
ivan
2026-04-11 10:52:14 +03:00
parent cea76873e9
commit e66a52a212
12 changed files with 227 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
ussrbasic/php/config.php
View File

@@ -4,6 +4,7 @@ namespace Zotlabs\Theme;
use ScssPhp\ScssPhp\Compiler;
use ScssPhp\ScssPhp\OutputStyle;
use ScssPhp\ScssPhp\ValueConverter;
class UssrbasicConfig {
@@ -68,85 +69,89 @@ class UssrbasicConfig {
}
if (isset($_POST['ussrbasic-settings-submit'])) {
if (isset($_POST['ussrbasic_primary_color']) || isset($_POST['ussrbasic_radius'])) {
$primary_color = '';
$color_changed = false;
$success_color = '';
$info_color = '';
$warning_color = '';
$danger_color = '';
$radius = floatval($_POST['ussrbasic_radius']);
$radius_changed = $_POST['ussrbasic_radius'] !== get_pconfig(local_channel(),'ussrbasic', 'radius');
$primary_color = '';
$success_color = '';
$info_color = '';
$warning_color = '';
$danger_color = '';
$radius = floatval($_POST['ussrbasic_radius']);
if (preg_match('/^#([A-Fa-f0-9]{3}){1,2}$/', $_POST['ussrbasic_primary_color'])) {
$primary_color = $_POST['ussrbasic_primary_color'];
if (preg_match('/^#([A-Fa-f0-9]{3}){1,2}$/', $_POST['ussrbasic_primary_color'])) {
if (!$color_changed) {
$color_changed = $_POST['ussrbasic_primary_color'] !== get_pconfig(local_channel(),'ussrbasic', 'primary_color');
}
if (preg_match('/^#([A-Fa-f0-9]{3}){1,2}$/', $_POST['ussrbasic_success_color'])) {
$success_color = $_POST['ussrbasic_success_color'];
$primary_color = $_POST['ussrbasic_primary_color'];
}
if (preg_match('/^#([A-Fa-f0-9]{3}){1,2}$/', $_POST['ussrbasic_success_color'])) {
if (!$color_changed) {
$color_changed = $_POST['ussrbasic_success_color'] !== get_pconfig(local_channel(),'ussrbasic', 'success_color');
}
if (preg_match('/^#([A-Fa-f0-9]{3}){1,2}$/', $_POST['ussrbasic_info_color'])) {
$info_color = $_POST['ussrbasic_info_color'];
$success_color = $_POST['ussrbasic_success_color'];
}
if (preg_match('/^#([A-Fa-f0-9]{3}){1,2}$/', $_POST['ussrbasic_info_color'])) {
if (!$color_changed) {
$color_changed = $_POST['ussrbasic_info_color'] !== get_pconfig(local_channel(),'ussrbasic', 'info_color');
}
if (preg_match('/^#([A-Fa-f0-9]{3}){1,2}$/', $_POST['ussrbasic_warning_color'])) {
$warning_color = $_POST['ussrbasic_warning_color'];
$info_color = $_POST['ussrbasic_info_color'];
}
if (preg_match('/^#([A-Fa-f0-9]{3}){1,2}$/', $_POST['ussrbasic_warning_color'])) {
if (!$color_changed) {
$color_changed = $_POST['ussrbasic_warning_color'] !== get_pconfig(local_channel(),'ussrbasic', 'warning_color');
}
if (preg_match('/^#([A-Fa-f0-9]{3}){1,2}$/', $_POST['ussrbasic_danger_color'])) {
$danger_color = $_POST['ussrbasic_danger_color'];
$warning_color = $_POST['ussrbasic_warning_color'];
}
if (preg_match('/^#([A-Fa-f0-9]{3}){1,2}$/', $_POST['ussrbasic_danger_color'])) {
if (!$color_changed) {
$color_changed = $_POST['ussrbasic_danger_color'] !== get_pconfig(local_channel(),'ussrbasic', 'danger_color');
}
$danger_color = $_POST['ussrbasic_danger_color'];
}
if ($primary_color || $success_color || $info_color || $warning_color || $danger_color || $radius) {
if (!$primary_color && !$success_color && !$info_color && !$warning_color && !$danger_color && !$radius) {
set_pconfig(local_channel(), 'ussrbasic', 'bootstrap', '');
}
else if ($color_changed || $radius_changed) {
try {
$compiler = new Compiler();
$compiler->setImportPaths('vendor/twbs/bootstrap/scss');
$compiler->setOutputStyle(OutputStyle::COMPRESSED);
try {
$cache_dir = 'store/[data]/[scss]/';
if(!is_dir($cache_dir)) {
os_mkdir($cache_dir, STORAGE_DEFAULT_PERMISSIONS, true);
}
$options = [
'cacheDir' => $cache_dir,
'prefix' => 'ussrbasic_',
'forceRefresh' => false
];
$compiler = new Compiler($options);
$compiler->setImportPaths('vendor/twbs/bootstrap/scss');
$compiler->setOutputStyle(OutputStyle::COMPRESSED);
// Set Variables
if ($primary_color) {
$variables['$primary'] = $primary_color;
}
if ($success_color) {
$variables['$success'] = $success_color;
}
if ($info_color) {
$variables['$info'] = $info_color;
}
if ($warning_color) {
$variables['$warning'] = $warning_color;
}
if ($danger_color) {
$variables['$danger'] = $danger_color;
}
if ($radius) {
$variables['$border-radius'] = $radius . 'rem';
$variables['$border-radius-sm'] = $radius/1.5 . 'rem';
$variables['$border-radius-lg'] = $radius*1.333 . 'rem';
$variables['$border-radius-xl'] = $radius*2.666 . 'rem';
$variables['$border-radius-xxl'] = $radius*5.333 . 'rem';
}
// Replace Bootstrap Variables with Customizer Variables
$compiler->replaceVariables($variables);
$bs = $compiler->compileString('@import "bootstrap.scss";');
set_pconfig(local_channel(), 'ussrbasic', 'bootstrap', $bs->getCss());
} catch (\Exception $e) {
logger('scssphp: Unable to compile content');
// Set Variables
if ($primary_color) {
$variables['$primary'] = ValueConverter::parseValue($primary_color);
}
}
else {
set_pconfig(local_channel(), 'ussrbasic', 'bootstrap', '');
if ($success_color) {
$variables['$success'] = ValueConverter::parseValue($success_color);
}
if ($info_color) {
$variables['$info'] = ValueConverter::parseValue($info_color);
}
if ($warning_color) {
$variables['$warning'] = ValueConverter::parseValue($warning_color);
}
if ($danger_color) {
$variables['$danger'] = ValueConverter::parseValue($danger_color);
}
if ($radius) {
$variables['$border-radius'] = ValueConverter::parseValue($radius . 'rem');
$variables['$border-radius-sm'] = ValueConverter::parseValue($radius/1.5 . 'rem');
$variables['$border-radius-lg'] = ValueConverter::parseValue($radius*1.333 . 'rem');
$variables['$border-radius-xl'] = ValueConverter::parseValue($radius*2.666 . 'rem');
$variables['$border-radius-xxl'] = ValueConverter::parseValue($radius*5.333 . 'rem');
}
// Replace Bootstrap Variables with Customizer Variables
if ($variables) {
$compiler->replaceVariables($variables);
}
$bs = $compiler->compileString('@import "bootstrap.scss";');
set_pconfig(local_channel(), 'ussrbasic', 'bootstrap', $bs->getCss());
} catch (\Exception $e) {
logger('scssphp: Unable to compile content');
}
}

2
ussrbasic/php/theme.php
View File

@@ -4,7 +4,7 @@
* * Name: Ussrbasic
* * Description: ussr.win theme based on Hubzilla standard theme
* * Version: 2.2
* * MinVersion: 8.9
* * MinVersion: 10.6
* * MaxVersion: 12.9
* * Author: Fabrixxm
* * Maintainer: ivan zlax

1
ussrbasic/php/theme_init.php
View File

@@ -9,7 +9,6 @@ head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js');
head_add_js('/library/bootbox/bootbox.min.js');
head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
head_add_js('/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');