hubzilla 8

This commit is contained in:
root
2024-02-17 17:00:05 +01:00
parent 945d6161b5
commit 35b5787038
275 changed files with 1548 additions and 19618 deletions

View File

@@ -37,20 +37,21 @@ class UssrbasicpubConfig {
}
$arr = array();
$arr['dark_mode'] = get_pconfig(local_channel(),'ussrbasicpub', 'dark_mode');
$arr['navbar_dark_mode'] = get_pconfig(local_channel(),'ussrbasicpub', 'navbar_dark_mode');
$arr['narrow_navbar'] = get_pconfig(local_channel(),'ussrbasicpub', 'narrow_navbar' );
$arr['nav_bg'] = get_pconfig(local_channel(),'ussrbasicpub', 'nav_bg' );
$arr['nav_icon_colour'] = get_pconfig(local_channel(),'ussrbasicpub', 'nav_icon_colour' );
$arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'ussrbasicpub', 'nav_active_icon_colour' );
$arr['link_colour'] = get_pconfig(local_channel(),'ussrbasicpub', 'link_colour' );
$arr['banner_colour'] = get_pconfig(local_channel(),'ussrbasicpub', 'banner_colour' );
$arr['bgcolour'] = get_pconfig(local_channel(),'ussrbasicpub', 'background_colour' );
$arr['nav_bg_dark'] = get_pconfig(local_channel(),'ussrbasicpub', 'nav_bg_dark' );
$arr['link_color'] = get_pconfig(local_channel(),'ussrbasicpub', 'link_color' );
$arr['link_color_dark'] = get_pconfig(local_channel(),'ussrbasicpub', 'link_color_dark' );
$arr['link_hover_color'] = get_pconfig(local_channel(),'ussrbasicpub', 'link_hover_color' );
$arr['link_hover_color_dark'] = get_pconfig(local_channel(),'ussrbasicpub', 'link_hover_color_dark' );
$arr['bgcolor'] = get_pconfig(local_channel(),'ussrbasicpub', 'background_color' );
$arr['bgcolor_dark'] = get_pconfig(local_channel(),'ussrbasicpub', 'background_color_dark' );
$arr['background_image'] = get_pconfig(local_channel(),'ussrbasicpub', 'background_image' );
$arr['item_colour'] = get_pconfig(local_channel(),'ussrbasicpub', 'item_colour' );
$arr['comment_item_colour'] = get_pconfig(local_channel(),'ussrbasicpub', 'comment_item_colour' );
$arr['background_image_dark'] = get_pconfig(local_channel(),'ussrbasicpub', 'background_image_dark' );
$arr['font_size'] = get_pconfig(local_channel(),'ussrbasicpub', 'font_size' );
$arr['font_colour'] = get_pconfig(local_channel(),'ussrbasicpub', 'font_colour' );
$arr['radius'] = get_pconfig(local_channel(),'ussrbasicpub', 'radius' );
$arr['shadow'] = get_pconfig(local_channel(),'ussrbasicpub', 'photo_shadow' );
$arr['converse_width']=get_pconfig(local_channel(),"ussrbasicpub","converse_width");
$arr['top_photo']=get_pconfig(local_channel(),"ussrbasicpub","top_photo");
$arr['reply_photo']=get_pconfig(local_channel(),"ussrbasicpub","reply_photo");
@@ -65,19 +66,20 @@ class UssrbasicpubConfig {
if (isset($_POST['ussrbasicpub-settings-submit'])) {
set_pconfig(local_channel(), 'ussrbasicpub', 'narrow_navbar', $_POST['ussrbasicpub_narrow_navbar']);
set_pconfig(local_channel(), 'ussrbasicpub', 'navbar_dark_mode', $_POST['ussrbasicpub_navbar_dark_mode']);
set_pconfig(local_channel(), 'ussrbasicpub', 'dark_mode', $_POST['ussrbasicpub_dark_mode']);
set_pconfig(local_channel(), 'ussrbasicpub', 'nav_bg', $_POST['ussrbasicpub_nav_bg']);
set_pconfig(local_channel(), 'ussrbasicpub', 'nav_icon_colour', $_POST['ussrbasicpub_nav_icon_colour']);
set_pconfig(local_channel(), 'ussrbasicpub', 'nav_active_icon_colour', $_POST['ussrbasicpub_nav_active_icon_colour']);
set_pconfig(local_channel(), 'ussrbasicpub', 'link_colour', $_POST['ussrbasicpub_link_colour']);
set_pconfig(local_channel(), 'ussrbasicpub', 'background_colour', $_POST['ussrbasicpub_background_colour']);
set_pconfig(local_channel(), 'ussrbasicpub', 'banner_colour', $_POST['ussrbasicpub_banner_colour']);
set_pconfig(local_channel(), 'ussrbasicpub', 'nav_bg_dark', $_POST['ussrbasicpub_nav_bg_dark']);
set_pconfig(local_channel(), 'ussrbasicpub', 'link_color', $_POST['ussrbasicpub_link_color']);
set_pconfig(local_channel(), 'ussrbasicpub', 'link_color_dark', $_POST['ussrbasicpub_link_color_dark']);
set_pconfig(local_channel(), 'ussrbasicpub', 'link_hover_color', $_POST['ussrbasicpub_link_hover_color']);
set_pconfig(local_channel(), 'ussrbasicpub', 'link_hover_color_dark', $_POST['ussrbasicpub_link_hover_color_dark']);
set_pconfig(local_channel(), 'ussrbasicpub', 'background_color', $_POST['ussrbasicpub_background_color']);
set_pconfig(local_channel(), 'ussrbasicpub', 'background_color_dark', $_POST['ussrbasicpub_background_color_dark']);
set_pconfig(local_channel(), 'ussrbasicpub', 'background_image', $_POST['ussrbasicpub_background_image']);
set_pconfig(local_channel(), 'ussrbasicpub', 'item_colour', $_POST['ussrbasicpub_item_colour']);
set_pconfig(local_channel(), 'ussrbasicpub', 'comment_item_colour', $_POST['ussrbasicpub_comment_item_colour']);
set_pconfig(local_channel(), 'ussrbasicpub', 'background_image_dark', $_POST['ussrbasicpub_background_image_dark']);
set_pconfig(local_channel(), 'ussrbasicpub', 'font_size', $_POST['ussrbasicpub_font_size']);
set_pconfig(local_channel(), 'ussrbasicpub', 'font_colour', $_POST['ussrbasicpub_font_colour']);
set_pconfig(local_channel(), 'ussrbasicpub', 'radius', $_POST['ussrbasicpub_radius']);
set_pconfig(local_channel(), 'ussrbasicpub', 'photo_shadow', $_POST['ussrbasicpub_shadow']);
set_pconfig(local_channel(), 'ussrbasicpub', 'converse_width', $_POST['ussrbasicpub_converse_width']);
set_pconfig(local_channel(), 'ussrbasicpub', 'top_photo', $_POST['ussrbasicpub_top_photo']);
set_pconfig(local_channel(), 'ussrbasicpub', 'reply_photo', $_POST['ussrbasicpub_reply_photo']);
@@ -87,29 +89,35 @@ class UssrbasicpubConfig {
function form($arr) {
if(get_pconfig(local_channel(), 'ussrbasicpub', 'advanced_theming'))
$expert = 1;
$expert = false;
if(get_pconfig(local_channel(), 'ussrbasicpub', 'advanced_theming')) {
$expert = true;
}
$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
$o = replace_macros(get_markup_template('theme_settings.tpl'), array(
'$submit' => t('Submit'),
'$baseurl' => z_root(),
'$theme' => \App::$channel['channel_theme'],
'$expert' => $expert,
'$title' => t("Theme settings"),
'$dark' => t('Dark style'),
'$light' => t('Light style'),
'$common' => t('Common settings'),
'$dark_mode' => array('ussrbasicpub_dark_mode',t('Default to dark mode'),$arr['dark_mode'], '', array(t('No'),t('Yes'))),
'$navbar_dark_mode' => array('ussrbasicpub_navbar_dark_mode',t('Always use light icons for navbar'),$arr['navbar_dark_mode'], t('Enable this option if you use a dark navbar color in light mode'), array(t('No'),t('Yes'))),
'$narrow_navbar' => array('ussrbasicpub_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
'$nav_bg' => array('ussrbasicpub_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
'$nav_icon_colour' => array('ussrbasicpub_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),
'$nav_active_icon_colour' => array('ussrbasicpub_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
'$link_colour' => array('ussrbasicpub_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
'$banner_colour' => array('ussrbasicpub_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
'$bgcolour' => array('ussrbasicpub_background_colour', t('Set the background color'), $arr['bgcolour']),
'$nav_bg_dark' => array('ussrbasicpub_nav_bg_dark', t('Dark navigation bar background color'), $arr['nav_bg_dark']),
'$link_color' => array('ussrbasicpub_link_color', t('Link color'), $arr['link_color']),
'$link_color_dark' => array('ussrbasicpub_link_color_dark', t('Dark link color'), $arr['link_color_dark']),
'$link_hover_color' => array('ussrbasicpub_link_hover_color', t('Link hover color'), $arr['link_hover_color']),
'$link_hover_color_dark' => array('ussrbasicpub_link_hover_color_dark', t('Dark link hover color'), $arr['link_hover_color_dark']),
'$bgcolor' => array('ussrbasicpub_background_color', t('Set the background color'), $arr['bgcolor']),
'$bgcolor_dark' => array('ussrbasicpub_background_color_dark', t('Set the dark background color'), $arr['bgcolor_dark']),
'$background_image' => array('ussrbasicpub_background_image', t('Set the background image'), $arr['background_image']),
'$item_colour' => array('ussrbasicpub_item_colour', t('Set the background color of items'), $arr['item_colour']),
'$comment_item_colour' => array('ussrbasicpub_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
'$background_image_dark' => array('ussrbasicpub_background_image_dark', t('Set the dark background image'), $arr['background_image_dark']),
'$font_size' => array('ussrbasicpub_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
'$font_colour' => array('ussrbasicpub_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
'$radius' => array('ussrbasicpub_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
'$shadow' => array('ussrbasicpub_shadow', t('Set shadow depth of photos'), $arr['shadow']),
'$converse_width' => array('ussrbasicpub_converse_width',t('Set maximum width of content region in rem'),$arr['converse_width'], t('Leave empty for default width')),
'$top_photo' => array('ussrbasicpub_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
'$reply_photo' => array('ussrbasicpub_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
@@ -121,7 +129,15 @@ class UssrbasicpubConfig {
}
function ussrbasicpub_theme_admin_enable() {
// This function is called once when the theme is being enabled by the admin
// It can be used to register hooks etc.
}
function ussrbasicpub_theme_admin_disable() {
// This function is called once when the theme is being disabled by the admin
// It can be used to unregister hooks etc.
}

View File

@@ -11,20 +11,19 @@ if(! App::$install) {
// Load the owners pconfig
$nav_bg = get_pconfig($uid, 'ussrbasicpub', 'nav_bg');
$nav_icon_colour = get_pconfig($uid, 'ussrbasicpub', 'nav_icon_colour');
$nav_active_icon_colour = get_pconfig($uid, 'ussrbasicpub', 'nav_active_icon_colour');
$banner_colour = get_pconfig($uid,'ussrbasicpub','banner_colour');
$nav_bg_dark = get_pconfig($uid, 'ussrbasicpub', 'nav_bg_dark');
$narrow_navbar = get_pconfig($uid,'ussrbasicpub','narrow_navbar');
$link_colour = get_pconfig($uid, 'ussrbasicpub', 'link_colour');
$link_color = get_pconfig($uid, 'ussrbasicpub', 'link_color');
$link_color_dark = get_pconfig($uid, 'ussrbasicpub', 'link_color_dark');
$link_hover_color = get_pconfig($uid, 'ussrbasicpub', 'link_hover_color');
$link_hover_color_dark = get_pconfig($uid, 'ussrbasicpub', 'link_hover_color_dark');
$bgcolor = get_pconfig($uid, 'ussrbasicpub', 'background_color');
$bgcolor_dark = get_pconfig($uid, 'ussrbasicpub', 'background_color_dark');
$schema = get_pconfig($uid,'ussrbasicpub','schema');
$bgcolour = get_pconfig($uid, 'ussrbasicpub', 'background_colour');
$background_image = get_pconfig($uid, 'ussrbasicpub', 'background_image');
$item_colour = get_pconfig($uid, 'ussrbasicpub', 'item_colour');
$comment_item_colour = get_pconfig($uid, 'ussrbasicpub', 'comment_item_colour');
$background_image_dark = get_pconfig($uid, 'ussrbasicpub', 'background_image_dark');
$font_size = get_pconfig($uid, 'ussrbasicpub', 'font_size');
$font_colour = get_pconfig($uid, 'ussrbasicpub', 'font_colour');
$radius = get_pconfig($uid, 'ussrbasicpub', 'radius');
$shadow = get_pconfig($uid,'ussrbasicpub','photo_shadow');
$converse_width=get_pconfig($uid,'ussrbasicpub','converse_width');
$top_photo=get_pconfig($uid,'ussrbasicpub','top_photo');
$reply_photo=get_pconfig($uid,'ussrbasicpub','reply_photo');
@@ -63,6 +62,7 @@ if ((!$schema) || ($schema == '---')) {
require_once ($schemefile);
}
$schemecss = '';
if(file_exists('view/theme/ussrbasicpub/schema/default.css')) {
$schemecss = file_get_contents('view/theme/ussrbasicpub/schema/default.css');
}
@@ -72,37 +72,47 @@ if ((!$schema) || ($schema == '---')) {
//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
//individually. If we don't, we'll have problems if a user has set one, but not all options.
if (! $nav_bg)
$nav_bg = '#343a40';
if (! $nav_icon_colour)
$nav_icon_colour = 'rgba(255, 255, 255, 0.55)';
if (! $nav_active_icon_colour)
$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
if (! $link_colour)
$link_colour = '#0d6efd';
if (! $banner_colour)
$banner_colour = '#fff';
if (! $bgcolour)
$bgcolour = 'rgb(254,254,254)';
$nav_bg = 'rgba(248, 249, 250, 1)';
if (! $nav_bg_dark)
$nav_bg_dark = 'rgba(43, 48, 53, 1)';
if (! $link_color)
$link_color = '#0d6efd';
if (! $link_color_dark)
$link_color_dark = '#6ea8fe';
if (! $link_hover_color)
$link_hover_color = '#0a58ca';
if (! $link_hover_color_dark)
$link_hover_color_dark = '#9ec5fe';
if (! $bgcolor)
$bgcolor = '#fff';
if (! $bgcolor_dark)
$bgcolor_dark = '#212529';
if (! $background_image)
$background_image ='';
if (! $item_colour)
$item_colour = 'rgb(238,238,238)';
if (! $comment_item_colour)
$comment_item_colour = 'rgb(255,255,255)';
if (! $item_opacity)
$item_opacity = '1';
$background_image = '';
if (! $background_image_dark)
$background_image_dark = '';
if (! $font_size)
$font_size = '0.875rem';
if (! $font_colour)
$font_colour = '#4d4d4d';
if (! $radius)
$radius = '0.25rem';
if (! $shadow)
$shadow = '0';
$radius = '0.375rem';
if (! $converse_width)
$converse_width = '52'; //unit: rem
if(! $top_photo)
$top_photo = '2.3rem';
if(! $reply_photo)
$reply_photo = '2.3rem';
@@ -111,10 +121,6 @@ if(file_exists('view/theme/ussrbasicpub/css/style.css')) {
$x = file_get_contents('view/theme/ussrbasicpub/css/style.css');
if($schema === 'dark' && file_exists('view/theme/ussrbasicpub/schema/bootstrap-nightfall.css')) {
$x .= file_get_contents('view/theme/ussrbasicpub/schema/bootstrap-nightfall.css');
}
if($narrow_navbar && file_exists('view/theme/ussrbasicpub/css/narrow_navbar.css')) {
$x .= file_get_contents('view/theme/ussrbasicpub/css/narrow_navbar.css');
}
@@ -133,31 +139,26 @@ if(file_exists('view/theme/ussrbasicpub/css/style.css')) {
$options = array (
'$nav_bg' => $nav_bg,
'$nav_icon_colour' => $nav_icon_colour,
'$nav_active_icon_colour' => $nav_active_icon_colour,
'$link_colour' => $link_colour,
'$banner_colour' => $banner_colour,
'$bgcolour' => $bgcolour,
'$nav_bg_dark' => $nav_bg_dark,
'$link_color' => $link_color,
'$link_color_dark' => $link_color_dark,
'$link_hover_color' => $link_hover_color,
'$link_hover_color_dark' => $link_hover_color_dark,
'$bgcolor' => $bgcolor,
'$bgcolor_dark' => $bgcolor_dark,
'$background_image' => $background_image,
'$item_colour' => $item_colour,
'$comment_item_colour' => $comment_item_colour,
'$background_image_dark' => $background_image_dark,
'$font_size' => $font_size,
'$font_colour' => $font_colour,
'$radius' => $radius,
'$shadow' => $shadow,
'$converse_width' => $converse_width,
'$nav_float_min_opacity' => $nav_float_min_opacity,
'$nav_percent_min_opacity' => $nav_percent_min_opacity,
'$top_photo' => $top_photo,
'$reply_photo' => $reply_photo,
'$pmenu_top' => $pmenu_top,
'$pmenu_reply' => $pmenu_reply,
'$main_width' => $main_width,
'$left_aside_width' => $left_aside_width,
'$right_aside_width' => $right_aside_width
);
echo str_replace(array_keys($options), array_values($options), $x);
echo strtr($x, $options);
}

View File

@@ -2,15 +2,17 @@
/**
* * Name: Ussrbasicpub
* * Description: ussr.win 2 column pub based on Hubzilla standard theme
* * Description: ussr.win public theme based on Hubzilla standard theme
* * Version: 2.2
* * MinVersion: 6.5.13
* * MaxVersion: 8.0
* * MinVersion: 8.0
* * MaxVersion: 9.0
* * Author: Fabrixxm
* * Theme_Color: #343a40
* * Maintainer: ivan zlax
* * Theme_Color: rgb(248, 249, 250)
* * Background_Color: rgb(254,254,254)
*/
function ussrbasicpub_init(&$a) {
function ussrbasicpub_init() {
}

View File

@@ -1,15 +1,34 @@
<?php
require_once('view/php/theme_init.php');
head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
head_add_css('/vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
head_add_css('/view/css/bootstrap-red.css');
head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
require_once('view/php/theme_init.php');
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/datetimepicker/jquery.datetimepicker.js');
head_add_js('/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
$ussrbasicpub_mode = '';
$ussrbasicpub_navbar_mode = '';
if (local_channel()) {
$ussrbasicpub_mode = ((get_pconfig(local_channel(), 'ussrbasicpub', 'dark_mode')) ? 'dark' : 'light');
$ussrbasicpub_navbar_mode = ((get_pconfig(local_channel(), 'ussrbasicpub', 'navbar_dark_mode')) ? 'dark' : 'light');
}
if (App::$profile_uid) {
$ussrbasicpub_mode = ((get_pconfig(App::$profile_uid, 'ussrbasicpub', 'dark_mode')) ? 'dark' : 'light');
$ussrbasicpub_navbar_mode = ((get_pconfig(App::$profile_uid, 'ussrbasicpub', 'navbar_dark_mode')) ? 'dark' : 'light');
}
if (!$ussrbasicpub_mode) {
$ussrbasicpub_mode = ((get_config('ussrbasicpub', 'dark_mode')) ? 'dark' : 'light');
$ussrbasicpub_navbar_mode = ((get_config('ussrbasicpub', 'navbar_dark_mode')) ? 'dark' : 'light');
}
App::$page['color_mode'] = 'data-bs-theme="' . $ussrbasicpub_mode . '"';
App::$page['navbar_color_mode'] = (($ussrbasicpub_navbar_mode === 'dark') ? 'data-bs-theme="' . $ussrbasicpub_navbar_mode . '"' : '');