From 5ebe10d7fc808dc2ed3502b532e6db020928aa1c Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Mon, 7 May 2018 18:28:55 +0200 Subject: [PATCH 1/2] Docs: add a note on adding `use` on theme.php --- doc/themes.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/themes.md b/doc/themes.md index 59f9570dd..d0d74a92c 100644 --- a/doc/themes.md +++ b/doc/themes.md @@ -167,6 +167,8 @@ The content of this file should be something like theme_info = array( 'extends' => 'duepuntozero'. @@ -246,6 +248,12 @@ These three pieces of information should be listed. If the original author is no longer working on the theme, but a maintainer has taken over, the maintainer should be listed as well. The information from the theme header will be displayed in the admin panel. +The first thing in file is to import the `App` class from `\Friendica\` namespace. + + use Friendica\App; + +This will make our job a little easier, as we don't have to specify the full name every time we need to use the `App` class. + The next crucial part of the theme.php file is a definition of an init function. The name of the function is _init. So in the case of quattro it is From 64a799198a328e8a2d8936b34aef9d331edfa267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= <25648755+M-arcus@users.noreply.github.com> Date: Sun, 13 May 2018 12:50:53 +0200 Subject: [PATCH 2/2] [TASK] Automatic installation: Install theme --- src/Core/Console/AutomaticInstallation.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php index 189bb9d19..e0eea1f50 100644 --- a/src/Core/Console/AutomaticInstallation.php +++ b/src/Core/Console/AutomaticInstallation.php @@ -6,6 +6,7 @@ use Asika\SimpleConsole\Console; use dba; use Friendica\App; use Friendica\Core\Install; +use Friendica\Core\Theme; require_once 'mod/install.php'; require_once 'include/dba.php'; @@ -90,6 +91,15 @@ HELP; $this->out(" Complete!\n\n"); + // Install theme + $this->out("Installing theme\n"); + if (!empty($a->config['system']['theme'])) { + Theme::install($a->config['system']['theme']); + $this->out(" Complete\n\n"); + } else { + $this->out(" Theme setting is empty. Please check the file htconfig.php\n\n"); + } + // Copy config file $this->out("Saving config file...\n"); if ($config_file != '.htconfig.php' && !copy($config_file, '.htconfig.php')) {