From dcf560cfb41afeaf878888685d466e01543e24de Mon Sep 17 00:00:00 2001 From: Martin Mares <mj@ucw.cz> Date: Fri, 17 Apr 2020 11:13:13 +0200 Subject: [PATCH] =?UTF-8?q?=C3=9Apravy=20pro=20Z=C5=A0=20Dob=C5=99ichovice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Makefile | 2 +- app/templates/main.html | 6 +----- app/zoom.py | 21 +++------------------ hook/Makefile | 2 +- 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/app/Makefile b/app/Makefile index 468b70f..a829551 100644 --- a/app/Makefile +++ b/app/Makefile @@ -1,4 +1,4 @@ -DEST=/srv/mffzoom/app +DEST=/srv/zoom-zs-dobrichovice/app install: rsync -av --delete zoom.py templates $(DEST)/ diff --git a/app/templates/main.html b/app/templates/main.html index ddf29a4..f365565 100644 --- a/app/templates/main.html +++ b/app/templates/main.html @@ -62,7 +62,7 @@ </style> </head> <body> - <h1>MFF Zoom</h1> + <h1>Zoom ZŠ Dobřichovice</h1> <p id=intro>This table summarizes meetings scheduled in our Zoom accounts. Use standard Zoom interface to create and modify reservations. Please keep in mind that there is a slight delay between Zoom and this table. Please report all bugs to Martin Mareš.</p> @@ -74,10 +74,6 @@ <option value=1{{ " selected" if g.hours==1 else "" }}>Working hours</option> <option value=2{{ " selected" if g.hours==2 else "" }}>Whole day</option> </select> - <select name=rooms> - <option value=i{{ " selected" if g.rooms=="i" else "" }}>CompSci rooms</option> - <option value=m{{ " selected" if g.rooms=="m" else "" }}>Math rooms</option> - </select> <input type=submit name=submit value="Submit"> </form> diff --git a/app/zoom.py b/app/zoom.py index 2970535..2631640 100644 --- a/app/zoom.py +++ b/app/zoom.py @@ -56,24 +56,9 @@ def get_date(): room_list = { 'i': [ - ('Z1', 'zoom-1@d3s.mff.cuni.cz'), - ('Z2', 'zoom-2@d3s.mff.cuni.cz'), - ('Z3', 'zoom-3@d3s.mff.cuni.cz'), - ('Z4', 'zoom-4@d3s.mff.cuni.cz'), - ('Z5', 'zoom-5@d3s.mff.cuni.cz'), - ('Z6', 'zoom-6@d3s.mff.cuni.cz'), - ('Z7', 'zoom-7@d3s.mff.cuni.cz'), - ('Z8', 'zoom-8@d3s.mff.cuni.cz'), - ('Z9', 'zoom-9@d3s.mff.cuni.cz'), - ('Z10', 'zoom-10@d3s.mff.cuni.cz'), - ], - 'm': [ - ('ZM1', 'zoom-m-1@d3s.mff.cuni.cz'), - ('ZM2', 'zoom-m-2@d3s.mff.cuni.cz'), - ('ZM3', 'zoom-m-3@d3s.mff.cuni.cz'), - ('ZM4', 'zoom-m-4@d3s.mff.cuni.cz'), - ('ZM7', 'zoom-m-7@d3s.mff.cuni.cz'), - ('ZM8', 'zoom-m-8@d3s.mff.cuni.cz'), + ('Mejstříková', 'mejstrikova@zsdobrichovice.cz'), + ('Barvová', 'barvova@zsdobrichovice.cz'), + ('Dvořáková', 'dvorakova@zsdobrichovice.cz'), ], } diff --git a/hook/Makefile b/hook/Makefile index 5348560..65d9d9e 100644 --- a/hook/Makefile +++ b/hook/Makefile @@ -1,4 +1,4 @@ -DEST=/srv/mffzoom/hook +DEST=/srv/zoom-zs-dobrichovice/hook install: cp hook.wsgi $(DEST)/ -- GitLab