Skip to content

Riina Antikainen / Moya

Go to a project
Commit 499a5b25 by Juho Salli
Options

IncomingFlow UIta korjailtu

1 parent 0923d92a
Inline Side-by-side
Showing with 11 additions and 5 deletions
code/MoyaAuthModule/.settings/org.eclipse.core.resources.prefs deleted 100644 → 0
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaAuthModuleClient/.settings/org.eclipse.core.resources.prefs deleted 100644 → 0
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaWeb/WebContent/admin/incoming/printCard.xhtml
...@@ -25,9 +25,10 @@ ...@@ -25,9 +25,10 @@
</h:panelGroup> </h:panelGroup>
<h:panelGroup> <h:panelGroup>
<h:form> <h:form>
<h:outputLabel value="Kuvan rajaus:" />
<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" /> <p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" />
<br />
<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" /> <h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
<h:commandButton action="#{userView.cancelCrop}" value="#{i18n['user.cropImage']}" />
</h:form> </h:form>
</h:panelGroup> </h:panelGroup>
<h:panelGroup> <h:panelGroup>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
...@@ -171,6 +171,8 @@ placegroupview.toptext = \ ...@@ -171,6 +171,8 @@ placegroupview.toptext = \
poll.edit = edit poll.edit = edit
print = Print
product.providedRole = Tuote tarjoaa roolin product.providedRole = Tuote tarjoaa roolin
product.returnProductEdit = Palaa tuotteeseen: product.returnProductEdit = Palaa tuotteeseen:
product.saved = Tuote tallennettu product.saved = Tuote tallennettu
...@@ -192,6 +194,7 @@ subnavi.cards = \u0009\u0009 ...@@ -192,6 +194,7 @@ subnavi.cards = \u0009\u0009
topnavi.license = Lisenssikoodit topnavi.license = Lisenssikoodit
user.cropImage = Crop
user.unauthenticated = Kirjautumaton user.unauthenticated = Kirjautumaton
usercart.downloadCsv = CSV usercart.downloadCsv = CSV
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -628,6 +628,8 @@ poll.end = Close poll ...@@ -628,6 +628,8 @@ poll.end = Close poll
poll.name = Poll name poll.name = Poll name
poll.save = Send answers poll.save = Send answers
print = Print
product.barcode = Barcode product.barcode = Barcode
product.billed = Billed product.billed = Billed
product.boughtTotal = Products billed product.boughtTotal = Products billed
...@@ -894,6 +896,7 @@ user.changepassword.forUser = For user ...@@ -894,6 +896,7 @@ user.changepassword.forUser = For user
user.changepassword.title = Change password user.changepassword.title = Change password
user.create = Create user user.create = Create user
user.createdmessage = User has been created successfully. You can now login. user.createdmessage = User has been created successfully. You can now login.
user.cropImage = Crop
user.defaultImage = Default picture user.defaultImage = Default picture
user.edit = Edit user.edit = Edit
user.edit.title = My information user.edit.title = My information
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -617,6 +617,8 @@ poll.end = Sulje kysely ...@@ -617,6 +617,8 @@ poll.end = Sulje kysely
poll.name = Kyselyn nimi poll.name = Kyselyn nimi
poll.save = L\u00E4het\u00E4 vastauksesi poll.save = L\u00E4het\u00E4 vastauksesi
print = Tulosta
product.barcode = Viivakoodi product.barcode = Viivakoodi
product.billed = Laskutettu product.billed = Laskutettu
product.boughtTotal = Tuotteita laskutettu product.boughtTotal = Tuotteita laskutettu
...@@ -880,6 +882,7 @@ user.changepassword.forUser = K\u00E4ytt\u00E4j\u00E4lle ...@@ -880,6 +882,7 @@ user.changepassword.forUser = K\u00E4ytt\u00E4j\u00E4lle
user.changepassword.title = Vaihda salasana user.changepassword.title = Vaihda salasana
user.create = Luo k\u00E4ytt\u00E4j\u00E4 user.create = Luo k\u00E4ytt\u00E4j\u00E4
user.createdmessage = K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n. user.createdmessage = K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n.
user.cropImage = Rajaa
user.defaultImage = Oletukuva user.defaultImage = Oletukuva
user.edit = Muokkaa user.edit = Muokkaa
user.edit.title = Omat tiedot user.edit.title = Omat tiedot
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!