From ca33d8000c2d515bfc58a290ef073da51d4432b1 Mon Sep 17 00:00:00 2001
From: danamir <danamir522@gmail.com>
Date: Mon, 9 Nov 2020 01:48:53 +0300
Subject: [PATCH] Refactor template

---
 static/css/rasp_group.css |   8 +-
 templates/rasp_dop.html   |  62 +++++--------
 templates/rasp_ekz.html   | 187 ++++++++------------------------------
 templates/rasp_group.html |  37 +-------
 templates/rasp_prep.html  |  60 ++----------
 wsgi.py                   |   4 +
 6 files changed, 84 insertions(+), 274 deletions(-)
 create mode 100644 wsgi.py

diff --git a/static/css/rasp_group.css b/static/css/rasp_group.css
index c7bc2cc..da0c1fa 100644
--- a/static/css/rasp_group.css
+++ b/static/css/rasp_group.css
@@ -143,5 +143,11 @@ margin-top: 2%;
     color:#1f446e;
 }
 .btn_back:hover {
-    color:#1f446e
+    color:#1f446e;
+}
+
+#backbutton{
+    color:#1f446e;
+    background-color: white;
+    font-size:25px;
 }
\ No newline at end of file
diff --git a/templates/rasp_dop.html b/templates/rasp_dop.html
index 49661f9..7b02f8a 100644
--- a/templates/rasp_dop.html
+++ b/templates/rasp_dop.html
@@ -17,7 +17,7 @@
 
   <a href="#" class="" ><img class="logo align-middle" src="{{url_for('static', filename='img/logo.png')}}"></a>
    
-    <a href="index.html" class="btn_back"> Назад </a>
+
 	
 	<nav class="navbar navbar-expand-sm  navbar-light justify-content-center">
         <div class="row">
@@ -119,37 +119,10 @@
 
 			</tbody>
           </table>
-          <hr>
-          <div class="container data text-center" id="fotdata">
-            <div class="row justify-content-around">
-      
-              <div class="data col-3">
-                <h5 class="justify-content-center ">{{days}}</h5>
-              </div>
-      
-              <div class="data col-3 ">
-                <h5 class="justify-content-center ">{{day_week}}</h5>
-              </div>
-      
-              <div class="data col-3">
-                <h5 class="justify-content-center ">Числитель</h5>
-              </div>
-      
-              <div class="data col-3">
-                <h5 class="justify-content-center " id="group__time">10:00</h5>
-              </div>
-      
-            </div>
-	</div>
 
-        
-   
-    
     </div> 
-    
-    
-   
-      <!-- Modal -->
+
+      <!-- Modal
       <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
         <div class="modal-dialog border-0" role="document">
           <div class="modal-content">
@@ -166,7 +139,7 @@
               <img src="images/Alex.jpg" class="border border-dark">
               </div>
               <div class="col text-center">
-                Сальный Александр Геннадьевич, Старший преподаватель  
+                Сальный Александр Геннадьевич, Старший преподаватель
 
                 </div>
               </div>
@@ -179,13 +152,28 @@
           </div>
         </div>
       </div>
-
+-->
 
 </body>
 <footer class="page-footer justify-content-center mx-auto ">
-	
-</footer>
-<!-- Footer -->
-</body>
-</div>
+    <div class="container data text-center" id="fotdata">
+      <div class="row justify-content-around">
+
+        <div class="data col-3">
+          <h5 class="justify-content-center ">{{days}}</h5>
+        </div>
+
+        <div class="data col-3 ">
+          <h5 class="justify-content-center ">{{day_week}}</h5>
+        </div>
+
+        <div class="data col-3">
+          <h5 class="justify-content-center ">Числитель</h5>
+        </div>
+
+        <div class="data col-3">
+            <h5 class="justify-content-center"><a href="index.html" class="btn-block" role="button" id="backbutton"> Назад </a></h5>
+        </div>
+      </div>
+    </div>
 </html>
\ No newline at end of file
diff --git a/templates/rasp_ekz.html b/templates/rasp_ekz.html
index 22911c6..c13fe55 100644
--- a/templates/rasp_ekz.html
+++ b/templates/rasp_ekz.html
@@ -17,15 +17,31 @@
 
  
 	<a href="#" class="" ><img class="logo align-middle" src="{{url_for('static', filename='img/logo.png')}}"></a>
-	<a href="index.html" class="btn_back"> Назад </a>
+
     
 	<nav class="navbar navbar-expand-sm  navbar-light justify-content-center">
         <div class="row">
 		<div class="col-12 text-center">
 			<h1 class="" style="float:center"> Расписание экзаменов</h1>
-	
 	</nav>
 
+
+
+  <div class="container" id=table>
+    <table class="table table-striped table-bordered ">
+      <thead>
+        <tr>
+          <th scope="col">№</th>
+          <th scope="col">Время</th>
+          <th scope="col">Наименование дисциплины</th>
+          <th scope="col">Аудитория</th>
+          <th scope="col">Преподаватель</th>
+        </tr>
+      </thead>
+      <tbody>
+      </tbody>
+    </table>
+
 	<div class="container">
 		<div class="row">
 			<div class="col text-center pt-3">
@@ -33,155 +49,28 @@
 			</div>
 		</div>
 	</div>
-	
-<!-- 	
-	<div class="container" id=dropdownMenu>
-     <div class="row justify-content-around ">
-		<div class="form-group col-4 text-center">
-			<label for="exampleFormControlSelect1">Курс</label>
-			<select class="custom-select form-control-lg  border-top text-center" id="exampleFormControlSelect1">
-              <option>Не выбрано</option>
-              <option>1</option>
-			  <option>2</option>
-			  <option>3</option>
-			  <option>4</option>
-			  <option>5</option>
-			</select>
-		  </div>
-		  <div class="form-group col-lg-4 text-center">
-			<label for="exampleFormControlSelect2">Группа</label> 
-			<select class="custom-select form-control-lg border-0 text-center" id="exampleFormControlSelect1"> 
-              <option>Не выбрано</option>
-              <option>4ЗбАСУс</option>
-			  <option>2</option>
-			  <option>3</option>
-			  <option>4</option>
-			  <option>5</option> 
-			</select>
-		  </div>
-
-        </div>
-	
-	</div> -->
-    
-    <!-- <hr >
-	<div class="container " id=table>
-		<table class="table table-striped table-bordered ">
-			<thead >
-			  <tr>
-				<th scope="col">№</th>
-				<th scope="col">Наименование дисциплины</th>
-				<th scope="col">Дата экзамена</th>
-				<th scope="col">Время начала экзамена</th>
-				<th scope="col">Аудитория</th>
-				<th scope="col">Преподаватель</th>
-			  </tr>
-			</thead>
-			<tbody>
-			  <tr>
-				<th scope="row">1</th>
-				<td class="col-auto">Основы компьютерной и демонтстрацинной графики</td>
-				<td class="col-auto">10.07.20</td>
-				<td class="col-auto">10:00</td>
-				<td class="col-auto">609л</td>
-				<td class="col-auto"><a data-toggle="modal" data-target="#exampleModal" href="#">Сальный А.Г.</a></td>
-			  </tr>
-			  <tr>
-				<th scope="row">2</th>
-				<td class="col-auto">Инженерная и компьютерная графика
-                </td>
-				<td class="col-auto">10.07.20</td>
-				<td class="col-auto">10:00</td>
-				<td class="col-auto">609л</td>
-				<td class="col-auto"><a data-toggle="modal" data-target="#exampleModal" href="#">Сальный А.Г.</a></td>
-			  </tr>
-			  <tr>
-				<th scope="row">3</th>
-				<td class="col-auto">Визуальное программирование</td>
-				<td class="col-auto">10.07.20</td>
-				<td class="col-auto">10:00</td>
-				<td class="col-auto">609л</td>
-				<td class="col-auto"><a data-toggle="modal" data-target="#exampleModal" href="#">Сальный А.Г.</a></td>
-			  </tr>
-			  <tr>
-				<th scope="row">4</th>
-				<td class="col-auto">Информатика</td>
-				<td class="col-auto">10.07.20</td>
-				<td class="col-auto">10:00</td>
-				<td class="col-auto">609л</td>
-				<td class="col-auto"><a data-toggle="modal" data-target="#exampleModal" href="#">Сальный А.Г.</a></td>
-			  </tr>
-
-			</tbody>
-          </table>
-          <hr>
-          <div class="container-fluid data text-center" id="fotdata"> 
-            <div class="row justify-content-around">
-
-            <div class="data col-3">
-            <h5 class="justify-content-center ">10 июля 2020</h5> 
-            </div>
-
-            <div class="data col-3 ">
-            <h5 class="justify-content-center ">Четверг</h5>
-            </div>
-
-            <div class="data col-3">
-            <h5 class="justify-content-center ">Числитель</h5>
-            </div>
-
-            <div class="data col-3">
-            <h5 class="justify-content-center ">10:00</h5>
-            </div>
-
-            </div>
-        </div>
-	</div>
-
-        
-   
-    
-    </div> 
-    
-     -->
-   
-      <!-- Modal -->
-      <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
-        <div class="modal-dialog border-0" role="document">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h5 class="modal-title" id="exampleModalLabel"></h5>
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-            </div>
-            <div class="modal-body">
-                <div class="container">
-                    <div class="row">
-                        <div class="col modul-foto">
-              <img src="images/Alex.jpg" class="border border-dark">
-              </div>
-              <div class="col text-center">
-                Сальный Александр Геннадьевич, Старший преподаватель  
-
-                </div>
-              </div>
-              </div>
-              </div>
-            </div>
-            <div class="modal-footer">
-              <button type="button" class="btn btn-secondary " data-dismiss="modal">Close</button>
-            </div>
-          </div>
-        </div>
-      </div>
 
 
 </body>
 <footer class="page-footer justify-content-center mx-auto ">
-	
-</footer>
-<!-- Footer -->
-</body>
-</div>
+    <div class="container data text-center" id="fotdata">
+      <div class="row justify-content-around">
+
+        <div class="data col-3">
+          <h5 class="justify-content-center ">{{days}}</h5>
+        </div>
+
+        <div class="data col-3 ">
+          <h5 class="justify-content-center ">{{day_week}}</h5>
+        </div>
+
+        <div class="data col-3">
+          <h5 class="justify-content-center ">Числитель</h5>
+        </div>
+
+        <div class="data col-3">
+            <h5 class="justify-content-center"><a href="index.html" class="btn-block" role="button" id="backbutton"> Назад </a></h5>
+        </div>
+      </div>
+    </div>
 </html>
\ No newline at end of file
diff --git a/templates/rasp_group.html b/templates/rasp_group.html
index 9174205..9297117 100644
--- a/templates/rasp_group.html
+++ b/templates/rasp_group.html
@@ -38,9 +38,6 @@
     </div>
   </nav>
 
-  <!-- <div class="container bg" id="dropdownMenu">
-     <div class="row justify-content-around "> -->
-
   <div class="container justify-content-around pt-3 form-group c_form pt-1 text-center">
 
 
@@ -58,8 +55,6 @@
   </div>
 
 
-
-
   <div class="container" id=table>
     <table class="table table-striped table-bordered ">
       <thead>
@@ -85,35 +80,16 @@
           <td class="col-auto">{{table[6 * i + 5]}}</td>
 
         </tr>
-        <!-- <tr>
-                <th scope="row">1</th>
-                <td class="col-auto">{{table[i][0]}}</td>
-				<td class="col-auto">{{table[i][1]}}</td>
-				<td class="col-auto">{{table[i][2]}}</td>
-				<td class="col-auto">{{table[i][3]}}</td>
-				<td class="col-auto">{{table[i][4]}}</td>
-				<td class="col-auto"><a data-toggle="modal" data-target="#exampleModal" href="#">{{table[5]}}</a></td>
-			 </tr> -->
         {% endfor %}
 
       </tbody>
     </table>
     <hr>
-
-
-
-
   </div>
-
-  </div>
-
-
-  </div>
-
-
 </body>
+
 <footer class="page-footer justify-content-center mx-auto ">
-<div class="container data text-center" id="fotdata">
+    <div class="container data text-center" id="fotdata">
       <div class="row justify-content-around">
 
         <div class="data col-3">
@@ -129,15 +105,10 @@
         </div>
 
         <div class="data col-3">
-            <h5 class="justify-content-center "><a href="index.html"> Назад </a></h5>
-
+            <h5 class="justify-content-center"><a href="index.html" class="btn-block" role="button" id="backbutton"> Назад </a></h5>
         </div>
-
       </div>
     </div>
+
 </footer>
-
-</body>
-</div>
-
 </html>
\ No newline at end of file
diff --git a/templates/rasp_prep.html b/templates/rasp_prep.html
index aec9ba6..cdb9c98 100644
--- a/templates/rasp_prep.html
+++ b/templates/rasp_prep.html
@@ -26,7 +26,7 @@
 
 
   <a href="#" class=""><img class="logo align-middle" src="{{url_for('static', filename='img/logo.png')}}"></a>
-  <a href="index.html" class="btn_back"> Назад </a>
+
 
   <nav class="navbar navbar-expand-sm  navbar-light justify-content-center">
     <div class="row">
@@ -83,8 +83,10 @@
 
       </tbody>
     </table>
-    <hr>
-    <div class="container-fluid data text-center" id="fotdata">
+
+</body>
+<footer class="page-footer justify-content-center mx-auto ">
+    <div class="container data text-center" id="fotdata">
       <div class="row justify-content-around">
 
         <div class="data col-3">
@@ -100,59 +102,9 @@
         </div>
 
         <div class="data col-3">
-          <h5 class="justify-content-center ">10:00</h5>
+            <h5 class="justify-content-center"><a href="index.html" class="btn-block" role="button" id="backbutton"> Назад </a></h5>
         </div>
-
       </div>
     </div>
-  </div>
-
-
-
-
-  </div>
-
-
-
-  <!-- Modal -->
-  <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-    aria-hidden="true">
-    <div class="modal-dialog border-0" role="document">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title" id="exampleModalLabel"></h5>
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-          </button>
-        </div>
-        <div class="modal-body">
-          <div class="container">
-            <div class="row">
-              <div class="col modul-foto">
-                <img src="images/Alex.jpg" class="border border-dark">
-              </div>
-              <div class="col text-center">
-                Сальный Александр Геннадьевич, Старший преподаватель
-
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary " data-dismiss="modal">Close</button>
-      </div>
-    </div>
-  </div>
-  </div>
-
-
-</body>
-<footer class="page-footer justify-content-center mx-auto ">
-
-</footer>
-<!-- Footer -->
-</body>
-</div>
 
 </html>
\ No newline at end of file
diff --git a/wsgi.py b/wsgi.py
new file mode 100644
index 0000000..9a5ee96
--- /dev/null
+++ b/wsgi.py
@@ -0,0 +1,4 @@
+import app
+
+if __name__ == "__main__":
+    app.run()
\ No newline at end of file