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

Merge pull request #960 from Zanz2/fixed_styling_after_merge

Browse source 
Fixed some styling bugs that happened after the merge
This commit is contained in:
Zanz2 2018-01-26 08:19:29 +01:00 • committed by GitHub
commit e484f0569b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/protocols/index.html.erb
View file

@ -54,9 +54,9 @@
<ul class="dropdown-menu">
<li>
<a class="btn-open-file" <%= can_create_protocols_in_repository?(@current_team) ? 'data-action="import"' : 'disabled="disabled"' %>>
<span class="glyphicon glyphicon-import"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.import") %></span>
<a class="btn-link-alt btn-default-link btn-open-file" <%= can_create_protocols_in_repository?(@current_team) ? 'data-action="import"' : 'disabled="disabled"' %>>
<span class="glyphicon glyphicon-file"></span>
<span class="hidden-xs"><%= t("protocols.index.import_alt") %></span>
<input type="file" value="" accept=".eln" data-role="import-file-input"
data-team-id="<%= @current_team.id %>"
data-type="<%= @type %>" data-import-url="<%= import_protocols_path %>"

4
config/locales/en.yml
View file

@ -1501,8 +1501,8 @@ en:
edit: "Edit"
clone_btn: "Copy"
import: "Import"
import_alt: "from SciNote protocol file(.eln)"
import_json: "from protocols.io file"
import_alt: " from SciNote protocol file(.eln)"
import_json: " from protocols.io file"
modal_import_json_upload: "Upload file"
modal_import_json_title: "Import protocols.io file"
modal_import_json_notice: "Upload your protocols.io protocol file"