more unbranding

This commit is contained in:
nobody 2022-02-17 12:39:21 -08:00
parent b5a8d2f6a0
commit 3e383fd71d
4 changed files with 7 additions and 13 deletions

View file

@ -3,14 +3,14 @@
namespace Code\Lib; namespace Code\Lib;
use Code\Render\Theme; use Code\Render\Theme;
use Code\Lib\System;
class Stringsjs { class Stringsjs {
public static function strings() public static function strings()
{ {
return replace_macros(Theme::get_template('js_strings.tpl'), array( return replace_macros(Theme::get_template('js_strings.tpl'), array(
'$icon' => '/images/' . PLATFORM_NAME . '-64.png', '$icon' => System::get_project_icon(),
'$delitem' => t('Delete this item?'), '$delitem' => t('Delete this item?'),
'$comment' => t('Comment'), '$comment' => t('Comment'),
'$showmore' => sprintf(t('%s show all'), '<i class=\'fa fa-chevron-down\'></i>'), '$showmore' => sprintf(t('%s show all'), '<i class=\'fa fa-chevron-down\'></i>'),

View file

@ -53,7 +53,7 @@ class System
public static function get_project_icon() public static function get_project_icon()
{ {
if (isset(App::$sys_channel['xchan_photo_l'])) { if (isset(App::$sys_channel['xchan_photo_l'])) {
return App::$sys_channel['xchan_photo_l']); return App::$sys_channel['xchan_photo_l'];
} }
if (is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('icon', App::$config['system'])) { if (is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('icon', App::$config['system'])) {
return App::$config['system']['icon']; return App::$config['system']['icon'];
@ -101,9 +101,6 @@ class System
public static function get_site_icon() public static function get_site_icon()
{ {
if (is_array(App::$config) && is_array(App::$config['system']) && isset(App::$config['system']['site_icon_url']) && App::$config['system']['site_icon_url']) {
return App::$config['system']['site_icon_url'];
}
return self::get_project_icon(); return self::get_project_icon();
} }

View file

@ -22,8 +22,6 @@ class Photo extends Controller
public function init() public function init()
{ {
if (ActivityStreams::is_as_request()) { if (ActivityStreams::is_as_request()) {
$sigdata = HTTPSig::verify(EMPTY_STR); $sigdata = HTTPSig::verify(EMPTY_STR);
if ($sigdata['portable_id'] && $sigdata['header_valid']) { if ($sigdata['portable_id'] && $sigdata['header_valid']) {

View file

@ -1182,9 +1182,8 @@ class App {
// webmanifest // webmanifest
Head::add_link( [ 'rel' => 'manifest', 'href' => z_root() . '/manifest.webmanifest' ] ); Head::add_link( [ 'rel' => 'manifest', 'href' => z_root() . '/manifest.webmanifest' ] );
self::$meta->set('application-name', System::get_platform_name() ); self::$meta->set('application-name', System::get_project_name() );
self::$meta->set('generator', System::get_project_name());
self::$meta->set('generator', System::get_platform_name());
$i = head_get_icon(); $i = head_get_icon();
if (! $i) { if (! $i) {
@ -1192,8 +1191,8 @@ class App {
} }
if ($i) { if ($i) {
Head::add_link(['rel' => 'shortcut icon', 'href' => $i ]); Head::add_link(['rel' => 'shortcut icon', 'href' => $i ]);
Head::add_link(['rel' => 'icon', 'sizes' => '64x64', 'href' => System::get_site_icon() ]); Head::add_link(['rel' => 'icon', 'sizes' => '64x64', 'href' => str_replace('/l/','/64/', System::get_site_icon()) ]);
Head::add_link(['rel' => 'icon', 'sizes' => '192x192', 'href' => 'images/' . System::get_platform_name() . '.svg' ]); Head::add_link(['rel' => 'icon', 'sizes' => '192x192', 'href' => str_replace('/l/','/192/', System::get_site_icon()) ]);
} }
$x = [ 'header' => '' ]; $x = [ 'header' => '' ];