DMC/scipro
7
0
Fork 0
Code Issues30 Pull Requests3 Actions Projects1 Releases Wiki Activity

Merge branch 'm3_application_periods' into develop

Browse Source
This commit is contained in:
Emil Siverhall 2012-07-30 15:48:11 +02:00
commit 59b4528076
2 changed files with 4 additions and 2 deletions
src/main/java/se/su/dsv/scipro
SciProApplication.java
supervisor/panels
SupervisorAvailabilityPanel.html

5
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
*/

1
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>