diff --git a/app/assets/stylesheets/app.utilities.scss b/app/assets/stylesheets/app.utilities.scss index d7ee4d420..274545752 100644 --- a/app/assets/stylesheets/app.utilities.scss +++ b/app/assets/stylesheets/app.utilities.scss @@ -319,6 +319,17 @@ p, .widget p { width: auto; vertical-align: sub; } + +// the two classes above are used in import results page for "import failed" +.fa-stack-inside { + font-size: 0.8em !important; +} + +.fa-stack-outside { + font-size: 1.3em !important; + line-height: 1.7em !important; +} + .contrast-250 { -webkit-filter: contrast(250%); filter: contrast(250%); } .clear{display:block;overflow: hidden;} diff --git a/app/assets/templates/admin/members/import_result.html b/app/assets/templates/admin/members/import_result.html index 447444d06..55fa8d6cb 100644 --- a/app/assets/templates/admin/members/import_result.html +++ b/app/assets/templates/admin/members/import_result.html @@ -42,10 +42,16 @@
{{ 'members_import_result.status_' + resultRow.status | translate:{ID:resultRow.user} }} - - - - + + + {{ 'members_import_result.success' }} + + + + + + + {{ 'members_import_result.failed' }}
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index a09a6abe0..eb9ee6fcd 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -605,6 +605,8 @@ en: pending: "Pending..." status_create: "Creating a new user" status_update: "Updating user {{ID}}" # angular interpolation + success: "Success" + failed: "Failed" error_details: "Error's details:" members_edit: diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 61193f92b..6e8bcadb2 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -605,6 +605,8 @@ es: pending: "Pending..." # translation_missing status_create: "Creating a new user" # translation_missing status_update: "Updating user {{ID}}" # angular interpolation # translation_missing + success: "Success" # translation_missing + failed: "Failed" # translation_missing error_details: "Error's details:" # translation_missing members_edit: diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 5b29a9c1a..9151a1297 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -605,6 +605,8 @@ fr: pending: "En cours..." status_create: "Création d'un nouvel utilisateur" status_update: "Mise à jour de l'utilisateur {{ID}}" # angular interpolation + success: "Succès" + failed: "Échec" error_details: "Détails de l'erreur :" members_edit: diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index ae2107ae8..4958bcf95 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -605,6 +605,8 @@ pt: pending: "Pending..." # translation_missing status_create: "Creating a new user" # translation_missing status_update: "Updating user {{ID}}" # angular interpolation # translation_missing + success: "Success" # translation_missing + failed: "Failed" # translation_missing error_details: "Error's details:" # translation_missing members_edit: