Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
ProjectSoft-STUDIONIONS committed Nov 29, 2024
1 parent 044e55c commit 6218396
Show file tree
Hide file tree
Showing 15 changed files with 72 additions and 75 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/workwlow.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Workflow
name: ГБОУ СОШ пос. Комсомольский
on:
push:
branches: [ "main" ]
Expand All @@ -9,19 +9,20 @@ on:
workflow_dispatch:
inputs:
Name:
description: Workflow
description: ГБОУ СОШ пос. Комсомольский
required: true
default: 'Workflow'
default: 'ГБОУ СОШ пос. Комсомольский'
jobs:
deploy:
job:
name: ГБОУ СОШ пос. Комсомольский
runs-on: ubuntu-latest
strategy:
matrix:
node: [20]
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Workflow
- name: ГБОУ СОШ пос. Комсомольский
uses: SamKirkland/FTP-Deploy-Action@v4.3.4
with:
server: ${{ secrets.FTP_SERVER }}
Expand All @@ -34,7 +35,7 @@ jobs:
**/viewer/**
**/assets/templates/projectsoft/images/**
**/assets/templates/projectsoft/fonts/**
- name: Remove Status
- name: Status ГБОУ СОШ пос. Комсомольский
uses: StephanThierry/ftp-delete-action@v2.1
with:
host: ${{ secrets.FTP_SERVER }}
Expand Down
48 changes: 24 additions & 24 deletions site/assets/templates/projectsoft/css/main.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion site/assets/templates/projectsoft/css/main.min.css

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions site/assets/templates/projectsoft/css/tinymce.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion site/assets/templates/projectsoft/css/tinymce.min.css

Large diffs are not rendered by default.

Binary file modified site/assets/templates/projectsoft/fonts/IconsSite.ttf
Binary file not shown.
Binary file modified site/assets/templates/projectsoft/fonts/IconsSite.woff
Binary file not shown.
Binary file modified site/assets/templates/projectsoft/fonts/IconsSite.woff2
Binary file not shown.
4 changes: 2 additions & 2 deletions site/assets/templates/projectsoft/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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~]?801302119786046acca509407b64b4c7">
<script src="[~424~]?801302119786046acca509407b64b4c7"></script>
<link type="text/css" rel="stylesheet" href="[~423~]?ff02a59dc945c8c2c3adf9f66ac4d543">
<script src="[~424~]?ff02a59dc945c8c2c3adf9f66ac4d543"></script>
<script>Widget("https://pos.gosuslugi.ru/form", 299239)</script>
</body>
</html>
10 changes: 4 additions & 6 deletions site/assets/templates/projectsoft/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -1576,13 +1576,11 @@
/**
* Если компьютер не в школе
* Показываем сообщение
https://media.tenor.com/xiJZlZtHNrUAAAAM/field-of.gif
assets/images/background/0010-bg.jpg
**/
/**
if(HTTP_CLIENT.int != 1){
$('.notification-form').removeClass('hidden');
var notIni = setTimeout(setCookieNotify, 10000);
}
**/
$('.notification-form').removeClass('hidden');
var notIni = setTimeout(setCookieNotify, 10000);
}
})();

Expand Down
2 changes: 1 addition & 1 deletion site/assets/templates/projectsoft/js/main.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions site/assets/templates/projectsoft/tpl/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -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?0791c7c93e3a6f3920e10da5a64d1155">
<link type="text/css" rel="stylesheet" href="css.css?0791c7c93e3a6f3920e10da5a64d1155">
<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">
<meta name="apple-mobile-web-app-title" content="[(site_name)]">
<meta name="application-name" content="[(site_name)]">
<meta name="title" content="[*pagetitle:notags:strip*]">
Expand Down
4 changes: 2 additions & 2 deletions site/assets/templates/projectsoft/tpl/yepnope-load.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

<script type="text/javascript"></script>
<script src="assets/templates/projectsoft/js/appjs.min.js?764ecc3a48613eb15db50ab51768e934"></script>
<script src="assets/templates/projectsoft/js/main.min.js?764ecc3a48613eb15db50ab51768e934"></script>[!YandexMetrika!]
<script src="assets/templates/projectsoft/js/appjs.min.js?d404cf6cc2f053bd003aebfae7926918"></script>
<script src="assets/templates/projectsoft/js/main.min.js?d404cf6cc2f053bd003aebfae7926918"></script>[!YandexMetrika!]
Binary file modified src/fonts/IconsSite.ttf
Binary file not shown.
10 changes: 4 additions & 6 deletions src/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -573,13 +573,11 @@
/**
* Если компьютер не в школе
* Показываем сообщение
https://media.tenor.com/xiJZlZtHNrUAAAAM/field-of.gif
assets/images/background/0010-bg.jpg
**/
/**
if(HTTP_CLIENT.int != 1){
$('.notification-form').removeClass('hidden');
var notIni = setTimeout(setCookieNotify, 10000);
}
**/
$('.notification-form').removeClass('hidden');
var notIni = setTimeout(setCookieNotify, 10000);
}
})();

Expand Down

0 comments on commit 6218396

Please sign in to comment.