diff options
| author | jpl | 2017-03-03 13:32:32 +0100 |
|---|---|---|
| committer | jpl | 2017-03-03 13:32:32 +0100 |
| commit | 3a2584cd73888cc600fd759b7e06bb941ce5221c (patch) | |
| tree | 1eed1ff35abab06d39f96af5114e6015e1417961 | |
| parent | ece023e308b97d9062d2ec6bf242b1e50188e1df (diff) | |
| download | chouette-core-3a2584cd73888cc600fd759b7e06bb941ce5221c.tar.bz2 | |
updating tables+metas attributes display (lines#show with sec. companies)
| -rw-r--r-- | app/assets/stylesheets/components/_lists.sass | 11 | ||||
| -rw-r--r-- | app/views/referential_lines/show.html.slim | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/stylesheets/components/_lists.sass b/app/assets/stylesheets/components/_lists.sass index 53c7df907..d8f83d72b 100644 --- a/app/assets/stylesheets/components/_lists.sass +++ b/app/assets/stylesheets/components/_lists.sass @@ -13,6 +13,7 @@ $dlWidth: 40% text-rendering: optimizespeed font-weight: 300 margin-bottom: 40px + border-bottom: 1px solid rgba($grey, 0.5) .dl-head display: block @@ -27,7 +28,7 @@ $dlWidth: 40% word-spacing: normal text-rendering: auto // overflow: hidden - vertical-align: middle + vertical-align: top padding: 5px 15px 6px 15px // Definition term @@ -36,16 +37,20 @@ $dlWidth: 40% width: $dlWidth font-weight: 700 - &:after + &:before content: '' display: block position: absolute z-index: 1 - bottom: 0 + top: 0 left: 0 width: (100 / ($dlWidth / 1%)) * 100 * 1% border-bottom: 1px solid rgba($grey, 0.5) + &:first-child + &:before + display: none + // Definition .dl-def width: 100% - $dlWidth diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim index f57843833..5f95463c4 100644 --- a/app/views/referential_lines/show.html.slim +++ b/app/views/referential_lines/show.html.slim @@ -31,17 +31,12 @@ .container-fluid .row .col-lg-6.col-md-6.col-sm-12.col-xs-12 - p = 'toto' - ul - - @line.secondary_companies.each do |sc| - li = sc.inspect - = definition_list t('metadatas'), { 'ID Codif' => @line.objectid.local_id, 'Activé' => (@line.deactivated? ? t('false') : t('true')), @line.human_attribute_name(:network) => (@line.network.nil? ? t('lines.index.unset') : @line.network.name), @line.human_attribute_name(:company) => (@line.company.nil? ? t('lines.index.unset') : @line.company.name), - # 'Transporteur(s) secondaire(s)' => (@line.secondary_companies.nil? ? t('lines.index.unset') : @line.secondary_companies.pluck(:name)), + 'Transporteur(s) secondaire(s)' => (@line.secondary_companies.nil? ? t('lines.index.unset') : @line.secondary_companies.collect(&:name).join(', ')), 'Nom court' => @line.number, 'Code public' => (@line.registration_number ? @line.registration_number : '-'), @line.human_attribute_name(:transport_mode) => (@line.transport_mode ? t("enumerize.line.transport_mode.#{@line.transport_mode}") : '-'), |