diff options
| author | Luc Donnet | 2014-07-21 16:43:41 +0200 |
|---|---|---|
| committer | Luc Donnet | 2014-07-21 16:43:41 +0200 |
| commit | 216f2e944b83353e8b3c1d9248c7e15ae6620957 (patch) | |
| tree | 1534c4f8d0dcdb3d7d5124c96ca301172ffebadc | |
| parent | e25fa67e867cdc283d8ac0028b002f020e3cf9d8 (diff) | |
| download | chouette-core-216f2e944b83353e8b3c1d9248c7e15ae6620957.tar.bz2 | |
Fix css when purge date for referential Refs #0026847
| -rw-r--r-- | app/assets/stylesheets/main/referentials.css.scss | 45 | ||||
| -rw-r--r-- | app/views/referentials/_clean.html.erb | 2 | ||||
| -rw-r--r-- | config/locales/clean_ups.yml | 18 |
3 files changed, 29 insertions, 36 deletions
diff --git a/app/assets/stylesheets/main/referentials.css.scss b/app/assets/stylesheets/main/referentials.css.scss index f5c2fa030..8f2fa0bf7 100644 --- a/app/assets/stylesheets/main/referentials.css.scss +++ b/app/assets/stylesheets/main/referentials.css.scss @@ -25,32 +25,27 @@ padding: 5px 15px; } } - + } #sidebar div#clean_up { - form { - fieldset { - padding: 0; - border: 0; - li.date { - padding: 0; - label { padding-left: 10px; - width: 40%;} - input { width: 42%; } - } - li { - padding: 0; - label { padding-left: 10px; - width: 90%;} - input { width: 12%; } - } - } - fieldset.actions { - margin-bottom: 0; - padding-left: 20px; - } - fieldset.inputs { - padding-top: 16px; + form { + fieldset { + li{ + margin-bottom: 0px; + } + + li.date { + + input{ + width: 125px; + font-size: 12px; + height: 25px + } + label{ + width: 35%; + } + } + } + } - } } diff --git a/app/views/referentials/_clean.html.erb b/app/views/referentials/_clean.html.erb index ff2cf1185..5c749867f 100644 --- a/app/views/referentials/_clean.html.erb +++ b/app/views/referentials/_clean.html.erb @@ -1,7 +1,7 @@ <div id="clean_up" > <%= semantic_form_for [@referential, CleanUp.new] do |form| %> <%= form.inputs do %> - <%= form.input :expected_date, :as => :date_picker , :wrapper_html => { :class => 'date' }%> + <%= form.input :expected_date, :as => :date_picker , :wrapper_html => { :class => 'date', :title => t('hints.clean_up.expected_date') } %> <%= form.input :keep_lines, :as => :boolean %> <%= form.input :keep_stops, :as => :boolean %> <%= form.input :keep_companies, :as => :boolean %> diff --git a/config/locales/clean_ups.yml b/config/locales/clean_ups.yml index 09abc5adf..dc03fb4a1 100644 --- a/config/locales/clean_ups.yml +++ b/config/locales/clean_ups.yml @@ -16,16 +16,15 @@ en: activemodel: attributes: clean_up: - expected_date: "Final date" + expected_date: "Final date : " keep_lines: "keep lines" keep_stops: "keep stop areas" keep_companies: "keep companies" keep_networks: "keep networks" keep_group_of_lines: "keep groups of lines" - formtastic: - hints: - clean_up: - expected_date: "value included in clean up" + hints: + clean_up: + expected_date: "value included in clean up" fr: clean_ups: success_tm: "%{count} calendrier(s) supprimé(s)" @@ -44,14 +43,13 @@ fr: activemodel: attributes: clean_up: - expected_date: "date limite" + expected_date: "Date limite : " keep_lines: "conserver les lignes" keep_stops: "conserver les arrêts" keep_companies: "conserver les transporteurs" keep_networks: "conserver les réseaux" keep_group_of_lines: "conserver les groupes de lignes" - formtastic: - hints: - clean_up: - expected_date: "valeur incluse dans la purge" + hints: + clean_up: + expected_date: "valeur incluse dans la purge" |
