[overlord-commits] Overlord SVN: r774 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client and 2 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-08-19 08:07:42 -0400 (Wed, 19 Aug 2009) New Revision: 774 Modified: bpm-console/trunk/BPMC.iws bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java Log: Include header debug information and version info upon login Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-08-19 09:58:12 UTC (rev 773) +++ bpm-console/trunk/BPMC.iws 2009-08-19 12:07:42 UTC (rev 774) @@ -18,6 +18,7 @@ <component name="ChangeListManager"> <list default="true" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css" afterPath="$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" afterPath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" /> @@ -106,7 +107,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" line="88" class="Class at Authentication.java:87" package="org.jboss.bpm.console.client"> + <breakpoint url="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" line="91" class="Class at Authentication.java:87" package="org.jboss.bpm.console.client"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -204,28 +205,28 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="AbstractRESTAction.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> + <file leaf-file-name="Header.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="79" column="21" selection-start="2890" selection-end="3075" vertical-scroll-proportion="0.28447205"> + <state line="113" column="52" selection-start="4195" selection-end="4195" vertical-scroll-proportion="0.7552795"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="LoginView.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> + <file leaf-file-name="console.css" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> <provider selected="true" editor-type-id="text-editor"> - <state line="130" column="36" selection-start="4166" selection-end="4166" vertical-scroll-proportion="0.66086954"> + <state line="45" column="37" selection-start="706" selection-end="706" vertical-scroll-proportion="0.60487807"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="RenderReportAction.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java"> + <file leaf-file-name="LoginView.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236"> + <state line="120" column="46" selection-start="3683" selection-end="3683" vertical-scroll-proportion="-1.484472"> <folding /> </state> </provider> @@ -234,39 +235,12 @@ <file leaf-file-name="Authentication.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="193" column="34" selection-start="6095" selection-end="6095" vertical-scroll-proportion="0.26459628"> + <state line="270" column="4" selection-start="7894" selection-end="7894" vertical-scroll-proportion="0.45217392"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Header.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="99" column="6" selection-start="3361" selection-end="3361" vertical-scroll-proportion="0.5463415"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ApplicationContext.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="11" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.31219512"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="UserMgmtFacade.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="69" selection-start="2329" selection-end="2329" vertical-scroll-proportion="0.19875777"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -625,6 +599,10 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -648,6 +626,94 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -723,7 +789,53 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="BPMC.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -1057,27 +1169,6 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="156" column="92" selection-start="6299" selection-end="6299" vertical-scroll-proportion="0.96263736"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/HttpClient.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="240" column="40" selection-start="7166" selection-end="7166" vertical-scroll-proportion="0.16666667"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/webapp/WEB-INF/web.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> <entry file="jar://$APPLICATION_HOME_DIR$/lib/resources.jar!/standardSchemas/web-app_2_3.dtd"> <provider selected="true" editor-type-id="text-editor"> <state line="431" column="10" selection-start="14438" selection-end="14438" vertical-scroll-proportion="0.2345679"> @@ -1119,13 +1210,6 @@ <state /> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="79" column="21" selection-start="2890" selection-end="3075" vertical-scroll-proportion="0.28447205"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java"> <provider selected="true" editor-type-id="text-editor"> <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236"> @@ -1147,27 +1231,57 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="99" column="6" selection-start="3361" selection-end="3361" vertical-scroll-proportion="0.5463415"> + <state line="79" column="21" selection-start="2890" selection-end="3075" vertical-scroll-proportion="0.28447205"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="34" column="13" selection-start="1464" selection-end="1464" vertical-scroll-proportion="0.15609756"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="68" column="49" selection-start="2400" selection-end="2415" vertical-scroll-proportion="0.93658537"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="193" column="34" selection-start="6095" selection-end="6095" vertical-scroll-proportion="0.26459628"> + <state line="270" column="4" selection-start="7894" selection-end="7894" vertical-scroll-proportion="0.45217392"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="130" column="36" selection-start="4166" selection-end="4166" vertical-scroll-proportion="0.66086954"> + <state line="120" column="46" selection-start="3683" selection-end="3683" vertical-scroll-proportion="-1.484472"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> + <provider selected="true" editor-type-id="text-editor"> + <state line="45" column="37" selection-start="706" selection-end="706" vertical-scroll-proportion="0.60487807"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="113" column="52" selection-start="4195" selection-end="4195" vertical-scroll-proportion="0.7552795"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-08-19 09:58:12 UTC (rev 773) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-08-19 12:07:42 UTC (rev 774) @@ -29,6 +29,7 @@ import org.gwt.mosaic.ui.client.layout.BoxLayout; import org.gwt.mosaic.ui.client.layout.BoxLayoutData; import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.LayoutPopupPanel; import org.jboss.bpm.console.client.icons.ConsoleIconBundle; import java.util.List; @@ -89,6 +90,33 @@ // account info Image img = icons.userIcon().createImage(); + img.addClickListener( + new ClickListener() + { + + public void onClick(Widget widget) + { + StringBuffer sb = new StringBuffer("<h3>User information</h3>"); + sb.append("- User: ").append(appContext.getAuthentication().getUsername()).append("<br/>"); + sb.append("- Logged in since: ").append(appContext.getAuthentication().getLoggedInSince()).append("<br/>"); + sb.append("- SID: ").append(appContext.getAuthentication().getSid()).append("<br/>"); + sb.append("- Roles: ").append(appContext.getAuthentication().getRolesAssigned()).append("<br/>"); + + + final LayoutPopupPanel popup = new LayoutPopupPanel(true); + popup.setPopupPosition( + widget.getAbsoluteLeft()-120, + widget.getAbsoluteTop()+20 + ); + popup.setAnimationEnabled(true); + popup.setSize("240px", "130px"); + HTML html = new HTML(sb.toString()); + html.setStyleName("bpm-user-info-popup"); + popup.add(html); + popup.show(); + } + } + ); HTML html = new HTML(appContext.getAuthentication().getUsername()); Button btn = new Button("Logout", new ClickListener() Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-19 09:58:12 UTC (rev 773) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-19 12:07:42 UTC (rev 774) @@ -30,6 +30,7 @@ import org.gwt.mosaic.ui.client.WindowPanel; import org.gwt.mosaic.ui.client.InfoPanel; import org.gwt.mosaic.ui.client.MessageBox; +import org.gwt.mosaic.ui.client.LayoutPopupPanel; import org.gwt.mosaic.ui.client.layout.*; import org.jboss.bpm.console.client.util.ConsoleLog; @@ -50,7 +51,7 @@ private Controller controller; public final static String[] KNOWN_ROLES = {"admin", "manager", "user"}; - + public LoginView() { @@ -76,7 +77,7 @@ { // force session invalidation, required to catch browser reload Authentication.logout(config); - + // start new session requestSessionID(); } @@ -198,6 +199,9 @@ layoutPanel.setLayout(new BorderLayout()); layoutPanel.setPadding(5); + + Widget form = createForm(); + final Button submit = new Button("Submit"); submit.addClickListener(new ClickListener() { @@ -208,10 +212,16 @@ } }); - Widget form = createForm(); - + + HTML html = new HTML("Version: " + Version.VERSION); + html.setStyleName("bpm-login-info"); + + LayoutPanel southContainer = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + southContainer.add(submit, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + southContainer.add(html); + layoutPanel.add(form, new BorderLayoutData(BorderLayout.Region.CENTER)); - layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH)); + layoutPanel.add(southContainer, new BorderLayoutData(BorderLayout.Region.SOUTH)); } @@ -281,6 +291,11 @@ grid.setWidget(1,0, new Label("Password:")); grid.setWidget(1,1, passwordInput); + /*DisclosurePanel msg = new DisclosurePanel("Contact Address"); + + grid.setWidget(2,0, new Label("")); + grid.setWidget(2,1, msg);*/ + p.add(grid); passwordInput.addKeyboardListener( @@ -304,6 +319,11 @@ } } ); + + + /*HTML htmlMsg = new HTML("Messages"); + p.add(htmlMsg);*/ + return p; } Modified: bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css =================================================================== --- bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-08-19 09:58:12 UTC (rev 773) +++ bpm-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-08-19 12:07:42 UTC (rev 774) @@ -37,6 +37,22 @@ color: #C8C8C8; } +.bpm-login-info { + font-family: sans-serif; + color: #000000; + font-size:9px; + width:95%; + margin-top:5px; + text-align:right; +} + +.bpm-user-info-popup { + font-family: sans-serif; + color: #000000; + font-size:9px; + margin:5px; +} + .bpm-property-image { padding-top:10px; } Modified: bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java =================================================================== --- bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 09:58:12 UTC (rev 773) +++ bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 12:07:42 UTC (rev 774) @@ -34,6 +34,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Date; public class Authentication { @@ -47,12 +48,14 @@ private ConsoleConfig config; private String rolesUrl; + private Date loggedInSince; public Authentication(ConsoleConfig config, String sessionID, String rolesUrl) { this.config = config; this.sid = sessionID; this.rolesUrl = rolesUrl; + this.loggedInSince = new Date(); } public String getSid() @@ -117,6 +120,11 @@ } } + public Date getLoggedInSince() + { + return loggedInSince; + } + /** * Login using specific credentials. * This delegates to {@link com.google.gwt.http.client.RequestBuilder#setUser(String)} @@ -260,6 +268,7 @@ username = null; password = null; rolesAssigned = new ArrayList<String>(); + loggedInSince = null; } public void handleSessionTimeout()