Merge remote-tracking branch 'refs/remotes/gitdedalo/v6_developer' in…

…to v6_developer # Conflicts: # core/base/version.inc
renderpci · Feb 15, 2025 · 213c7a5 · 213c7a5
2 parents eeba78f + 01e1934
commit 213c7a5
Show file tree

Hide file tree

Showing 10 changed files with 149 additions and 457 deletions.
diff --git a/core/common/class.label.php b/core/common/class.label.php
@@ -91,7 +91,7 @@ public static function get_label(string $name, string $lang=DEDALO_APPLICATION_L
 		label::get_ar_label($lang);
 
 		$label = (!isset(label::$ar_label[$lang][$name]))
-			? component_common::decore_untranslated($name)
+			? component_common::decorate_untranslated($name)
 			: label::$ar_label[$lang][$name];
 
 

diff --git a/core/login/class.login.php b/core/login/class.login.php
@@ -1380,7 +1380,7 @@ public function get_structure_context(int $permissions=1, bool $add_request_conf
 			$properties->info[] = [
 				'type'	=> 'data_version',
 				'label'	=> 'Data version',
-				'value'	=> get_current_version_in_db()
+				'value'	=> implode('.', get_current_version_in_db())
 			];
 		// ontology version
 			$properties->info[] = [

diff --git a/core/unit_test/css/unit_test.css b/core/unit_test/css/unit_test.css
diff --git a/core/unit_test/css/unit_test.css.map b/core/unit_test/css/unit_test.css.map
diff --git a/core/unit_test/css/unit_test.less b/core/unit_test/css/unit_test.less
@@ -3,25 +3,47 @@
 *
 */
 
-body {
+html {
+	// from mocha css depending on dark mode
+	// background-color: var(--mocha-bg-color);
 	background-color: transparent;
-	    // display: contents;
+}
+
+body {
+	// background-color: transparent;
+	// display: contents;
 }
 
 #content {
 	padding: 4rem;
 	padding-top: 0px;
 	margin-top: 60px;
 }
+
 #mocha .test pre.error {
 	background-color: #fafafa !important;
+	// background-color: #808080;
+}
+
+.wrapper_component {
+	@media (prefers-color-scheme: dark) {
+		background-color: white;
+	}
+	color: var(--mocha-color);
+}
+
+.wrapper.page {
+	@media (prefers-color-scheme: dark) {
+		background-color: white;
+	}
 }
 
 .pair_container {
 	padding: 2rem;
 	border-top: 1px solid #7f7f7f;
 	margin-bottom: 4rem;
 	display: block;
+	background-color: white;
 
 	>.wrapper_component {
 		margin-bottom: 2rem;

diff --git a/core/unit_test/index.html b/core/unit_test/index.html
@@ -5,11 +5,11 @@
 	<title>Dédalo V6 unit test</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<link rel="shortcut icon" href="../../favicon.ico?ckcachebust=20C9E48A97F649F6FCA9500A5AEA9416" />
-	<link rel="stylesheet" href="../page/css/main.css?ckcachebust=8F0A8908A90E379D42A633CCED099EE0" />
+	<link rel="stylesheet" href="../page/css/main.css?ckcachebust=CB149FBB37AE223EF0782AB1407D9305" />
 	<!-- add mocha css, to show results https://cdnjs.cloudflare.com/ajax/libs/mocha/3.2.0/mocha.css | https://unpkg.com/mocha/mocha.css -->
-	<link rel="stylesheet" href="../../lib/mocha/dist/mocha.css?ckcachebust=7A49CF7B52AFA5EA3A59A12796C0523C">
+	<link rel="stylesheet" href="../../lib/mocha/dist/mocha.css?ckcachebust=D06EC5CDE2AD7C7D1614EC8046205386">
 	<!-- add unit_test custom styles p-->
-	<link rel="stylesheet" href="css/unit_test.css?ckcachebust=FC62977ADA65D9CE4933A042A6F37174" media="print" onload="this.media='all'; this.onload=null;">
+	<link rel="stylesheet" href="css/unit_test.css?ckcachebust=0529A112A6B1AC8C06BE014CE886252A" media="print" onload="this.media='all'; this.onload=null;">
 	<script type="importmap">
 		{
 			"imports": {

diff --git a/lib/mocha/dist/mocha.css b/lib/mocha/dist/mocha.css
@@ -3,11 +3,11 @@
 :root {
   --mocha-color: #000;
   --mocha-bg-color: #fff;
-  --mocha-pass-icon-color: #00d6b2;
-  --mocha-pass-color: #fff;
-  --mocha-pass-shadow-color: rgba(0,0,0,.2);
-  --mocha-pass-mediump-color: #c09853;
-  --mocha-pass-slow-color: #b94a48;
+  --mocha-test-pass-color: #007f6a;
+  --mocha-test-pass-duration-color: #fff;
+  --mocha-test-pass-shadow-color: rgba(0,0,0, 0.2);
+  --mocha-test-pass-mediump-color: #c09853;
+  --mocha-test-pass-slow-color: #b94a48;
   --mocha-test-pending-color: #0b97c4;
   --mocha-test-pending-icon-color: #0b97c4;
   --mocha-test-fail-color: #c00;
@@ -33,16 +33,16 @@
   --mocha-code-keyword: #8a6343;
   --mocha-code-number: #2f6fad;
 }
-/*
-@media (prefers-color-scheme: dark) {
+
+@media (prefers-color-scheme: light) {
   :root {
      --mocha-color: #fff;
      --mocha-bg-color: #222;
-     --mocha-pass-icon-color: #00d6b2;
-     --mocha-pass-color: #222;
-     --mocha-pass-shadow-color: rgba(255,255,255,.2);
-     --mocha-pass-mediump-color: #f1be67;
-     --mocha-pass-slow-color: #f49896;
+     --mocha-test-pass-color: #00d6b2;
+     --mocha-test-pass-duration-color: #222;
+     --mocha-test-pass-shadow-color: rgba(255, 255, 255, 0.2);
+     --mocha-test-pass-mediump-color: #f1be67;
+     --mocha-test-pass-slow-color: #f49896;
      --mocha-test-pending-color: #0b97c4;
      --mocha-test-pending-icon-color: #0b97c4;
      --mocha-test-fail-color: #f44;
@@ -69,7 +69,7 @@
      --mocha-code-number: #4ca7ff;
   }
 }
-*/
+
 body {
   margin:0;
   background-color: var(--mocha-bg-color);
@@ -141,11 +141,11 @@ body {
 }
 
 #mocha .test.pass.medium .duration {
-  background: var(--mocha-pass-mediump-color);
+  background: var(--mocha-test-pass-mediump-color);
 }
 
 #mocha .test.pass.slow .duration {
-  background: var(--mocha-pass-slow-color);
+  background: var(--mocha-test-pass-slow-color);
 }
 
 #mocha .test.pass::before {
@@ -154,17 +154,17 @@ body {
   display: block;
   float: left;
   margin-right: 5px;
-  color: var(--mocha-pass-icon-color);
+  color: var(--mocha-test-pass-color);
 }
 
 #mocha .test.pass .duration {
   font-size: 9px;
   margin-left: 5px;
   padding: 2px 5px;
-  color: var(--mocha-pass-color);
-  -webkit-box-shadow: inset 0 1px 1px var(--mocha-pass-shadow-color);
-  -moz-box-shadow: inset 0 1px 1px var(--mocha-pass-shadow-color);
-  box-shadow: inset 0 1px 1px var(--mocha-pass-shadow-color);
+  color: var(--mocha-test-pass-duration-color);
+  -webkit-box-shadow: inset 0 1px 1px var(--mocha-test-pass-shadow-color);
+  -moz-box-shadow: inset 0 1px 1px var(--mocha-test-pass-shadow-color);
+  box-shadow: inset 0 1px 1px var(--mocha-test-pass-shadow-color);
   -webkit-border-radius: 5px;
   -moz-border-radius: 5px;
   -ms-border-radius: 5px;
@@ -344,12 +344,37 @@ body {
   z-index: 1;
 }
 
+#mocha-stats.fail li.result {
+  color: var(--mocha-test-fail-color);
+}
+
+#mocha-stats.fail li.failures {
+  color: var(--mocha-test-fail-color);
+}
+
+#mocha-stats.fail li.failures em {
+  color: var(--mocha-test-fail-color);
+}
+
+#mocha-stats.pass li.result {
+  color: var(--mocha-test-pass-color);
+}
+
+#mocha-stats.pass li.passes {
+  color: var(--mocha-test-pass-color);
+}
+
+#mocha-stats.pass li.passes em {
+  color: var(--mocha-test-pass-color);
+}
+
 #mocha-stats .progress-contain {
   float: right;
   padding: 0;
 }
 
-#mocha-stats :is(.progress-element, .progress-text) {
+#mocha-stats .progress-element,
+#mocha-stats .progress-text {
   width: var(--ring-container-size);
   display: block;
   top: 12px;
@@ -374,7 +399,8 @@ body {
   height: var(--ring-container-size);
 }
 
-#mocha-stats :is(.ring-flatlight, .ring-highlight) {
+#mocha-stats .ring-flatlight,
+#mocha-stats .ring-highlight {
   --stroke-thickness: 1.65px;
   --center: calc(var(--ring-container-size) / 2);
   cx: var(--center);