minor fixes

ojsde · Dec 8, 2021 · e472ba7 · e472ba7
1 parent 9e779b0
commit e472ba7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/ShariffBlockPlugin.inc.php b/ShariffBlockPlugin.inc.php
@@ -122,7 +122,7 @@ function getContents($templateMgr, $request = null) {
     		$requestedUrl = $request->getCompleteUrl();
     		$baseUrl = $request->getBaseUrl();
     		$jsUrl = $baseUrl .'/'. $this->getShariffPlugin()->getPluginPath().'/shariff-3.2.1/shariff.complete.js';
-    		$cssUrl = $baseUrl .'/' . $this->getShariffPlugin()->getPluginPath() . '/' . '/shariff-3.2.1/shariff.complete.css';
+    		$cssUrl = $baseUrl .'/' . $this->getShariffPlugin()->getPluginPath() . '/shariff-3.2.1/shariff.complete.css';
     		$backendUrl = $baseUrl .'/'. 'shariff-backend';
 
     		// assign variables to the templates

diff --git a/ShariffSettingsForm.inc.php b/ShariffSettingsForm.inc.php
@@ -82,40 +82,40 @@ public function __construct($action, $locales, $context) {
 				['value' => 'vk', 'label' => __('plugins.generic.shariff.settings.service.vk')],
 				['value' => 'info', 'label' => __('plugins.generic.shariff.settings.service.info')]
 			],
-			'value' => $context->getData('shariffServicesSelected'),
+			'value' => $context->getData('shariffServicesSelected') ?: [],
 			'isOrderable' => true,
 			'groupId' => 'shariffsettings'
 		]))
 		->addField(new FieldOptions('shariffThemeSelected', [
 			'label' => __('plugins.generic.shariff.settings.theme'),
-			'type' => 'dropdown',
+			'type' => 'radio',
 			'options' => [
 				['value' => 'standard', 'label' => __('plugins.generic.shariff.settings.theme.standard')],
 				['value' => 'grey', 'label' => __('plugins.generic.shariff.settings.theme.grey')],
 				['value' => 'white', 'label' => __('plugins.generic.shariff.settings.theme.white')],
 			],
-			'value' => $context->getData('shariffThemeSelected'),
+			'value' => $context->getData('shariffThemeSelected') ?: "standard",
 			'groupId' => 'shariffsettings'
 		]))
 		->addField(new FieldOptions('shariffPositionSelected', [
 			'label' => __('plugins.generic.shariff.settings.position'),
-			'type' => 'dropdown',
+			'type' => 'radio',
 			'options' => [
+				['value' => 'submission', 'label' => __('plugins.generic.shariff.settings.position.submission')],
 				['value' => 'footer', 'label' => __('plugins.generic.shariff.settings.position.footer')],
 				['value' => 'sidebar', 'label' => __('plugins.generic.shariff.settings.position.sidebar')],
-				['value' => 'submission', 'label' => __('plugins.generic.shariff.settings.position.submission')],
 			],
-			'value' => $context->getData('shariffPositionSelected'),
+			'value' => $context->getData('shariffPositionSelected') ?: "submission",
 			'groupId' => 'shariffsettings'
 		]))
 		->addField(new FieldOptions('shariffOrientationSelected', [
 			'label' => __('plugins.generic.shariff.settings.orientation'),
-			'type' => 'dropdown',
+			'type' => 'radio',
 			'options' => [
-				['value' => 'vertical', 'label' => __('plugins.generic.shariff.settings.orientation.vertical')],
 				['value' => 'horizontal', 'label' => __('plugins.generic.shariff.settings.orientation.horizontal')],
+				['value' => 'vertical', 'label' => __('plugins.generic.shariff.settings.orientation.vertical')],
 			],
-			'value' => $context->getData('shariffOrientationSelected'),
+			'value' => $context->getData('shariffOrientationSelected') ?: "horizontal",
 			'groupId' => 'shariffsettings'
 		]));
 	}