some interface improvements

spaceonfire · Jan 29, 2019 · 33f05db · 33f05db
1 parent 183012b
commit 33f05db
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/Module.php b/src/Module.php
@@ -8,6 +8,7 @@ class Module {
 	private $MODULE_ID;
 	private $MODULE_VERSION;
 	private $MODULE_VERSION_DATE;
+	private $ADMIN_FORM_ID;
 
 	public $options;
 	public $logger;
@@ -25,6 +26,7 @@ public function __construct(array $options = []) {
 		$this->MODULE_ID = $options['MODULE_ID'];
 		$this->MODULE_VERSION = $options['MODULE_VERSION'];
 		$this->MODULE_VERSION_DATE = $options['MODULE_VERSION_DATE'];
+		$this->ADMIN_FORM_ID = $options['ADMIN_FORM_ID'];
 
 		$this->options = new Options\Manager($this->MODULE_ID);
 		$this->logger = new Logger($this->MODULE_ID);
@@ -71,7 +73,7 @@ public function setVersionDate($MODULE_VERSION_DATE) {
 	}
 
 	public function showOptionsForm() {
-		$form = new Options\Form($this->options);
+		$form = new Options\Form($this->options, $this->ADMIN_FORM_ID);
 		$form->handleRequest();
 		$form->write();
 	}

diff --git a/src/Options/Form.php b/src/Options/Form.php
@@ -19,15 +19,17 @@ class Form {
 
 	private $tabControl = null;
 	private $context = null;
+	private $formId = null;
 
-	public function __construct($options) {
+	public function __construct($options, $formId) {
 		global $USER, $APPLICATION;
 		if (!$USER->isAdmin()) {
-			$APPLICATION->authForm('Nope');
+			$APPLICATION->authForm('Access denied.');
 		}
 
 		$this->options = $options;
 		$this->context = Application::getInstance()->getContext();
+		$this->formId = $formId ?: 'module_settings_form';
 
 		defined('ADMIN_MODULE_NAME') or define('ADMIN_MODULE_NAME', $this->options->getModuleId());
 	}
@@ -99,20 +101,28 @@ public function write() {
 
 		$this->tabControl->begin();
 		?>
-		<form method="post" action="<?=sprintf('%s?mid=%s&lang=%s', $this->getRequest()->getRequestedPage(), urlencode($mid), LANGUAGE_ID)?>">
+		<form method="post" action="<?=sprintf('%s?mid=%s&lang=%s', $this->getRequest()->getRequestedPage(), urlencode($mid), LANGUAGE_ID)?>" name="<?=$this->formId?>" id="<?=$this->formId?>">
 			<?php
 			echo bitrix_sessid_post();
 			foreach ($this->tabControl->tabs as $tab) {
 				$this->tabControl->beginNextTab();
 				$filteredOpts = array_filter($fields, function ($opt) use ($tab) { return $opt['tab'] === $tab['DIV']; });
 				foreach ($filteredOpts as $opt_name=>$opt) { ?>
-				<tr>
+				<tr id="<?=$opt_name?>_row">
 					<?
 					switch ($opt['type']) {
 						case 'html':
-							?>
-							<td colspan="2">
+							if (strlen($opt['label'])) {
+								?>
+								<td width="30%" style="vertical-align: top; line-height: 25px;">
+									<label for="<?=$opt_name?>"><?=$opt['label'] . ($opt['required'] ? ' *' : '')?>:</label>
+								<td width="70%">
+								<?
+							} else {
+								?>
+								<td colspan="2">
 								<?
+							}
 								if ($opt['html']) {
 									echo $opt['html'];
 								} else if (file_exists($opt['path'])) {
@@ -182,6 +192,7 @@ public function write() {
 										?>
 										<input
 											type="<?=$opt['type']?>"
+											size="<?=$opt['size'] ?: '50'?>"
 											name="<?=$opt_name?>"
 											id="<?=$opt_name?>"
 											value="<?=htmlspecialchars(Option::get(ADMIN_MODULE_NAME, $opt_name));?>"