1
0
mirror of https://github.com/typemill/typemill.git synced 2025-10-17 07:36:24 +02:00

Version 1.0.4 optimized author panel and refactoring

This commit is contained in:
Sebastian
2018-04-30 16:05:04 +02:00
parent ef704daa6e
commit 7bf12c6fa0
59 changed files with 900 additions and 653 deletions

View File

@@ -41,8 +41,9 @@ class Settings
'userPath' => $rootPath . 'settings' . DIRECTORY_SEPARATOR . 'users',
'authorPath' => __DIR__ . DIRECTORY_SEPARATOR . 'author' . DIRECTORY_SEPARATOR,
'contentFolder' => 'content',
'version' => '1.1.3',
'setup' => true
'version' => '1.1.4',
'setup' => true,
'welcome' => true
];
}
@@ -54,30 +55,19 @@ class Settings
return $userSettings;
}
public static function getPluginSettings($pluginName)
public static function getObjectSettings($objectType, $objectName)
{
$yaml = new Models\WriteYaml();
$pluginFolder = 'plugins' . DIRECTORY_SEPARATOR . $pluginName;
$pluginFile = $pluginName . '.yaml';
$pluginSettings = $yaml->getYaml($pluginFolder, $pluginFile);
$objectFolder = $objectType . DIRECTORY_SEPARATOR . $objectName;
$objectFile = $objectName . '.yaml';
$objectSettings = $yaml->getYaml($objectFolder, $objectFile);
return $pluginSettings;
}
public static function getThemeSettings($themeName)
{
$yaml = new Models\WriteYaml();
$themeFolder = 'themes' . DIRECTORY_SEPARATOR . $themeName;
$themeFile = $themeName . '.yaml';
$themeSettings = $yaml->getYaml($themeFolder, $themeFile);
return $themeSettings;
return $objectSettings;
}
public static function updateSettings($settings)
public static function createSettings($settings)
{
$yaml = new Models\WriteYaml();
@@ -85,6 +75,21 @@ class Settings
$yaml->updateYaml('settings', 'settings.yaml', $settings);
}
public static function updateSettings($settings)
{
$userSettings = self::getUserSettings();
if($userSettings)
{
$yaml = new Models\WriteYaml();
$settings = array_merge($userSettings, $settings);
/* write settings to yaml */
$yaml->updateYaml('settings', 'settings.yaml', $settings);
}
}
public static function removePluginSettings($pluginName)
{
$userSettings = self::getUserSettings();
@@ -111,7 +116,7 @@ class Settings
{
$yaml = new Models\WriteYaml();
$pluginSettings = self::getPluginSettings($pluginName);
$pluginSettings = self::getObjectSettings('plugins', $pluginName);
if(isset($pluginSettings['settings']))
{
$userSettings['plugins'][$pluginName] = $pluginSettings['settings'];