diff --git a/src/app/static/stylesheet.css b/src/app/static/stylesheet.css
index e3710c2..b8efb54 100644
--- a/src/app/static/stylesheet.css
+++ b/src/app/static/stylesheet.css
@@ -22,6 +22,7 @@ body {
.projects div {
border: 1px solid gray;
+ cursor: pointer;
}
.categories {
@@ -90,6 +91,25 @@ nav ul {
cursor: pointer;
margin: 2px;
}
+
.user_projects_category:hover {
background-color: lightskyblue;
}
+
+#apply {
+ border: 1px solid gray;
+ padding: 5px;
+ background-color: lightslategray;
+ cursor: pointer;
+ margin: auto;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
+#apply:hover {
+ background-color: lightskyblue;
+}
+
+#project_meta {
+ margin: auto;
+}
diff --git a/src/app/templates/project.html b/src/app/templates/project.html
index bb34cba..1587ddc 100644
--- a/src/app/templates/project.html
+++ b/src/app/templates/project.html
@@ -1,4 +1,4 @@
-$def with (nav, project_form, project, tasks, permissions)
+$def with (nav, project_form, project, tasks, permissions, categories)
Beelance2
@@ -11,25 +11,29 @@ $def with (nav, project_form, project, tasks, permissions)
$:nav
- Project View
$if len(project):
- Title: $project[3]
- Description: $project[4]
- Status: $project[5]
+ Project: $project[3]
+
+ $if project[5] == "open" and session.userid != project[2]:
+ Apply for this project
+
+
$for task in tasks:
- - $task
-
- $permissions
-
+ -
+
Task: $task[2]
+ Description: $task[3]
+ Budget: $task[4]
$if project[5] != "open":
-
$for filename in get_task_files(task[0]):
$filename[0].split("/")[-1]
-
-
- $if project[5] == "open" and session.userid != project[2]:
- Apply for this project
-
+
\ No newline at end of file
diff --git a/src/app/views/project.py b/src/app/views/project.py
index f87f083..6ee9134 100644
--- a/src/app/views/project.py
+++ b/src/app/views/project.py
@@ -26,6 +26,7 @@ class Project:
data = web.input(projectid=0)
permissions = models.project.get_user_permissions(str(session.userid), data.projectid)
+ categories = models.project.get_categories()
if data.projectid:
project = models.project.get_project_by_id(data.projectid)
@@ -34,7 +35,7 @@ class Project:
project = [[]]
tasks = [[]]
render = web.template.render('templates/', globals={'get_task_files':models.project.get_task_files, 'session':session})
- return render.project(nav, project_form, project, tasks,permissions)
+ return render.project(nav, project_form, project, tasks,permissions, categories)
def POST(self):
# Get session
@@ -43,6 +44,7 @@ class Project:
data = web.input(myfile={}, deliver=None, accepted=None, declined=None, projectid=0)
fileitem = data['myfile']
permissions = models.project.get_user_permissions(str(session.userid), data.projectid)
+ categories = models.project.get_categories()
tasks = models.project.get_tasks_by_project_id(data.projectid)
# Determine status of the targeted task