]> git.agnieray.net Git - galette.git/commitdiff
Display installation steps vertically (#354)
authorGuillaume AGNIERAY <107203963+gagnieray@users.noreply.github.com>
Sat, 4 Nov 2023 17:49:16 +0000 (18:49 +0100)
committerJohan Cwiklinski <johan@x-tnd.be>
Sun, 5 Nov 2023 09:44:21 +0000 (10:44 +0100)
* Display installation steps vertically

* FUI step element theme

* Show required fields on install admin step

* Fix buttons order

* Fix buttons order on mobile and tablet

* Improve leading dots CSS

---------

Co-authored-by: Johan Cwiklinski <johan@x-tnd.be>
15 files changed:
galette/install/steps/admin.php
galette/install/steps/check.php
galette/install/steps/db.php
galette/install/steps/db_checks.php
galette/install/steps/db_install.php
galette/install/steps/db_select_version.php
galette/install/steps/end.php
galette/install/steps/galette.php
galette/install/steps/telemetry.php
galette/install/steps/type.php
galette/webroot/installer.php
ui/semantic/galette/elements/step.overrides [new file with mode: 0644]
ui/semantic/galette/elements/step.variables [new file with mode: 0644]
ui/semantic/galette/globals/site.overrides
ui/semantic/theme.config

index 0479849ecba21a1f5b9e2ef1e33c3619b035648a..85637f76154f6741ad562f6116d39783b382b39f 100644 (file)
 use Galette\Core\Install as GaletteInstall;
 use Galette\Core\Db as GaletteDb;
 ?>
-                <form id="adminform" action="installer.php" method="post" class="ui form">
-                    <div class="ui segment">
-                        <div class="content field">
-                            <div class="ui text container">
-                                <h2><?php echo _T("Please chose the parameters of the admin account on Galette"); ?></h2>
-                                <div class="field inline">
-                                    <label for="install_adminlogin"><?php echo _T("Username:"); ?></label>
-                                    <input type="text" name="install_adminlogin" id="install_adminlogin" value="<?php if (isset($_POST['install_adminlogin'])) echo $_POST['install_adminlogin']; ?>" required autofocus/>
-                                </div>
-                                <div class="field inline">
-                                    <label for="install_adminpass"><?php echo _T("Password:"); ?></label>
-                                    <input type="password" name="install_adminpass" id="install_adminpass" value="" required/>
-                                </div>
-                                <div class="field inline">
-                                    <label for="install_adminpass_verif"><?php echo _T("Retype password:"); ?></label>
-                                    <input type="password" name="install_adminpass_verif" id="install_adminpass_verif" value="" required/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="ui mobile tablet computer reversed equal width grid">
-                        <div class="right aligned column">
-                            <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
-                        </div>
-                    </div>
-                </form>
-                <script type="text/javascript">
-                    $(function(){
-                        $('#adminform').submit(function(){
-                            if ( $('#install_adminpass').val() == $('#install_adminpass_verif').val() ) {
-                                return true;
-                            } else {
-                                alert("<?php echo _T("Password mismatch!") ?>");
-                                return false;
-                            }
-                        });
-                    });
-                </script>
+<form id="adminform" action="installer.php" method="post" class="ui form">
+    <h2><?php echo _T("Please chose the parameters of the admin account on Galette"); ?></h2>
+    <div class="field required inline">
+        <label for="install_adminlogin"><?php echo _T("Username:"); ?></label>
+        <input type="text" name="install_adminlogin" id="install_adminlogin" value="<?php if (isset($_POST['install_adminlogin'])) echo $_POST['install_adminlogin']; ?>" required autofocus/>
+    </div>
+    <div class="field required inline">
+        <label for="install_adminpass"><?php echo _T("Password:"); ?></label>
+        <input type="password" name="install_adminpass" id="install_adminpass" value="" required/>
+    </div>
+    <div class="field required inline">
+        <label for="install_adminpass_verif"><?php echo _T("Retype password:"); ?></label>
+        <input type="password" name="install_adminpass_verif" id="install_adminpass_verif" value="" required/>
+    </div>
+
+    <div class="ui section divider"></div>
+
+    <div class="ui equal width grid">
+        <div class="right aligned column">
+            <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
+        </div>
+    </div>
+</form>
+<script type="text/javascript">
+    $(function(){
+        $('#adminform').submit(function(){
+            if ( $('#install_adminpass').val() == $('#install_adminpass_verif').val() ) {
+                return true;
+            } else {
+                alert("<?php echo _T("Password mismatch!") ?>");
+                return false;
+            }
+        });
+    });
+</script>
index 476f3e6730ba6ac1d681075fed700a63df03b201..5500f6b6e7a9bbc3ac7697bf1304f25f70ff0e45 100644 (file)
@@ -85,11 +85,7 @@ foreach ($files_need_rw as $label => $file) {
     }
 }
 ?>
-
-    <div class="ui segment">
-        <div class="active content field">
-            <div class="ui text container">
-                <h2 class="ui center aligned header"><?php echo _T("Welcome to the Galette Install!"); ?></h2>
+    <h2><?php echo _T("Welcome to the Galette Install!"); ?></h2>
 <?php
 if ($perms_ok && $modules_ok && $php_ok && $date_ok) {
     echo '<p class="ui green message">' . _T("Galette requirements are met :)") . '</p>';
@@ -99,47 +95,47 @@ if (!$date_ok) {
     echo '<p class="ui red message">' . _T("Your PHP date settings are not correct. Maybe you've missed the timezone settings that is mandatory since PHP 5.3?") . '</p>';
 }
 ?>
-                <ul class="leaders">
-                    <li>
-                        <span><?php echo _T("PHP version"); ?> (<?php echo PHP_VERSION . ' >= ' . GALETTE_PHP_MIN; ?>)</span>
-                        <span><?php echo $install->getValidationImage($php_ok == true); ?></span>
-                    </li>
-                    <li>
-                        <span><?php echo _T("Date settings"); ?></span>
-                        <span><?php echo $install->getValidationImage($date_ok == true); ?></span>
-                    </li>
-                </ul>
+    <ul class="leaders">
+        <li>
+            <span><?php echo _T("PHP version"); ?> (<?php echo PHP_VERSION . ' >= ' . GALETTE_PHP_MIN; ?>)</span>
+            <span><?php echo $install->getValidationImage($php_ok == true); ?></span>
+        </li>
+        <li>
+            <span><?php echo _T("Date settings"); ?></span>
+            <span><?php echo $install->getValidationImage($date_ok == true); ?></span>
+        </li>
+    </ul>
 
-                <h3><?php echo _T("PHP Modules"); ?></h3>
+    <h3><?php echo _T("PHP Modules"); ?></h3>
 <?php
 if (!$modules_ok) {
     echo '<p class="ui red message">' . _T("Some PHP modules are missing. Please install them or contact your support.<br/>More information on required modules may be found in the documentation.") . '</p>';
 }
 ?>
-                <ul class="leaders">
-                    <?php echo $cm->toHtml(); ?>
-                </ul>
+    <ul class="leaders">
+        <?php echo $cm->toHtml(); ?>
+    </ul>
 
-                <h3><?php echo _T("Files permissions"); ?></h3>
-                <ul class="leaders">
+    <h3><?php echo _T("Files permissions"); ?></h3>
+    <ul class="leaders">
 <?php
 foreach ($files_need_rw as $label => $file) {
     $writable = is_writable($file);
     ?>
-                    <li>
-                        <span><?php echo $label ?></span>
-                        <span><?php echo $install->getValidationImage(is_writable($file)); ?></span>
-                    </li>
+        <li>
+            <span><?php echo $label ?></span>
+            <span><?php echo $install->getValidationImage(is_writable($file)); ?></span>
+        </li>
     <?php
 }
 ?>
-                </ul>
+    </ul>
 <?php
 if (!$perms_ok) {
     ?>
-                <article id="files_perms" class="ui orange message <?php echo $files_perms_class; ?>">
-                    <p class="ui small header"><?php echo _T("Files permissions are not OK!"); ?></p>
-                    <p>
+        <article id="files_perms" class="ui orange message <?php echo $files_perms_class; ?>">
+            <p class="ui small header"><?php echo _T("Files permissions are not OK!"); ?></p>
+            <p>
     <?php
     if ($install->isInstall()) {
         echo _T("To work as excpected, Galette needs write permission on files listed above.");
@@ -147,19 +143,17 @@ if (!$perms_ok) {
         echo _T("In order to be updated, Galette needs write permission on files listed above.");
     }
     ?>
-                    </p>
-                    <p><?php echo _T("Under UNIX/Linux, you can give the permissions using those commands"); ?><br />
-                        <code>chown <em><?php echo _T("apache_user"); ?></em> <em><?php echo _T("file_name"); ?></em><br />chmod 700 <em><?php echo _T("directory_name"); ?></em></code>
-                    </p>
-                    <p><?php echo _T("Under Windows, check these directories are not in Read-Only mode in their property panel."); ?></p>
-                </article>
+            </p>
+            <p><?php echo _T("Under UNIX/Linux, you can give the permissions using those commands"); ?><br />
+                <code>chown <em><?php echo _T("apache_user"); ?></em> <em><?php echo _T("file_name"); ?></em><br />chmod 700 <em><?php echo _T("directory_name"); ?></em></code>
+            </p>
+            <p><?php echo _T("Under Windows, check these directories are not in Read-Only mode in their property panel."); ?></p>
+        </article>
     <?php
 }
     ?>
-            </div>
-        </div>
-    </div>
-    <div class="ui mobile tablet computer reversed equal width grid">
+    <div class="ui section divider"></div>
+    <div class="ui equal width grid">
         <div class="right aligned column">
     <?php
 if (!$perms_ok || !$modules_ok || !$php_ok || !$date_ok) {
index 396fdfbbb396f44a8c77e93b4e7067a6e3f54f80..0ccbacbf137d36cffa8b432cdfcaa05becacd844 100644 (file)
@@ -45,10 +45,7 @@ if (!isset($_POST['install_dbtype']) || $_POST['install_dbtype'] == 'mysql') {
     $default_dbport = GaletteDb::PGSQL_DEFAULT_PORT;
 }
 ?>
-            <form action="installer.php" method="post" class="ui form">
-                <div class="ui segment">
-                    <div class="content field">
-                        <div class="ui text container">
+    <form action="installer.php" method="post" class="ui form">
 <?php
 echo '<div class="ui blue message">';
 if ($install->getMode() === GaletteInstall::INSTALL) {
@@ -64,70 +61,67 @@ if ($install->isUpgrade()) {
     }
 }
 ?>
-                            <div class="inline field">
-                                <label for="install_dbtype"><?php echo _T("Database type:"); ?></label>
-                                <select name="install_dbtype" id="install_dbtype" class="ui dropdown nochosen">
-                                    <option value="mysql"<?php if ($install->getDbType() === GaletteDb::MYSQL) {echo ' selected="selected"'; } ?>>Mysql</option>
-                                    <option value="pgsql"<?php if ($install->getDbType() === GaletteDb::PGSQL) {echo ' selected="selected"'; } ?>>Postgresql</option>
-                                </select>
-                            </div>
-                            <div id="install_dbconfig">
-                                <div class="inline field">
-                                    <label for="install_dbhost"><?php echo _T("Host:"); ?></label>
-                                    <input type="text" name="install_dbhost" id="install_dbhost" value="<?php echo ($install->getDbHost() !== null) ? $install->getDbHost() : 'localhost'; ?>" required/>
-                                </div>
-                                <div class="inline field">
-                                    <label for="install_dbport"><?php echo _T("Port:"); ?></label>
-                                    <input type="text" name="install_dbport" id="install_dbport" value="<?php echo ($install->getDbPort() !== null) ? $install->getDbPort() : $default_dbport; ?>" required/>
-                                </div>
-                                <div class="inline field">
-                                    <label for="install_dbuser"><?php echo _T("User:"); ?></label>
-                                    <input type="text" name="install_dbuser" id="install_dbuser" value="<?php echo $install->getDbUser(); ?>" required/>
-                                </div>
-                                <div class="inline field">
-                                    <label for="install_dbpass"><?php echo _T("Password:"); ?></label>
-                                    <input type="password" name="install_dbpass" id="install_dbpass" value="" required/>
-                                </div>
-                                <div class="inline field">
-                                    <label for="install_dbname"><?php echo _T("Database:"); ?></label>
-                                    <input type="text" name="install_dbname" id="install_dbname" value="<?php echo $install->getDbName(); ?>" required/>
-                                </div>
-                                <div class="inline field">
-                                    <label for="install_dbprefix"><?php echo _T("Table prefix:"); ?></label>
-                                    <input type="text" name="install_dbprefix" id="install_dbprefix" value="<?php echo ($install->getTablesPrefix() !== null) ? $install->getTablesPrefix() : 'galette_'; ?>" required/>
-                                </div>
+        <div class="inline required field">
+            <label for="install_dbtype"><?php echo _T("Database type:"); ?></label>
+            <select name="install_dbtype" id="install_dbtype" class="ui dropdown nochosen">
+                <option value="mysql"<?php if ($install->getDbType() === GaletteDb::MYSQL) {echo ' selected="selected"'; } ?>>Mysql</option>
+                <option value="pgsql"<?php if ($install->getDbType() === GaletteDb::PGSQL) {echo ' selected="selected"'; } ?>>Postgresql</option>
+            </select>
+        </div>
+        <div id="install_dbconfig">
+            <div class="inline required field">
+                <label for="install_dbhost"><?php echo _T("Host:"); ?></label>
+                <input type="text" name="install_dbhost" id="install_dbhost" value="<?php echo ($install->getDbHost() !== null) ? $install->getDbHost() : 'localhost'; ?>" required/>
+            </div>
+            <div class="inline required field">
+                <label for="install_dbport"><?php echo _T("Port:"); ?></label>
+                <input type="text" name="install_dbport" id="install_dbport" value="<?php echo ($install->getDbPort() !== null) ? $install->getDbPort() : $default_dbport; ?>" required/>
+            </div>
+            <div class="inline required field">
+                <label for="install_dbuser"><?php echo _T("User:"); ?></label>
+                <input type="text" name="install_dbuser" id="install_dbuser" value="<?php echo $install->getDbUser(); ?>" required/>
+            </div>
+            <div class="inline required field">
+                <label for="install_dbpass"><?php echo _T("Password:"); ?></label>
+                <input type="password" name="install_dbpass" id="install_dbpass" value="" required/>
+            </div>
+            <div class="inline required field">
+                <label for="install_dbname"><?php echo _T("Database:"); ?></label>
+                <input type="text" name="install_dbname" id="install_dbname" value="<?php echo $install->getDbName(); ?>" required/>
+            </div>
+            <div class="inline required field info">
+                <label for="install_dbprefix"><?php echo _T("Table prefix:"); ?></label>
+                <input type="text" name="install_dbprefix" id="install_dbprefix" value="<?php echo ($install->getTablesPrefix() !== null) ? $install->getTablesPrefix() : 'galette_'; ?>" required/>
 <?php
 if ($install->isUpgrade()) {
-    echo '<div class="ui orange message"><p>' .
+    echo '<div class="ui compact floating orange message"><p>' .
         _T("(Indicate the CURRENT prefix of your Galette tables)") .
         '</p></div>';
 }
 ?>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="ui mobile tablet computer reversed equal width grid">
-                    <div class="right aligned column">
-                        <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
-                    </div>
-                    <div class="left aligned column">
-                        <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
-                    </div>
-                </div>
-            </form>
-            <script type="text/javascript">
-                $(function(){
-                    $('#install_dbtype').change(function(){
-                        var _db = $(this).val();
-                        var _port = null;
-                        if ( _db === 'pgsql' ) {
-                            _port = <?php echo GaletteDb::PGSQL_DEFAULT_PORT; ?>;
-                        } else if ( _db === 'mysql' ) {
-                            _port = <?php echo GaletteDb::MYSQL_DEFAULT_PORT; ?>;
-                        }
-                        $('#install_dbport').val(_port);
-                    });
-                });
-            </script>
+            </div>
+        </div>
+        <div class="ui section divider"></div>
+        <div class="ui mobile reversed tablet reversed computer reversed equal width grid">
+            <div class="right aligned column">
+                <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
+            </div>
+            <div class="left aligned column">
+                <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
+            </div>
+        </div>
+    </form>
+    <script type="text/javascript">
+        $(function(){
+            $('#install_dbtype').change(function(){
+                var _db = $(this).val();
+                var _port = null;
+                if ( _db === 'pgsql' ) {
+                    _port = <?php echo GaletteDb::PGSQL_DEFAULT_PORT; ?>;
+                } else if ( _db === 'mysql' ) {
+                    _port = <?php echo GaletteDb::MYSQL_DEFAULT_PORT; ?>;
+                }
+                $('#install_dbport').val(_port);
+            });
+        });
+    </script>
index 455fa97efe28e3cfd50bfb2d2a144f64002fbeec..67fd870a252a033dc732a6520547797b6ef3ec7b 100644 (file)
@@ -177,17 +177,13 @@ if ($db_connected === true) {
     }
 }
 ?>
-    <div class="ui segment">
-        <div class="content field">
-            <div class="ui text container">
-
 
 <?php
 if (!isset($install_plugin)) {
 ?>
-                <h2><?php echo _T("Check of the database"); ?></h2>
+    <h2><?php echo _T("Check of the database"); ?></h2>
 <?php
-                echo '<p>' . _T("Database exists and connection parameters are OK.") . '</p>';
+    echo '<p>' . _T("Database exists and connection parameters are OK.") . '</p>';
 }
 
 if ($supported_db === false) {
@@ -212,12 +208,12 @@ if ($db_connected !== true) {
 
 if (!$conndb_ok) {
     ?>
-                <p><?php echo _T("Database can't be reached. Please go back to enter the connection parameters again."); ?></p>
+        <p><?php echo _T("Database can't be reached. Please go back to enter the connection parameters again."); ?></p>
     <?php
 } elseif ($supported_db === true) {
     if (!isset($install_plugin)) {
     ?>
-                <h2><?php echo _T("Permissions on the base"); ?></h2>
+        <h2><?php echo _T("Permissions on the base"); ?></h2>
     <?php
     }
     if (!$permsdb_ok) {
@@ -232,30 +228,29 @@ if (!$conndb_ok) {
         echo '</div>';
     }
     ?>
-                <ul class="leaders">
+        <ul class="leaders">
         <?php
         foreach ($result as $r) {
         ?>
-                    <li>
-                        <span><?php echo $r['message'] ?></span>
-                        <span><?php echo $install->getValidationImage($r['res']); ?></span>
-                    </li>
+            <li>
+                <span><?php echo $r['message'] ?></span>
+                <span><?php echo $install->getValidationImage($r['res']); ?></span>
+            </li>
         <?php
         }
         ?>
-                </ul>
+        </ul>
         <?php
 }
 ?>
-            </div>
-        </div>
-    </div>
+
+    <div class="ui section divider"></div>
 
 <?php
 if (!isset($install_plugin)) {
 ?>
     <form action="installer.php" method="POST" class="ui form">
-        <div class="ui mobile tablet computer reversed equal width grid">
+        <div class="ui mobile reversed tablet reversed computer reversed equal width grid">
             <div class="right aligned column">
                 <button type="submit"<?php if (!$conndb_ok || !$permsdb_ok) { echo ' disabled="disabled"'; } ?> class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
 <?php
index 79aed4caa59f1fb1cda14f6484724e4101e982cf..4aed8d1e55a78b6a32fb83b4ef4d3aaa26369dfe 100644 (file)
@@ -39,11 +39,7 @@ use Galette\Core\Db as GaletteDb;
 
 //ok, let's run the scripts!
 $db_installed = $install->executeScripts($zdb);
-?>
-                <div class="ui segment">
-                    <div class="content field">
-                        <div class="ui text container">
-<?php
+
 if ($db_installed === false) {
     $msg = _T("Database has not been installed!");
     if ($install->isUpgrade()) {
@@ -58,50 +54,49 @@ if ($db_installed === false) {
     echo '<p class="ui green message">' . $msg . '</p>';
 }
 ?>
-                            <ul class="leaders">
+    <ul class="leaders">
 <?php
 foreach ($install->getDbInstallReport() as $r) {
     ?>
-                                <li>
-                                    <span><?php echo $r['message']; ?></span>
-                                    <span><?php echo $install->getValidationImage($r['res']); ?></span>
-                                </li>
+        <li>
+            <span><?php echo $r['message']; ?></span>
+            <span><?php echo $install->getValidationImage($r['res']); ?></span>
+        </li>
     <?php
 }
 ?>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
+    </ul>
+
+    <div class="ui section divider"></div>
 
-                <form action="installer.php" method="POST" class="ui form">
-                    <div class="ui mobile tablet computer reversed equal width grid">
-                        <div class="right aligned column">
+    <form action="installer.php" method="POST" class="ui form">
+        <div class="ui mobile reversed tablet reversed computer reversed equal width grid">
+            <div class="right aligned column">
 <?php
 if (!$db_installed) {
 ?>
-                            <button type="submit" class="ui right labeled icon button"><i class="redo alternate double right icon"></i> <?php echo _T("Retry"); ?></button>
+                <button type="submit" class="ui right labeled icon button"><i class="redo alternate double right icon"></i> <?php echo _T("Retry"); ?></button>
 <?php
 }
 ?>
-                            <button type="submit" class="ui right labeled icon button"<?php if (!$db_installed) { echo ' disabled="disabled"'; } ?>><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
+                <button type="submit" class="ui right labeled icon button"<?php if (!$db_installed) { echo ' disabled="disabled"'; } ?>><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
 <?php
 if ($db_installed) {
 ?>
-                            <input type="hidden" name="install_dbwrite_ok" value="1"/>
+                <input type="hidden" name="install_dbwrite_ok" value="1"/>
 <?php
 }
 ?>
-                        </div>
-                        <div class="left aligned column">
+            </div>
 <?php
 if (!$db_installed) {
     //once DB is installed, that does not make sense to go back
-?>
-                            <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
-<?php
+    ?>
+                <div class="column">
+                    <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
+                </div>
+    <?php
 }
 ?>
-                        </div>
-                    </div>
-                </form>
+        </div>
+    </form>
index 9041757ba59aea02fd8692ec330620832d657b98..c11d2427fb40c4d20db0290537bc065a5bd810dc 100644 (file)
@@ -42,19 +42,16 @@ $current = $install->getCurrentVersion($zdb);
 $raw_current = $zdb->getDbVersion(true);
 $last = '0.00';
 ?>
-            <form action="installer.php" method="post" class="ui form">
-                <div class="ui segment">
-                    <div class="content field">
-                        <div class="ui text container">
-                            <p class="ui blue message"><?php echo _T("Select your previous Galette version below, and then click next."); ?></p>
+    <form action="installer.php" method="post" class="ui form">
+        <p class="ui blue message"><?php echo _T("Select your previous Galette version below, and then click next."); ?></p>
 <?php
 if (count($versions) == 0) {
     ?>
-                            <p class="ui red message"><?php echo _T("No update script found!"); ?></p>
+        <p class="ui red message"><?php echo _T("No update script found!"); ?></p>
 <?php
     if ($raw_current === GALETTE_DB_VERSION) {
         ?>
-                            <p class="ui orange message"><?php echo _T("It seems you already use latest Galette version!"); ?></p>
+            <p class="ui orange message"><?php echo _T("It seems you already use latest Galette version!"); ?></p>
         <?php
     }
 
@@ -62,37 +59,37 @@ if (count($versions) == 0) {
     if ($current !== false) {
         if ($current < 0.70) {
         ?>
-                            <p class="ui orange message"><?php echo _T("Previous version is older than 0.7. <strong>Make sure you select the right version</strong>."); ?></p>
+            <p class="ui orange message"><?php echo _T("Previous version is older than 0.7. <strong>Make sure you select the right version</strong>."); ?></p>
         <?php
         } else {
         ?>
-                            <p class="ui green message"><?php echo _T("Your previous version should be selected and <strong>displayed in bold</strong>."); ?></p>
+            <p class="ui green message"><?php echo _T("Your previous version should be selected and <strong>displayed in bold</strong>."); ?></p>
         <?php
         }
     }
 
     if ($raw_current === GALETTE_DB_VERSION) {
         ?>
-                            <p class="ui orange message"><?php echo _T("It seems you already use latest Galette version!<br/>Are you sure you want to upgrade?"); ?></p>
+            <p class="ui orange message"><?php echo _T("It seems you already use latest Galette version!<br/>Are you sure you want to upgrade?"); ?></p>
         <?php
     }
     ?>
-                            <h2><?php echo _T("Your current Galette version is..."); ?></h2>
+        <h2><?php echo _T("Your current Galette version is..."); ?></h2>
 
-                            <ul class="leaders">
+        <ul class="leaders">
     <?php
     $is_current = false;
     $previous = null;
     foreach ($versions as $version) {
         ?>
-                                <li>
+            <li>
         <?php
         if ($is_current) {
             echo '<strong>';
         }
         ?>
-                                    <span>
-                                        <label for="upgrade-<?php echo $version; ?>">
+                <span>
+                    <label for="upgrade-<?php echo $version; ?>">
         <?php
         if ($last === '0.00') {
             echo str_replace(
@@ -108,11 +105,11 @@ if (count($versions) == 0) {
         }
         $last = $version;
         ?>
-                                        </label>
-                                    </span>
-                                    <span>
-                                    <input type="radio" name="previous_version" value="<?php echo $previous ?? $version; ?>" id="upgrade-<?php echo $version; ?>"<?php if ($is_current) { echo ' checked="checked"'; }; ?> required/>
-                                    </span>
+                    </label>
+                </span>
+                <span>
+                <input type="radio" name="previous_version" value="<?php echo $previous ?? $version; ?>" id="upgrade-<?php echo $version; ?>"<?php if ($is_current) { echo ' checked="checked"'; }; ?> required/>
+                </span>
         <?php
         if ($is_current) {
             echo '</strong>';
@@ -120,42 +117,42 @@ if (count($versions) == 0) {
         $is_current = $current == $version;
         ?>
 
-                                </li>
+            </li>
     <?php
         $previous = $version;
     }
     ?>
-                            </ul>
+        </ul>
     <?php
 }
 ?>
-                        </div>
-                    </div>
-                </div>
+
+        <div class="ui section divider"></div>
+
 <?php
 if (count($versions) == 0) {
 ?>
-                <div class="ui mobile tablet computer reversed equal width grid">
-                    <div class="right aligned column">
-                        <input type="submit" class="ui icon button" name="abort_btn" value="<?php echo _T("Cancel"); ?>"/>
-                        <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
-                    </div>
-                    <div class="left aligned column">
-                        <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
-                    </div>
-                </div>
+        <div class="ui mobile reversed tablet reversed computer reversed equal width grid">
+            <div class="right aligned column">
+                <input type="submit" class="ui icon button" name="abort_btn" value="<?php echo _T("Cancel"); ?>"/>
+                <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
+            </div>
+            <div class="left aligned column">
+                <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
+            </div>
+        </div>
 <?php
 } else {
 ?>
-                <div class="ui mobile tablet computer reversed equal width grid">
-                    <div class="right aligned column">
-                        <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
-                    </div>
-                    <div class="left aligned column">
-                        <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
-                    </div>
-                </div>
-            </form>
+        <div class="ui mobile reversed tablet reversed computer reversed equal width grid">
+            <div class="right aligned column">
+                <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
+            </div>
+            <div class="left aligned column">
+                <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
+            </div>
+        </div>
+    </form>
 <?php
 }
 ?>
index 202304fb81f41fe7ac52eee6a16bee33ff2e154f..99241a6f09ca34b9c2e0ebeb729e65a4798b700c 100644 (file)
@@ -39,10 +39,7 @@ use Galette\Core\Install as GaletteInstall;
 $session[md5(GALETTE_ROOT)] = null;
 unset($session[md5(GALETTE_ROOT)]);
 ?>
-                <div class="ui segment">
-                    <div class="content field">
-                        <div class="ui text container">
-                            <p class="ui green message">
+    <p class="ui green message">
 <?php
 if ($install->isInstall()) {
     echo _T("Galette has been successfully installed!");
@@ -51,14 +48,14 @@ if ($install->isUpgrade()) {
     echo _T("Galette has been successfully updated!");
 }
 ?>
-                            </p>
-                        </div>
-                    </div>
-                </div>
-                <form action="<?php echo GALETTE_BASE_PATH; ?>" method="get">
-                    <div class="ui mobile tablet computer reversed equal width grid">
-                        <div class="right aligned column">
-                            <button type="submit" class="ui right labeled icon button"><i class="home icon"></i> <?php echo _T("Homepage"); ?></button>
-                        </div>
-                    </div>
-                </form>
+    </p>
+
+    <div class="ui section divider"></div>
+
+    <form action="<?php echo GALETTE_BASE_PATH; ?>" method="get">
+        <div class="ui equal width grid">
+            <div class="right aligned column">
+                <button type="submit" class="ui right labeled icon button"><i class="home icon"></i> <?php echo _T("Homepage"); ?></button>
+            </div>
+        </div>
+    </form>
index 28a37a1d6971678320ef9220c9d0dce64f9761c7..d4be05b596420e0253d9b33bb0e0b49e660fa79c 100644 (file)
@@ -45,12 +45,7 @@ $install->reinitReport();
 
 $config_file_ok = $install->writeConfFile();
 $objects_ok = $install->initObjects($i18n, $zdb, new Login($zdb, $i18n));
-?>
 
-                <div class="ui segment">
-                    <div class="content field">
-                        <div class="ui text container">
-<?php
 if ($config_file_ok === true && $objects_ok === true) {
     echo '<p class="ui green message">' . _T("Configuration file created!") .
         '<br/>' . _T("Data initialized.") . '</p>';
@@ -58,50 +53,49 @@ if ($config_file_ok === true && $objects_ok === true) {
     echo '<p class="ui red message">' . _T("An error occurred :(") . '</p>';
 }
 ?>
-                            <ul class="leaders">
+    <ul class="leaders">
 <?php
 foreach ($install->getInitializationReport() as $r) {
     ?>
-                                <li>
-                                    <span><?php echo $r['message']; ?></span>
-                                    <span><?php echo $install->getValidationImage($r['res']); ?></span>
-                                </li>
+        <li>
+            <span><?php echo $r['message']; ?></span>
+            <span><?php echo $install->getValidationImage($r['res']); ?></span>
+        </li>
     <?php
 }
 ?>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
+    </ul>
+
+    <div class="ui section divider"></div>
 
-                <form action="installer.php" method="POST" class="ui form">
-                    <div class="ui mobile tablet computer reversed equal width grid">
-                        <div class="right aligned column">
+    <form action="installer.php" method="POST" class="ui form">
+        <div class="ui mobile reversed tablet reversed computer reversed equal width grid">
+            <div class="right aligned column">
 <?php
 if (!$config_file_ok || !$objects_ok) {
 ?>
-                            <button type="submit" class="ui right labeled icon button"><i class="redo alternate double right icon"></i> <?php echo _T("Retry"); ?></button>
+                <button type="submit" class="ui right labeled icon button"><i class="redo alternate double right icon"></i> <?php echo _T("Retry"); ?></button>
 <?php
 }
 ?>
-                            <button type="submit" class="ui right labeled icon button"<?php if (!$config_file_ok || !$objects_ok) { echo ' disabled="disabled"'; } ?>><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
+                <button type="submit" class="ui right labeled icon button"<?php if (!$config_file_ok || !$objects_ok) { echo ' disabled="disabled"'; } ?>><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
 <?php
 if ($config_file_ok && $objects_ok) {
 ?>
-                        <input type="hidden" name="install_prefs_ok" value="1"/>
+                <input type="hidden" name="install_prefs_ok" value="1"/>
 <?php
 }
 ?>
-                        </div>
-                        <div class="left aligned column">
+            </div>
 <?php
 if (!$config_file_ok || !$objects_ok) {
     //once DB is installed, that does not make sense to go back
-?>
-                            <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
-<?php
+    ?>
+                <div class="left aligned column">
+                    <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
+                </div>
+                <?php
 }
 ?>
-                        </div>
-                    </div>
-                </form>
+        </div>
+    </form>
index 10176fcdca5d6cb87a617999ebccf65b0f014cde..3ec281286d1fb41bc8cbc7aa67e1c4910252d50f 100644 (file)
@@ -45,40 +45,43 @@ $telemetry = new \Galette\Util\Telemetry(
     $plugins
 );
 ?>
-                <form action="installer.php" method="POST" class="ui form">
-                    <div class="ui segment">
-                        <div class="content field">
-                            <div class="ui text container">
-                                <div class="ui toggle checkbox tooltip" title="<?php echo _T("Send anonymous and imprecise data about your Galette instance"); ?>">
-                                    <input type="checkbox" name="send_telemetry" tabindex="0" class="hidden" checked="checked"/>
-                                    <label><?php echo _T("Send telemetry information"); ?></label>
-                                </div>
+    <form action="installer.php" method="POST" class="ui form">
+        <div class="ui stackable equal width grid">
+            <div class="column">
+                <div class="ui toggle checkbox tooltip" title="<?php echo _T("Send anonymous and imprecise data about your Galette instance"); ?>">
+                    <input type="checkbox" name="send_telemetry" tabindex="0" class="hidden" checked="checked"/>
+                    <label><?php echo _T("Send telemetry information"); ?></label>
+                </div>
+            </div>
 <?php
 if (!$telemetry->isRegistered()) {
 ?>
-                                <a class="ui button right floated" href="<?php echo GALETTE_TELEMETRY_URI; ?>reference?showmodal&uuid=<?php echo $telemetry->getRegistrationUuid(); ?>" title="<?php echo _T("Register your organization as a Galette user"); ?>" target="_blank">
-                                    <i class="id card icon"></i>
-                                    <?php echo _T("Register"); ?>
-                                </a>
+            <div class="right aligned column">
+                <a class="ui button" href="<?php echo GALETTE_TELEMETRY_URI; ?>reference?showmodal&uuid=<?php echo $telemetry->getRegistrationUuid(); ?>" title="<?php echo _T("Register your organization as a Galette user"); ?>" target="_blank">
+                    <i class="id card icon"></i>
+                    <?php echo _T("Register"); ?>
+                </a>
+            </div>
 <?php
 }
 ?>
-                                <div class="ui message scrolling content">
-                                    <p><?php echo _T("Telemetry data are <strong>anonymous</strong>; nothing about your organization or its members will be sent."); ?></p>
-                                    <p>
-                                        <?php echo _T("Also note tha all data is sent over a <strong>HTTPS secured connection</strong>."); ?>
-                                    </p>
-                                    <div class="tdata">
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="ui mobile tablet computer reversed equal width grid">
-                        <div class="right aligned column">
-                            <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
-                            <input type="hidden" name="install_telemetry_ok" value="1"/>
-                        </div>
-                    </div>
-                </form>
+        </div>
+        <div class="ui message scrolling content">
+            <p><?php echo _T("Telemetry data are <strong>anonymous</strong>; nothing about your organization or its members will be sent."); ?></p>
+            <p>
+                <?php echo _T("Also note tha all data is sent over a <strong>HTTPS secured connection</strong>."); ?>
+            </p>
+            <div class="tdata">
+            </div>
+        </div>
+
+        <div class="ui section divider"></div>
+
+        <div class="ui equal width grid">
+            <div class="right aligned column">
+                <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
+                <input type="hidden" name="install_telemetry_ok" value="1"/>
+            </div>
+        </div>
+    </form>
 
index c00e157da85504f5950774d65d0851b1d4e56612..ff3e12189ed00bcfca0f8b2ce1bf292d54166749 100644 (file)
 
 use Galette\Core\Install as GaletteInstall;
 ?>
-                <form action="installer.php" method="POST" class="ui form">
-                    <div class="ui two stackable cards">
-                            <div class="ui fluid card">
-                                <div class="content">
-                                    <h2>
-                                        <input type="radio" name="install_type" value="<?php echo GaletteInstall::INSTALL; ?>"<?php if ($install->isInstall() || !$install->isUpgrade()) { echo ' checked="checked"'; } ?> id="install"/>
-                                        <label for="install"><?php echo _T("New installation"); ?></label>
-                                    </h2>
-                                    <ul>
-                                        <li><?php echo _T("you're installing Galette for the first time"); ?>,</li>
-                                        <li><?php echo _T("you wish to erase an older version of Galette without keeping your data"); ?>.</li>
-                                    </ul>
-                                </div>
-                            </div>
-                            <div class="ui fluid card">
-                                <div class="content">
-                                    <h2>
-                                        <input type="radio" name="install_type" value="<?php echo GaletteInstall::UPDATE; ?>"<?php if ($install->isUpgrade()) { echo ' checked="checked"'; } ?> id="update"/>
-                                        <label for="update"><?php echo _T("Update"); ?></label>
-                                    </h2>
-                                    <ul>
-                                    <li><?php echo _T("you already have installed Galette, and you want to upgrade to the latest version"); ?>.</li>
-                                    </ul>
-                                    <p class="ui orange message"><?php echo _T("Warning: Don't forget to backup your current database."); ?></p>
-                                </div>
-                            </div>
-                    </div>
-
-                    <div class="ui mobile tablet computer reversed equal width grid">
-                        <div class="right aligned column">
-                            <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
-                        </div>
-                        <div class="left aligned column">
-                            <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
-                        </div>
-                    </div>
-                </form>
+<form action="installer.php" method="POST" class="ui form">
+    <div class="ui two stackable cards">
+            <div class="ui fluid card">
+                <div class="content">
+                    <h2>
+                        <input type="radio" name="install_type" value="<?php echo GaletteInstall::INSTALL; ?>"<?php if ($install->isInstall() || !$install->isUpgrade()) { echo ' checked="checked"'; } ?> id="install"/>
+                        <label for="install"><?php echo _T("New installation"); ?></label>
+                    </h2>
+                    <ul>
+                        <li><?php echo _T("you're installing Galette for the first time"); ?>,</li>
+                        <li><?php echo _T("you wish to erase an older version of Galette without keeping your data"); ?>.</li>
+                    </ul>
+                </div>
+            </div>
+            <div class="ui fluid card">
+                <div class="content">
+                    <h2>
+                        <input type="radio" name="install_type" value="<?php echo GaletteInstall::UPDATE; ?>"<?php if ($install->isUpgrade()) { echo ' checked="checked"'; } ?> id="update"/>
+                        <label for="update"><?php echo _T("Update"); ?></label>
+                    </h2>
+                    <ul>
+                    <li><?php echo _T("you already have installed Galette, and you want to upgrade to the latest version"); ?>.</li>
+                    </ul>
+                    <p class="ui orange message"><?php echo _T("Warning: Don't forget to backup your current database."); ?></p>
+                </div>
+            </div>
+    </div>
+    <div class="ui section divider"></div>
+    <div class="ui mobile reversed tablet reversed computer reversed equal width grid">
+        <div class="right aligned column">
+            <button type="submit" class="ui right labeled icon button"><i class="angle double right icon"></i> <?php echo _T("Next step"); ?></button>
+        </div>
+        <div class="left aligned column">
+            <button type="submit" id="btnback" name="stepback_btn" formnovalidate class="ui labeled icon button"><i class="angle double left icon"></i> <?php echo _T("Back"); ?></button>
+        </div>
+    </div>
+</form>
index b62cd574337d688b4306753751df41f55f11ad60..633a4437e3fa4ddc107756d78275d0dd6f3bd907 100644 (file)
@@ -247,7 +247,7 @@ header('Content-Type: text/html; charset=UTF-8');
     </head>
     <body class="pushable">
         <header id="top-navbar" class="ui fixed menu bgcolor">
-            <div class="ui container">
+            <div class="ui wide container">
                 <div class="header item">
                     <span><?php echo _T("Galette installation") ?></span>
                 </div>
@@ -268,7 +268,7 @@ foreach ($i18n->getList() as $langue) {
             </div>
         </header>
         <div class="pusher">
-            <div id="main" class="ui container">
+            <div id="main" class="ui wide container">
                 <div class="ui basic segment">
                     <div class="ui basic center aligned fitted segment">
                         <img class="icon" alt="[ Galette ]" src="./themes/default/images/galette.png"/>
@@ -294,6 +294,92 @@ if (count($error_detected) > 0) {
     <?php
 }
 ?>
+                    <div class="ui mobile reversed stackable two column grid">
+                        <div class="four wide column">
+                            <div class="ui stackable mini vertical steps fluid">
+                                <div class="step<?php if ($install->isCheckStep()) echo ' active'; elseif (!$install->isStepPassed(GaletteInstall::STEP_CHECK)) echo ' disabled'; ?>">
+                                    <i class="tasks icon<?php if($install->isStepPassed(GaletteInstall::STEP_CHECK)) { echo ' green'; } ?>"></i>
+                                    <div class="content">
+                                        <div class="title"><?php echo _T("Checks"); ?></div>
+                                    </div>
+                                </div>
+                                <div class="step<?php if ($install->isTypeStep()) echo ' active'; elseif (!$install->isStepPassed(GaletteInstall::STEP_TYPE)) echo ' disabled'; ?>">
+                                    <i class="question icon<?php if($install->isStepPassed(GaletteInstall::STEP_TYPE)) { echo ' green'; } ?>"></i>
+                                    <div class="content">
+                                        <div class="title"><?php echo _T("Installation mode"); ?></div>
+                                    </div>
+                                </div>
+                                <div class="step<?php if ($install->isDbStep()) echo ' active'; elseif (!$install->isStepPassed(GaletteInstall::STEP_DB)) echo ' disabled'; ?>">
+                                    <i class="database icon<?php if($install->isStepPassed(GaletteInstall::STEP_DB)) { echo ' green'; } ?>"></i>
+                                    <div class="content">
+                                        <div class="title"><?php echo _T("Database"); ?></div>
+                                    </div>
+                                </div>
+                                <div class="step<?php if ($install->isDbCheckStep()) echo ' active'; elseif (!$install->isStepPassed(GaletteInstall::STEP_DB_CHECKS)) echo ' disabled'; ?>">
+                                    <i class="key icon<?php if($install->isStepPassed(GaletteInstall::STEP_DB_CHECKS)) { echo ' green'; } ?>"></i>
+                                    <div class="content">
+                                        <div class="title"><?php echo _T("Database access/permissions"); ?></div>
+                                    </div>
+                                </div>
+<?php
+if ($install->isUpgrade()) {
+    ?>
+                                <div class="step<?php if ($install->isVersionSelectionStep()) echo ' active'; elseif (!$install->isStepPassed(GaletteInstall::STEP_VERSION)) echo ' disabled'; ?>">
+                                    <i class="tag icon<?php if($install->isStepPassed(GaletteInstall::STEP_VERSION)) { echo ' green'; } ?>"></i>
+                                    <div class="content">
+                                        <div class="title"><?php echo _T("Version selection"); ?></div>
+                                    </div>
+                                </div>
+                                <div class="step<?php if ($install->isDbUpgradeStep()) echo ' active'; elseif (!$install->isStepPassed(GaletteInstall::STEP_DB_UPGRADE)) echo ' disabled'; ?>">
+                                    <i class="sync alt icon<?php if($install->isStepPassed(GaletteInstall::STEP_DB_UPGRADE)) { echo ' green'; } ?>"></i>
+                                    <div class="content">
+                                        <div class="title"><?php echo _T("Database upgrade"); ?></div>
+                                    </div>
+                                </div>
+    <?php
+} else {
+    ?>
+                                <div class="step<?php if ($install->isDbinstallStep()) echo ' active'; elseif (!$install->isStepPassed(GaletteInstall::STEP_DB_INSTALL)) echo ' disabled'; ?>">
+                                    <i class="spinner icon<?php if($install->isStepPassed(GaletteInstall::STEP_DB_INSTALL)) { echo ' green'; } ?>"></i>
+                                    <div class="content">
+                                        <div class="title"><?php echo _T("Database installation"); ?></div>
+                                    </div>
+                                </div>
+    <?php
+}
+
+if (!$install->isUpgrade()) {
+    ?>
+                                <div class="step<?php if ($install->isAdminStep()) echo ' active'; elseif (!$install->isStepPassed(GaletteInstall::STEP_ADMIN)) echo ' disabled'; ?>">
+                                    <i class="user icon<?php if($install->isStepPassed(GaletteInstall::STEP_ADMIN)) { echo ' green'; } ?>"></i>
+                                    <div class="content">
+                                        <div class="title"><?php echo _T("Admin parameters"); ?></div>
+                                    </div>
+                                </div>
+    <?php
+}
+?>
+                                <div class="step<?php if ($install->isTelemetryStep()) echo ' active'; elseif (!$install->isStepPassed(GaletteInstall::STEP_TELEMETRY)) echo ' disabled'; ?>">
+                                    <i class="chart bar icon<?php if($install->isStepPassed(GaletteInstall::STEP_TELEMETRY)) { echo ' green'; } ?>"></i>
+                                    <div class="content">
+                                        <div class="title"><?php echo _T("Telemetry"); ?></div>
+                                    </div>
+                                </div>
+                                <div class="step<?php if ($install->isGaletteInitStep()) echo ' active'; elseif (!$install->isStepPassed(GaletteInstall::STEP_GALETTE_INIT)) echo ' disabled'; ?>">
+                                    <i class="cogs icon<?php if($install->isStepPassed(GaletteInstall::STEP_GALETTE_INIT)) { echo ' green'; } ?>"></i>
+                                    <div class="content">
+                                        <div class="title"><?php echo _T("Galette initialisation"); ?></div>
+                                    </div>
+                                </div>
+                                <div class="step<?php if ($install->isEndStep()) echo ' active'; elseif (!$install->isStepPassed(GaletteInstall::STEP_END)) echo ' disabled'; ?>">
+                                    <i class="flag checkered icon<?php if($install->isStepPassed(GaletteInstall::STEP_END)) { echo ' green'; } ?>"></i>
+                                    <div class="content">
+                                        <div class="title"><?php echo _T("End!"); ?></div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="twelve wide column">
 <?php
 if ($install->isCheckStep()) {
     include_once __DIR__ . '/../install/steps/check.php';
@@ -317,97 +403,40 @@ if ($install->isCheckStep()) {
     include_once __DIR__ . '/../install/steps/end.php';
 }
 ?>
-                <div class="ui tablet stackable mini nine steps fluid">
-                    <div class="step<?php if ($install->isCheckStep()) echo ' active'; ?> tooltip" title="<?php echo htmlentities(_T("Checks"), ENT_QUOTES); ?>">
-                        <i class="tasks icon<?php if($install->isStepPassed(GaletteInstall::STEP_CHECK)) { echo ' green'; } ?>"></i>
-                        <span class="displaynone"><?php echo _T("Checks"); ?></span>
-                    </div>
-                    <div class="step<?php if ($install->isTypeStep()) echo ' active'; ?> tooltip" title="<?php echo htmlentities(_T("Installation mode"), ENT_QUOTES); ?>">
-                        <i class="question icon<?php if($install->isStepPassed(GaletteInstall::STEP_TYPE)) { echo ' green'; } ?>"></i>
-                        <span class="displaynone"><?php echo _T("Installation mode"); ?></span>
-                    </div>
-                    <div class="step<?php if ($install->isDbStep()) echo ' active'; ?> tooltip" title="<?php echo htmlentities(_T("Database"), ENT_QUOTES); ?>">
-                        <i class="database icon"></i>
-                        <span class="displaynone"><?php echo _T("Database"); ?></span>
-                    </div>
-                    <div class="step<?php if ($install->isDbCheckStep()) echo ' active'; ?> tooltip" title="<?php echo htmlentities(_T("Database access/permissions"), ENT_QUOTES); ?>">
-                        <i class="key icon"></i>
-                        <span class="displaynone"><?php echo _T("Database access/permissions"); ?></span>
-                    </div>
-<?php
-if ($install->isUpgrade()) {
-    ?>
-                    <div class="step<?php if ($install->isVersionSelectionStep()) echo ' active'; ?> tooltip" title="<?php echo htmlentities(_T("Version selection"), ENT_QUOTES); ?>">
-                        <i class="tag icon"></i>
-                        <span class="displaynone"><?php echo _T("Version selection"); ?></span>
-                    </div>
-                    <div class="step<?php if ($install->isDbUpgradeStep()) echo ' active'; ?> tooltip" title="<?php echo htmlentities(_T("Database upgrade", ENT_QUOTES)); ?>">
-                        <i class="sync alt icon"></i>
-                        <span class="displaynone"><?php echo _T("Database upgrade"); ?></span>
-                    </div>
-    <?php
-} else {
-    ?>
-                    <div class="step<?php if ($install->isDbinstallStep()) echo ' active'; ?> tooltip" title="<?php echo htmlentities(_T("Database installation"), ENT_QUOTES); ?>">
-                        <i class="spinner icon"></i>
-                        <span class="displaynone"><?php echo _T("Database installation"); ?></span>
-                    </div>
-    <?php
-}
-
-if (!$install->isUpgrade()) {
-    ?>
-                    <div class="step<?php if ($install->isAdminStep()) echo ' active'; ?> tooltip" title="<?php echo htmlentities(_T("Admin parameters"), ENT_QUOTES); ?>">
-                        <i class="user icon"></i>
-                        <span class="displaynone"><?php echo _T("Admin parameters"); ?></span>
-                    </div>
-    <?php
-}
-?>
-                    <div class="step<?php if ($install->isTelemetryStep()) echo ' active'; ?> tooltip" title="<?php echo htmlentities(_T("Telemetry"), ENT_QUOTES); ?>">
-                        <i class="chart bar icon"></i>
-                        <span class="displaynone"><?php echo _T("Telemetry"); ?></span>
+                        </div>
                     </div>
-                    <div class="step<?php if ($install->isGaletteInitStep()) echo ' active'; ?> tooltip" title="<?php echo htmlentities(_T("Galette initialisation"), ENT_QUOTES); ?>">
-                        <i class="cogs icon"></i>
-                        <span class="displaynone"><?php echo _T("Galette initialisation"); ?></span>
+                </div>
+                <footer class="ui basic center aligned segment">
+                    <div class="row">
+                        <nav class="ui horizontal bulleted link list">
+                            <a href="https://galette.eu" class="item">
+                                <i class="icon globe europe"></i>
+                                <?php echo _T("Website"); ?>
+                            </a>
+                            <a href="https://doc.galette.eu" class="item">
+                                <i class="icon book"></i>
+                               <?php echo _T("Documentation"); ?>
+                            </a>
+                            <a href="https://twitter.com/galette_soft" class="item">
+                                <i class="icon twitter"></i>
+                                @galette_soft
+                            </a>
+                            <a href="https://framapiaf.org/@galette" class="item">
+                                <i class="icon mastodon"></i>
+                                @galette
+                            </a>
+                        </nav>
                     </div>
-                    <div class="step<?php if ($install->isEndStep()) echo ' active'; ?> tooltip" title="<?php echo htmlentities(_T("End!"), ENT_QUOTES); ?>">
-                        <i class="flag checkered icon"></i>
-                        <span class="displaynone"><?php echo _T("End!"); ?></span>
+                    <div class="row">
+                        <nav class="ui horizontal bulleted link list">
+                            <a id="copyright" href="https://galette.eu/" class="item">
+                                <i class="icon cookie bite"></i>
+                                Galette <?php echo GALETTE_DISPLAY_VERSION; ?>
+                            </a>
+                        </nav>
                     </div>
-                </div>
+                </footer>
             </div>
-            <footer class="ui basic center aligned segment">
-                <div class="row">
-                    <nav class="ui horizontal bulleted link list">
-                        <a href="https://galette.eu" class="item">
-                            <i class="icon globe europe"></i>
-                            <?php echo _T("Website"); ?>
-                        </a>
-                        <a href="https://doc.galette.eu" class="item">
-                            <i class="icon book"></i>
-                           <?php echo _T("Documentation"); ?>
-                        </a>
-                        <a href="https://twitter.com/galette_soft" class="item">
-                            <i class="icon twitter"></i>
-                            @galette_soft
-                        </a>
-                        <a href="https://framapiaf.org/@galette" class="item">
-                            <i class="icon mastodon"></i>
-                            @galette
-                        </a>
-                    </nav>
-                </div>
-                <div class="row">
-                    <nav class="ui horizontal bulleted link list">
-                        <a id="copyright" href="https://galette.eu/" class="item">
-                            <i class="icon cookie bite"></i>
-                            Galette <?php echo GALETTE_DISPLAY_VERSION; ?>
-                        </a>
-                    </nav>
-                </div>
-            </footer>
         </div>
         <script type="text/javascript" src="./assets/js/galette-main.bundle.min.js"></script>
         <script type="text/javascript" src="./themes/default/ui/semantic.min.js"></script>
diff --git a/ui/semantic/galette/elements/step.overrides b/ui/semantic/galette/elements/step.overrides
new file mode 100644 (file)
index 0000000..6891bdd
--- /dev/null
@@ -0,0 +1,3 @@
+/*******************************
+         Galette Overrides
+*******************************/
diff --git a/ui/semantic/galette/elements/step.variables b/ui/semantic/galette/elements/step.variables
new file mode 100644 (file)
index 0000000..dcf7cc4
--- /dev/null
@@ -0,0 +1,12 @@
+/*******************************
+    Galette Variable Overrides
+*******************************/
+
+/* -------------------
+       States
+-------------------- */
+
+/* Active */
+@activeBackground: @lightPrimaryColor;
+@activeColor: @textColor;
+@activeIconColor: @textColor;
index f55c2660d7e3b01a372d7be8a2c4c0c28b0c450e..d0f3b5da7ddf309f138a18e07be24eb152ad263b 100644 (file)
@@ -300,7 +300,6 @@ ul.sortable-items {
 ---------------------*/
 ul.leaders {
   display: block!important;
-  max-width: 40em;
   padding: 0;
   overflow-x: hidden;
   list-style: none;
@@ -310,14 +309,13 @@ ul.leaders li {
   position: relative;
 }
 ul.leaders li:before {
-  float: left;
-  width: 0;
-  white-space: nowrap;
-  content:
-    ". . . . . . . . . . . . . . . . . . . . "
-    ". . . . . . . . . . . . . . . . . . . . "
-    ". . . . . . . . . . . . . . . . . . . . "
-    ". . . . . . . . . . . . . . . . . . . . "
+  width: 100%;
+  content: "";
+  border-bottom: 1px dotted @textColor;
+  height: 1rem;
+  position: absolute;
+  bottom: .5rem;
+  z-index: -1;
 }
 ul.leaders span:first-child {
   padding-right: 0.33em;
index 2231fa9103ff12522af0dcdf6a4cbfbc25227db1..384140835144fda24eb3e1ce7fd8f7d4552d5467 100644 (file)
@@ -38,7 +38,7 @@
 @rail       : 'default';
 @reveal     : 'default';
 @segment    : 'galette';
-@step       : 'default';
+@step       : 'galette';
 @text       : 'default';
 
 /* Collections */