From b2e39428510654fdc84461275551d8180cafa9a2 Mon Sep 17 00:00:00 2001
From: Emil Siverhall <emil-siv@dsv.su.se>
Date: Mon, 30 Jul 2012 15:39:21 +0200
Subject: [PATCH 1/2] removed some dummy text
---
.../scipro/supervisor/panels/SupervisorAvailabilityPanel.html | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAvailabilityPanel.html b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAvailabilityPanel.html
index 8985326240..de9158bc2b 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAvailabilityPanel.html
+++ b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAvailabilityPanel.html
@@ -6,7 +6,6 @@
<body>
<wicket:panel>
<div class="info-box rounded-box last">
- <p>Application period is open from xxxx-xx-xx to xxxx-xx-xx and the course start for the application period is xxxx-xx-xx</p>
<p>
According to the settings entered by admin, you should supervise <span wicket:id="targets"></span> projects.
</p>
From 4e0f55e675e9c4763e8c1cd8dd1c837707b57514 Mon Sep 17 00:00:00 2001
From: Emil Siverhall <emil-siv@dsv.su.se>
Date: Mon, 30 Jul 2012 15:45:05 +0200
Subject: [PATCH 2/2] mounted new project idea pages to make better looking
url's
---
src/main/java/se/su/dsv/scipro/SciProApplication.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/se/su/dsv/scipro/SciProApplication.java b/src/main/java/se/su/dsv/scipro/SciProApplication.java
index 5fe6f263ca..eaa6dfc420 100644
--- a/src/main/java/se/su/dsv/scipro/SciProApplication.java
+++ b/src/main/java/se/su/dsv/scipro/SciProApplication.java
@@ -180,8 +180,9 @@ public class SciProApplication extends RepositoryApplication implements IThemabl
mountBookmarkablePage("noproject", NoActiveProjectPage.class);
mountBookmarkablePage("project/checklist", ProjectChecklistPage.class);
mountBookmarkablePage("project/checklist/viewchecklist", ProjectViewCheckListPage.class);
- mountBookmarkablePage("projectideas", MyProjectIdeasPage.class);
+ mountBookmarkablePage("projectideas", ProjectIdeaStartPage.class);
mountBookmarkablePage("projectideas/submit", ProjectIdeaSubmissionPage.class);
+ mountBookmarkablePage("projectideas/myideas", MyProjectIdeasPage.class);
/*
* Supervisor pages
*/
@@ -202,6 +203,8 @@ public class SciProApplication extends RepositoryApplication implements IThemabl
mountBookmarkablePage("supervisor/project/activityplan", SupervisorActivityPlanPage.class);
mountBookmarkablePage("supervisor/project/files", SupervisorFilePage.class);
mountBookmarkablePage("supervisor/interest", SupervisorInterestPage.class);
+ mountBookmarkablePage("supervisor/projectideas", SupervisorProjectIdeaStartPage.class);
+ mountBookmarkablePage("supervisor/projectideas/myideas", SupervisorMyProjectIdeasPage.class);
/*
* Peer pages
*/