Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Max Mecklin
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 70890659
authored
Jun 11, 2014
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moar, still not perfect
1 parent
3c29d0e7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
4 deletions
code/MoyaWeb/WebContent/admin/adduser/update.xhtml
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserView.java
code/MoyaWeb/WebContent/admin/adduser/update.xhtml
View file @
7089065
...
...
@@ -8,7 +8,8 @@
<f:metadata>
<f:viewParam
name=
"userid"
value=
"#{userView.userid}"
/>
<f:event
type=
"preRenderView"
listener=
"#{userView.initView}"
/>
<f:event
type=
"preRenderView"
listener=
"#{userView.setCaptureForwardUrl('/admin/adduser/capturesuccess')}"
/>
<f:event
type=
"preRenderView"
listener=
"#{userView.setCaptureForwardUrl('/admin/adduser/update')}"
/>
</f:metadata>
<ui:define
name=
"topbar"
>
...
...
@@ -22,6 +23,10 @@
<ui:define
name=
"content"
>
<div
style=
"text-align: center;"
>
<h:form
styleClass=
"captureForm"
>
<h:panelGrid
columns=
"2"
>
...
...
@@ -34,21 +39,33 @@
</a>
</h:panelGroup>
<h:panelGroup>
<div
id=
"webcamcontainer"
>
<p:photoCam
widgetVar=
"pc"
listener=
"#{userView.oncapture}"
/>
<p:commandButton
type=
"button"
value=
"Capture"
onclick=
"PF('pc').capture()"
/>
<div
id=
"count"
/>
<p:photoCam
widgetVar=
"pc"
listener=
"#{userView.oncapture}"
update=
"@all"
/>
<!-- <p:commandButton type="button" value="Capture" onclick="dophoto(pc)" />
-->
</div>
</h:panelGroup>
</h:panelGrid>
</h:form>
</div>
<div
style=
""
>
<h:form>
<h:commandLink
style=
"margin: 0 auto; font-size: 3em;"
action=
"#{userView.incomingPhotoReady}"
value=
"Valmis"
/>
<h:form
id=
"incomingpictureform"
>
<h:commandLink
rendered=
"#{!empty userView.selectedUser.currentImage}"
style=
"margin: 0 auto; font-size: 3em;"
action=
"#{userView.incomingPhotoReady}"
value=
"Valmis"
/>
<br
/>
<p:fragment
rendered=
"#{!empty userView.selectedUser.currentImage}"
>
<p:graphicImage
value=
"/dydata/userimage/#{userView.selectedUser.currentImage.id}.img"
alt=
"image"
/>
</p:fragment>
</h:form>
</div>
...
...
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserView.java
View file @
7089065
...
...
@@ -154,6 +154,12 @@ public class UserView extends GenericCDIView {
}
/**
* This is the user we are currently editing, if that is not found we user
* current user
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment