jro_apps/redmine Commit - r15371:2342fe9a755f

User preference for monospaced / variable-width font in textareas (#23653)....

Jean-Philippe Lang -

r15371:2342fe9a755f

parent child

Context file:

r15371:2342fe9a755f

app/helpers/application_helper.rb +3 0

                 css << 'project-' + @project.identifier if @project && @project.identifier.present?
                 css << 'controller-' + controller_name
                 css << 'action-' + action_name
+                if UserPreference::TEXTAREA_FONT_OPTIONS.include?(User.current.pref.textarea_font)
+                  css << "textarea-#{User.current.pref.textarea_font}"
+                end
                 css.join(' ')
               end

app/helpers/users_helper.rb +4 0

                 user.valid_notification_options.collect {|o| [l(o.last), o.first]}
               end
+              def textarea_font_options
+                [[l(:label_font_default), '']] + UserPreference::TEXTAREA_FONT_OPTIONS.map {|o| [l("label_font_#{o}"), o]}
+              end
               def change_status_link(user)
                 url = {:controller => 'users', :action => 'update', :id => user, :page => params[:page], :status => params[:status], :tab => nil}

app/models/user_preference.rb +7 -1

                 'time_zone',
                 'comments_sorting',
                 'warn_on_leaving_unsaved',
-                'no_self_notified'
+                'no_self_notified',
+                'textarea_font'
+              TEXTAREA_FONT_OPTIONS = ['monospace', 'proportional']
               def initialize(attributes=nil, *args)
                 super
               def activity_scope; Array(self[:activity_scope]) ; end
               def activity_scope=(value); self[:activity_scope]=value ; end
+              def textarea_font; self[:textarea_font] end
+              def textarea_font=(value); self[:textarea_font]=value; end
             end

app/views/users/_preferences.html.erb +1 0

             <p><%= pref_fields.time_zone_select :time_zone, nil, :include_blank => true %></p>
             <p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
             <p><%= pref_fields.check_box :warn_on_leaving_unsaved %></p>
+            <p><%= pref_fields.select :textarea_font, textarea_font_options %></p>
             <% end %>

config/locales/en.yml +4 0

               field_total_estimated_hours: Total estimated time
               field_default_version: Default version
               field_remote_ip: IP address
+              field_textarea_font: Font used for text areas
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle
               label_relations: Relations
               label_new_project_issue_tab_enabled: Display the "New issue" tab
               label_new_object_tab_enabled: Display the "+" drop-down
+              label_font_default: Default font
+              label_font_monospace: Monospaced font
+              label_font_proportional: Proportional font
               button_login: Login
               button_submit: Submit

config/locales/fr.yml +4 0

               field_time_entries_visibility: Visibilité du temps passé
               field_total_estimated_hours: Temps estimé total
               field_default_version: Version par défaut
+              field_textarea_font: Police utilisée pour les champs texte
               setting_app_title: Titre de l'application
               setting_app_subtitle: Sous-titre de l'application
               label_relations: Relations
               label_new_project_issue_tab_enabled: Afficher l'onglet "Nouvelle demande"
               label_new_object_tab_enabled: Afficher le menu déroulant "+"
+              label_font_default: Police par défaut
+              label_font_monospace: Police non proportionnelle
+              label_font_proportional: Police proportionnelle
               button_login: Connexion
               button_submit: Soumettre

public/stylesheets/application.css +2 0

             blockquote blockquote { margin-left: 0;}
             abbr, span.field-description[title] { border-bottom: 1px dotted #aaa; cursor: help; }
             textarea.wiki-edit {width:99%; resize:vertical;}
+            body.textarea-monospace textarea.wiki-edit {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; font-size: 12px;}
+            body.textarea-proportional textarea.wiki-edit {font-family: Verdana, sans-serif; font-size: 12px;}
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px; border: 1px solid #d7d7d7; border-radius:3px;}
             p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}

test/functional/users_controller_test.rb +3 -1

                       'hide_mail' => '1',
                       'time_zone' => 'Paris',
                       'comments_sorting' => 'desc',
-                      'warn_on_leaving_unsaved' => '0'
+                      'warn_on_leaving_unsaved' => '0',
+                      'textarea_font' => 'proportional'
                     }
                   }
                 end
                 assert_equal 'Paris', user.pref.time_zone
                 assert_equal 'desc', user.pref[:comments_sorting]
                 assert_equal '0', user.pref[:warn_on_leaving_unsaved]
+                assert_equal 'proportional', user.pref[:textarea_font]
               end
               def test_create_with_generate_password_should_email_the_password

test/functional/welcome_controller_test.rb +18 0

@@ -104,6 +104,24 class WelcomeControllerTest < Redmine::ControllerTest
104	assert_select 'script', :text => %r{warnLeavingUnsaved}, :count => 0	104	assert_select 'script', :text => %r{warnLeavingUnsaved}, :count => 0
105	end	105	end
106		106
		107	def test_textarea_font_set_to_monospace
		108	user = User.find(1)
		109	user.pref.textarea_font = 'monospace'
		110	user.pref.save!
		111	@request.session[:user_id] = 1
		112	get :index
		113	assert_select 'body.textarea-monospace'
		114	end
		115
		116	def test_textarea_font_set_to_proportional
		117	user = User.find(1)
		118	user.pref.textarea_font = 'proportional'
		119	user.pref.save!
		120	@request.session[:user_id] = 1
		121	get :index
		122	assert_select 'body.textarea-proportional'
		123	end
		124
107	def test_logout_link_should_post	125	def test_logout_link_should_post
108	@request.session[:user_id] = 2	126	@request.session[:user_id] = 2
109		127

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages