DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

Implementerat IAjaxIndicatorAware för att slippa alla ajaxindicatorlänkar etc.

Browse Source 
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@328 73ecded7-942e-4092-bab0-0e58ef0ee984
This commit is contained in:
dan-kjel 2011-03-14 13:17:16 +00:00
parent 280c5ea522
commit 4006dbf471
2 changed files with 11 additions and 4 deletions
src/main/java/se/su/dsv/scipro/basepages
BasePage.htmlBasePage.java

3
src/main/java/se/su/dsv/scipro/basepages/BasePage.html

@ -11,11 +11,12 @@
<!--[if lt IE 8]>
<link rel="stylesheet" href="styles/blueprint/ie.css" type="text/css" media="screen, projection" />
<![endif]-->
<link href="styles/global.css" rel="stylesheet" media="screen,projection" />
<link href="styles/css/scipro.css" rel="stylesheet" media="screen,projection" />
</head>
<body>
<div>
<div id="ajax-loader" style="display:none;"><span>Loading...</span></div>
<wicket:child/>
</div>
</body>

12
src/main/java/se/su/dsv/scipro/basepages/BasePage.java

@ -2,6 +2,7 @@ package se.su.dsv.scipro.basepages;
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.ajax.IAjaxIndicatorAware;
import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.markup.html.WebPage;
@ -12,7 +13,7 @@ import se.su.dsv.scipro.security.auth.SecurityFailAction;
import se.su.dsv.scipro.security.auth.roles.Roles;
@Authorization(requiresLoggedInUser = true, authorizedRoles = {Roles.STUDENT, Roles.ADMIN, Roles.EMPLOYEE, Roles.EXTERNAL, Roles.SYSADMIN})
public abstract class BasePage extends WebPage {
public abstract class BasePage extends WebPage implements IAjaxIndicatorAware {
public BasePage(){
super();
@ -37,7 +38,7 @@ public abstract class BasePage extends WebPage {
add(CSSPackageResource.getHeaderContribution("styles/" + languageCode + CSS_SUFFIX));
*/
//add(CSSPackageResource.getHeaderContribution("styles/" + GLOBAL_CSS + CSS_SUFFIX));
add(CSSPackageResource.getHeaderContribution("styles/" + css + CSS_SUFFIX));
//add(CSSPackageResource.getHeaderContribution("styles/" + css + CSS_SUFFIX));
}
/**
@ -68,7 +69,12 @@ public abstract class BasePage extends WebPage {
public void authorize(Component component, Roles[] roles, boolean removeOnFail){
MetaDataActionStrategy.authorize(component, roles, removeOnFail);
}
@Override
public String getAjaxIndicatorMarkupId() {
// TODO Auto-generated method stub
return "ajax-loader";
}