Skip to content

Codecrew / Moya

Go to a project
Commit cbc75ac2 by Tuomas Riihimäki
Options

Merge branch 'user-edit' of https://gitlab.codecrew.fi/annttu/moya into annttu/moya-user-edit 

Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
2 parents eb5c9921 9051a1f2
Expand all
Inline Side-by-side
Showing with 5 additions and 7 deletions
code/MoyaWeb/WebContent/resources/templates/template1/css/style.css
.ui-widget,.ui-widget .ui-widget,.ui-button-text,.ui-wizard-step-title { .ui-widget,.ui-widget .ui-widget,.ui-button-text,.ui-wizard-step-title {
font-size: 90% !important; font-size: 10pt !important;
} }
.ui-panelmenu-header { .ui-panelmenu-header {
......
code/MoyaWeb/WebContent/useradmin/edit.xhtml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account"
xmlns:c="http://java.sun.com/jsp/jstl/core"> xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
<h:body> <h:body>
<ui:composition template="#{sessionHandler.template}"> <ui:composition template="#{sessionHandler.template}">
<f:metadata> <f:metadata>
...@@ -19,11 +19,9 @@ ...@@ -19,11 +19,9 @@
<users:usertabs tabId="edit" /> <users:usertabs tabId="edit" />
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<p> <p:button render="#{userSessionView.currentUser.user.superadmin}" outcome="/useradmin/changePassword" value="#{i18n['submenu.user.changePassword']}">
<h:link outcome="/useradmin/changePassword" value="#{i18n['submenu.user.changePassword']}"> <f:param name="userid" value="#{userView.user.user.id}" />
<f:param name="userid" value="#{userView.user.user.id}" /> </p:button>
</h:link>
</p>
<users:edit commitaction="#{userCartView.saveUser()}" commitvalue="#{i18n['user.save']}" /> <users:edit commitaction="#{userCartView.saveUser()}" commitvalue="#{i18n['user.save']}" />
<h:form id="roleform" rendered="#{roleView.canReadRoles}"> <h:form id="roleform" rendered="#{roleView.canReadRoles}">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!