From d254140b91f08a54d4753f26dafc14c689e46bfb Mon Sep 17 00:00:00 2001 From: Igor I Date: Mon, 14 Jul 2025 15:07:32 +0500 Subject: [PATCH] Download reports repair --- .../java/org/ccalm/main/MainController.java | 4 - src/main/resources/templates/index.html | 449 ++++++++++++++---- src/main/resources/templates/index_old.html | 97 ++++ 3 files changed, 464 insertions(+), 86 deletions(-) create mode 100644 src/main/resources/templates/index_old.html diff --git a/src/main/java/org/ccalm/main/MainController.java b/src/main/java/org/ccalm/main/MainController.java index 92da510..a7e9806 100644 --- a/src/main/java/org/ccalm/main/MainController.java +++ b/src/main/java/org/ccalm/main/MainController.java @@ -1,12 +1,10 @@ package org.ccalm.main; -import java.io.FileInputStream; import java.io.IOException; import java.sql.*; import java.util.List; import java.util.Locale; import java.util.Properties; -import java.util.Set; import java.util.concurrent.TimeUnit; //import javax.servlet.ServletContext; @@ -21,7 +19,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.http.CacheControl; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Controller; @@ -30,7 +27,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.context.ServletContextAware; -import org.ccalm.main.TranslationUtils; import tools.DBTools; import tools.User; diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index fdc8c78..68f158e 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -1,97 +1,382 @@ - - - - - Automated system of data collection - + + + + + + + + - - + Caucasus and Central Asia Locust Management System (CCALM) + + + + + + + + + + + + + + + + - - - + .fade-in-section.is-visible { + opacity: 1; + transform: translateY(0); + } -
+ /* Language selector styling */ + .language-selector { + position: absolute; + top: 20px; + right: 20px; + z-index: 50; + } -
+ .language-button { + background: rgba(255, 255, 255, 0.9); + border: 1px solid rgba(255, 255, 255, 0.3); + border-radius: 0.5rem; + padding: 0.5rem 1rem; + color: #374151; + cursor: pointer; + transition: all 0.3s ease; + display: flex; + align-items: center; + gap: 0.5rem; + } -
-

Caucasus and Central Asia Locusts Management system (CCALM)

-

- - According to the implementation of the Road Map "program to improve national and regional locust control in the Caucasus and Central Asia (CCA)" developed a system of monitoring and analysis designed to control locusts in the CCA using a geographic information system and remote sensing technology. -

+ .language-button:hover { + background: rgba(255, 255, 255, 1); + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); + } - + .language-button.active { + background: var(--color-button); + color: white; + } + + + -
-
-
Automated system of data collection (ASDC)
-
-
-
Caucasus and Central Asia Locusts Management system (CCALM)
-
-
-
+ + + + +
+ + +
+ + +
+
+
+

+
+
+
+ + +
+
+ + +
+
+

+
+
+ + +
+ + +
+
+ +
+

+ +
+ + +
+
+ +
+

+ +
+ +
+
+
+ + + + + + diff --git a/src/main/resources/templates/index_old.html b/src/main/resources/templates/index_old.html new file mode 100644 index 0000000..fdc8c78 --- /dev/null +++ b/src/main/resources/templates/index_old.html @@ -0,0 +1,97 @@ + + + + + Automated system of data collection + + + + + + + + + + + + +
+ +
+ +
+

Caucasus and Central Asia Locusts Management system (CCALM)

+

+ + According to the implementation of the Road Map "program to improve national and regional locust control in the Caucasus and Central Asia (CCA)" developed a system of monitoring and analysis designed to control locusts in the CCA using a geographic information system and remote sensing technology. +

+ + + +
+
+
Automated system of data collection (ASDC)
+
+
+
Caucasus and Central Asia Locusts Management system (CCALM)
+
+
+
+ +
+
For any questions contact us at tel./Fax 8(727)3967038, E-mail: info@ccalm.org.
+ +
+
+ + \ No newline at end of file