From 02c8da4011de44079849cbd93207eb7bd9077e6e Mon Sep 17 00:00:00 2001 From: "vit.jonas@gmail.com" Date: Sun, 8 May 2011 16:54:58 +0000 Subject: [PATCH] Merged development branch * updated Plupload to 1.4.3.2 * Plupload tuned * upload controls set according to settings * added setting for max number of uploaded files at once * incremented version info git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@22 5e329b0b-a2ee-ea63-e329-299493fc886d --- README.txt | 70 +- app/views/dmsf/index.html.erb | 35 +- app/views/settings/_dmsf_settings.erb | 8 + assets/images/plupload/plupload-bw.png | Bin 2105 -> 0 bytes assets/images/plupload/plupload.png | Bin 3641 -> 0 bytes assets/javascripts/plupload/gears_init.js | 86 - assets/javascripts/plupload/i18n/fr.js | 25 +- assets/javascripts/plupload/i18n/lv.js | 33 + .../plupload/jquery.plupload.queue.min.js | 1 - .../jquery.ui.plupload.js | 30 +- .../plupload/plupload.browserplus.js | 337 ++++ .../plupload/plupload.browserplus.min.js | 1 - assets/javascripts/plupload/plupload.flash.js | 387 ++++ .../plupload/plupload.flash.min.js | 1 - .../javascripts/plupload/plupload.flash.swf | Bin 14493 -> 18538 bytes .../javascripts/plupload/plupload.full.min.js | 2 - assets/javascripts/plupload/plupload.gears.js | 420 +++++ .../plupload/plupload.gears.min.js | 1 - assets/javascripts/plupload/plupload.html4.js | 413 ++++ .../plupload/plupload.html4.min.js | 1 - assets/javascripts/plupload/plupload.html5.js | 1315 +++++++++++++ .../plupload/plupload.html5.min.js | 1 - assets/javascripts/plupload/plupload.js | 1680 +++++++++++++++++ assets/javascripts/plupload/plupload.min.js | 2 - .../plupload/plupload.silverlight.js | 439 +++++ .../plupload/plupload.silverlight.min.js | 1 - .../plupload/plupload.silverlight.xap | Bin 43313 -> 43337 bytes assets/stylesheets/dmsf.css | 11 +- .../plupload/jquery.ui.plupload.css | 5 +- .../stylesheets/plupload/plupload.queue.css | 177 -- init.rb | 3 +- 31 files changed, 5139 insertions(+), 346 deletions(-) delete mode 100644 assets/images/plupload/plupload-bw.png delete mode 100644 assets/images/plupload/plupload.png delete mode 100644 assets/javascripts/plupload/gears_init.js create mode 100644 assets/javascripts/plupload/i18n/lv.js delete mode 100644 assets/javascripts/plupload/jquery.plupload.queue.min.js rename assets/javascripts/plupload/{ => jquery.ui.plupload}/jquery.ui.plupload.js (93%) create mode 100644 assets/javascripts/plupload/plupload.browserplus.js delete mode 100644 assets/javascripts/plupload/plupload.browserplus.min.js create mode 100644 assets/javascripts/plupload/plupload.flash.js delete mode 100644 assets/javascripts/plupload/plupload.flash.min.js delete mode 100644 assets/javascripts/plupload/plupload.full.min.js create mode 100644 assets/javascripts/plupload/plupload.gears.js delete mode 100644 assets/javascripts/plupload/plupload.gears.min.js create mode 100644 assets/javascripts/plupload/plupload.html4.js delete mode 100644 assets/javascripts/plupload/plupload.html4.min.js create mode 100644 assets/javascripts/plupload/plupload.html5.js delete mode 100644 assets/javascripts/plupload/plupload.html5.min.js create mode 100644 assets/javascripts/plupload/plupload.js delete mode 100644 assets/javascripts/plupload/plupload.min.js create mode 100644 assets/javascripts/plupload/plupload.silverlight.js delete mode 100644 assets/javascripts/plupload/plupload.silverlight.min.js delete mode 100644 assets/stylesheets/plupload/plupload.queue.css diff --git a/README.txt b/README.txt index dc9cacbe..d4adb343 100644 --- a/README.txt +++ b/README.txt @@ -4,15 +4,21 @@ Redmine Document Management System "Features" plugin is distributed under GNU GP License itself is here: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html#SEC1 -2 Installation and Setup +2 Installation -2.1. Required packages +2.1. Prerequisities -For zipped content download you must have rubyzip gem installed. +* Redmine 1.1.x +* Ruby Zip library - rubyzip gem -To use file/document search capabilities you must install xapian (http://xapian.org) search engine. -That means libxapian-ruby1.8 and xapian-omega packages. To index some files with omega you may have to install some other -packages like xpdf, antiword, ... +2.1.1 Fulltext search (optional) + +If you want to use fulltext search abilities: +* Xapian (http://xapian.org) search engine +* Xapian Omega indexing tool +* Xapian ruby bindings - xapian or xapian-full gem + +To index some files with omega you may have to install some other packages like xpdf, antiword, ... From Omega documentation: @@ -36,34 +42,45 @@ From Omega documentation: On Debinan (Squeeze) use: apt-get install xapian-ruby1.8 xapian-omega libxapian-dev xpdf antiword unzip antiword\ - catdoc libwpd8c2a libwps-0.1-1 gzip unrtf catdvi djview djview3 libzip-ruby1.8 + catdoc libwpd8c2a libwps-0.1-1 gzip unrtf catdvi djview djview3 -In case of package shortage it is possible to use: -gem install xapian-full rubyzip +2.2. Setup -2.2. Plugin installation - -Install redmine_dmsf into vendor/plugins directory with: -* Put redmine_dmsf plugin content into vendor/plugins +* Put redmine_dmsf plugin directory into vendor/plugins * Initialize database: - rake db:migrate:plugins RAILS_ENV="production" -* The access rights must be set for web server - Example: + rake db:migrate:plugins RAILS_ENV="production" +* The access rights must be set for web server, example: chown -R www-data:www-data /opt/redmine/vendor/plugins/redmine_dmsf * Restart web server +* You should configure plugin via Redmine interface: Administration -> Plugins -> DMSF -> Configure +* Assign DMSF permissions to appropriate roles -2.3. Setup +2.2.1 Fulltext search (optional) -Then you must configure plugin in Administration -> Plugins -> DMSF -> Configure +If you want to use fulltext search features, you must setup file content indexing. -It is also neccessary to assign DMSF permissions to appropriate roles. +It is necessary to index DMSF files with omega before searching attemts to recieve some output: + omindex -s english -l 1 --db {path to index database from configuration} {path to storage from configuration} + +This command must be run on regular basis (e.g. from cron) + +Example of cron job (once per hour at 8th minute): + * 8 * * * root /usr/bin/omindex -s english -l 1 --db /opt/redmine/files/dmsf_index /opt/redmine/files/dmsf + +Use omindex -h for help. + +2.3 Usage DMSF act as project module so you must check DMSF in project settings. Search options will now contain "Dmsf files" check, that allows you to search DMSF content. -To include Wiki DMSF link help: -* In file public/help/wiki_syntax_detailed.html include after document link description: +There is possibility to link DMSF files from Wiki entries: + {{dmsf(17)}} link to file with id 17 +DMSF file id can be found in link for file download. + +You can also publish Wiki help description. +In file /public/help/wiki_syntax_detailed.html include after document link description: - -It is necessary to index DMSF files with omega before searching attemts to recieve some output: - -omindex -s english -l 1 --db {path to index database from plugin configuration} {path to storage from plugin configuration} - -This command must be run on regular basis (e.g. from cron) - -Example of cron job (once per hour at 8th minute): -* 8 * * * root /usr/bin/omindex -s english -l 1 --db /opt/redmine/files/dmsf_index /opt/redmine/files/dmsf - -Use omindex -h for help. diff --git a/app/views/dmsf/index.html.erb b/app/views/dmsf/index.html.erb index 32c290ee..d08d083b 100644 --- a/app/views/dmsf/index.html.erb +++ b/app/views/dmsf/index.html.erb @@ -163,12 +163,17 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder

File Upload

<% form_tag({:controller => "dmsf_detail", :action => "upload_files", :id => @project, :folder_id => @folder}, :id => "uploadform", :method=>:post, :multipart => true) do %> -
-
- File size: -
-There can be uploaded maximum of 20 files at once. To upload files greater than 2GB you must have 64b browser. -
+
+<% if Setting.attachment_max_size.to_i >= 102400 %> +
+ File size: +
+
+<% end %> + + <% if Setting.plugin_redmine_dmsf["dmsf_max_file_upload"].to_i > 0 %>There can be uploaded maximum of <%= Setting.plugin_redmine_dmsf["dmsf_max_file_upload"].to_i %> files at once.<% end %> + <% if Setting.attachment_max_size.to_i >= 2097151 %>To upload files greater than 2GB you must have 64b browser.<% end %> +

@@ -188,14 +193,18 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder <%= render(:partial => 'user_pref') %> <% content_for :header_tags do %> - <%= stylesheet_link_tag "dmsf", :plugin => "redmine_dmsf" %> <%= stylesheet_link_tag "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.10/themes/base/jquery-ui.css" %> <%= stylesheet_link_tag "plupload/jquery.ui.plupload.css", :plugin => "redmine_dmsf" %> - <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js" %> - <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.10/jquery-ui.min.js" %> - <%= javascript_include_tag "plupload/gears_init.js", :plugin => "redmine_dmsf" %> - <%= javascript_include_tag "plupload/plupload.full.min.js", :plugin => "redmine_dmsf" %> - <%= javascript_include_tag "plupload/jquery.ui.plupload.js", :plugin => "redmine_dmsf" %> + <%= stylesheet_link_tag "dmsf", :plugin => "redmine_dmsf" %> + + <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js" %> + <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.12/jquery-ui.min.js" %> + <%= javascript_include_tag "plupload/plupload.js", :plugin => "redmine_dmsf" %> + <%= javascript_include_tag "plupload/plupload.flash.js", :plugin => "redmine_dmsf" %> + <%= javascript_include_tag "plupload/plupload.gears.js", :plugin => "redmine_dmsf" %> + <%= javascript_include_tag "plupload/plupload.html5.js", :plugin => "redmine_dmsf" %> + <%= javascript_include_tag "plupload/plupload.html4.js", :plugin => "redmine_dmsf" %> + <%= javascript_include_tag "plupload/jquery.ui.plupload/jquery.ui.plupload.js", :plugin => "redmine_dmsf" %>