обновлено

KSOSH · Nov 29, 2024 · ccbd68a · ccbd68a
1 parent 6218396
commit ccbd68a
Show file tree

Hide file tree

Showing 14 changed files with 107 additions and 73 deletions.
diff --git a/site/assets/templates/projectsoft/css/main.css b/site/assets/templates/projectsoft/css/main.css
diff --git a/site/assets/templates/projectsoft/css/main.min.css b/site/assets/templates/projectsoft/css/main.min.css
diff --git a/site/assets/templates/projectsoft/css/tinymce.css b/site/assets/templates/projectsoft/css/tinymce.css
diff --git a/site/assets/templates/projectsoft/css/tinymce.min.css b/site/assets/templates/projectsoft/css/tinymce.min.css
diff --git a/site/assets/templates/projectsoft/fonts/IconsSite.ttf b/site/assets/templates/projectsoft/fonts/IconsSite.ttf
diff --git a/site/assets/templates/projectsoft/fonts/IconsSite.woff b/site/assets/templates/projectsoft/fonts/IconsSite.woff
diff --git a/site/assets/templates/projectsoft/fonts/IconsSite.woff2 b/site/assets/templates/projectsoft/fonts/IconsSite.woff2
diff --git a/site/assets/templates/projectsoft/index.html b/site/assets/templates/projectsoft/index.html
@@ -36,8 +36,8 @@
 		</div>{{@FILE assets/templates/projectsoft/tpl/yepnope.html}}
 		{{@FILE assets/templates/projectsoft/tpl/yepnope-load.html}}
 		<script src="https://pos.gosuslugi.ru/bin/script.min.js"></script>
-		<link type="text/css" rel="stylesheet" href="[~423~]?ff02a59dc945c8c2c3adf9f66ac4d543">
-		<script src="[~424~]?ff02a59dc945c8c2c3adf9f66ac4d543"></script>
+		<link type="text/css" rel="stylesheet" href="[~423~]?b0533e6d6cf7b04745ef73e90fb83a5e">
+		<script src="[~424~]?b0533e6d6cf7b04745ef73e90fb83a5e"></script>
 		<script>Widget("https://pos.gosuslugi.ru/form", 299239)</script>
 	</body>
 </html>
diff --git a/site/assets/templates/projectsoft/js/main.js b/site/assets/templates/projectsoft/js/main.js
@@ -1002,6 +1002,10 @@
 	};
 })(jQuery);
 (function($){
+	/**
+	 * Set Cookie notify (days)
+	 **/
+	const COOKIE_DATE = 7;
 	!(function(){
 		let ref = document.referrer;
 		try {
@@ -1012,8 +1016,7 @@
 				let person = document.querySelector('.news_person');
 				if(person){
 					a = document.createElement('a');
-					a.innerHTML = 'Вернуться';//'<span>В</span><span>е</span><span>р</span><span>н</span><span>у</span><span>т</span><span>ь</span><span>с</span><span>я</span>';
-					//a.setAttribute('data-before', 'Вернуться');
+					a.innerHTML = 'Вернуться';
 					a.classList.add('btn');
 					a.classList.add('btn-any')
 					if(url.searchParams.has('page')){
@@ -1037,10 +1040,6 @@
 	/**
 	 * http://gbou.school/viewer/web/viewer.html?file=assets/files/0007/0608/prn1-od-ot-09.01.2023_.pdf
 	 **/
-	/**
-	 * Set Cookie notify (days)
-	 **/
-	const COOKIE_DATE = 7;
 	/**
 	 * Default options Fancybox
 	**/
@@ -1551,11 +1550,31 @@
 		/**
 		 * new_year prazdnik                01
 		 * defender_day prazdnik            23
+		 
+			https://media.tenor.com/xiJZlZtHNrUAAAAM/field-of.gif
+			assets/images/background/0010-bg.jpg
 		 *
 		 **/
+		// Новый год 15.12 - 15.01
 		if((day > 15 && month == 12) || (day < 15 && month == 1)) {
 			$("body").addClass('new_year prazdnik');
 		}
+		// Двадцать третье февраля 18.02 - 27.01
+		if((day > 15 && month == 2) || (day < 27 && month == 2)) {
+			$("body").addClass('feast_23');
+		}
+		// Восьмое марта 4.03 - 11.03
+		if((day > 4 && month == 3) || (day < 11 && month == 3)) {
+			$("body").addClass('feast_08');
+		}
+		// День космонавтики 08.04 - 16.04
+		if((day > 8 && month == 4) || (day < 16 && month == 4)) {
+			$("body").addClass('feast_12');
+		}
+		// Девятое мая 01.05 - 14.05
+		if((day > 1 && month == 5) || (day < 14 && month == 5)) {
+			$("body").addClass('feast_09');
+		}
 	})();
 	/**
 	 * Cookies
@@ -1576,8 +1595,6 @@
 			/**
 			 * Если компьютер не в школе
 			 * Показываем сообщение
-			https://media.tenor.com/xiJZlZtHNrUAAAAM/field-of.gif
-			assets/images/background/0010-bg.jpg
 			**/
 			$('.notification-form').removeClass('hidden');
 			var notIni = setTimeout(setCookieNotify, 10000);

diff --git a/site/assets/templates/projectsoft/js/main.min.js b/site/assets/templates/projectsoft/js/main.min.js
diff --git a/site/assets/templates/projectsoft/tpl/head.html b/site/assets/templates/projectsoft/tpl/head.html
@@ -26,8 +26,8 @@
 	<meta name="msapplication-TileColor" content="#ffffff">
 	<meta name="msapplication-TileImage" content="[(site_url)]ms-icon-144x144.png">
 	<meta name="theme-color" content="#ffffff">
-	<link type="text/css" rel="stylesheet" href="assets/templates/projectsoft/css/main.min.css?76fc9d815986c8bc1963c2dc20454dc8">
-	<link type="text/css" rel="stylesheet" href="css.css?76fc9d815986c8bc1963c2dc20454dc8">
+	<link type="text/css" rel="stylesheet" href="assets/templates/projectsoft/css/main.min.css?534d46164ecd8e218189fc4eb2f2a065">
+	<link type="text/css" rel="stylesheet" href="css.css?534d46164ecd8e218189fc4eb2f2a065">
 	<meta name="apple-mobile-web-app-title" content="[(site_name)]">
 	<meta name="application-name" content="[(site_name)]">
 	<meta name="title" content="[*pagetitle:notags:strip*]">

diff --git a/site/assets/templates/projectsoft/tpl/yepnope-load.html b/site/assets/templates/projectsoft/tpl/yepnope-load.html
@@ -1,4 +1,4 @@
 
 <script type="text/javascript"></script>
-<script src="assets/templates/projectsoft/js/appjs.min.js?d404cf6cc2f053bd003aebfae7926918"></script>
-<script src="assets/templates/projectsoft/js/main.min.js?d404cf6cc2f053bd003aebfae7926918"></script>[!YandexMetrika!]
+<script src="assets/templates/projectsoft/js/appjs.min.js?ef41a9e711602668392936c06112b66c"></script>
+<script src="assets/templates/projectsoft/js/main.min.js?ef41a9e711602668392936c06112b66c"></script>[!YandexMetrika!]
diff --git a/src/fonts/IconsSite.ttf b/src/fonts/IconsSite.ttf
diff --git a/src/js/main.js b/src/js/main.js
@@ -1,4 +1,8 @@
 (function($){
+	/**
+	 * Set Cookie notify (days)
+	 **/
+	const COOKIE_DATE = 7;
 	!(function(){
 		let ref = document.referrer;
 		try {
@@ -9,8 +13,7 @@
 				let person = document.querySelector('.news_person');
 				if(person){
 					a = document.createElement('a');
-					a.innerHTML = 'Вернуться';//'<span>В</span><span>е</span><span>р</span><span>н</span><span>у</span><span>т</span><span>ь</span><span>с</span><span>я</span>';
-					//a.setAttribute('data-before', 'Вернуться');
+					a.innerHTML = 'Вернуться';
 					a.classList.add('btn');
 					a.classList.add('btn-any')
 					if(url.searchParams.has('page')){
@@ -34,10 +37,6 @@
 	/**
 	 * http://gbou.school/viewer/web/viewer.html?file=assets/files/0007/0608/prn1-od-ot-09.01.2023_.pdf
 	 **/
-	/**
-	 * Set Cookie notify (days)
-	 **/
-	const COOKIE_DATE = 7;
 	/**
 	 * Default options Fancybox
 	**/
@@ -548,11 +547,31 @@
 		/**
 		 * new_year prazdnik                01
 		 * defender_day prazdnik            23
+		 
+			https://media.tenor.com/xiJZlZtHNrUAAAAM/field-of.gif
+			assets/images/background/0010-bg.jpg
 		 *
 		 **/
+		// Новый год 15.12 - 15.01
 		if((day > 15 && month == 12) || (day < 15 && month == 1)) {
 			$("body").addClass('new_year prazdnik');
 		}
+		// Двадцать третье февраля 18.02 - 27.01
+		if((day > 15 && month == 2) || (day < 27 && month == 2)) {
+			$("body").addClass('feast_23');
+		}
+		// Восьмое марта 4.03 - 11.03
+		if((day > 4 && month == 3) || (day < 11 && month == 3)) {
+			$("body").addClass('feast_08');
+		}
+		// День космонавтики 08.04 - 16.04
+		if((day > 8 && month == 4) || (day < 16 && month == 4)) {
+			$("body").addClass('feast_12');
+		}
+		// Девятое мая 01.05 - 14.05
+		if((day > 1 && month == 5) || (day < 14 && month == 5)) {
+			$("body").addClass('feast_09');
+		}
 	})();
 	/**
 	 * Cookies
@@ -573,8 +592,6 @@
 			/**
 			 * Если компьютер не в школе
 			 * Показываем сообщение
-			https://media.tenor.com/xiJZlZtHNrUAAAAM/field-of.gif
-			assets/images/background/0010-bg.jpg
 			**/
 			$('.notification-form').removeClass('hidden');
 			var notIni = setTimeout(setCookieNotify, 10000);