Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
birger
users
Commits
5d1a987c
Commit
5d1a987c
authored
Aug 02, 2019
by
o@immerda.ch
Browse files
cosmetics, wording and details
parent
02986e44
Changes
15
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/application.css
View file @
5d1a987c
...
...
@@ -57,23 +57,6 @@
border
:
dashed
gray
2px
;
}
.app-password
{
border
:
dashed
gray
3px
;
padding
:
10px
;
margin-top
:
20px
;
font-size
:
9pt
;
font-family
:
monospace
;
width
:
300px
;
}
.output-box
{
border
:
dashed
gray
3px
;
padding
:
10px
;
margin-top
:
20px
;
font-size
:
9pt
;
font-family
:
monospace
;
}
.content-inner
td
{
padding-right
:
5px
;
}
...
...
@@ -145,3 +128,19 @@
@-moz-keyframes
spin
{
100
%
{
-moz-transform
:
rotate
(
360deg
);
}
}
@-webkit-keyframes
spin
{
100
%
{
-webkit-transform
:
rotate
(
360deg
);
}
}
@keyframes
spin
{
100
%
{
-webkit-transform
:
rotate
(
360deg
);
transform
:
rotate
(
360deg
);
}
}
.password-readable
{
font-size
:
14pt
;
padding
:
10px
;
margin-top
:
20px
;
font-family
:
monospace
;
background-color
:
white
;
color
:
black
;
border
:
dashed
gray
3px
;
width
:
auto
;
}
.password-readable
div
{
padding
:
2px
;
display
:
inline
;
}
app/controllers/app_passwords_controller.rb
View file @
5d1a987c
...
...
@@ -9,9 +9,13 @@ class AppPasswordsController < ApplicationController
puts
res
@passwords
=
res
[
'res'
]
if
session
[
:app_pw
]
@app_pw
=
session
[
:app_pw
]
@app_pw
=
(
'<div>'
+
session
[
:app_pw
].
gsub
(
/(.{5})/
,
'\1</div><div>'
)
+
'</div>'
).
html_safe
begin
@qr
=
RQRCode
::
QRCode
.
new
(
@
app_pw
,
:size
=>
13
,
:level
=>
:h
)
@qr
=
RQRCode
::
QRCode
.
new
(
session
[
:
app_pw
]
,
:size
=>
13
,
:level
=>
:h
)
rescue
=>
e
@qr
=
''
puts
"qr token generation failed
#{
e
}
"
...
...
app/views/app_passwords/show.html.erb
View file @
5d1a987c
...
...
@@ -3,7 +3,7 @@
<%
if
@app_pw
%>
<b>
<%=
t
(
:your_app_pw_is
)
%>
</b>
<p>
<div
class=
"
app-
password"
>
<%=
@app_pw
%>
</div>
<div
class=
"password
-readable
"
>
<%=
@app_pw
%>
</div>
<br
/>
<b><a
href=
"#"
id=
"qr-toggle"
>
<%=
t
(
:qr_code
)
%>
</a></b>
<div
id=
"qr-hidden"
>
...
...
app/views/layouts/application.html.erb
View file @
5d1a987c
...
...
@@ -43,9 +43,8 @@
<div
class=
"content-inner"
>
<%
if
s
=
flash
[
:notice
]
%>
<div
id=
"flash-notice"
class=
"notice"
>
<%=
s
.
is_a?
(
Symbol
)
?
t
(
s
)
:
s
%>
</div>
<div
id=
"flash-notice"
class=
"notice"
>
<%=
I18n
.
exists?
(
s
)
?
t
(
s
)
:
s
%>
</div>
<%
end
%>
<%=
yield
%>
</div>
</div>
...
...
app/views/mail_crypt/show.html.erb
View file @
5d1a987c
...
...
@@ -6,7 +6,7 @@
</p>
<p>
<b>
<%=
t
(
:recovery_token
)
%>
</b>
<div
class=
"
output-box
"
>
<%=
@recovery_token
%>
</div>
<div
class=
"
password-readable
"
>
<%=
@recovery_token
%>
</div>
</p>
<br
/>
<p>
...
...
app/views/mail_crypt/show_enable.html.erb
View file @
5d1a987c
...
...
@@ -16,8 +16,11 @@
</table>
<div
id=
"keep_recovery_token_question"
>
<p>
<%=
t
:recovery_token_help
%>
<br
/>
</p>
<p>
<input
type=
"radio"
id=
"keep_recovery_token_no"
name=
"keep_recovery_token"
value=
"no"
<%=
if
@keep_recovery_token
==
'no'
then
'checked="checked"'
else
''
end
%>
/>
...
...
@@ -27,6 +30,7 @@
<%=
if
@keep_recovery_token
==
'yes'
then
'checked="checked"'
else
''
end
%>
/>
<%=
t
(
:backup_recovery_token_keep
)
%>
</p>
</div>
<br>
...
...
app/views/signup/create.html.erb
View file @
5d1a987c
...
...
@@ -35,27 +35,28 @@
<%=
render
"password_help_
#{
I18n
.
locale
}
"
rescue
render
'password_help_en'
%>
</div>
<table>
<tr><td>
<tr><td
colspan=
"4"
style=
"max-width: 500px"
>
<br
/>
<%=
t
:recovery_email_short_help
%>
</td></tr>
<tr><td>
<%=
label_tag
(
:recovery_email
,
(
t
:recovery_email
))
%>
</td><td>
<%=
text_field_tag
(
:recovery_email
,
''
,
value:
@recovery_email
)
%>
</td><td>
</td><td>
</td></tr>
</table>
<br
/>
<table>
<tr><td>
<tr><td
colspan=
"4"
style=
"max-width: 600px"
>
<br
/>
<%=
t
:recovery_email_short_help
%>
</td></tr>
<tr><td>
<%=
label_tag
(
:recovery_email
,
(
t
:recovery_email
))
%>
</td><td>
<%=
text_field_tag
(
:recovery_email
,
''
,
value:
@recovery_email
)
%>
</td><td>
</td><td>
</td></tr>
</table>
<p>
<div
style=
"max-width: 600px"
>
<p>
<div
id=
"keep_recovery_token_question"
>
<br
/>
<%=
t
:recovery_token_help
%>
<br
/>
</p>
<p>
<input
type=
"radio"
id=
"keep_recovery_token_yes"
name=
"keep_recovery_token"
value=
"email"
<%=
if
@keep_recovery_token
==
'email'
then
'checked="checked"'
else
''
end
%>
/>
...
...
@@ -71,7 +72,8 @@
/>
<%=
t
(
:backup_recovery_token_keep
)
%>
</div>
</p>
</p>
</div>
<p>
<%=
submit_tag
(
t
:create
)
%>
...
...
app/views/signup/success.html.erb
View file @
5d1a987c
...
...
@@ -15,7 +15,7 @@
<br
/>
<%
if
@mail_crypt_recovery_token
%>
<br
/>
<b>
<%=
t
(
:recovery_token
)
%>
</b>
<div
class=
"
output-box
"
>
<%=
@mail_crypt_recovery_token
%>
</div>
<b>
<%=
t
(
:recovery_token
)
%>
</b>
<div
class=
"
password-readable
"
>
<%=
@mail_crypt_recovery_token
%>
</div>
</p>
<p>
<%=
t
(
:new_account_intro_token_display
)
%>
...
...
app/views/tfa/show.html.erb
View file @
5d1a987c
...
...
@@ -6,6 +6,8 @@
<p>
<%=
t
(
:tfa_enable_help
)
%>
</p>
<br
/>
<br
/>
<h4>
<%=
t
(
:totp
)
%>
</h4>
<p>
<%=
t
(
:totp_description
)
%>
...
...
@@ -35,6 +37,8 @@
<p>
<%=
link_to
(
t
(
:add_totp
),
tfa_totp_path
)
%>
</p>
<br
/>
<br
/>
<h4>
<%=
t
(
:webauthn
)
%>
</h4>
<p>
<%=
t
(
:webauthn_description
)
%>
...
...
app/views/welcome/index.html.erb
View file @
5d1a987c
...
...
@@ -3,9 +3,15 @@
<li>
<%=
link_to
t
(
:change_password
),
password_path
%>
<br
/>
<%=
t
(
:change_password_short_help
)
%>
</li>
<%
if
mail_crypt_enabled?
%>
<li>
<%
if
tfa_enabled?
%><%=
link_to
t
(
:tfa
)
,
tfa_path
%><%
else
%><%=
t
(
:tfa
)
%><%
end
-%>
<%
if
requires_2fa?
%>
(
<%=
t
(
:enabled
)
%>
)
<%
end
%>
<br
/>
<%=
t
(
:tfa_short_help
)
%><%
unless
tfa_enabled?
%>
-
<%=
t
(
:requires_recovery_email
)
%><%
end
-%>
</li>
<%
else
%>
<li>
<%=
t
(
:tfa
)
%>
-
<%=
t
(
:requires_secured_mailbox
)
%>
<br
/>
<%=
t
(
:tfa_short_help
)
%>
</li>
<%
end
%>
<li>
<%=
link_to
(
t
:recovery_email
)
,
recovery_email_path
%><%
if
recovery_email_set?
%>
(
<%=
t
(
:present
)
%>
)
<%
end
%>
<br
/>
<%=
t
(
:recovery_email_short_help
)
%>
</li>
...
...
config/locales/de.yml
View file @
5d1a987c
...
...
@@ -27,7 +27,7 @@ de:
mail_crypt_settings
:
"
Geschützte
Mailablage"
mail_crypt_short_help
:
"
Bestimme
wie
deine
Mails
auf
unserem
Server
gespeichert
werden."
mail_crypt_help_existing
:
"
ACHTUNG:
Diese
Funktion
ist
erst
im
Testbetrieb
und
gilt
a
ktuell
nur
für
neu
eintreffende
Nachrichten.
Möchtest
du,
dass
deine
Mails
auf
unserem
Server
mit
deinem
Passwort
geschützt
abgelegt
werden?
Dann
kannst
du
dies
hier
aktivieren."
mail_crypt_help_existing
:
"
ACHTUNG:
A
ktuell
nur
für
neu
eintreffende
Nachrichten.
Möchtest
du,
dass
deine
Mails
auf
unserem
Server
mit
deinem
Passwort
geschützt
abgelegt
werden?
Dann
kannst
du
dies
hier
aktivieren."
mail_crypt_enabled
:
"
Geschützte
Mailablage
aktiviert.
Bitte
melde
dich
im
Webmail
neu
an
und/oder
starte
dein
Mailprogramm
neu."
mail_crypt_already_enabled
:
"
Gratualation!
Die
geschützte
Mailablage
ist
bei
dir
bereits
aktiviert."
...
...
@@ -35,7 +35,7 @@ de:
backup_recovery_token_email
:
"
Sende
mir
einen
Wiederherstellungscode
an
meine
Wiederherstellubngs
Email
Adresse
(nur
für
immerda
Wiederherstellungs
Adresse
möglich)."
backup_recovery_token_keep
:
"
Ich
kann
den
Wiederherstellungscode
jetzt
gerade
nicht
aufbewahren
und
werde
ihn
später
generieren."
backup_recovery_token_delete
:
"
Ich
kann
den
Wiederherstellungscode
jetzt
sicher
aufbewahren."
backup_recovery_token_delete
:
"
Ich
kann
den
Wiederherstellungscode
jetzt
sicher
aufbewahren.
(DATENVERLUST
beim
Verlust
von
Passwort
und
Code)
"
decide_recovery_token
:
"
Bitte
wähle
aus,
ob
du
dein
Wiederherstellungscode
aufbewahren
kannst"
invalid_recovery_token_receiver
:
"
An
diese
Wiederherstellungs
Email
Adresse
können
wir
den
Wiederherstellungs
code
nicht
schicken.
Zugelassen
sind
nur
Immerda
Adressen
und
wenige
Ausnahmen.
Wenn
du
diese
trotzdem
möchtest,
wähle
eine
andere
Option
für
den
Wiederherstellungscode."
...
...
config/locales/en.yml
View file @
5d1a987c
...
...
@@ -27,14 +27,14 @@ en:
mail_crypt_settings
:
"
Secured
Mailstorage"
mail_crypt_short_help
:
"
Decide
how
your
mails
are
stored
on
our
servers."
mail_crypt_help_existing
:
"
Warning:
This
option
is
currently
in
test
mode
and
only
accounts
for
newly
delivered
mails.
Would
you
like
to
protect
the
storage
of
your
mails
with
your
password
on
our
servers?"
mail_crypt_help_existing
:
"
Warning:
This
option
only
accounts
for
newly
delivered
mails.
Would
you
like
to
protect
the
storage
of
your
mails
with
your
password
on
our
servers?"
mail_crypt_enabled
:
"
Secured
Mailstorage
activated.
Please
sign
out
your
webmail
session
and/or
restart
your
mailprogram."
mail_crypt_already_enabled
:
"
Congratulations!
You
already
enabled
secured
mailstorage"
recovery_token_hint
:
"
We
recommend
you
generate
a
recovery
token"
backup_recovery_token_email
:
"
Send
me
a
recovery
token
to
the
recovery
email
address
(only
for
immerda
recovery
emails)."
backup_recovery_token_delete
:
"
I
can
safely
store
my
token."
backup_recovery_token_delete
:
"
I
can
safely
store
my
token.
(LOSS
OF
DATA
in
case
Password
and
Token
are
lost)
"
backup_recovery_token_keep
:
"
I
can't
safely
store
the
token
right
now.
I
will
generate
one
later."
decide_recovery_token
:
"
Please
decide
if
you
store
your
recovery
token"
...
...
config/locales/es.yml
View file @
5d1a987c
...
...
@@ -27,7 +27,7 @@ es:
mail_crypt_settings
:
"
Almacenamiento
de
correo
cifrado"
mail_crypt_short_help
:
"
Determine
cómo
se
almacenan
tus
correos
electrónicos
en
nuestro
servidor."
mail_crypt_help_existing
:
"
ATENCIÓN:
Esta
función
solo
está
en
modo
de
prueba
y
actualmente
solo
es
válida
para
nuevos
mensajes
entrantes.
¿Deseas
que
tus
correos
electrónicos
se
almacenen
en
nuestro
servidor
protegido
con
tu
contraseña?
Entonces
puedes
activar
esto
aquí."
mail_crypt_help_existing
:
"
ATENCIÓN:
Esta
función
actualmente
solo
es
válida
para
nuevos
mensajes
entrantes.
¿Deseas
que
tus
correos
electrónicos
se
almacenen
en
nuestro
servidor
protegido
con
tu
contraseña?
Entonces
puedes
activar
esto
aquí."
mail_crypt_enabled
:
"
Activar
almacenamiento
de
correo
cifrado.
Por
favor
reinicie
tu
sesión
en
el
correo
web/webmail
y/o
reinicie
tu
programa
de
correo."
mail_crypt_already_enabled
:
"
Felicitaciones!
Ya
has
habilitado
el
almacenamiento
de
correo
seguro."
...
...
config/locales/fr.yml
View file @
5d1a987c
...
...
@@ -25,7 +25,7 @@ fr:
mail_crypt_settings
:
"
Stockage
sécurisé
des
emails"
mail_crypt_short_help
:
"
Décide
de
quelle
manière
tes
emails
sont
stockés
sur
notre
server."
mail_crypt_help_existing
:
"
ATTENTION:
Cette
fonction
est
actuellement
en
mode
test
et
ne
concerne
que
les
nouveaux
messages
entrants.
Désires-tu
sécuriser
le
stockage
de
tes
emails
sur
nos
servers
à
l'aide
de
ton
mot
de
passe?
Tu
peux
activer
cette
option
ici."
mail_crypt_help_existing
:
"
ATTENTION:
Cette
fonction
actuellement
ne
concerne
que
les
nouveaux
messages
entrants.
Désires-tu
sécuriser
le
stockage
de
tes
emails
sur
nos
servers
à
l'aide
de
ton
mot
de
passe?
Tu
peux
activer
cette
option
ici."
mail_crypt_enabled
:
"
Stockage
sécurisé
des
emails
activé.
Merci
de
te
connecter
à
nouveau
au
webmail
et/ou
de
redémarrer
ton
logiciel
de
messagerie."
mail_crypt_already_enabled
:
"
Félicitations
!
Vous
avez
déjà
activé
le
stockage
sécurisé
du
courrier."
...
...
config/locales/it.yml
View file @
5d1a987c
...
...
@@ -25,7 +25,7 @@ it:
mail_crypt_settings
:
"
Archivio
mail
protetto"
mail_crypt_short_help
:
"
Determina
in
che
modo
salvare
le
tue
e-mail
sui
nostri
server."
mail_crypt_help_existing
:
"
ATTENZIONE:
Questa
funzione
è
in
modalità
test
e
viene
applicata
solo
ai
nuovi
messaggi
in
arrivo.
Desideri
proteggere
l'archiviazione
delle
tue
e-mail
con
la
tua
password
sui
nostri
server?"
mail_crypt_help_existing
:
"
ATTENZIONE:
Questa
funzione
e
viene
applicata
solo
ai
nuovi
messaggi
in
arrivo.
Desideri
proteggere
l'archiviazione
delle
tue
e-mail
con
la
tua
password
sui
nostri
server?"
mail_crypt_enabled
:
"
Protezione
archivio
mail
attivato.
Esci
dalla
sessione
webmail
e/o
riavvia
il
tuo
programma
di
posta."
mail_crypt_already_enabled
:
"
Congratulazioni!
Hai
già
abilitato
lo
stoccaggio
di
posta
protetta."
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
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 comment