diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb index c046a09e..8d6d243e 100644 --- a/app/views/dmsf/show.html.erb +++ b/app/views/dmsf/show.html.erb @@ -86,6 +86,7 @@ +
<%= form_tag(entries_operations_dmsf_path(id: @project, folder_id: @folder), method: :post, class: 'dmsf_entries', id: 'entries_form', data: { cm_url: dmsf_context_menu_path }) do %> <%= hidden_field_tag('action') %> @@ -186,6 +187,7 @@ var browserFilter = $("#browser_filter"); $("#dmsf_buttons").insertBefore(browserFilter); $("#dmsf_tag").insertBefore(browserFilter); + $("#dmsf_ajax_loading").hide(); $("#browser").show(); $("#dmsf_buttons").show(); $("#dmsf_tag").show(); diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb index 611d98a6..5548fb58 100644 --- a/app/views/dmsf/trash.html.erb +++ b/app/views/dmsf/trash.html.erb @@ -30,6 +30,7 @@ + <%= form_tag(entries_operations_dmsf_path(:id => @project, :folder_id => @folder), :method => :post, :class => 'dmsf_entries', :id => 'entries_form', :data => {:cm_url => dmsf_trash_context_menu_path}) do %> <%= hidden_field_tag('action') %> @@ -221,6 +222,7 @@ ], "fnInitComplete": function() { $("#dmsf_buttons").insertBefore($("#browser_filter")); + $("#dmsf_ajax_loading").hide(); $("#browser").show(); $("#dmsf_buttons").show(); }, diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css index 07dcdc87..9250296d 100644 --- a/assets/stylesheets/redmine_dmsf.css +++ b/assets/stylesheets/redmine_dmsf.css @@ -24,6 +24,12 @@ display: none; } +#dmsf_ajax_loading.ajax-loading { + background:url(../../../images/loading.gif) no-repeat 0 50%; + width: 16px; + height: 16px; +} + #dmsf_buttons, #dmsf_tag, #dmsf_uploader,