diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-07 13:48:07 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-07 13:48:07 +0000 |
| commit | a0c495b953b84d90f5c87f089eaefbf310b9dfeb (patch) | |
| tree | 80206825ef5f1674b9330aa2688e3bb0d3c48f24 /config | |
| parent | b0bd50620195b19dcc1b7f2f82de73fceaa13692 (diff) | |
| download | redmine-a0c495b953b84d90f5c87f089eaefbf310b9dfeb.tar.gz redmine-a0c495b953b84d90f5c87f089eaefbf310b9dfeb.zip | |
Displays thumbnails of attached images of the issue view (#1006).
This behaviour can be turned on/off in Settings -> Display (off by default). Thumbnail size can be configured there too.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9933 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/configuration.yml.example | 4 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/fr.yml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 1 | ||||
| -rw-r--r-- | config/settings.yml | 5 |
5 files changed, 14 insertions, 0 deletions
diff --git a/config/configuration.yml.example b/config/configuration.yml.example index 2224cd130..35f1fa4b4 100644 --- a/config/configuration.yml.example +++ b/config/configuration.yml.example @@ -163,6 +163,10 @@ default: # same secret token on each machine. #secret_token: 'change it to a long random string' + # Absolute path (e.g. /usr/bin/convert, c:/im/convert.exe) to + # the ImageMagick's `convert` binary. Used to generate attachment thumbnails. + #imagemagick_convert_command: + # specific configuration options for production environment # that overrides the default ones production: diff --git a/config/locales/en.yml b/config/locales/en.yml index 4609cfba3..ef4466c52 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -394,6 +394,8 @@ en: setting_unsubscribe: Allow users to delete their own account setting_session_lifetime: Session maximum lifetime setting_session_timeout: Session inactivity timeout + setting_thumbnails_enabled: Display attachment thumbnails + setting_thumbnails_size: Thumbnails size (in pixels) permission_add_project: Create project permission_add_subprojects: Create subprojects diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ca06fac06..7a68b72c0 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -390,6 +390,8 @@ fr: setting_unsubscribe: Permettre aux utilisateurs de supprimer leur propre compte setting_session_lifetime: Durée de vie maximale des sessions setting_session_timeout: Durée maximale d'inactivité + setting_thumbnails_enabled: Afficher les vignettes des images + setting_thumbnails_size: Taille des vignettes (en pixels) permission_add_project: Créer un projet permission_add_subprojects: Créer des sous-projets diff --git a/config/routes.rb b/config/routes.rb index 1ecaba8af..b4c792b99 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -264,6 +264,7 @@ RedmineApp::Application.routes.draw do match 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/, :via => :get match 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/, :via => :get match 'attachments/download/:id', :controller => 'attachments', :action => 'download', :id => /\d+/, :via => :get + match 'attachments/thumbnail/:id', :controller => 'attachments', :action => 'thumbnail', :id => /\d+/, :via => :get resources :attachments, :only => [:show, :destroy] resources :groups do diff --git a/config/settings.yml b/config/settings.yml index edb3baa24..01906609f 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -212,3 +212,8 @@ default_notification_option: default: 'only_my_events' emails_header: default: '' +thumbnails_enabled: + default: 0 +thumbnails_size: + format: int + default: 100 |