DMC/scipro
7
0
Fork 0
Code Issues28 Pull Requests6 Actions Projects1 Wiki Activity

some link changes

Browse Source
This commit is contained in:
fred-fri 2012-09-12 16:38:21 +09:00
parent fc8a499530
commit 57bb023e54
3 changed files with 13 additions and 12 deletions

7
src/main/java/se/su/dsv/scipro/match/panel/ApplicationPeriodInfoPanel.html

@ -15,7 +15,12 @@
<div><span>Start date: <span wicket:id="startDate"></span> End date: <span wicket:id="endDate"></span> Course start date: <span wicket:id="courseStartDate"></span></span></div>
</div>
<a wicket:id="firstLink"><span wicket:id="firstLinkLabel"></span></a>
<!--add(new BookmarkablePageLink<Void>("supervisorSelectLink", SupervisorInterestPage.class).setVisible(model.getObject().equals(Roles.EMPLOYEE)));-->
<!--add(new BookmarkablePageLink<Void>("studentSelectLink", ProjectIdeaStartPage.class).setVisible(model.getObject().equals(Roles.STUDENT)));-->
<!--add(new BookmarkablePageLink<Void>("studentCreateLink", ProjectIdeaSubmissionPage.class).setVisible(model.getObject().equals(Roles.STUDENT)));-->
<a wicket:id="supervisorSelectLink">Select from available student project ideas</a>
<div><a wicket:id="studentSelectLink">View available supervisor project ideas</a> or <a wicket:id="studentCreateLink">submit own project idea</a></div>
</wicket:enclosure>
</div>

16
src/main/java/se/su/dsv/scipro/match/panel/ApplicationPeriodInfoPanel.java

@ -69,16 +69,12 @@ public class ApplicationPeriodInfoPanel extends Panel {
BookmarkablePageLink firstLink;
if (model.getObject().equals(Roles.STUDENT)){
firstLink = new BookmarkablePageLink("firstLink", .class);
add(firstLink);
firstLink.add(new Label("firstLinkLabel", "Select a supervior project idea"));
} else if (model.getObject().equals(Roles.EMPLOYEE)){
firstLink = new BookmarkablePageLink("firstLink", SupervisorIdeaSubmissionPage.class);
add(firstLink);
}
// masterLinkWMC.add(new BookmarkablePageLink<Void>("msupervisorSelectLink", SupervisorInterestPage.class).setVisible(model.getObject().equals(Roles.EMPLOYEE)));
// masterLinkWMC.add(new BookmarkablePageLink<Void>("mstudentSelectLink", ProjectIdeaStartPage.class).setVisible(model.getObject().equals(Roles.STUDENT)));
// masterLinkWMC.add(new BookmarkablePageLink<Void>("mstudentCreateLink", ProjectIdeaSubmissionPage.class).setVisible(model.getObject().equals(Roles.STUDENT)&&!hideCreateLinks));
add(new BookmarkablePageLink<Void>("supervisorSelectLink", SupervisorInterestPage.class).setVisible(model.getObject().equals(Roles.EMPLOYEE)));
add(new BookmarkablePageLink<Void>("studentSelectLink", ProjectIdeaStartPage.class).setVisible(model.getObject().equals(Roles.STUDENT)));
add(new BookmarkablePageLink<Void>("studentCreateLink", ProjectIdeaSubmissionPage.class).setVisible(model.getObject().equals(Roles.STUDENT)));
}
}

2
src/main/java/se/su/dsv/scipro/project/pages/ProjectIdeaStartPage.html

@ -3,7 +3,7 @@
<body>
<wicket:extend>
<div class="prepend-top span-24 last">
<div class="append-bottom"><a wicket:id="backLink">Project ideas</a> > View all available supervisor
<div class="append-bottom"><a wicket:id="backLink">Project ideas</a> > View available supervisor
project ideas
</div>
<div wicket:id="feedback"></div>