diff --git a/app/assets/javascripts/admin/templates/user.js.handlebars b/app/assets/javascripts/admin/templates/user.js.handlebars index 05c3f379ca0..57a132b3551 100644 --- a/app/assets/javascripts/admin/templates/user.js.handlebars +++ b/app/assets/javascripts/admin/templates/user.js.handlebars @@ -1,5 +1,4 @@
-

{{i18n admin.user.basics}}

{{i18n user.username.title}}
@@ -17,14 +16,17 @@ {{/if}}
+
{{i18n user.email.title}}
{{content.email}}
+
{{i18n user.avatar.title}}
{{avatar content imageSize="large"}}
+
{{i18n user.ip_address.title}}
{{content.ip_address}}
@@ -34,6 +36,7 @@
+
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss index e229b1e9c1c..63e2ed99a9c 100644 --- a/app/assets/stylesheets/admin/admin_base.scss +++ b/app/assets/stylesheets/admin/admin_base.scss @@ -131,10 +131,8 @@ section.details { h1 { font-size: 15px; background-color: $gray; - box-shadow: 1px 1px 3px $darkish_gray; - color: $darkish_gray; + color: $white; padding: 0 10px; - line-height: 25px; margin: 0px 0 5px 0; } } diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 272bd683a94..251520fa198 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -959,7 +959,6 @@ cs: grant_admin: 'Udělit administrátorská práva' revoke_moderation: 'Odebrat moderátorská práva' grant_moderation: 'Udělit moderátorská práva' - basics: Základní informace reputation: Reputace permissions: Povolení activity: Aktivita diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index a82eed213d6..8b61eaf5397 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -778,7 +778,6 @@ da: grant_admin: 'Grant Admin' revoke_moderation: 'Revoke Moderation' grant_moderation: 'Grant Moderation' - basics: Basics reputation: Reputation permissions: Permissions activity: Activity diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 0245b6e1af3..dc3712d58ee 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -802,7 +802,6 @@ de: grant_admin: 'Administrationsrechte vergeben' revoke_moderation: 'Moderationsrechte entziehen' grant_moderation: 'Moderationsrechte vergeben' - basics: Grundlagen reputation: Reputation permissions: Rechte activity: Aktivität diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 2100111a339..4ea24399ef8 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -930,7 +930,6 @@ en: grant_admin: 'Grant Admin' revoke_moderation: 'Revoke Moderation' grant_moderation: 'Grant Moderation' - basics: Basics reputation: Reputation permissions: Permissions activity: Activity diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 8511a7b28ff..8deee6eff5b 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -770,7 +770,6 @@ es: grant_admin: 'Grant Admin' revoke_moderation: 'Revoke Moderation' grant_moderation: 'Grant Moderation' - basics: Basics reputation: Reputación permissions: Permisos activity: Actividad diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index c618305d029..b4f2e25723a 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -920,7 +920,6 @@ fr: grant_admin: "Accorder les droits d'admin" revoke_moderation: 'Révoquer les droits de modération' grant_moderation: 'Accorder les droits de modération' - basics: "bases" reputation: "Réputation" permissions: "permissions" activity: "activité" diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index 6c27d5c9e10..88c7dfd9098 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -711,7 +711,6 @@ id: grant_admin: 'Grant Admin' revoke_moderation: 'Revoke Moderation' grant_moderation: 'Grant Moderation' - basics: Basics reputation: Reputation permissions: Permissions activity: Activity diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 95159c55bec..42021940a31 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -791,7 +791,6 @@ it: grant_admin: 'Garantisci Amministratore' revoke_moderation: 'Revoca Moderatore' grant_moderation: 'Garantisci Moderatore' - basics: Basics (wtf?) reputation: Reputazione permissions: Permessi activity: Attività diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 0fd831ca9fd..273ec91984c 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -921,7 +921,6 @@ nl: grant_admin: Geef Beheerdersrechten revoke_moderation: Ontneem modereerrechten grant_moderation: Geef modereerrechten - basics: Algemeen reputation: Reputatie permissions: Toestemmingen activity: Activiteit diff --git a/config/locales/client.pseudo.yml b/config/locales/client.pseudo.yml index 0931bdc27d3..61d0b2ffea1 100644 --- a/config/locales/client.pseudo.yml +++ b/config/locales/client.pseudo.yml @@ -817,7 +817,6 @@ pseudo: grant_admin: '[[ Ǧřáɳť Áďɱíɳ ]]' revoke_moderation: '[[ Řéνóǩé Ϻóďéřáťíóɳ ]]' grant_moderation: '[[ Ǧřáɳť Ϻóďéřáťíóɳ ]]' - basics: '[[ Ɓášíčš ]]' reputation: '[[ Řéƿůťáťíóɳ ]]' permissions: '[[ Рéřɱíššíóɳš ]]' activity: '[[ Áčťíνíťý ]]' diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index d849020294f..0db6c5ac748 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -667,7 +667,6 @@ pt: grant_admin: 'Conceder Admin' revoke_moderation: 'Revogar Moderação' grant_moderation: 'Conceder Moderação' - basics: Básicos reputation: Reputação permissions: Permissões activity: Atividade diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 4769e71ba13..41aa42f6809 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -891,7 +891,6 @@ sv: grant_admin: 'Bevilja Administratör' revoke_moderation: 'Återkalla Moderering' grant_moderation: 'Bevilja Moderering' - basics: Grundläggande reputation: Rykte permissions: Rättigheter activity: Aktivitet diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 3638ed213c6..093ac993bbf 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -912,7 +912,6 @@ zh_CN: grant_admin: '赋予管理员资格' revoke_moderation: '吊销论坛版主资格' grant_moderation: '赋予论坛版主资格' - basics: 基础 reputation: 声誉 permissions: 权限 activity: 活动 diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index ec18a5fe7c5..a65216b390d 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -912,7 +912,6 @@ zh_TW: grant_admin: '賦予管理員資格' revoke_moderation: '吊銷論壇版主資格' grant_moderation: '賦予論壇版主資格' - basics: 基礎 reputation: 聲譽 permissions: 權限 activity: 活動