diff --git a/app/views/dmsf/dmsf_rows.js.erb b/app/views/dmsf/dmsf_rows.js.erb index 287c76f2..e95c0116 100644 --- a/app/views/dmsf/dmsf_rows.js.erb +++ b/app/views/dmsf/dmsf_rows.js.erb @@ -62,6 +62,7 @@ browser.dataTable({ if($(dmsfTag) != null) { $(dmsfTag).prependTo(wrapper); } + $("#browser").show(); }, "fnInfoCallback": function( oSettings, iStart, iEnd, iMax, iTotal, sPre ) { return browserInfo; diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb index b4fc93a5..31844495 100644 --- a/app/views/dmsf/show.html.erb +++ b/app/views/dmsf/show.html.erb @@ -186,6 +186,11 @@ var browserFilter = $("#browser_filter"); $("#dmsf_buttons").insertBefore(browserFilter); $("#dmsf_tag").insertBefore(browserFilter); + $("#browser").show(); + $("#dmsf_buttons").show(); + $("#dmsf_tag").show(); + $("#dmsf_uploader").show(); + $("#dmsf_uploader_header").show(); }, "fnInfoCallback": function( oSettings, iStart, iEnd, iMax, iTotal, sPre ) { <% folder_id = @folder ? @folder.id : nil %> diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb index de7641b1..884be48b 100644 --- a/app/views/dmsf/trash.html.erb +++ b/app/views/dmsf/trash.html.erb @@ -221,6 +221,8 @@ ], "fnInitComplete": function() { $("#dmsf_buttons").insertBefore($("#browser_filter")); + $("#browser").show(); + $("#dmsf_buttons").show(); }, "fnInfoCallback": function( oSettings, iStart, iEnd, iMax, iTotal, sPre ) { return "<%= l(:label_number_of_folders)%>: <%= @subfolders.count + @dir_links.count %>, <%= l(:label_number_of_documents)%>: <%= @files.count + @file_links.count + @url_links.count %>"; diff --git a/app/views/dmsf_upload/_multi_upload.html.erb b/app/views/dmsf_upload/_multi_upload.html.erb index d7e1877d..2a98df12 100644 --- a/app/views/dmsf_upload/_multi_upload.html.erb +++ b/app/views/dmsf_upload/_multi_upload.html.erb @@ -21,19 +21,21 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> -
- + +
+
+ +
+ +

<%= l(:label_upload) %>

- -

<%= l(:label_upload) %>

- <%= form_tag({:controller => 'dmsf_upload', :action => 'upload_files', :id => @project, :folder_id => @folder}, :id => 'uploadform', :method => :post, :multipart => true) do %>
diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css index 937654fa..bb89a413 100644 --- a/assets/stylesheets/redmine_dmsf.css +++ b/assets/stylesheets/redmine_dmsf.css @@ -21,6 +21,14 @@ #browser { border-bottom: none; + display: none; +} + +#dmsf_buttons, +#dmsf_tag, +#dmsf_uploader, +#dmsf_uploader_header { + display: none; } #browser_wrapper .ui-toolbar {