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

Merge pull request #508 from biosistemika/lm-sci-838-fix

Browse source 
Open edit/view Office files in new browser tab/window [SCI-838]
This commit is contained in:
Luka Murn 2017-03-09 10:39:16 +01:00 • committed by GitHub
commit 1e3a697a91
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/results/_result_asset.html.erb
View file

@ -15,7 +15,8 @@
<% if result.asset.can_perform_action('view') %> <% if result.asset.can_perform_action('view') %>
<%= link_to view_asset_url(id: result.asset), <%= link_to view_asset_url(id: result.asset),
class: 'btn btn-default btn-sm', class: 'btn btn-default btn-sm',
style: 'display: inline-block' do %> target: '_blank',
style: 'display: inline-block' do %>
<%= file_application_icon(result.asset) %> <%= file_application_icon(result.asset) %>
<%= wopi_button_text(result.asset, 'view') %> <%= wopi_button_text(result.asset, 'view') %>
<% end %> <% end %>
@ -24,7 +25,8 @@
result.asset.can_perform_action('edit') %> result.asset.can_perform_action('edit') %>
<%= link_to edit_asset_url(id: result.asset), <%= link_to edit_asset_url(id: result.asset),
class: 'btn btn-default btn-sm', class: 'btn btn-default btn-sm',
style: 'display: inline-block' do %> target: '_blank',
style: 'display: inline-block' do %>
<%= file_application_icon(result.asset) %> <%= file_application_icon(result.asset) %>
<%= wopi_button_text(result.asset, 'edit') %> <%= wopi_button_text(result.asset, 'edit') %>
<% end %> <% end %>

6
app/views/steps/_step.html.erb
View file

@ -102,7 +102,8 @@
<% if asset.can_perform_action('view') %> <% if asset.can_perform_action('view') %>
<%= link_to view_asset_url(id: asset), <%= link_to view_asset_url(id: asset),
class: 'btn btn-default btn-sm', class: 'btn btn-default btn-sm',
style: 'display: inline-block' do %> target: '_blank',
style: 'display: inline-block' do %>
<%= file_application_icon(asset) %> <%= file_application_icon(asset) %>
<%= wopi_button_text(asset, 'view') %> <%= wopi_button_text(asset, 'view') %>
<% end %> <% end %>
@ -111,7 +112,8 @@
asset.can_perform_action('edit') %> asset.can_perform_action('edit') %>
<%= link_to edit_asset_url(id: asset), <%= link_to edit_asset_url(id: asset),
class: 'btn btn-default btn-sm', class: 'btn btn-default btn-sm',
style: 'display: inline-block' do %> target: '_blank',
style: 'display: inline-block' do %>
<%= file_application_icon(asset) %> <%= file_application_icon(asset) %>
<%= wopi_button_text(asset, 'edit') %> <%= wopi_button_text(asset, 'edit') %>
<% end %> <% end %>