scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-06 15:40:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #378 from Ducz0r/lm-sci-802-fix

Browse source 
Add tooltips to samples column dropdown [SCI-802]
This commit is contained in:
Luka Murn 2017-01-04 11:30:04 +01:00 committed by GitHub
commit 09ef3b3ad5
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/samples/sample_datatable.js.erb
View file

@ -980,11 +980,11 @@ function changeToEditMode() {
'<span class="text">' + generateColumnNameTooltip(thederName) + '</span> ' + '<span class="text">' + generateColumnNameTooltip(thederName) + '</span> ' +
'<span class="form-group"><input type="text" class="text-edit form-control" style="display: none;" />' + '<span class="form-group"><input type="text" class="text-edit form-control" style="display: none;" />' +
'<span class="pull-right controls">' + '<span class="pull-right controls">' +
'<span class="ok glyphicon glyphicon-ok" style="display: none;"></span>' + '<span class="ok glyphicon glyphicon-ok" style="display: none;" title="<%= I18n.t("general.save") %>"></span>' +
'<span class="cancel glyphicon glyphicon-remove" style="display: none;"></span>' + '<span class="cancel glyphicon glyphicon-remove" style="display: none;" title="<%= I18n.t("general.cancel") %>"></span>' +
'<span class="vis glyphicon ' + visClass + '"></span> ' + '<span class="vis glyphicon ' + visClass + '" title="<%= I18n.t("samples.columns_visibility") %>"></span> ' +
'<span class="edit glyphicon glyphicon-pencil ' + editClass + '"></span>' + '<span class="edit glyphicon glyphicon-pencil ' + editClass + '" title="<%= I18n.t("general.edit") %>"></span>' +
'<span class="del glyphicon glyphicon-trash ' + delClass + '"></span>' + '<span class="del glyphicon glyphicon-trash ' + delClass + '" title="<%= I18n.t("samples.columns_delete") %>"></span>' +
'</span><br></span></li>'; '</span><br></span></li>';
dropdownList.append(html); dropdownList.append(html);
} }

3
config/locales/en.yml
View file

@ -805,6 +805,8 @@ en:
samples: samples:
columns: "Columns" columns: "Columns"
columns_visibility: "Toggle visibility"
columns_delete: "Delete"
types_and_groups: "Types and groups" types_and_groups: "Types and groups"
actions: "Actions" actions: "Actions"
add_new_sample: "Add new sample" add_new_sample: "Add new sample"
@ -1457,6 +1459,7 @@ en:
# application. # application.
general: general:
save: "Save"
update: "Update" update: "Update"
edit: "Edit" edit: "Edit"
cancel: "Cancel" cancel: "Cancel"