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

Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371

Browse source
This commit is contained in:
zmagod 2018-05-17 15:22:43 +02:00
commit cf4c33bf92
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/my_modules/protocols.js.erb
View file

@ -295,7 +295,7 @@ function initLoadFromRepositoryTable(content) {
{ data: "6" } { data: "6" }
], ],
oLanguage: { oLanguage: {
sSearch: "Filter:" sSearch: I18n.t('general.filter')
}, },
rowCallback: function(row, data, dataIndex) { rowCallback: function(row, data, dataIndex) {
// Get row ID // Get row ID

2
app/assets/javascripts/protocols/index.js
View file

@ -66,7 +66,7 @@ function initProtocolsTable() {
{ data: "6" } { data: "6" }
], ],
oLanguage: { oLanguage: {
sSearch: "Filter:" sSearch: I18n.t('general.filter')
}, },
rowCallback: function(row, data, dataIndex) { rowCallback: function(row, data, dataIndex) {
// Get row ID // Get row ID

2
app/assets/javascripts/reports/reports_datatable.js.erb
View file

@ -147,7 +147,7 @@
'render': renderCheckboxHTML 'render': renderCheckboxHTML
}], }],
'oLanguage': { 'oLanguage': {
'sSearch': "Filter:" 'sSearch': I18n.t('general.filter')
}, },
'fnDrawCallback': tableDrowCallback, 'fnDrawCallback': tableDrowCallback,
'createdRow': appendEditPathToRow 'createdRow': appendEditPathToRow

2
app/assets/javascripts/repositories/repository_datatable.js.erb
View file

@ -93,7 +93,7 @@ var RepositoryDatatable = (function(global) {
} }
}], }],
oLanguage: { oLanguage: {
sSearch: "Filter:" sSearch: I18n.t('general.filter')
}, },
rowCallback: function(row, data) { rowCallback: function(row, data) {
// Get row ID // Get row ID

2
app/assets/javascripts/users/settings/teams/show.js
View file

@ -122,7 +122,7 @@ function initUsersTable() {
{ data: "5" } { data: "5" }
], ],
oLanguage: { oLanguage: {
sSearch: "Filter:" sSearch: I18n.t('general.filter')
} }
}); });
} }

3
app/assets/stylesheets/themes/scinote.scss
View file

@ -1721,9 +1721,8 @@ th.custom-field .modal-tooltiptext {
} }
.sa-type { .sa-type {
border: 1px solid $color-black; border: 1px solid $color-emperor;
border-radius: 4px; border-radius: 4px;
color: $color-black;
font-weight: 600; font-weight: 600;
padding: 0 2px; padding: 0 2px;
text-decoration: none; text-decoration: none;

1
config/locales/en.yml
View file

@ -1932,6 +1932,7 @@ en:
busy: "The server is still processing your request. If you leave this page, the changes will be lost! Are you sure you want to continue?" busy: "The server is still processing your request. If you leave this page, the changes will be lost! Are you sure you want to continue?"
no_name: "(no name)" no_name: "(no name)"
error: "An error has occurred, please try again later." error: "An error has occurred, please try again later."
filter: "Filter:"
api: api:
core: core: