From bd9cf7eac32b788a9f8b779aef30f510909dbe39 Mon Sep 17 00:00:00 2001 From: Ludovic <54670129+lbr38@users.noreply.github.com> Date: Thu, 26 Dec 2024 17:39:54 +0100 Subject: [PATCH] patch --- www/controllers/Logging/SubStep.php | 15 +++++++--- www/controllers/Repo/Mirror/Deb.php | 9 ++++-- www/controllers/Repo/Mirror/Rpm.php | 5 +++- www/public/assets/icons/alarm.svg | 14 ++++----- www/public/assets/icons/build.svg | 10 +++---- www/public/assets/icons/close.svg | 8 ++--- www/public/assets/icons/cog.svg | 16 +++++----- www/public/assets/icons/cpu.svg | 30 +++++++++---------- www/public/assets/icons/delete.svg | 8 ++--- www/public/assets/icons/disabled.svg | 20 ++++++------- www/public/assets/icons/down.svg | 8 ++--- www/public/assets/icons/duplicate.svg | 12 ++++---- www/public/assets/icons/enabled.svg | 10 +++---- www/public/assets/icons/external-link.svg | 14 ++++----- www/public/assets/icons/file.svg | 10 +++---- www/public/assets/icons/folder.svg | 14 ++++----- www/public/assets/icons/info.svg | 10 +++---- www/public/assets/icons/key.svg | 8 ++--- www/public/assets/icons/key2.svg | 8 ++--- www/public/assets/icons/link.svg | 12 ++++---- www/public/assets/icons/next.svg | 10 +++---- www/public/assets/icons/package.svg | 18 +++++------ www/public/assets/icons/pin.svg | 18 +++++------ www/public/assets/icons/play.svg | 8 ++--- www/public/assets/icons/plus.svg | 8 ++--- www/public/assets/icons/previous.svg | 10 +++---- www/public/assets/icons/profile.svg | 18 +++++------ www/public/assets/icons/rocket.svg | 16 +++++----- www/public/assets/icons/server.svg | 16 +++++----- www/public/assets/icons/stack.svg | 20 ++++++------- www/public/assets/icons/terminal.svg | 10 +++---- www/public/assets/icons/time.svg | 10 +++---- www/public/assets/icons/up.svg | 8 ++--- www/public/assets/icons/update.svg | 10 +++---- www/public/assets/icons/user.svg | 12 ++++---- www/public/assets/icons/view-off.svg | 28 ++++++++--------- www/public/assets/icons/view.svg | 14 ++++----- www/public/resources/styles/common.css | 2 +- www/public/resources/styles/run.css | 1 + .../containers/tasks/log/substep.inc.php | 2 +- 40 files changed, 247 insertions(+), 233 deletions(-) diff --git a/www/controllers/Logging/SubStep.php b/www/controllers/Logging/SubStep.php index b12997cab..39aacc943 100644 --- a/www/controllers/Logging/SubStep.php +++ b/www/controllers/Logging/SubStep.php @@ -7,6 +7,9 @@ class SubStep extends Logging { + /** + * Add a new sub step to the latest step + */ public function new(string $identifier, array $data) { $content = $this->getContent(); @@ -17,7 +20,7 @@ public function new(string $identifier, array $data) $content['steps'][$name]['substeps'][$identifier] = [ 'title' => '', 'note' => '', - 'status' => '', + 'status' => 'running', 'start' => microtime(true), 'end' => '', 'duration' => '', @@ -42,7 +45,7 @@ public function new(string $identifier, array $data) /** * Set latest sub step as completed */ - public function completed(string|null $message = '') + public function completed(string|null $message = '', string|null $identifier = '') { // Add message to output $this->output($message); @@ -52,8 +55,12 @@ public function completed(string|null $message = '') // Get latest step key name $name = array_key_last($content['steps']); - // Get latest sub step key name - $subName = array_key_last($content['steps'][$name]['substeps']); + // If no identifier is provided, get latest sub step key name, otherwise use the provided identifier + if (!empty($identifier)) { + $subName = $identifier; + } else { + $subName = array_key_last($content['steps'][$name]['substeps']); + } // Set status to completed $content['steps'][$name]['substeps'][$subName]['status'] = 'completed'; diff --git a/www/controllers/Repo/Mirror/Deb.php b/www/controllers/Repo/Mirror/Deb.php index ef2657be8..ebd2ad54f 100644 --- a/www/controllers/Repo/Mirror/Deb.php +++ b/www/controllers/Repo/Mirror/Deb.php @@ -790,9 +790,12 @@ private function downloadDebPackages($url) /** * Print OK if package has been downloaded and verified successfully */ - $this->loggingSubStepController->completed('Done'); + $this->loggingSubStepController->completed(); } + // Set the main substep as completed + $this->loggingSubStepController->completed('', 'downloading-packages'); + unset($this->debPackagesLocation, $totalPackages, $packageCounter); } @@ -887,7 +890,7 @@ private function downloadDebSourcesPackages($url) /** * Print OK if source package has been downloaded and verified successfully */ - $this->loggingSubStepController->completed('Done'); + $this->loggingSubStepController->completed(); } unset($this->sourcesPackagesLocation, $totalPackages, $packageCounter); @@ -945,7 +948,7 @@ private function downloadTranslation() /** * Print OK if package has been downloaded and verified successfully */ - $this->loggingSubStepController->completed('Done'); + $this->loggingSubStepController->completed(); } unset($this->translationsLocation); diff --git a/www/controllers/Repo/Mirror/Rpm.php b/www/controllers/Repo/Mirror/Rpm.php index 3bc816e30..f22b7296c 100644 --- a/www/controllers/Repo/Mirror/Rpm.php +++ b/www/controllers/Repo/Mirror/Rpm.php @@ -935,11 +935,14 @@ private function downloadRpmPackages(string $url) /** * Print OK if package has been downloaded and verified successfully */ - $this->loggingSubStepController->completed('Done'); + $this->loggingSubStepController->completed(); unset($myprocess, $content, $keyId, $matches); } + // Set the main substep as completed + $this->loggingStepController->completed('', 'downloading-packages'); + unset($this->rpmPackagesLocation, $totalPackages, $packageCounter); } diff --git a/www/public/assets/icons/alarm.svg b/www/public/assets/icons/alarm.svg index 75a6ff33c..e81bbdb4e 100644 --- a/www/public/assets/icons/alarm.svg +++ b/www/public/assets/icons/alarm.svg @@ -5,7 +5,7 @@ viewBox="0 0 512 512" version="1.1" id="svg6" - sodipodi:docname="notifications.svg" + sodipodi:docname="alarm.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -23,20 +23,20 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="865" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg6" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.1364" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.1364" /> diff --git a/www/public/assets/icons/build.svg b/www/public/assets/icons/build.svg index 2f5267423..557b47ad4 100644 --- a/www/public/assets/icons/build.svg +++ b/www/public/assets/icons/build.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.13036" /> diff --git a/www/public/assets/icons/close.svg b/www/public/assets/icons/close.svg index 8bde5a236..f9ab33332 100644 --- a/www/public/assets/icons/close.svg +++ b/www/public/assets/icons/close.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="248.60522" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22338" /> diff --git a/www/public/assets/icons/cog.svg b/www/public/assets/icons/cog.svg index 1c0742901..2bc304cad 100644 --- a/www/public/assets/icons/cog.svg +++ b/www/public/assets/icons/cog.svg @@ -5,7 +5,7 @@ viewBox="0 0 512 512" version="1.1" id="svg6" - sodipodi:docname="settings.svg" + sodipodi:docname="cog.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -23,22 +23,22 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg6" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.10503" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.10503" /> diff --git a/www/public/assets/icons/cpu.svg b/www/public/assets/icons/cpu.svg index d27dad031..c3590485a 100644 --- a/www/public/assets/icons/cpu.svg +++ b/www/public/assets/icons/cpu.svg @@ -5,7 +5,7 @@ viewBox="0 0 512 512" version="1.1" id="svg8" - sodipodi:docname="hardware-chip.svg" + sodipodi:docname="cpu.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -23,29 +23,29 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg8" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.1311" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.1311" /> diff --git a/www/public/assets/icons/delete.svg b/www/public/assets/icons/delete.svg index 8bde5a236..f9ab33332 100644 --- a/www/public/assets/icons/delete.svg +++ b/www/public/assets/icons/delete.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="248.60522" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22338" /> diff --git a/www/public/assets/icons/disabled.svg b/www/public/assets/icons/disabled.svg index 1d7fdfea3..fdff02163 100644 --- a/www/public/assets/icons/disabled.svg +++ b/www/public/assets/icons/disabled.svg @@ -21,32 +21,32 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg6" /> diff --git a/www/public/assets/icons/down.svg b/www/public/assets/icons/down.svg index 719c645b0..0b1c8655c 100644 --- a/www/public/assets/icons/down.svg +++ b/www/public/assets/icons/down.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22216" /> diff --git a/www/public/assets/icons/duplicate.svg b/www/public/assets/icons/duplicate.svg index 74600cb16..ae2289077 100644 --- a/www/public/assets/icons/duplicate.svg +++ b/www/public/assets/icons/duplicate.svg @@ -23,20 +23,20 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg6" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.13155" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.13155" /> diff --git a/www/public/assets/icons/enabled.svg b/www/public/assets/icons/enabled.svg index ea565a549..327b71933 100644 --- a/www/public/assets/icons/enabled.svg +++ b/www/public/assets/icons/enabled.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.21911" /> diff --git a/www/public/assets/icons/external-link.svg b/www/public/assets/icons/external-link.svg index 5457fba7e..527ffb6f3 100644 --- a/www/public/assets/icons/external-link.svg +++ b/www/public/assets/icons/external-link.svg @@ -23,20 +23,20 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg6" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22024" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22024" /> diff --git a/www/public/assets/icons/file.svg b/www/public/assets/icons/file.svg index 3e7fad0d6..f143c1ceb 100644 --- a/www/public/assets/icons/file.svg +++ b/www/public/assets/icons/file.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.13156" /> diff --git a/www/public/assets/icons/folder.svg b/www/public/assets/icons/folder.svg index 8324d5964..ca60beaa1 100644 --- a/www/public/assets/icons/folder.svg +++ b/www/public/assets/icons/folder.svg @@ -23,20 +23,20 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" - inkscape:cy="256" + inkscape:cx="253.53507" + inkscape:cy="265.15543" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg6" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.0632" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.0632" /> diff --git a/www/public/assets/icons/info.svg b/www/public/assets/icons/info.svg index aec817cce..55fd0370a 100644 --- a/www/public/assets/icons/info.svg +++ b/www/public/assets/icons/info.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.26963" /> diff --git a/www/public/assets/icons/key.svg b/www/public/assets/icons/key.svg index 5f5cb6436..3a2b7e928 100644 --- a/www/public/assets/icons/key.svg +++ b/www/public/assets/icons/key.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.21953" /> diff --git a/www/public/assets/icons/key2.svg b/www/public/assets/icons/key2.svg index 081b5767f..faa7f0c0e 100644 --- a/www/public/assets/icons/key2.svg +++ b/www/public/assets/icons/key2.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffb536;fill-opacity:1;stroke-width:1.22517" /> diff --git a/www/public/assets/icons/link.svg b/www/public/assets/icons/link.svg index 51cfdbaf5..262e01b0c 100644 --- a/www/public/assets/icons/link.svg +++ b/www/public/assets/icons/link.svg @@ -5,7 +5,7 @@ viewBox="0 0 512 512" version="1.1" id="svg4" - sodipodi:docname="git-branch.svg" + sodipodi:docname="link.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.13407" /> diff --git a/www/public/assets/icons/next.svg b/www/public/assets/icons/next.svg index 672eacde9..43518a4dd 100644 --- a/www/public/assets/icons/next.svg +++ b/www/public/assets/icons/next.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22044" /> diff --git a/www/public/assets/icons/package.svg b/www/public/assets/icons/package.svg index ad114a879..094ffdcc9 100644 --- a/www/public/assets/icons/package.svg +++ b/www/public/assets/icons/package.svg @@ -23,24 +23,24 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg8" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.13769" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.13769" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.13769" /> diff --git a/www/public/assets/icons/pin.svg b/www/public/assets/icons/pin.svg index 7cd614870..82ce7a971 100644 --- a/www/public/assets/icons/pin.svg +++ b/www/public/assets/icons/pin.svg @@ -5,7 +5,7 @@ viewBox="0 0 512 512" version="1.1" id="svg6" - sodipodi:docname="location.svg" + sodipodi:docname="pin.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -23,22 +23,22 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg6" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.13402" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.13402" /> diff --git a/www/public/assets/icons/play.svg b/www/public/assets/icons/play.svg index 812ae702b..66b48ed84 100644 --- a/www/public/assets/icons/play.svg +++ b/www/public/assets/icons/play.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22282" /> diff --git a/www/public/assets/icons/plus.svg b/www/public/assets/icons/plus.svg index 0c1d253ff..607e424bc 100644 --- a/www/public/assets/icons/plus.svg +++ b/www/public/assets/icons/plus.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22132" /> diff --git a/www/public/assets/icons/previous.svg b/www/public/assets/icons/previous.svg index e287ad269..2c306f872 100644 --- a/www/public/assets/icons/previous.svg +++ b/www/public/assets/icons/previous.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22345" /> diff --git a/www/public/assets/icons/profile.svg b/www/public/assets/icons/profile.svg index 9080de76a..e2140f6e5 100644 --- a/www/public/assets/icons/profile.svg +++ b/www/public/assets/icons/profile.svg @@ -23,24 +23,24 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg8" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.15812" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.15812" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.15812" /> diff --git a/www/public/assets/icons/rocket.svg b/www/public/assets/icons/rocket.svg index a9c3ec510..1e8c978a3 100644 --- a/www/public/assets/icons/rocket.svg +++ b/www/public/assets/icons/rocket.svg @@ -23,24 +23,24 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg8" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.1331" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.1331" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.1331" /> diff --git a/www/public/assets/icons/server.svg b/www/public/assets/icons/server.svg index 431c1310b..dacbe0db8 100644 --- a/www/public/assets/icons/server.svg +++ b/www/public/assets/icons/server.svg @@ -23,24 +23,24 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg8" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.06148" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.06148" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.06148" /> diff --git a/www/public/assets/icons/stack.svg b/www/public/assets/icons/stack.svg index be0743336..921372ee4 100644 --- a/www/public/assets/icons/stack.svg +++ b/www/public/assets/icons/stack.svg @@ -5,7 +5,7 @@ viewBox="0 0 512 512" version="1.1" id="svg8" - sodipodi:docname="layers.svg" + sodipodi:docname="stack.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -23,24 +23,24 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg8" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22308" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22308" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22308" /> diff --git a/www/public/assets/icons/terminal.svg b/www/public/assets/icons/terminal.svg index e8e1db11f..91ac356e3 100644 --- a/www/public/assets/icons/terminal.svg +++ b/www/public/assets/icons/terminal.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.06141" /> diff --git a/www/public/assets/icons/time.svg b/www/public/assets/icons/time.svg index 8006488aa..a6400d9ec 100644 --- a/www/public/assets/icons/time.svg +++ b/www/public/assets/icons/time.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22379" /> diff --git a/www/public/assets/icons/up.svg b/www/public/assets/icons/up.svg index ce47503c0..8a9b55bb1 100644 --- a/www/public/assets/icons/up.svg +++ b/www/public/assets/icons/up.svg @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22296" /> diff --git a/www/public/assets/icons/update.svg b/www/public/assets/icons/update.svg index 87c842a9c..312cdbc2f 100644 --- a/www/public/assets/icons/update.svg +++ b/www/public/assets/icons/update.svg @@ -5,7 +5,7 @@ viewBox="0 0 512 512" version="1.1" id="svg4" - sodipodi:docname="reload-circle.svg" + sodipodi:docname="update.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22527" /> diff --git a/www/public/assets/icons/user.svg b/www/public/assets/icons/user.svg index 55461c031..c8cdb5adb 100644 --- a/www/public/assets/icons/user.svg +++ b/www/public/assets/icons/user.svg @@ -5,7 +5,7 @@ viewBox="0 0 512 512" version="1.1" id="svg4" - sodipodi:docname="person-circle.svg" + sodipodi:docname="user.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -23,16 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="0" - inkscape:window-y="31" + inkscape:window-x="598" + inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.22438" /> diff --git a/www/public/assets/icons/view-off.svg b/www/public/assets/icons/view-off.svg index 5c37d5ae9..2ef7615fa 100644 --- a/www/public/assets/icons/view-off.svg +++ b/www/public/assets/icons/view-off.svg @@ -22,33 +22,33 @@ inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" showgrid="false" - inkscape:zoom="1.4199219" - inkscape:cx="256" - inkscape:cy="256" + inkscape:zoom="1.0040364" + inkscape:cx="108.5618" + inkscape:cy="328.17535" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg12" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.0815" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.0815" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.0815" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.0815" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.0815" /> diff --git a/www/public/assets/icons/view.svg b/www/public/assets/icons/view.svg index 10b39d016..21183d0da 100644 --- a/www/public/assets/icons/view.svg +++ b/www/public/assets/icons/view.svg @@ -5,7 +5,7 @@ viewBox="0 0 512 512" version="1.1" id="svg6" - sodipodi:docname="eye.svg" + sodipodi:docname="view.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -23,22 +23,22 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.4199219" - inkscape:cx="256" + inkscape:cx="256.35213" inkscape:cy="256" inkscape:window-width="1920" inkscape:window-height="977" - inkscape:window-x="856" + inkscape:window-x="598" inkscape:window-y="1111" inkscape:window-maximized="1" inkscape:current-layer="svg6" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.06081" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:1.06081" /> diff --git a/www/public/resources/styles/common.css b/www/public/resources/styles/common.css index 49d9cdd82..02e679f91 100644 --- a/www/public/resources/styles/common.css +++ b/www/public/resources/styles/common.css @@ -852,7 +852,7 @@ textarea { } .slide-panel-close-btn { - width: 25px; + width: 32px; cursor: pointer; } diff --git a/www/public/resources/styles/run.css b/www/public/resources/styles/run.css index 791ad1239..f5f9f5562 100644 --- a/www/public/resources/styles/run.css +++ b/www/public/resources/styles/run.css @@ -133,6 +133,7 @@ max-height: 800px; overflow-y: auto; border-radius: 8px; + margin-top: 2px; border: 1px solid #24405c; background-color: #182b3e; -webkit-box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px; diff --git a/www/views/includes/containers/tasks/log/substep.inc.php b/www/views/includes/containers/tasks/log/substep.inc.php index 9810a7fd5..9a1fa2b91 100644 --- a/www/views/includes/containers/tasks/log/substep.inc.php +++ b/www/views/includes/containers/tasks/log/substep.inc.php @@ -2,7 +2,7 @@
'; + echo ''; } if ($substepStatus == 'completed') {