diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets')
4 files changed, 63 insertions, 12 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp index a10b6e202..56fcf9681 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp @@ -4,9 +4,14 @@ <html> <div id="header_area"> - <p><%=LanguageHelper.getGUIString("webpages.header.info", request) %> + <div><%=LanguageHelper.getGUIString("webpages.header.info", request) %> <s:property value="authUser.givenName"/> <s:property value="authUser.familyName"/>, <%=LanguageHelper.getGUIString("webpages.header.lastlogin", request) %> <s:property value="authUser.lastLogin"/> - </p> + + <s:url action="logout" var="logoutURL" namespace="/"/> + <a id="logoutbutton" href="<s:property value="#logoutURL" />"><%=LanguageHelper.getGUIString("webpages.index.logout", request) %></a> + </div> + + </div> </html>
\ No newline at end of file diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp index 06bb1130c..26b12cdcb 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp @@ -5,34 +5,38 @@ <html> <div id="menu_area"> <div class="menu_element"> - <s:url action="newOA.action" var="newOA" namespace="/secure"/> + <s:url action="newOA" var="newOA" namespace="/secure"/> <a href="<s:property value="#newOA" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.oa.insert", request) %></a> </div> <div class="menu_element"> - <s:url action="searchOAInit.action" var="searchOAs" namespace="/secure"/> + <s:url action="searchOAInit" var="searchOAs" namespace="/secure"/> <a href="<s:property value="#searchOAs" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.oa.search", request) %></a> </div> <div class="menu_element"> - <s:url action="listallapplications.action" var="listAllOAs" namespace="/secure"/> + <s:url action="listallapplications" var="listAllOAs" namespace="/secure"/> <a href="<s:property value="#listAllOAs" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.oa.display", request) %></a> </div> <s:if test="authUser.isAdmin()"> <div class="menu_element"> - <s:url action="loadGeneralConfig.action" var="generalConfig" namespace="/secure"/> + <s:url action="loadGeneralConfig" var="generalConfig" namespace="/secure"/> <a href="<s:property value="#generalConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.config.moaid", request) %></a> </div> <div class="menu_element"> - <a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.importexport", request) %></a> - </div> - <div class="menu_element"> - <a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.usermanagement", request) %></a> + <s:url action="importexport" var="importexportUrl" namespace="/secure"/> + <a href="<s:property value="#importexportUrl" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.importexport", request) %></a> </div> </s:if> <div class="menu_element"> - <a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.user", request) %></a> + <s:url action="usermanagementInit" var="userManagementUrl" namespace="/secure"/> + <a href="<s:property value="#userManagementUrl" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.usermanagement", request) %></a> </div> + +<%-- <div class="menu_element"> + <a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.user", request) %></a> + </div> --%> + </div> </html>
\ No newline at end of file diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp index 2e1b0365f..113e822f8 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp @@ -28,7 +28,7 @@ </s:iterator> </div> - <s:form namespace="/" method="GET" id="selectOAForm" action="loadOA" namespace="/secure"> + <s:form method="POST" id="selectOAForm" action="loadOA" namespace="/secure"> <s:hidden id="selectOAForm_OAID" name="oaidobj"></s:hidden> </s:form> </s:if> diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp new file mode 100644 index 000000000..c5b67cbac --- /dev/null +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp @@ -0,0 +1,42 @@ +<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<html> + <s:if test="userlist && userlist.size > 0"> + <h3><%=LanguageHelper.getGUIString("webpages.listUsers.list.header", request) %></h3> + <div id="list_area"> + <div id="listHeader" class="listElement"> + <div class="userListFirst"> + <%=LanguageHelper.getGUIString("webpages.listUsers.list.first", request) %> + </div> + <div class="userListSecond"> + <%=LanguageHelper.getGUIString("webpages.listUsers.list.second", request) %> + </div> + <div class="userListThird"> + <%=LanguageHelper.getGUIString("webpages.listUsers.list.third", request) %> + </div> + </div> + + <s:iterator var="UserElement" value="userlist"> + + <div class="listElement" onclick="userOA(<s:property value='userID'/>);"> + <div class="userListFirst"> + <s:property value="givenName"/> + </div> + <div class="userListSecond"> + <s:property value="familyName"/> + </div> + <div class="userListThird"> + <s:property value="userName"/> + </div> + </div> + + </s:iterator> + </div> + + <s:form method="POST" id="selectUserForm" action="editUser" namespace="/secure"> + <s:hidden id="selectUserForm_OAID" name="useridobj"></s:hidden> + </s:form> + </s:if> +</html>
\ No newline at end of file |