Merge branch 'master' of https://github.com/clyhtsuriva/ATS-Project

8 files changed, 3 insertions, 2 deletions

diff --git a/web/website/.htaccess b/www/html/.htaccess
index 825c08d..d074f91 100755
--- a/web/website/.htaccess
+++ b/www/html/.htaccess
@@ -1,4 +1,5 @@
 AuthType Basic
 AuthName "restricted area"
-AuthUserFile /var/www/html/ATS-Project/web/.htpasswd
+AuthUserFile /var/www/.htpasswd
 require valid-user
+DirectoryIndex index.py
diff --git a/web/website/fonctions.py b/www/html/fonctions.py
index c1566af..c1566af 100755
--- a/web/website/fonctions.py
+++ b/www/html/fonctions.py
diff --git a/web/website/index.html b/www/html/index.html
index 27f4dda..27f4dda 100755
--- a/web/website/index.html
+++ b/www/html/index.html
diff --git a/web/website/index.py b/www/html/index.py
index 131a82a..010ed2d 100755
--- a/web/website/index.py
+++ b/www/html/index.py
@@ -35,5 +35,5 @@ def index(req):
 + content + 
 """
 </table>
-"""))
+""")) #tableheads to change so it takes the output of the select
 
diff --git a/web/website/init-bd.sql b/www/html/init-bd.sql
index f1a4f2b..f1a4f2b 100755
--- a/web/website/init-bd.sql
+++ b/www/html/init-bd.sql
diff --git a/web/website/style.css b/www/html/style.css
index 6d0bd42..6d0bd42 100755
--- a/web/website/style.css
+++ b/www/html/style.css
diff --git a/web/website/test.html b/www/html/test.html
index b789672..b789672 100755
--- a/web/website/test.html
+++ b/www/html/test.html
diff --git a/web/website/test.py b/www/html/test.py
index 6ff289c..6ff289c 100755
--- a/web/website/test.py
+++ b/www/html/test.py