DMC/scipro
7
0
Fork 0
Code Issues39 Pull Requests8 Actions Projects1 Releases Wiki Activity

Added new settings tab on the service menu + the main menu must be contracted in order to make room for the wider service menu

Browse Source
This commit is contained in:
Tom Vahlman 2012-03-29 15:25:22 +02:00
parent 954219bdc2
commit b3451b0852
4 changed files with 82 additions and 55 deletions
src/main/java/se/su/dsv/scipro
basepanels
HeaderPanel.htmlServiceMenuPanel.java
settings/pages
SettingsPage.htmlSettingsPage.java

49
src/main/java/se/su/dsv/scipro/basepanels/HeaderPanel.html

@ -1,25 +1,26 @@
<!DOCTYPE html>
<html
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:panel>
<header id="main-header" class="span-24">
<div class="prepend-1 span-5">
<h1 id="logo">
<a href="" wicket:id="homeLink" title="SciPro">SciPro</a>
</h1>
</div>
<div class="prepend-2 span-15 last user-links"
wicket:id="userLinksPanel"></div>
<div class="main-menu blue-tab-menu">
<a href="https://scipro.dsv.su.se/">Start</a>
</div>
<div class="main-menu prepend-6" wicket:id="mainMenuPanel">
</div>
<div wicket:id="serviceMenuPanel" class="service-menu"></div>
</header>
</wicket:panel>
</body>
<!DOCTYPE html>
<html
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:panel>
<header id="main-header" class="span-24">
<div class="prepend-1 span-5">
<h1 id="logo">
<a href="" wicket:id="homeLink" title="SciPro">SciPro</a>
</h1>
</div>
<div class="prepend-2 span-15 last user-links"
wicket:id="userLinksPanel">
</div>
<div class="main-menu blue-tab-menu">
<a href="https://scipro.dsv.su.se/">Start</a>
</div>
<div class="main-menu prepend-3" wicket:id="mainMenuPanel"></div>
<div wicket:id="serviceMenuPanel" class="service-menu"></div>
</header>
</wicket:panel>
</body>
</html>

62
src/main/java/se/su/dsv/scipro/basepanels/ServiceMenuPanel.java

@ -1,31 +1,31 @@
package se.su.dsv.scipro.basepanels;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.Page;
import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.basepages.MenuPage;
import se.su.dsv.scipro.data.dao.interfaces.WebNotificationDao;
import se.su.dsv.scipro.message.pages.PrivateMessagesPage;
import se.su.dsv.scipro.notifications.NotificationsPage;
public class ServiceMenuPanel extends AbstractBaseMenuPanel {
private static final long serialVersionUID = 3738086567246191811L;
@SpringBean
private WebNotificationDao webNotificationDao;
public ServiceMenuPanel(String id, Class<? extends Page> containerClass) {
super(id,MenuPage.class,containerClass);
}
@Override
protected List<MenuItem> getItemList(){
List<MenuItem> list = new ArrayList<MenuItem>();
list.add(new MenuItem("Notifications " + "(" + Integer.toString(webNotificationDao.getCountOfWebNotifications(SciProSession.get().getUser())) + ")" ,NotificationsPage.class));
return list;
}
}
package se.su.dsv.scipro.basepanels;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.Page;
import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.basepages.MenuPage;
import se.su.dsv.scipro.data.dao.interfaces.WebNotificationDao;
import se.su.dsv.scipro.notifications.NotificationsPage;
import se.su.dsv.scipro.settings.pages.SettingsPage;
public class ServiceMenuPanel extends AbstractBaseMenuPanel {
private static final long serialVersionUID = 3738086567246191811L;
@SpringBean
private WebNotificationDao webNotificationDao;
public ServiceMenuPanel(String id, Class<? extends Page> containerClass) {
super(id,MenuPage.class,containerClass);
}
@Override
protected List<MenuItem> getItemList(){
List<MenuItem> list = new ArrayList<MenuItem>();
list.add(new MenuItem("Settings", SettingsPage.class));
list.add(new MenuItem("Notifications " + "(" + Integer.toString(webNotificationDao.getCountOfWebNotifications(SciProSession.get().getUser())) + ")" ,NotificationsPage.class));
return list;
}
}

10
src/main/java/se/su/dsv/scipro/settings/pages/SettingsPage.html Normal file

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:extend>
<div wicket:id="dialogContent" class="span-22"></div>
</wicket:extend>
</body>
</html>

16
src/main/java/se/su/dsv/scipro/settings/pages/SettingsPage.java Normal file

@ -0,0 +1,16 @@
package se.su.dsv.scipro.settings.pages;
import org.apache.wicket.PageParameters;
import se.su.dsv.scipro.basepages.MenuPage;
import se.su.dsv.scipro.settings.panels.UserSettingsPanel;
public class SettingsPage extends MenuPage {
private static final long serialVersionUID = 9094434431847199240L;
public SettingsPage(final PageParameters pp){
super(pp);
add(new UserSettingsPanel("dialogContent"));
}
}