scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 11:45:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

refactor

Browse source
This commit is contained in:
zmagod 2017-03-29 09:32:23 +02:00
parent 0996c14449
commit 0096f9dc14
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/zip_exports_controller.rb
View file

@ -12,8 +12,7 @@ class ZipExportsController < ApplicationController
end end
end end
def file_expired def file_expired; end
end
private private

3
app/views/user_notifications/_list.html.erb
View file

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="col-xs-3 col-md-1"> <div class="col-xs-3 col-md-1">
<span style="display: none;" data-hook="user-notification-list-item"></span> <span style="display: none;" data-hook="user-notification-list-item"></span>
<% if notification.type_of == 'recent_changes' %> <% if notification.type_of == 'recent_changes' %>
<div class="text-center"> <div class="text-center">
<%= image_tag avatar_path(notification.generator_user, :icon_small), class: 'avatar img-circle' %> <%= image_tag avatar_path(notification.generator_user, :icon_small), class: 'avatar img-circle' %>
</div> </div>
@ -18,7 +18,6 @@
<span class="system-message"><i class="glyphicon glyphicon-tower" aria-hidden="true"></i></span> <span class="system-message"><i class="glyphicon glyphicon-tower" aria-hidden="true"></i></span>
</div> </div>
<% end %> <% end %>
<% if notification.type_of == 'deliver' %> <% if notification.type_of == 'deliver' %>
<div class="text-center"> <div class="text-center">
<span class="deliver"><%= fa_icon 'truck' %></span> <span class="deliver"><%= fa_icon 'truck' %></span>

2
config/locales/en.yml
View file

@ -1544,7 +1544,7 @@ en:
zip_export: zip_export:
notification_title: 'Your package is ready to be exported!' notification_title: 'Your package is ready to be exported!'
expired_title: 'The required file was expired!' expired_title: 'The required file was expired!'
expired_description: 'The downloadable file expires in 3 days after is created.' expired_description: 'The downloadable file expires in 3 days after its creation.'
# This section contains general words that can be used in any parts of # This section contains general words that can be used in any parts of
# application. # application.