Installer: step icons added

mirekmarek · mirekmarek · commit ed49c1abe2b9 · 2023-01-26T17:30:26.000+01:00
diff --git a/_installer/Classes/Step/Controller.php b/_installer/Classes/Step/Controller.php
@@ -12,6 +12,8 @@
 use Jet\MVC_View;
 use Jet\Tr;
 use Jet\Http_Request;
+use Jet\UI;
+use Jet\UI_icon;
 
 /**
  *
@@ -22,6 +24,11 @@ abstract class Installer_Step_Controller
 	 * @var string
 	 */
 	protected string $name = '';
+	
+	/**
+	 * @var string
+	 */
+	protected string $icon = '';
 
 	/**
 	 * @var string
@@ -89,6 +96,28 @@ public function getName(): string
 	{
 		return $this->name;
 	}
+	
+	/**
+	 * @return string
+	 */
+	public function getIcon( string $size = UI_icon::SIZE_NORMAL ): string
+	{
+		if(!$this->icon) {
+			return '';
+		}
+		
+		return UI::icon($this->icon)->setSize( $size );
+	}
+	
+	/**
+	 * @param string $icon
+	 */
+	public function setIcon( string $icon ): void
+	{
+		$this->icon = $icon;
+	}
+	
+	
 
 	/**
 	 *
diff --git a/_installer/Step/ConfigureDb/Controller.php b/_installer/Step/ConfigureDb/Controller.php
@@ -23,6 +23,7 @@
  */
 class Installer_Step_ConfigureDb_Controller extends Installer_Step_Controller
 {
+	protected string $icon = 'database';
 
 	/**
 	 * @var string
diff --git a/_installer/Step/ConfigureStudio/Controller.php b/_installer/Step/ConfigureStudio/Controller.php
@@ -25,7 +25,8 @@
  */
 class Installer_Step_ConfigureStudio_Controller extends Installer_Step_Controller
 {
-
+	protected string $icon = 'laptop-code';
+	
 	/**
 	 * @var string
 	 */
diff --git a/_installer/Step/CreateAdministrator/Controller.php b/_installer/Step/CreateAdministrator/Controller.php
@@ -15,6 +15,7 @@
  */
 class Installer_Step_CreateAdministrator_Controller extends Installer_Step_Controller
 {
+	protected string $icon = 'user-secret';
 
 	/**
 	 * @var string
diff --git a/_installer/Step/CreateBases/Controller.php b/_installer/Step/CreateBases/Controller.php
@@ -33,6 +33,7 @@
  */
 class Installer_Step_CreateBases_Controller extends Installer_Step_Controller
 {
+	protected string $icon = 'wand-sparkles';
 
 	/**
 	 * @var string
diff --git a/_installer/Step/CreateDB/Controller.php b/_installer/Step/CreateDB/Controller.php
@@ -35,6 +35,7 @@
  */
 class Installer_Step_CreateDB_Controller extends Installer_Step_Controller
 {
+	protected string $icon = 'square-plus';
 
 	/**
 	 * @var string
diff --git a/_installer/Step/CreateRESTClient/Controller.php b/_installer/Step/CreateRESTClient/Controller.php
@@ -20,6 +20,8 @@ class Installer_Step_CreateRESTClient_Controller extends Installer_Step_Controll
 	const MAIN_ROLE_ID = 'main';
 	const MAIN_ROLE_NAME = 'Main';
 	
+	protected string $icon = 'server';
+	
 	/**
 	 * @var string
 	 */
diff --git a/_installer/Step/CreateVisitor/Controller.php b/_installer/Step/CreateVisitor/Controller.php
@@ -20,6 +20,8 @@ class Installer_Step_CreateVisitor_Controller extends Installer_Step_Controller
 	const MAIN_ROLE_ID = 'main';
 	const MAIN_ROLE_NAME = 'Main';
 	
+	protected string $icon = 'users';
+	
 	/**
 	 * @var string
 	 */
diff --git a/_installer/Step/DirsCheck/Controller.php b/_installer/Step/DirsCheck/Controller.php
@@ -20,6 +20,11 @@
  */
 class Installer_Step_DirsCheck_Controller extends Installer_Step_Controller
 {
+	
+	/**
+	 * @var string
+	 */
+	protected string $icon = 'folder-open';
 
 	/**
 	 * @var string
diff --git a/_installer/Step/Final/Controller.php b/_installer/Step/Final/Controller.php
@@ -22,7 +22,8 @@
  */
 class Installer_Step_Final_Controller extends Installer_Step_Controller
 {
-
+	protected string $icon = 'flag-checkered';
+	
 	/**
 	 * @var string
 	 */
diff --git a/_installer/Step/InstallModules/Controller.php b/_installer/Step/InstallModules/Controller.php
@@ -19,7 +19,8 @@
  */
 class Installer_Step_InstallModules_Controller extends Installer_Step_Controller
 {
-
+	protected string $icon = 'boxes-stacked';
+	
 	/**
 	 * @var string
 	 */
diff --git a/_installer/Step/Mailing/Controller.php b/_installer/Step/Mailing/Controller.php
@@ -22,6 +22,7 @@
  */
 class Installer_Step_Mailing_Controller extends Installer_Step_Controller
 {
+	protected string $icon = 'at';
 
 	/**
 	 * @var string
diff --git a/_installer/Step/SelectDbType/Controller.php b/_installer/Step/SelectDbType/Controller.php
@@ -27,6 +27,7 @@
 class Installer_Step_SelectDbType_Controller extends Installer_Step_Controller
 {
 
+	protected string $icon = 'database';
 
 	/**
 	 * @var string
diff --git a/_installer/Step/SelectLocales/Controller.php b/_installer/Step/SelectLocales/Controller.php
@@ -16,7 +16,8 @@
  */
 class Installer_Step_SelectLocales_Controller extends Installer_Step_Controller
 {
-
+	protected string $icon = 'language';
+	
 	/**
 	 * @var string
 	 */
diff --git a/_installer/Step/SystemCheck/Controller.php b/_installer/Step/SystemCheck/Controller.php
@@ -16,6 +16,8 @@
 class Installer_Step_SystemCheck_Controller extends Installer_Step_Controller
 {
 
+	protected string $icon = 'list-check';
+	
 	/**
 	 * @var string
 	 */
diff --git a/_installer/Step/Welcome/Controller.php b/_installer/Step/Welcome/Controller.php
@@ -18,6 +18,8 @@
 class Installer_Step_Welcome_Controller extends Installer_Step_Controller
 {
 
+	protected string $icon = 'door-open';
+	
 	/**
 	 * @var string
 	 */
diff --git a/_installer/layout/default.phtml b/_installer/layout/default.phtml
@@ -3,6 +3,7 @@ namespace JetApplication\Installer;
 
 use Jet\MVC_Layout;
 use Jet\Tr;
+use Jet\UI_icon;
 use Jet\UI_messages;
 use Jet\SysConf_URI;
 
@@ -104,22 +105,22 @@ $this->requireCssFile( SysConf_URI::getCss() . 'flags.css' );
 				<?php if( $step->getIsPast() ): ?>
 				<div class="step step-prev<?= $class; ?>">
 					<?php if( $step->getIsAvailable() ): ?>
-						<a href="<?= $step->getURL(); ?>"><?= $step->getLabel(); ?></a>
+						<a href="<?= $step->getURL(); ?>"><?=$step->getIcon()?> <?= $step->getLabel(); ?></a>
 					<?php else: ?>
-						<?= $step->getLabel(); ?>
+						<?=$step->getIcon()?> <?= $step->getLabel(); ?>
 					<?php endif; ?>
 				</div>
 			<?php endif; ?>
 				<?php if( $step->getIsCurrent() ): ?>
-				<div class="step step-current<?= $class; ?>"><?= $step->getLabel(); ?></div>
+				<div class="step step-current<?= $class; ?>"><?=$step->getIcon()?> <?= $step->getLabel(); ?></div>
 			<?php endif; ?>
 				<?php if( $step->getIsFuture() ): ?>
-				<div class="step step-next<?= $class; ?>"><?= $step->getLabel(); ?></div>
+				<div class="step step-next<?= $class; ?>"><?=$step->getIcon()?> <?= $step->getLabel(); ?></div>
 			<?php endif; ?>
 			<?php endforeach; ?>
 		</div>
-		<div class="col-md-10 main">
-			<h1><?= Installer::getCurrentStepController()->getLabel() ?></h1>
+		<div class="col-md-10 main" style="padding-top: 10px;">
+			<h1><?= Installer::getCurrentStepController()->getIcon( UI_icon::SIZE_EXTRA_LARGE ) ?> <?= Installer::getCurrentStepController()->getLabel() ?></h1>
 			<hr/>
 			<div id="system-messages-area">
 				<?php

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`	`class Installer_Step_ConfigureDb_Controller extends Installer_Step_Controller`
`25`	`25`	`{`
	`26`	`+ protected string $icon = 'database';`
`26`	`27`
`27`	`28`	`/**`
`28`	`29`	`* @var string`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`class Installer_Step_CreateAdministrator_Controller extends Installer_Step_Controller`
`17`	`17`	`{`
	`18`	`+ protected string $icon = 'user-secret';`
`18`	`19`
`19`	`20`	`/**`
`20`	`21`	`* @var string`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`*/`
`34`	`34`	`class Installer_Step_CreateBases_Controller extends Installer_Step_Controller`
`35`	`35`	`{`
	`36`	`+ protected string $icon = 'wand-sparkles';`
`36`	`37`
`37`	`38`	`/**`
`38`	`39`	`* @var string`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`*/`
`36`	`36`	`class Installer_Step_CreateDB_Controller extends Installer_Step_Controller`
`37`	`37`	`{`
	`38`	`+ protected string $icon = 'square-plus';`
`38`	`39`
`39`	`40`	`/**`
`40`	`41`	`* @var string`