aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorZog2018-02-05 11:26:54 +0100
committercedricnjanga2018-04-10 20:52:21 -0700
commit9f374650488fdbfd86fbbdc66cfebda4e9f5a551 (patch)
tree3dfaf0d4b642f388e78c0c3f9f31969a6287c241 /app
parent38f89197a5f09d7c29c483850793e6b52cead20e (diff)
downloadchouette-core-9f374650488fdbfd86fbbdc66cfebda4e9f5a551.tar.bz2
Refs 5846; Fix wrong translation
And a very small css fix
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/components/_referential_overview.sass1
-rw-r--r--app/views/lines/show.html.slim2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/components/_referential_overview.sass b/app/assets/stylesheets/components/_referential_overview.sass
index 7a0cc98c5..cf440b22c 100644
--- a/app/assets/stylesheets/components/_referential_overview.sass
+++ b/app/assets/stylesheets/components/_referential_overview.sass
@@ -24,6 +24,7 @@
.time-travel
padding-top: 3px
padding-bottom: 4px
+ height: 43px
a.btn:first-child
margin-right: 1px
a.btn:last-child
diff --git a/app/views/lines/show.html.slim b/app/views/lines/show.html.slim
index 96bb5bb0d..9e1ae6d6f 100644
--- a/app/views/lines/show.html.slim
+++ b/app/views/lines/show.html.slim
@@ -6,7 +6,7 @@
.row
.col-lg-6.col-md-6.col-sm-12.col-xs-12
= definition_list t('metadatas'),
- { t('id_codif') => @line.get_objectid.short_id,
+ { t('objectid') => @line.get_objectid.short_id,
@line.human_attribute_name(:deactivated) => (@line.deactivated? ? t('false') : t('true')),
@line.human_attribute_name(:network_id) => (@line.network.nil? ? t('lines.index.unset') : @line.network.name),
@line.human_attribute_name(:company_id) => (@line.company.nil? ? t('lines.index.unset') : @line.company.name),