diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index fed38cb4b..3046c50cc 100644 Binary files a/app/assets/fonts/icons.eot and b/app/assets/fonts/icons.eot differ diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index 602058baf..c107e740d 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -44,4 +44,5 @@ + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 96e944231..b933f1c3f 100644 Binary files a/app/assets/fonts/icons.ttf and b/app/assets/fonts/icons.ttf differ diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff index fb76f3b26..feb047bd0 100644 Binary files a/app/assets/fonts/icons.woff and b/app/assets/fonts/icons.woff differ diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index 93f7ebcf3..eda8b979d 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -148,3 +148,6 @@ .icon-youtube:before { content: "K"; } +.icon-letter:before { + content: "L"; +} \ No newline at end of file diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 88a4ccab0..356299fba 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1768,7 +1768,8 @@ table { } .verify { - margin: rem-calc(24) 0 rem-calc(48); + margin-bottom: rem-calc(48); + margin-top: rem-calc(24); h1 { color: $check; @@ -1778,6 +1779,24 @@ table { vertical-align: middle; } } + + .letter-divider { + border-top: 1px solid #DDDDDD; + clear: both; + height: 0; + margin: rem-calc(24) 0; + position: relative; + + .icon-letter { + background: white; + color: $info-color; + font-size: rem-calc(24); + margin-left: rem-calc(-27); + padding: 0 rem-calc(12); + position: absolute; + top: rem-calc(-12); + } + } } // 18. Comments diff --git a/app/views/verification/letter/edit.html.erb b/app/views/verification/letter/edit.html.erb index 3f2084d26..65da25a05 100644 --- a/app/views/verification/letter/edit.html.erb +++ b/app/views/verification/letter/edit.html.erb @@ -1,5 +1,5 @@
-
+

@@ -9,15 +9,24 @@

<%= t("pages.verify.info") %>

-
- <%= form_for @letter, url: letter_path, method: :patch do |f| %> - <%= render "/shared/errors", resource: @letter %> - <%= f.text_field :email, label: t("pages.verify.email") %> - <%= f.password_field :password, label: t("pages.verify.password") %> - <%= f.text_field :verification_code, label: t("pages.verify.code") %> +
+ <%= form_for @letter, url: letter_path, method: :patch do |f| %> + <%= render "/shared/errors", resource: @letter %> + <%= f.text_field :email, label: t("pages.verify.email"), placeholder: t("pages.verify.email") %> + <%= f.password_field :password, label: t("pages.verify.password"), placeholder: t("pages.verify.password") %> - <%= f.submit(class: "button radius success expand", value: t("pages.verify.submit")) %> - <% end %> +

+ +

+ +

+ <%= t("pages.verify.info_code") %> +

+ + <%= f.text_field :verification_code, label: t("pages.verify.code"), placeholder: t("pages.verify.code") %> + + <%= f.submit(class: "button radius success expand", value: t("pages.verify.submit")) %> + <% end %>
\ No newline at end of file diff --git a/config/locales/pages.en.yml b/config/locales/pages.en.yml index a01b380d7..ef2b271a9 100644 --- a/config/locales/pages.en.yml +++ b/config/locales/pages.en.yml @@ -21,8 +21,9 @@ en: "Open Data" verify: title: "Verify your account" - info: "Introduce your access data and the code you received in letter." + info: "For verufy your account introduce your access data:" + info_code: "Now introduce the code you received in letter:" email: "Email" password: "Password" - code: "Secure code" + code: "Code you received in letter" submit: "Verify my account" \ No newline at end of file diff --git a/config/locales/pages.es.yml b/config/locales/pages.es.yml index 8749aa715..623b38ecf 100644 --- a/config/locales/pages.es.yml +++ b/config/locales/pages.es.yml @@ -23,8 +23,9 @@ es: "Datos abiertos" verify: title: "Verifica tu cuenta" - info: "Introduce tus datos con los que te registraste y el código que has recibido en tu carta." + info: "Para verificar tu cuenta introduce los datos con los que te registraste:" + info_code: "Ahora introduce el código que has recibido en tu carta:" email: "Email" password: "Contraseña" - code: "Código de seguridad" + code: "Código que has recibido en tu carta" submit: "Verificar mi cuenta"