refactor

src/app/views/index.py

@@ -5,8 +5,8 @@ from views.login import Login
 from views.logout import Logout
 from views.register import Register
 from views.admin import Admin
-from views.project import Project
-from views.my_projects import My_projects
+from views.new_project import New_project
+from views.open_projects import Open_projects
 import models.project
 
 # Define application routes
@@ -16,8 +16,8 @@ urls = (
     '/logout', 'Logout',
     '/register', 'Register',
     '/guestbook', 'Guestbook',
-    '/new_project', 'Project',
-    '/my_projects', 'My_projects',
+    '/new_project', 'New_project',
+    '/open_projects', 'Open_projects',
     '/admin', 'Admin',
 )
                               

src/app/views/project.py → src/app/views/new_project.py

@@ -6,7 +6,7 @@ from views.utils import get_nav_bar
 # Get html templates
 render = web.template.render('templates/')
 
-class Project:
+class New_project:
 
     # Get the registration form
     def GET(self):
@@ -15,7 +15,7 @@ class Project:
         project_form_elements = get_project_form_elements()
         task_form_elements = get_task_form_elements()
         project_form = get_new_project_form((project_form_elements + task_form_elements))
-        return render.project(nav, project_form)
+        return render.new_project(nav, project_form)
 
     # Register new project in database
     def POST(self):

src/app/views/my_projects.py → src/app/views/open_projects.py

@@ -1,12 +1,11 @@
 import web
 from views.utils import get_nav_bar
-from views.project import Project
 from models.project import get_categories, get_projects_by_status_and_category
 
 # Get html templates
 render = web.template.render('templates/')
 
-class My_projects:
+class Open_projects:
     
     # Get projects
     def GET(self):
@@ -17,4 +16,4 @@ class My_projects:
             open_projects = get_projects_by_status_and_category(data.categoryid, "open")
         nav = get_nav_bar(session)
         categories = get_categories()
-        return render.my_projects(nav, categories, open_projects)
+        return render.open_projects(nav, categories, open_projects)

src/app/views/utils.py

@@ -10,7 +10,7 @@ def get_nav_bar(session):
         result += '    <li><a href="register">Register</a></li>'
         result += '    <li><a href="login">Login</a></li>'
     result += '    <li><a href="new_project">New</a></li>'
-    result += '    <li><a href="my_projects">Projects</a></li>'
+    result += '    <li><a href="open_projects">Projects</a></li>'
     result += '    <li><a href="guestbook">Guestbook</a></li>'
     result += ' </ul>'
     result += '</nav>'