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

Changed some minor button text and fixed a local error

Browse source
This commit is contained in:
Žan Žagar 2017-09-12 09:26:22 +02:00
parent 62350d0d42
commit 2a7a2b8fa1
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/application.js.erb
View file

@ -8,9 +8,9 @@
//= require jquery.scrollTo //= require jquery.scrollTo
//= require jquery.autosize //= require jquery.autosize
//= require jquery-ui/widget //= require jquery-ui/widget
//= require jquery-ui/widgets/mouse //= require jquery-ui/mouse
//= require jquery-ui/widgets/draggable //= require jquery-ui/draggable
//= require jquery-ui/widgets/droppable //= require jquery-ui/droppable
//= require jquery.ui.touch-punch.min //= require jquery.ui.touch-punch.min
//= require jquery.caret.min //= require jquery.caret.min
//= require jquery.atwho.min //= require jquery.atwho.min

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

@ -62,14 +62,21 @@
data-team-id="<%= @current_team.id %>" data-team-id="<%= @current_team.id %>"
data-type="<%= @type %>" data-import-url="<%= import_protocols_path %>" data-type="<%= @type %>" data-import-url="<%= import_protocols_path %>"
<%= 'disabled="disabled"' unless can_import_protocols(@current_team) %>> <%= 'disabled="disabled"' unless can_import_protocols(@current_team) %>>
</a> </a>
</li> </li>
<li> <li>
<%= link_to import_protocols_path(@protocol, format: :json), remote: true, data: { action: "import"} do %> <a class="btn-link btn-default-link btn-open-file" <%= can_import_protocols(@current_team) ? 'data-action="import"' : 'disabled="disabled"' %>>
<span class="glyphicon glyphicon-file"></span>&nbsp;<%= "from protocols.io file(.json)" %></a> <span class="glyphicon glyphicon-file"></span>
<% end %> <span class="hidden-xs"><%= t("protocols.index.import_json") %></span>
<input type="file" value="" accept=".txt" data-role="import-json-file-input"
data-team-id="<%= @current_team.id %>"
data-type="<%= @type %>" data-import-url="<%= import_protocols_path %>"
<%= 'disabled="disabled"' unless can_import_protocols(@current_team) %>>
</a>
</li> </li>
</ul> </ul>

1
config/locales/en.yml
View file

@ -1444,6 +1444,7 @@ en:
clone_btn: "Copy" clone_btn: "Copy"
import: "Import" import: "Import"
import_alt: "from SciNote protocol file(.eln)" import_alt: "from SciNote protocol file(.eln)"
import_json: "from protocols.io file(.json)"
export: "Export" export: "Export"
make_private: "Make private" make_private: "Make private"
publish: "Publish" publish: "Publish"