diff --git a/src/app/templates/project.html b/src/app/templates/new_project.html similarity index 100% rename from src/app/templates/project.html rename to src/app/templates/new_project.html diff --git a/src/app/templates/my_projects.html b/src/app/templates/open_projects.html similarity index 100% rename from src/app/templates/my_projects.html rename to src/app/templates/open_projects.html diff --git a/src/app/views/index.py b/src/app/views/index.py index 34810d9..899d960 100644 --- a/src/app/views/index.py +++ b/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', ) diff --git a/src/app/views/project.py b/src/app/views/new_project.py similarity index 97% rename from src/app/views/project.py rename to src/app/views/new_project.py index a3b6c7c..7721082 100644 --- a/src/app/views/project.py +++ b/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): diff --git a/src/app/views/my_projects.py b/src/app/views/open_projects.py similarity index 81% rename from src/app/views/my_projects.py rename to src/app/views/open_projects.py index 84360ba..4c5fa60 100644 --- a/src/app/views/my_projects.py +++ b/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) diff --git a/src/app/views/utils.py b/src/app/views/utils.py index 4437310..bae6492 100644 --- a/src/app/views/utils.py +++ b/src/app/views/utils.py @@ -10,7 +10,7 @@ def get_nav_bar(session): result += '