From 6653f0d4c116c24811b531211fe7fb1abea7a7d8 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Thu, 19 Jan 2017 16:42:14 +0100 Subject: [PATCH] small fixes --- app/assets/stylesheets/reports.scss | 2 +- app/views/steps/_form_tables.html.erb | 2 +- config/locales/en.yml | 1 - db/migrate/20170116143350_add_name_to_tables.rb | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/reports.scss b/app/assets/stylesheets/reports.scss index 669004bb1..9b330ca54 100644 --- a/app/assets/stylesheets/reports.scss +++ b/app/assets/stylesheets/reports.scss @@ -347,7 +347,7 @@ ul { } } -/* Result table element style */ +// Result table element style .report-result-table-element { .report-element-body { padding-top: 30px; diff --git a/app/views/steps/_form_tables.html.erb b/app/views/steps/_form_tables.html.erb index 593c8d9f6..89948547e 100644 --- a/app/views/steps/_form_tables.html.erb +++ b/app/views/steps/_form_tables.html.erb @@ -9,7 +9,7 @@
- <%= ff.text_area :name, label: t("protocols.steps.new.table_name"), class: "table_name", autofocus: true, placeholder: t("protocols.steps.new.table_name_placeholder") %> + <%= ff.smart_text_area :name, label: t("protocols.steps.new.table_name"), class: "table_name", autofocus: true, placeholder: t("protocols.steps.new.table_name_placeholder") %>
<%= ff.hidden_field(:contents, value: ff.object.contents_utf_8, class: "hot-contents" ) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 5e2dfc548..ee0c26de5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -379,7 +379,6 @@ en: step_pos: "Step %{pos}:" no_description: "No description" step_table: - sidebar_name: "Table" # TODO table_name: "[ %{name} ]" user_time: "Table created on %{timestamp}." step_asset: diff --git a/db/migrate/20170116143350_add_name_to_tables.rb b/db/migrate/20170116143350_add_name_to_tables.rb index 74ba4ef8d..78f74d218 100644 --- a/db/migrate/20170116143350_add_name_to_tables.rb +++ b/db/migrate/20170116143350_add_name_to_tables.rb @@ -1,5 +1,5 @@ class AddNameToTables < ActiveRecord::Migration def change - add_column :tables, :name, :string, default: '' + add_column :tables, :name, :string, default: '', index: true end end