hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

new logout button

Browse Source
This commit is contained in:
Peter Hormanns 2012-11-02 15:42:49 +01:00
parent f002ef41f2
commit 78f70feab7
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hsarweb/src/de/hsadmin/web/AbstractModule.java
View File

@ -6,10 +6,12 @@ import java.util.Map;
import com.vaadin.data.Property; import com.vaadin.data.Property;
import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.terminal.ExternalResource;
import com.vaadin.terminal.Sizeable; import com.vaadin.terminal.Sizeable;
import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.ThemeResource;
import com.vaadin.ui.Button; import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component; import com.vaadin.ui.Component;
import com.vaadin.ui.Form; import com.vaadin.ui.Form;
import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalLayout;
@ -55,7 +57,6 @@ public abstract class AbstractModule implements Module, Serializable {
if (this instanceof SearchAble || this instanceof InsertAble || if (this instanceof SearchAble || this instanceof InsertAble ||
!("USER".equals(application.getLoginUserRole()) || "NONE".equals(application.getLoginUserRole()))) { !("USER".equals(application.getLoginUserRole()) || "NONE".equals(application.getLoginUserRole()))) {
HorizontalLayout toolbar = new HorizontalLayout(); HorizontalLayout toolbar = new HorizontalLayout();
createRunAsSelect(toolbar);
if (this instanceof InsertAble) { if (this instanceof InsertAble) {
Button btNew = new Button(moduleConfig.getLabel("new")); Button btNew = new Button(moduleConfig.getLabel("new"));
ThemeResource icon = new ThemeResource("../runo/icons/16/document-add.png"); ThemeResource icon = new ThemeResource("../runo/icons/16/document-add.png");
@ -108,6 +109,24 @@ public abstract class AbstractModule implements Module, Serializable {
}); });
toolbar.addComponent(btNew); toolbar.addComponent(btNew);
} }
toolbar.setWidth("100%");
Label space = new Label(" ");
space.setWidth("100%");
toolbar.addComponent(space);
toolbar.setExpandRatio(space, 1.0f);
createRunAsSelect(toolbar);
Button btLogout = new Button(localeConfig.getText("logout"));
btLogout.addListener(new ClickListener() {
private static final long serialVersionUID = 1L;
@Override
public void buttonClick(ClickEvent event) {
ExternalResource logoutLink = new ExternalResource("logout");
application.getMainWindow().open(logoutLink);
}
});
toolbar.addComponent(btLogout);
ThemeResource icon = new ThemeResource("../runo/icons/16/cancel.png");
btLogout.setIcon(icon);
layout.addComponent(toolbar); layout.addComponent(toolbar);
} }
layout.addComponent(component); layout.addComponent(component);

1
hsarweb/src/texts/main.properties
View File

@ -6,6 +6,7 @@ save=save
abort=abort abort=abort
new=new new=new
runas=<strong>select</strong><br />change user perspective runas=<strong>select</strong><br />change user perspective
logout=logout
modules.NONE=de.hsadmin.web.HomeModule modules.NONE=de.hsadmin.web.HomeModule
modules.USER=de.hsadmin.web.HomeModule modules.USER=de.hsadmin.web.HomeModule
modules.DOM_ADMIN=de.hsadmin.web.DomainReadonlyModule,de.hsadmin.web.EMailAddressModule,de.hsadmin.web.HomeModule modules.DOM_ADMIN=de.hsadmin.web.DomainReadonlyModule,de.hsadmin.web.EMailAddressModule,de.hsadmin.web.HomeModule

1
hsarweb/src/texts/main_de.properties
View File

@ -6,3 +6,4 @@ save=speichern
abort=abbrechen abort=abbrechen
new=Eintrag anlegen new=Eintrag anlegen
runas=<strong>Auswahl/Eingabe:</strong><br />zur Ansicht eines anderen<br />Benutzers wechseln runas=<strong>Auswahl/Eingabe:</strong><br />zur Ansicht eines anderen<br />Benutzers wechseln
logout=abmelden