jro_apps/redmine Commit - r19:552d99d664b6

tables and forms redesign,...

Jean-Philippe Lang -

r19:552d99d664b6

parent child

Context file:

r19:552d99d664b6

Expand all files

redmine/lang/de.yml created 644 +290 0

@@ -0,0 +1,290
	1	_gloc_rule_default: '\|n\| n==1 ? "" : "_plural" '
	2
	3	actionview_datehelper_select_day_prefix:
	4	actionview_datehelper_select_month_names: January,February,March,April,May,June,July,August,September,October,November,December
	5	actionview_datehelper_select_month_names_abbr: Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec
	6	actionview_datehelper_select_month_prefix:
	7	actionview_datehelper_select_year_prefix:
	8	actionview_datehelper_time_in_words_day: 1 day
	9	actionview_datehelper_time_in_words_day_plural: %d days
	10	actionview_datehelper_time_in_words_hour_about: about an hour
	11	actionview_datehelper_time_in_words_hour_about_plural: about %d hours
	12	actionview_datehelper_time_in_words_hour_about_single: about an hour
	13	actionview_datehelper_time_in_words_minute: 1 minute
	14	actionview_datehelper_time_in_words_minute_half: half a minute
	15	actionview_datehelper_time_in_words_minute_less_than: less than a minute
	16	actionview_datehelper_time_in_words_minute_plural: %d minutes
	17	actionview_datehelper_time_in_words_minute_single: 1 minute
	18	actionview_datehelper_time_in_words_second_less_than: less than a second
	19	actionview_datehelper_time_in_words_second_less_than_plural: less than %d seconds
	20	actionview_instancetag_blank_option: Bitte auserwählt
	21
	22	activerecord_error_inclusion: ist nicht in der Liste eingeschlossen
	23	activerecord_error_exclusion: ist reserviert
	24	activerecord_error_invalid: ist unzulässig
	25	activerecord_error_confirmation: bringt nicht Bestätigung zusammen
	26	activerecord_error_accepted: muß angenommen werden
	27	activerecord_error_empty: kann nicht leer sein
	28	activerecord_error_blank: kann nicht leer sein
	29	activerecord_error_too_long: ist zu lang
	30	activerecord_error_too_short: ist zu kurz
	31	activerecord_error_wrong_length: ist die falsche Länge
	32	activerecord_error_taken: ist bereits genommen worden
	33	activerecord_error_not_a_number: ist nicht eine Zahl
	34
	35	general_fmt_age: %d yr
	36	general_fmt_age_plural: %d yrs
	37	general_fmt_date: %%b %%d, %%Y (%%a)
	38	general_fmt_datetime: %%b %%d, %%Y (%%a), %%I:%%M %%p
	39	general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
	40	general_fmt_time: %%I:%%M %%p
	41	general_text_No: 'Nein'
	42	general_text_Yes: 'Ja'
	43	general_text_no: 'nein'
	44	general_text_yes: 'ja'
	45	general_lang_de: 'Deutsch'
	46
	47	notice_account_updated: Konto wurde erfolgreich aktualisiert.
	48	notice_account_invalid_creditentials: Unzulässiger Benutzer oder Passwort
	49	notice_account_password_updated: Passwort wurde erfolgreich aktualisiert.
	50	notice_account_wrong_password: Falsches Passwort
	51	notice_account_register_done: Konto wurde erfolgreich verursacht.
	52	notice_account_unknown_email: Unbekannter Benutzer.
	53	notice_can_t_change_password: Dieses Konto verwendet eine externe Authentisierung Quelle. Unmöglich, das Kennwort zu ändern.
	54	notice_account_lost_email_sent: Ein email mit Anweisungen, ein neues Kennwort zu wählen ist dir geschickt worden.
	55	notice_account_activated: Dein Konto ist aktiviert worden. Du kannst jetzt einloggen.
	56	notice_successful_create: Erfolgreiche Kreation.
	57	notice_successful_update: Erfolgreiches Update.
	58	notice_successful_delete: Erfolgreiche Auslassung.
	59	notice_successful_connection: Erfolgreicher Anschluß.
	60	notice_file_not_found: Erbetene Akte besteht nicht oder ist gelöscht worden.
	61
	62	gui_validation_error: 1 Störung
	63	gui_validation_error_plural: %d Störungen
	64
	65	field_name: Name
	66	field_description: Beschreibung
	67	field_summary: Zusammenfassung
	68	field_is_required: Erforderlich
	69	field_firstname: Vorname
	70	field_lastname: Nachname
	71	field_mail: Email
	72	field_filename: Datei
	73	field_filesize: Grootte
	74	field_downloads: Downloads
	75	field_author: Autor
	76	field_created_on: Angelegt
	77	field_updated_on: aktualisiert
	78	field_field_format: Format
	79	field_is_for_all: Für alle Projekte
	80	field_possible_values: Mögliche Werte
	81	field_regexp: Regulärer Ausdruck
	82	field_min_length: Minimale Länge
	83	field_max_length: Maximale Länge
	84	field_value: Wert
	85	field_category: Kategorie
	86	field_title: Títel
	87	field_project: Projekt
	88	#field_issue: Issue
	89	field_status: Status
	90	field_notes: Anmerkungen
	91	field_is_closed: Problem erledigt
	92	#field_is_default: Default status
	93	field_html_color: Farbe
	94	field_tracker: Tracker
	95	field_subject: Thema
	96	#field_due_date: Due date
	97	field_assigned_to: Zugewiesen an
	98	field_priority: Priorität
	99	field_fixed_version: Erledigt in Version
	100	field_user: Benutzer
	101	field_role: Rolle
	102	field_homepage: Startseite
	103	field_is_public: Öffentlich
	104	#field_parent: Subprojekt von
	105	field_is_in_chlog: Ansicht der Issues in der Historie
	106	field_login: Mitgliedsname
	107	field_mail_notification: Mailbenachrichtigung
	108	#field_admin: Administrator
	109	field_locked: Gesperrt
	110	field_last_login_on: Letzte Anmeldung
	111	field_language: Sprache
	112	field_effective_date: Datum
	113	field_password: Passwort
	114	field_new_password: Neues Passwort
	115	field_password_confirmation: Bestätigung
	116	field_version: Version
	117	field_type: Typ
	118	field_host: Host
	119	#field_port: Port
	120	#field_account: Account
	121	#field_base_dn: Base DN
	122	#field_attr_login: Login attribute
	123	#field_attr_firstname: Firstname attribute
	124	#field_attr_lastname: Lastname attribute
	125	#field_attr_mail: Email attribute
	126	#field_onthefly: On-the-fly user creation
	127
	128	label_user: Benutzer
	129	label_user_plural: Benutzer
	130	label_user_new: Neuer Benutzer
	131	label_project: Projekt
	132	label_project_new: Neues Projekt
	133	label_project_plural: Projekte
	134	#label_project_latest: Latest projects
	135	#label_issue: Issue
	136	#label_issue_new: New issue
	137	#label_issue_plural: Issues
	138	#label_issue_view_all: View all issues
	139	label_document: Dokument
	140	label_document_new: Neues Dokument
	141	label_document_plural: Dokumente
	142	label_role: Rolle
	143	label_role_plural: Rollen
	144	label_role_new: Neue Rolle
	145	label_role_and_permissions: Rollen und Rechte
	146	label_member: Mitglied
	147	label_member_new: Neues Mitglied
	148	label_member_plural: Mitglieder
	149	label_tracker: Tracker
	150	label_tracker_plural: Tracker
	151	label_tracker_new: Neuer Tracker
	152	label_workflow: Workflow
	153	label_issue_status: Problem Status
	154	label_issue_status_plural: Problem Stati
	155	label_issue_status_new: Neuer Status
	156	label_issue_category: Problem Kategorie
	157	label_issue_category_plural: Problem Kategorien
	158	label_issue_category_new: Neue Kategorie
	159	label_custom_field: Benutzerdefiniertes Feld
	160	label_custom_field_plural: Benutzerdefinierte Felder
	161	label_custom_field_new: Neues Feld
	162	label_enumerations: Enumerationen
	163	label_enumeration_new: Neuer Wert
	164	label_information: Information
	165	label_information_plural: Informationen
	166	#label_please_login: Please login
	167	label_register: Anmelden
	168	label_password_lost: Passwort vergessen
	169	label_home: Hauptseite
	170	label_my_page: Meine Seite
	171	label_my_account: Mein Konto
	172	label_my_projects: Meine Projekte
	173	label_administration: Administration
	174	label_login: Einloggen
	175	label_logout: Abmelden
	176	label_help: Hilfe
	177	label_reported_issues: Gemeldete Issues
	178	label_assigned_to_me_issues: Mir zugewiesen
	179	label_last_login: Letzte Anmeldung
	180	#label_last_updates: Last updated
	181	#label_last_updates_plural: %d last updated
	182	label_registered_on: Angemeldet am
	183	label_activity: Aktivität
	184	label_new: Neue
	185	label_logged_as: Angemeldet als
	186	#label_environment: Environment
	187	label_authentication: Authentisierung
	188	#label_auth_source: Authentification mode
	189	#label_auth_source_new: New authentication mode
	190	#label_auth_source_plural: Authentification modes
	191	#label_subproject: Subproject
	192	#label_subproject_plural: Subprojects
	193	label_min_max_length: Min - Max Länge
	194	label_list: Liste
	195	label_date: Date
	196	label_integer: Zahl
	197	label_boolean: Boolesch
	198	#label_string: String
	199	label_text: Text
	200	label_attribute: Attribut
	201	label_attribute_plural: Attribute
	202	#label_download: %d Download
	203	#label_download_plural: %d Downloads
	204	label_no_data: Nichts anzuzeigen
	205	label_change_status: Statuswechsel
	206	label_history: Historie
	207	label_attachment: Datei
	208	label_attachment_new: Neue Datei
	209	#label_attachment_delete: Delete file
	210	label_attachment_plural: Dateien
	211	label_report: Bericht
	212	label_report_plural: Berichte
	213	#label_news: Neuigkeiten
	214	#label_news_new: Add news
	215	#label_news_plural: Neuigkeiten
	216	label_news_latest: Letzte Neuigkeiten
	217	label_news_view_all: Alle Neuigkeiten anzeigen
	218	label_change_log: Change log
	219	label_settings: Konfiguration
	220	label_overview: Übersicht
	221	label_version: Version
	222	label_version_new: Neue Version
	223	label_version_plural: Versionen
	224	label_confirmation: Bestätigung
	225	#label_export_csv: Export to CSV
	226	label_read: Lesen...
	227	label_public_projects: Öffentliche Projekte
	228	#label_open_issues: Open
	229	#label_open_issues_plural: Open
	230	#label_closed_issues: Closed
	231	#label_closed_issues_plural: Closed
	232	label_total: Gesamtzahl
	233	label_permissions: Berechtigungen
	234	label_current_status: Gegenwärtiger Status
	235	label_new_statuses_allowed: Neue Status gewährten
	236	label_all: Alle
	237	label_none: Kein
	238	label_next: Weiter
	239	label_previous: Zurück
	240	label_used_by: Benutzt von
	241
	242	button_login: Einloggen
	243	button_submit: Einreichen
	244	button_save: Speichern
	245	button_check_all: Alles auswählen
	246	button_uncheck_all: Alles abwählen
	247	button_delete: Löschen
	248	button_create: Anlegen
	249	button_test: Testen
	250	button_edit: Bearbeiten
	251	button_add: Hinzufügen
	252	button_change: Wechseln
	253	button_apply: Anwenden
	254	button_clear: Zurücksetzen
	255	button_lock: Verriegeln
	256	button_unlock: Entriegeln
	257	button_download: Fernzuladen
	258	button_list: Aufzulisten
	259	button_view: Siehe
	260
	261	text_select_mail_notifications: Aktionen für die Mailbenachrichtigung aktiviert werden soll.
	262	text_regexp_info: eg. ^[A-Z0-9]+$
	263	text_min_max_length_info: 0 heisst keine Beschränkung
	264	#text_possible_values_info: values separated with \|
	265	text_project_destroy_confirmation: Sind sie sicher, daß sie das Projekt löschen wollen ?
	266	text_workflow_edit: Auswahl Workflow zum Bearbeiten
	267	text_are_you_sure: Sind sie sicher ?
	268
	269	default_role_manager: Manager
	270	default_role_developper: Developer
	271	default_role_reporter: Reporter
	272	default_tracker_bug: Fehler
	273	default_tracker_feature: Feature
	274	default_tracker_support: Support
	275	default_issue_status_new: Neu
	276	default_issue_status_assigned: Zugewiesen
	277	default_issue_status_resolved: Gelöst
	278	default_issue_status_feedback: Feedback
	279	default_issue_status_closed: Erledigt
	280	default_issue_status_rejected: Abgewiesen
	281	default_doc_category_user: Benutzerdokumentation
	282	default_doc_category_tech: Technische Dokumentation
	283	default_priority_low: Niedrig
	284	default_priority_normal: Normal
	285	default_priority_high: Hoch
	286	default_priority_urgent: Dringend
	287	default_priority_immediate: Sofort
	288
	289	enumeration_issue_priorities: Issue-Prioritäten
	290	enumeration_doc_categories: Dokumentenkategorien

redmine/app/helpers/application_helper.rb +43 0

@@ -104,4 +104,47 module ApplicationHelper
104	def lang_options_for_select	104	def lang_options_for_select
105	(GLoc.valid_languages.sort {\|x,y\| x.to_s <=> y.to_s }).collect {\|lang\| [ l_lang_name(lang.to_s, lang), lang.to_s]}	105	(GLoc.valid_languages.sort {\|x,y\| x.to_s <=> y.to_s }).collect {\|lang\| [ l_lang_name(lang.to_s, lang), lang.to_s]}
106	end	106	end
		107
		108	def label_tag_for(name, option_tags = nil, options = {})
		109	label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
		110	content_tag("label", label_text)
		111	end
		112
		113	def labelled_tabular_form_for(name, object, options, &proc)
		114	options[:html] \|\|= {}
		115	options[:html].store :class, "tabular"
		116	form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
		117	end
		118	end
		119
		120	class TabularFormBuilder < ActionView::Helpers::FormBuilder
		121	include GLoc
		122
		123	def initialize(object_name, object, template, options, proc)
		124	set_language_if_valid options.delete(:lang)
		125	@object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
107	end	126	end
		127
		128	(field_helpers - %w(radio_button) + %w(date_select)).each do \|selector\|
		129	src = <<-END_SRC
		130	def #{selector}(field, options = {})
		131	label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
		132	label = @template.content_tag("label", label_text,
		133	:class => (@object.errors[field] ? "error" : nil),
		134	:for => (@object_name.to_s + "_" + field.to_s))
		135	label + super
		136	end
		137	END_SRC
		138	class_eval src, __FILE__, __LINE__
		139	end
		140
		141	def select(field, choices, options = {})
		142	label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
		143	label = @template.content_tag("label", label_text,
		144	:class => (@object.errors[field] ? "error" : nil),
		145	:for => (@object_name.to_s + "_" + field.to_s))
		146	label + super
		147	end
		148
		149	end
		150

redmine/app/helpers/custom_fields_helper.rb +3 -8

               def custom_field_label_tag(custom_value)
                 content_tag "label", custom_value.custom_field.name +
             	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
-            	:for => "custom_fields_#{custom_value.custom_field.id}"
+            	:for => "custom_fields_#{custom_value.custom_field.id}",
+            	:class => (custom_value.errors.empty? ? nil : "error" )
               end
               # Return custom field tag with its label tag
               def custom_field_tag_with_label(custom_value)
-                case custom_value.custom_field.field_format
+                custom_field_label_tag(custom_value) + custom_field_tag(custom_value)
-                when "bool"
-                  # label is displayed inline after the checkbox
-                  custom_field_tag(custom_value) + " " + custom_field_label_tag(custom_value)
-                else
-                  custom_field_label_tag(custom_value) + "<br />" + custom_field_tag(custom_value)
-                end
               end
               # Return a string used to display a custom value

redmine/app/views/account/login.rhtml +9 -16

@@ -2,24 +2,17
2	<div class="box login">	2	<div class="box login">
3	<h2><%= image_tag 'login' %>  <%=l(:label_please_login)%></h2>	3	<h2><%= image_tag 'login' %>  <%=l(:label_please_login)%></h2>
4		4
5	<%= start_form_tag :action=> "login" %>	5	<%= start_form_tag({:action=> "login"}, :class => "tabular") %>
6	<table cellpadding="4">	6	<p><label for="login"><%=l(:field_login)%>:</label>
7	<tr>	7	<%= text_field_tag 'login', nil, :size => 25 %></p>
8	<td><label for="login"><%=l(:field_login)%>:</label></td>
9	<td><%= text_field_tag 'login', nil, :size => 25 %></td>
10	</tr>
11	<tr>
12	<td><label for="password"><%=l(:field_password)%>:</label></td>
13	<td><%= password_field_tag 'password', nil, :size => 25 %></td>
14	</tr>
15	</table>
16		8
17		9	<p><label for="password"><%=l(:field_password)%>:</label>
		10	<%= password_field_tag 'password', nil, :size => 25 %></p>
18		11
19	<p><center><input type="submit" name="login" value="<%=l(:button_login)%> »" class="primary" /></center></p>	12	<p><center><input type="submit" name="login" value="<%=l(:button_login)%> »" class="primary" /></center>
20	<%= end_form_tag %>	13	<%= end_form_tag %>
21	<br />	14
22	<% unless $RDM_SELF_REGISTRATION == false %><%= link_to l(:label_register), :action => 'register' %> \|<% end %>	15	<br><% unless $RDM_SELF_REGISTRATION == false %><%= link_to l(:label_register), :action => 'register' %> \|<% end %>
23	<%= link_to l(:label_password_lost), :action => 'lost_password' %>	16	<%= link_to l(:label_password_lost), :action => 'lost_password' %></p>
24	</div>	17	</div>
25	</center> No newline at end of file	18	</center>

redmine/app/views/account/lost_password.rhtml +2 -2

             <div class="box login">
             <h2><%=l(:label_password_lost)%></h2>
-            <%= start_form_tag %>
+            <%= start_form_tag({:action=> "lost_password"}, :class => "tabular") %>
-            <p><label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label><br/>
+            <p><label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
             <%= text_field_tag 'mail', nil, :size => 40 %></p>
             <p><center><%= submit_tag l(:button_submit) %></center></p>

redmine/app/views/account/my_account.rhtml +11 -14

             <%= error_messages_for 'user' %>
-            <div class="splitcontentleft">
               <div class="box">
               <h3><%=l(:label_information_plural)%></h3>
-              <%= start_form_tag :action => 'my_account' %>
+              <%= start_form_tag({:action => 'my_account'}, :class => "tabular") %>
               <!--[form:user]-->
-              <p><label for="user_firstname"><%=l(:field_firstname)%> <span class="required">*</span></label><br/>
+              <p><label for="user_firstname"><%=l(:field_firstname)%> <span class="required">*</span></label>
               <%= text_field 'user', 'firstname'  %></p>
-              <p><label for="user_lastname"><%=l(:field_lastname)%> <span class="required">*</span></label><br/>
+              <p><label for="user_lastname"><%=l(:field_lastname)%> <span class="required">*</span></label>
               <%= text_field 'user', 'lastname'  %></p>
-              <p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label><br/>
+              <p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label>
               <%= text_field 'user', 'mail', :size => 40 %></p>
-              <p><label for="user_language"><%=l(:field_language)%></label><br/>
+              <p><label for="user_language"><%=l(:field_language)%></label>
               <%= select("user", "language", lang_options_for_select) %></p>
               <!--[eoform:user]-->
-              <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
+              <p><label for="user_mail_notification"><%=l(:field_mail_notification)%></label>
+              <%= check_box 'user', 'mail_notification' %></p>
               <center><%= submit_tag l(:button_save) %></center>
               <%= end_form_tag %>
               </div>
-            </div>
-            <div class="splitcontentright">
             <% unless @user.auth_source_id %>
               <div class="box">
               <h3><%=l(:field_password)%></h3>
-              <%= start_form_tag :action => 'change_password' %>
+              <%= start_form_tag({:action => 'change_password'}, :class => "tabular") %>
-              <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label><br/>
+              <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
               <%= password_field_tag 'password', nil, :size => 25 %></p>
-              <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label><br/>
+              <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
               <%= password_field_tag 'new_password', nil, :size => 25 %></p>
-              <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label><br/>
+              <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
               <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
               <center><%= submit_tag l(:button_save) %></center>
               <%= end_form_tag %>
               </div>
             <% end %>
-            </div>
  No newline at end of file

redmine/app/views/account/password_recovery.rhtml +3 -3

             <%= error_messages_for 'user' %>
-              <%= start_form_tag :token => @token.value %>
+              <%= start_form_tag({:token => @token.value}, :class => "tabular") %>
-              <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label><br/>
+              <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
               <%= password_field_tag 'new_password', nil, :size => 25 %></p>
-              <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label><br/>
+              <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
               <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
               <p><center><%= submit_tag l(:button_save) %></center></p>

redmine/app/views/account/register.rhtml +10 -9

             <h2><%=l(:label_register)%></h2>
-            <%= start_form_tag %>
+            <%= start_form_tag({:action => 'register'}, :class => "tabular") %>
             <%= error_messages_for 'user' %>
             <div class="box">
             <!--[form:user]-->
-            <p><label for="user_login"><%=l(:field_login)%></label> <span class="required">*</span><br/>
+            <p><label for="user_login"><%=l(:field_login)%> <span class="required">*</span></label>
             <%= text_field 'user', 'login', :size => 25  %></p>
-            <p><label for="password"><%=l(:field_password)%></label> <span class="required">*</span><br/>
+            <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
             <%= password_field_tag 'password', nil, :size => 25  %></p>
-            <p><label for="password_confirmation"><%=l(:field_password_confirmation)%></label> <span class="required">*</span><br/>
+            <p><label for="password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
             <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
-            <p><label for="user_firstname"><%=l(:field_firstname)%></label> <span class="required">*</span><br/>
+            <p><label for="user_firstname"><%=l(:field_firstname)%> <span class="required">*</span></label>
             <%= text_field 'user', 'firstname'  %></p>
-            <p><label for="user_lastname"><%=l(:field_lastname)%></label> <span class="required">*</span><br/>
+            <p><label for="user_lastname"><%=l(:field_lastname)%> <span class="required">*</span></label>
             <%= text_field 'user', 'lastname'  %></p>
-            <p><label for="user_mail"><%=l(:field_mail)%></label> <span class="required">*</span><br/>
+            <p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label>
             <%= text_field 'user', 'mail'  %></p>
-            <p><label for="user_language"><%=l(:field_language)%></label><br/>
+            <p><label for="user_language"><%=l(:field_language)%></label>
             <%= select("user", "language", lang_options_for_select) %></p>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
-            <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
+            <p><label for="user_mail_notification"><%=l(:field_mail_notification)%></label>
+            <%= check_box 'user', 'mail_notification' %></p>
             <!--[eoform:user]-->
             </div>

redmine/app/views/admin/projects.rhtml +2 -4

             <h2><%=l(:label_project_plural)%></h2>
-            <table width="100%" cellspacing="1" cellpadding="2" class="listTableContent">
+            <table class="listTableContent">
               <tr class="ListHead">
             	<%= sort_header_tag('name', :caption => l(:label_project)) %>
             	<th><%=l(:field_description)%></th>
             	<td align="center"><%= project.projects_count %>
             	<td align="center"><%= format_date(project.created_on) %>
               <td align="center">
-                <%= start_form_tag({:controller => 'projects', :action => 'destroy', :id => project}) %>
+                <%= button_to l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => "button-small" %>
-                <%= submit_tag l(:button_delete), :class => "button-small"  %>
-                <%= end_form_tag %>
               </td>
               </tr>
             <% end %>

redmine/app/views/auth_sources/_form.rhtml +18 -22

             <div class="box">
             <!--[form:auth_source]-->
-            <p><label for="auth_source_name"><%=l(:field_name)%></label> <span class="required">*</span><br/>
+            <p><label for="auth_source_name"><%=l(:field_name)%> <span class="required">*</span></label>
             <%= text_field 'auth_source', 'name'  %></p>
-            <p><label for="auth_source_host"><%=l(:field_host)%></label> <span class="required">*</span><br/>
+            <p><label for="auth_source_host"><%=l(:field_host)%> <span class="required">*</span></label>
             <%= text_field 'auth_source', 'host'  %></p>
-            <p><label for="auth_source_port"><%=l(:field_port)%></label> <span class="required">*</span><br/>
+            <p><label for="auth_source_port"><%=l(:field_port)%> <span class="required">*</span></label>
             <%= text_field 'auth_source', 'port', :size => 6 %></p>
-            <p><label for="auth_source_account"><%=l(:field_account)%></label><br/>
+            <p><label for="auth_source_account"><%=l(:field_account)%></label>
             <%= text_field 'auth_source', 'account'  %></p>
-            <p><label for="auth_source_account_password"><%=l(:field_password)%></label><br/>
+            <p><label for="auth_source_account_password"><%=l(:field_password)%></label>
             <%= password_field 'auth_source', 'account_password'  %></p>
-            <p><label for="auth_source_base_dn"><%=l(:field_base_dn)%></label> <span class="required">*</span><br/>
+            <p><label for="auth_source_base_dn"><%=l(:field_base_dn)%> <span class="required">*</span></label>
             <%= text_field 'auth_source', 'base_dn', :size => 60 %></p>
+            </div>
-            <p><%= check_box 'auth_source', 'onthefly_register' %>
+            <div class="box">
-            <label for="auth_source_onthefly_register"><%=l(:field_onthefly)%></label></p>
+            <p><label for="auth_source_onthefly_register"><%=l(:field_onthefly)%></label>
+            <%= check_box 'auth_source', 'onthefly_register' %></p>
+            <p>
             <fieldset><legend><%=l(:label_attribute_plural)%></legend>
-            <div style="float:left;margin-right:10px;">
+            <p><label for="auth_source_attr_login"><%=l(:field_login)%> <span class="required">*</span></label>
-            <p><label for="auth_source_attr_login"><%=l(:field_login)%></label> <span class="required">*</span><br/>
             <%= text_field 'auth_source', 'attr_login', :size => 20  %></p>
-            </div>
-            <div style="float:left;margin-right:10px;">
+            <p><label for="auth_source_attr_firstname"><%=l(:field_firstname)%></label>
-            <p><label for="auth_source_attr_firstname"><%=l(:field_firstname)%></label><br/>
             <%= text_field 'auth_source', 'attr_firstname', :size => 20  %></p>
-            </div>
-            <div style="float:left;margin-right:10px;">
+            <p><label for="auth_source_attr_lastname"><%=l(:field_lastname)%></label>
-            <p><label for="auth_source_attr_lastname"><%=l(:field_lastname)%></label><br/>
             <%= text_field 'auth_source', 'attr_lastname', :size => 20  %></p>
-            </div>
-            <div>
+            <p><label for="auth_source_attr_mail"><%=l(:field_mail)%></label>
-            <p><label for="auth_source_attr_mail"><%=l(:field_mail)%></label><br/>
             <%= text_field 'auth_source', 'attr_mail', :size => 20  %></p>
-            </div>
             </fieldset>
+            </p>
-            <!--[eoform:auth_source]-->
             </div>
+            <!--[eoform:auth_source]-->

redmine/app/views/auth_sources/edit.rhtml +1 -1

             <h2><%=l(:label_auth_source)%> (<%= @auth_source.auth_method_name %>)</h2>
-            <%= start_form_tag :action => 'update', :id => @auth_source %>
+            <%= start_form_tag({:action => 'update', :id => @auth_source}, :class => "tabular") %>
               <%= render :partial => 'form' %>
               <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/auth_sources/list.rhtml +2 -4

             <h2><%=l(:label_auth_source_plural)%></h2>
-            <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
+            <table class="listTableContent">
               <tr class="ListHead">
               <td><%=l(:field_name)%></td>
               <td><%=l(:field_type)%></td>
                     <%= link_to l(:button_test), :action => 'test_connection', :id => source %>
                 </td>
                 <td align="center">
-                    <%= start_form_tag :action => 'destroy', :id => source %>
+                    <%= button_to l(:button_delete), { :action => 'destroy', :id => source }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
-                    <%= submit_tag l(:button_delete), :class => "button-small" %>
-                    <%= end_form_tag %>
                 </td>
                 </tr>
             <% end %>

redmine/app/views/auth_sources/new.rhtml +1 -1

             <h2><%=l(:label_auth_source_new)%> (<%= @auth_source.auth_method_name %>)</h2>
-            <%= start_form_tag :action => 'create' %>
+            <%= start_form_tag({:action => 'create'}, :class => "tabular") %>
               <%= render :partial => 'form' %>
               <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/custom_fields/_form.rhtml +16 -17

             <!--[form:custom_field]-->
             <div class="box">
-            <p><label for="custom_field_name"><%=l(:field_name)%></label> <span class="required">*</span><br/>
+            <p><label for="custom_field_name"><%=l(:field_name)%><span class="required"> *</span></label>
             <%= text_field 'custom_field', 'name' %></p>
-            <p><label for="custom_field_typ"><%=l(:field_field_format)%></label><br/>
+            <p><label for="custom_field_field_format"><%=l(:field_field_format)%></label>
             <%= select("custom_field", "field_format", custom_field_formats_for_select) %></p>
-            <p><label for="custom_field_min_length"><%=l(:label_min_max_length)%></label> (<%=l(:text_min_max_length_info)%>)<br/>
+            <p><label for="custom_field_min_length"><%=l(:label_min_max_length)%></label>
             <%= text_field 'custom_field', 'min_length', :size => 5 %> -
-            <%= text_field 'custom_field', 'max_length', :size => 5 %></p>
+            <%= text_field 'custom_field', 'max_length', :size => 5 %><br>(<%=l(:text_min_max_length_info)%>)</p>
-            <p><label for="custom_field_regexp"><%=l(:field_regexp)%></label> (<%=l(:text_regexp_info)%>)<br/>
+            <p><label for="custom_field_regexp"><%=l(:field_regexp)%></label>
-            <%= text_field 'custom_field', 'regexp', :size => 50 %></p>
+            <%= text_field 'custom_field', 'regexp', :size => 50 %><br>(<%=l(:text_regexp_info)%>)</p>
-            <p><label for="custom_field_possible_values"><%=l(:field_possible_values)%></label> (<%=l(:text_possible_values_info)%>)<br/>
+            <p><label for="custom_field_possible_values"><%=l(:field_possible_values)%></label>
-            <%= text_area 'custom_field', 'possible_values', :rows => 5, :cols => 60  %></p>
+            <%= text_area 'custom_field', 'possible_values', :rows => 5, :cols => 60  %><br>(<%=l(:text_possible_values_info)%>)</p>
             </div>
             <!--[eoform:custom_field]-->
             <% end %></fieldset>
             &nbsp;
-            <p><%= check_box 'custom_field', 'is_required' %>
+            <p><label for="custom_field_is_required"><%=l(:field_is_required)%></label>
-            <label for="custom_field_is_required"><%=l(:field_is_required)%></label></p>
+            <%= check_box 'custom_field', 'is_required' %></p>
-            <p><%= check_box 'custom_field', 'is_for_all' %>
+            <p><label for="custom_field_is_for_all"><%=l(:field_is_for_all)%></label>
-            <label for="custom_field_is_for_all"><%=l(:field_is_for_all)%></label></p>
+            <%= check_box 'custom_field', 'is_for_all' %></p>
             <%   when "UserCustomField" %>
-            <p><%= check_box 'custom_field', 'is_required' %>
+            <p><label for="custom_field_is_required"><%=l(:field_is_required)%></label>
-            <label for="custom_field_is_required"><%=l(:field_is_required)%></label></p>
+            <%= check_box 'custom_field', 'is_required' %></p>
             <%   when "ProjectCustomField" %>
-            <p><%= check_box 'custom_field', 'is_required' %>
+            <p><label for="custom_field_is_required"><%=l(:field_is_required)%></label>
-            <label for="custom_field_is_required"><%=l(:field_is_required)%></label></p>
+            <%= check_box 'custom_field', 'is_required' %></p>
             <% end %>
             </div>

redmine/app/views/custom_fields/edit.rhtml +1 -1

             <h2><%=l(:label_custom_field)%> (<%=l(@custom_field.type_name)%>)</h2>
-            <%= start_form_tag :action => 'edit', :id => @custom_field %>
+            <%= start_form_tag({:action => 'edit', :id => @custom_field}, :class => "tabular") %>
               <%= render :partial => 'form', :locals => { :type => @custom_field.type } %>
               <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/custom_fields/list.rhtml +3 -4

             <h2><%=l(:label_custom_field_plural)%></h2>
-            <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
+            <table class="listTableContent">
             <tr class="ListHead">
             	<th><%=l(:field_name)%></th>
             	<th><%=l(:field_type)%></th>
             	<td align="center"><%= image_tag 'true' if custom_field.is_for_all? %></td>
             	<td align="center"><%= custom_field.projects.count.to_s + ' ' + lwr(:label_project, custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
             	<td align="center">
-                <%= start_form_tag :action => 'destroy', :id => custom_field %>
+            	   <%= button_to l(:button_delete), { :action => 'destroy', :id => custom_field }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
-                <%= submit_tag l(:button_delete), :class => "button-small"  %>
+                </td>
-                <%= end_form_tag %>	</td>
               </tr>
             <% end %>
             </table>

redmine/app/views/custom_fields/new.rhtml +1 -1

             <h2><%=l(:label_custom_field_new)%> (<%=l(@custom_field.type_name)%>)</h2>
-            <%= start_form_tag :action => 'new' %>
+            <%= start_form_tag({:action => 'new'}, :class => "tabular") %>
               <%= render :partial => 'form', :locals => { :type => @custom_field.type } %>
               <%= hidden_field_tag 'type', @custom_field.type %>
               <%= submit_tag l(:button_save) %>

redmine/app/views/documents/_form.rhtml +5 -5

             <%= error_messages_for 'document' %>
+            <div class="box">
             <!--[form:document]-->
-            <p><label for="document_category_id"><%=l(:field_category)%></label><br />
+            <p><label for="document_category_id"><%=l(:field_category)%></label>
             <select name="document[category_id]">
             <%= options_from_collection_for_select @categories, "id", "name", @document.category_id %>
             </select></p>
-            <p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label><br />
+            <p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label>
             <%= text_field 'document', 'title', :size => 60 %></p>
-            <p><label for="document_description"><%=l(:field_description)%></label><br />
+            <p><label for="document_description"><%=l(:field_description)%></label>
             <%= text_area 'document', 'description', :cols => 60, :rows => 5 %></p>
             <!--[eoform:document]-->
+            </div>
  No newline at end of file

redmine/app/views/documents/edit.rhtml +1 -1

             <h2><%=l(:label_document)%></h2>
-            <%= start_form_tag :action => 'edit', :id => @document %>
+            <%= start_form_tag({:action => 'edit', :id => @document}, :class => "tabular") %>
               <%= render :partial => 'form' %>
               <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/enumerations/_form.rhtml +3 -3

             <%= error_messages_for 'enumeration' %>
+            <div class="box">
             <!--[form:optvalue]-->
             <%= hidden_field 'enumeration', 'opt'  %>
-            <p><label for="enumeration_name"><%=l(:field_name)%></label><br/>
+            <p><label for="enumeration_name"><%=l(:field_name)%></label>
             <%= text_field 'enumeration', 'name'  %></p>
             <!--[eoform:optvalue]-->
+            </div>
  No newline at end of file

redmine/app/views/enumerations/edit.rhtml +1 -1

             <h2><%=l(:label_enumerations)%></h2>
-            <%= start_form_tag :action => 'update', :id => @enumeration %>
+            <%= start_form_tag({:action => 'update', :id => @enumeration}, :class => "tabular") %>
               <%= render :partial => 'form' %>
               <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/enumerations/new.rhtml +1 -1

             <h2><%=l(:label_enumeration_new)%></h2>
-            <%= start_form_tag :action => 'create' %>
+            <%= start_form_tag({:action => 'create'}, :class => "tabular") %>
               <%= render :partial => 'form' %>
               <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/issue_categories/_form.rhtml +1 -1

             <%= error_messages_for 'issue_category' %>
             <!--[form:issue_category]-->
-            <p><label for="issue_category_name"><%l(:field_name)%></label><br/>
+            <p><label for="issue_category_name"><%l(:field_name)%></label>
             <%= text_field 'issue_category', 'name'  %></p>
             <!--[eoform:issue_category]-->

redmine/app/views/issue_categories/edit.rhtml +1 -1

             <h2><%=l(:label_issue_category)%></h2>
-            <%= start_form_tag :action => 'edit', :id => @category %>
+            <%= start_form_tag({:action => 'edit', :id => @category}, :class => "tabular") %>
               <%= render :partial => 'form' %>
               <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/issue_statuses/_form.rhtml +9 -8

             <%= error_messages_for 'issue_status' %>
+            <div class="box">
             <!--[form:issue_status]-->
-            <p><label for="issue_status_name"><%=l(:field_name)%></label> <span class="required">*</span><br/>
+            <p><label for="issue_status_name"><%=l(:field_name)%><span class="required"> *</span></label>
             <%= text_field 'issue_status', 'name'  %></p>
-            <p><%= check_box 'issue_status', 'is_closed' %>
+            <p><label for="issue_status_is_closed"><%=l(:field_is_closed)%></label>
-            <label for="issue_status_is_closed"><%=l(:field_is_closed)%></label></p>
+            <%= check_box 'issue_status', 'is_closed' %></p>
-            <p><%= check_box 'issue_status', 'is_default' %>
+            <p><label for="issue_status_is_default"><%=l(:field_is_default)%></label>
-            <label for="issue_status_is_default"><%=l(:field_is_default)%></label></p>
+            <%= check_box 'issue_status', 'is_default' %></p>
-            <p><label for="issue_status_html_color"><%=l(:field_html_color)%></label>
+            <p><label for="issue_status_html_color"><%=l(:field_html_color)%><span class="required"> *</span></label>
-            #<%= text_field 'issue_status', 'html_color', :maxlength => 6 %> <span class="required">*</span></p>
+            #<%= text_field 'issue_status', 'html_color', :maxlength => 6 %></p>
             <!--[eoform:issue_status]-->
+            </div>
  No newline at end of file

redmine/app/views/issue_statuses/edit.rhtml +1 -1

             <h2><%=l(:label_issue_status)%></h2>
-            <%= start_form_tag :action => 'update', :id => @issue_status %>
+            <%= start_form_tag({:action => 'update', :id => @issue_status}, :class => "tabular") %>
               <%= render :partial => 'form' %>
               <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/issue_statuses/list.rhtml +3 -5

             <h2><%=l(:label_issue_status_plural)%></h2>
-            <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
+            <table class="listTableContent">
               <tr class="ListHead">
               <th><%=l(:field_status)%></th>
               <th><%=l(:field_is_default)%></th>
               <td><%= link_to status.name, :action => 'edit', :id => status %></td>
               <td align="center"><%= image_tag 'true' if status.is_default? %></td>
               <td align="center"><%= image_tag 'true' if status.is_closed? %></td>
-              <td bgcolor="#<%= status.html_color %>">&nbsp</td>
+              <td><div style="background-color:#<%= status.html_color %>">&nbsp</div></td>
               <td align="center">
-                <%= start_form_tag :action => 'destroy', :id => status %>
+                <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
-                <%= submit_tag l(:button_delete), :class => "button-small" %>
-                <%= end_form_tag %>
               </td>
               </tr>
             <% end %>

redmine/app/views/issue_statuses/new.rhtml +1 -1

             <h2><%=l(:label_issue_status_new)%></h2>
-            <%= start_form_tag :action => 'create' %>
+            <%= start_form_tag({:action => 'create'}, :class => "tabular") %>
               <%= render :partial => 'form' %>
               <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/issues/_list_simple.rhtml +1 -1

             <% if issues.length > 0 %>
             <table cellspacing="0" cellpadding="1" width="100%" border="0" class="listTable">
             	<tr><td>
-            	<table width="100%" border="0" cellspacing="1" cellpadding="2" class="listTableContent">
+            	<table class="listTableContent">
             		<tr class="ListHead">
             		<th>#</th>
             		<th><%=l(:field_tracker)%></th>

redmine/app/views/issues/change_status.rhtml +5 -7

             <h2><%=l(:label_issue)%> #<%= @issue.id %>: <%= @issue.subject %></h2>
             <%= error_messages_for 'history' %>
-            <%= start_form_tag :action => 'change_status', :id => @issue %>
+            <%= start_form_tag({:action => 'change_status', :id => @issue}, :class => "tabular") %>
             <%= hidden_field_tag 'confirm', 1 %>
             <%= hidden_field 'history', 'status_id' %>
             <div class="box">
-            <p><%=l(:label_issue_status_new)%>: <b><%= @history.status.name %></b></p>
+            <p><label><%=l(:label_issue_status_new)%></label> <%= @history.status.name %></p>
-            <div>
+            <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label>
-            <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label><br/>
             <select name="issue[assigned_to_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @assignable_to, "id", "display_name", @issue.assigned_to_id %></p>
             </select></p>
-            </div>
-            <p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label><br/>
+            <p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label>
             <select name="issue[fixed_version_id]">
             <option value="">--none--</option>
             <%= options_from_collection_for_select @issue.project.versions, "id", "name", @issue.fixed_version_id %>
             </select></p>
-            <p><label for="history_notes"><%=l(:field_notes)%></label><br />
+            <p><label for="history_notes"><%=l(:field_notes)%></label>
             <%= text_area 'history', 'notes', :cols => 60, :rows => 10  %></p>
             </div>

redmine/app/views/issues/edit.rhtml +10 -40

@@ -1,56 +1,26
1	<h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%= @issue.subject %></h2>	1	<h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%= @issue.subject %></h2>
2		2
		3	<% labelled_tabular_form_for :issue, @issue, :url => {:action => 'edit'} do \|f\| %>
3	<%= error_messages_for 'issue' %>	4	<%= error_messages_for 'issue' %>
4	<%= start_form_tag :action => 'edit', :id => @issue %>
5
6	<div class="box">	5	<div class="box">
7	<!--[form:issue]-->	6	<!--[form:issue]-->
8	<p><%=l(:field_status)%>: <b><%= @issue.status.name %></b~~></~~p>	7	<p><label><%=l(:field_status)%></label> <%= @issue.status.name %></p>
9
10	<div style="float:left;margin-right:10px;">
11	<p><label for="issue_priority_id"><%=l(:field_priority)%> <span class="required">*</span></label><br/>
12	<select name="issue[priority_id]">
13	<%= options_from_collection_for_select @priorities, "id", "name", @issue.priority_id %></p>
14	</select></p>
15	</div>
16
17	<div style="float:left;margin-right:10px;">
18	<p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label><br/>
19	<select name="issue[assigned_to_id]">
20	<option value=""></option>
21	<%= options_from_collection_for_select @issue.project.members, "user_id", "name", @issue.assigned_to_id %></p>
22	</select></p>
23	</div>
24		8
25	<div>	9	<p><%= f.select :priority_id, (@priorities.collect {\|p\| [p.name, p.id]}), :required => true %></p>
26	<p><label for="issue_category_id"><%=l(:field_category)%></label><br/>	10	<p><%= f.select :assigned_to_id, (@issue.project.members.collect {\|m\| [m.name, m.user_id]}), :include_blank => true %></p>
27	<select name="issue[category_id]">	11	<p><%= f.select :category_id, (@project.issue_categories.collect {\|c\| [c.name, c.id]}) %></p>
28	<option value=""></option>	12	<p><%= f.text_field :subject, :size => 80, :required => true %></p>
29	<%= options_from_collection_for_select @project.issue_categories, "id", "name", @issue.category_id %></p>	13	<p><%= f.text_area :description, :cols => 60, :rows => 10, :required => true %></p>
30	</select></p>	14	<p><%= f.date_select :due_date, :start_year => Date.today.year, :include_blank => true %></p>
31	</div>
32
33	<p><label for="issue_subject"><%=l(:field_subject)%></label><span class="required">*</span><br/>
34	<%= text_field 'issue', 'subject', :size => 60 %></p>
35
36	<p><label for="issue_description"><%=l(:field_description)%></label><span class="required">*</span><br/>
37	<%= text_area 'issue', 'description', :cols => 60, :rows => 10 %></p>
38
39	<p><label for="issue_due_date"><%=l(:field_due_date)%></label><br />
40	<%= date_select 'issue', 'due_date', :start_year => Date.today.year, :include_blank => true %></p>
41		15
42	<% for @custom_value in @custom_values %>	16	<% for @custom_value in @custom_values %>
43	<p><%= custom_field_tag_with_label @custom_value %></p>	17	<p><%= custom_field_tag_with_label @custom_value %></p>
44	<% end %>	18	<% end %>
45		19
46	<p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label><br/>	20	<p><%= f.select :fixed_version_id, (@project.versions.collect {\|v\| [v.name, v.id]}), { :include_blank => true } %>
47	<select name="issue[fixed_version_id]">
48	<option value="">--none--</option>
49	<%= options_from_collection_for_select @project.versions, "id", "name", @issue.fixed_version_id %>
50	</select></p>	21	</select></p>
51
52	<!--[eoform:issue]-->	22	<!--[eoform:issue]-->
53	</div>	23	</div>
54		24
55	<%= submit_tag l(:button_save) %>	25	<%= submit_tag l(:button_save) %>
56	<%= end~~_form_tag~~ %>	26	<% end %> No newline at end of file

redmine/app/views/news/_form.rhtml +5 -12

@@ -1,13 +1,6
1	<%= error_messages_for 'news' %>	1	<%= error_messages_for 'news' %>
2		2	<div class="box">
3	<!--[form:news]-->	3	<p><%= f.text_field :title, :required => true, :size => 60 %></p>
4	<p><label for="news_title"><%=l(:field_title)%></label> <span class="required">*</span><br/>	4	<p><%= f.text_area :summary, :cols => 60, :rows => 2 %></p>
5	<%= text_field 'news', 'title', :size => 60 %></p>	5	<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 10 %></p>
6		6	</div> No newline at end of file
7	<p><label for="news_summary"><%=l(:field_summary)%></label><br/>
8	<%= text_area 'news', 'summary', :cols => 60, :rows => 2 %></p>
9
10	<p><label for="news_description"><%=l(:field_description)%> <span class="required">*</span></label><br/>
11	<%= text_area 'news', 'description', :cols => 60, :rows => 10 %></p>
12	<!--[eoform:news]-->
13

redmine/app/views/news/edit.rhtml +3 -3

             <h2><%=l(:label_news)%></h2>
-            <%= start_form_tag :action => 'edit', :id => @news %>
+            <% labelled_tabular_form_for :news, @news, :url => { :action => "edit" } do |f| %>
-              <%= render :partial => 'form' %>
+            <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
-            <%= end_form_tag %>
+            <% end %>
  No newline at end of file

redmine/app/views/news/show.rhtml +11 0

@@ -8,3 +8,14
8		8
9	<%= simple_format auto_link @news.description %>	9	<%= simple_format auto_link @news.description %>
10		10
		11	<% if authorize_for('news', 'edit') %>
		12	<%= start_form_tag ({:controller => 'news', :action => 'edit', :id => @news}, :method => 'get' ) %>
		13	<%= submit_tag l(:button_edit) %>
		14	<%= end_form_tag %>
		15	<% end %>
		16
		17	<% if authorize_for('news', 'destroy') %>
		18	<%= start_form_tag ({:controller => 'news', :action => 'destroy', :id => @news}) %>
		19	<%= submit_tag l(:button_delete) %>
		20	<%= end_form_tag %>
		21	<% end %>

redmine/app/views/projects/_form.rhtml +10 -27

@@ -1,41 +1,24
1	<%= error_messages_for 'project' %>	1	<%= error_messages_for 'project' %>
2
3	<div class="box">	2	<div class="box">
4	<!--[form:project]-->	3	<!--[form:project]-->
5	<p><label for="project_name"><%=l(:field_name)%> <span class="required">*</span></label><br/>	4	<p><%= f.text_field :name, :required => true %></p>
6	<%= text_field 'project', 'name' %></p>
7		5
8	<% if admin_loggedin? %>	6	<% if admin_loggedin? %>
9	<p><label for="project_parent_id"><%=l(:field_parent)%></label><br/>	7	<p><%= f.select :parent_id, (@root_projects.collect {\|p\| [p.name, p.id]}), { :include_blank => true } %></p>
10	<select name="project[parent_id]">
11	<option value=""></option>
12	<%= options_from_collection_for_select @root_projects, "id", "name", @project.parent_id %>
13	</select></p>
14	<% end %>	8	<% end %>
15		9
16	<p><label for="project_description"><%=l(:field_description)%> <span class="required">*</span></label><br/>	10	<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 3 %></p>
17	<%= text_area 'project', 'description', :cols => 60, :rows => 3 %></p>	11	<p><%= f.text_field :homepage, :size => 40 %></p>
18		12	<p><%= f.check_box :is_public %></p>
19	<p><label for="project_homepage"><%=l(:field_homepage)%></label><br/>
20	<%= text_field 'project', 'homepage', :size => 40 %></p>
21
22	<p><%= check_box 'project', 'is_public' %>
23	<label for="project_is_public"><%=l(:field_is_public)%></label></p>
24		13
25	<% for @custom_value in @custom_values %>	14	<% for @custom_value in @custom_values %>
26	<p><%= custom_field_tag_with_label @custom_value %></p>	15	<p><%= custom_field_tag_with_label @custom_value %></p>
27	<% end %>	16	<% end %>
28		17
29	<~~fieldset~~><l~~egend~~><%=l(:label_custom_field_plural)%></l~~egend~~>	18	<p><label><%=l(:label_custom_field_plural)%></label>
30	<% for custom_field in @custom_fields %>	19	<% for custom_field in @custom_fields %>
31	<input type="checkbox"	20	<%= check_box_tag "custom_field_ids[]", custom_field.id, (@project.custom_fields.include? custom_field) %>
32		21	<%= custom_field.name %>
33	name="custom_field_ids[]"	22	<% end %></p>
34	value="<%= custom_field.id %>"
35	<%if @project.custom_fields.include? custom_field%>checked="checked"<%end%>
36	> <%= custom_field.name %>
37
38	<% end %></fieldset>
39
40	</div>
41	<!--[eoform:project]-->	23	<!--[eoform:project]-->
		24	</div>

redmine/app/views/projects/add.rhtml +4 -4

@@ -1,6 +1,6
1	<h2><%=l(:label_project_new)%></h2>	1	<h2><%=l(:label_project_new)%></h2>
2		2
3	<%= start_form_tag :action => 'add' %>	3	<% labelled_tabular_form_for :project, @project, :url => { :action => "add" } do \|f\| %>
4	<%= render :partial => 'form' %>	4	<%= render :partial => 'form', :locals => { :f => f } %>
5	<%= submit_tag l(:button_~~creat~~e) %>	5	<%= submit_tag l(:button_save) %>
6	<%= end~~_form_tag~~ %>	6	<% end %> No newline at end of file

redmine/app/views/projects/add_document.rhtml +4 -2

             <h2><%=l(:label_document_new)%></h2>
-            <%= start_form_tag( { :action => 'add_document', :id => @project }, :multipart => true) %>
+            <%= start_form_tag( { :action => 'add_document', :id => @project }, :class => "tabular", :multipart => true) %>
             <%= render :partial => 'documents/form' %>
-            <p><label for="attachment_file"><%=l(:label_attachment)%></label><br/>
+            <div class="box">
+            <p><label for="attachment_file"><%=l(:label_attachment)%></label>
             <%= file_field 'attachment', 'file' %></p>
+            </div>
             <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/projects/add_issue.rhtml +9 -35

@@ -1,52 +1,26
1	<h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>	1	<h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>
2		2
3	<%= ~~start_form_tag~~( { :action => 'add_issue', :id => ~~@project~~ }, :multipart => true) %>	3	<% labelled_tabular_form_for :issue, @issue, :url => {:action => 'add_issue'}, :html => {:multipart => true} do \|f\| %>
4	<%= error_messages_for 'issue' %>	4	<%= error_messages_for 'issue' %>
5
6	<div class="box">	5	<div class="box">
7	<!--[form:issue]-->	6	<!--[form:issue]-->
8
9	<%= hidden_field_tag 'tracker_id', @tracker.id %>	7	<%= hidden_field_tag 'tracker_id', @tracker.id %>
10		8
11	<div style="float:left;margin-right:10px;">	9	<p><%= f.select :priority_id, (@priorities.collect {\|p\| [p.name, p.id]}), :required => true %></p>
12	<p><label for="issue_priority_id"><%=l(:field_priority)%> <span class="required">*</span></label><br />	10	<p><%= f.select :assigned_to_id, (@issue.project.members.collect {\|m\| [m.name, m.user_id]}), :include_blank => true %></p>
13	<select name="issue[priority_id]">	11	<p><%= f.select :category_id, (@project.issue_categories.collect {\|c\| [c.name, c.id]}) %></p>
14	<%= options_from_collection_for_select @priorities, "id", "name", @issue.priority_id %></p>	12	<p><%= f.text_field :subject, :size => 80, :required => true %></p>
15	</select></p>	13	<p><%= f.text_area :description, :cols => 60, :rows => 10, :required => true %></p>
16	</div>	14	<p><%= f.date_select :due_date, :start_year => Date.today.year, :include_blank => true %></p>
17
18	<div style="float:left;margin-right:10px;">
19	<p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label><br />
20	<select name="issue[assigned_to_id]">
21	<option value=""></option>
22	<%= options_from_collection_for_select @issue.project.members, "user_id", "name", @issue.assigned_to_id %></p>
23	</select></p>
24	</div>
25
26	<div>
27	<p><label for="issue_category_id"><%=l(:field_category)%></label><br />
28	<select name="issue[category_id]">
29	<option value=""></option><%= options_from_collection_for_select @project.issue_categories, "id", "name", @issue.category_id %>
30	</select></p>
31	</div>
32
33	<p><label for="issue_subject"><%=l(:field_subject)%> <span class="required">*</span></label><br />
34	<%= text_field 'issue', 'subject', :size => 80 %></p>
35
36	<p><label for="issue_description"><%=l(:field_description)%> <span class="required">*</span></label><br />
37	<%= text_area 'issue', 'description', :cols => 60, :rows => 10 %></p>
38
39	<p><label for="issue_due_date"><%=l(:field_due_date)%></label><br />
40	<%= date_select 'issue', 'due_date', :start_year => Date.today.year, :include_blank => true %></p>
41		15
42	<% for @custom_value in @custom_values %>	16	<% for @custom_value in @custom_values %>
43	<p><%= custom_field_tag_with_label @custom_value %></p>	17	<p><%= custom_field_tag_with_label @custom_value %></p>
44	<% end %>	18	<% end %>
45		19
46	<p><label for="attachment_file"><%=l(:label_attachment)%></label><br />	20	<p><label for="attachment_file"><%=l(:label_attachment)%></label>
47	<%= file_field 'attachment', 'file' %></p>	21	<%= file_field 'attachment', 'file' %></p>
48	<!--[eoform:issue]-->	22	<!--[eoform:issue]-->
49	</div>	23	</div>
50		24
51	<%= submit_tag l(:button_create) %>	25	<%= submit_tag l(:button_create) %>
52	<%= end~~_form_tag~~ %> No newline at end of file	26	<% end %> No newline at end of file

redmine/app/views/projects/add_news.rhtml +3 -4

@@ -1,7 +1,6
1	<h2><%=l(:label_news_new)%></h2>	1	<h2><%=l(:label_news_new)%></h2>
2		2
3	<%= start_form_tag :action => 'add_news', :id => @project %>	3	<% labelled_tabular_form_for :news, @news, :url => { :action => "add_news" } do \|f\| %>
4	<%= render :partial => 'news/form' %>	4	<%= render :partial => 'news/form', :locals => { :f => f } %>
5	<%= submit_tag l(:button_create) %>	5	<%= submit_tag l(:button_create) %>
6	<%= end~~_form_tag~~ %>	6	<% end %> No newline at end of file
7

redmine/app/views/projects/add_version.rhtml +3 -4

@@ -1,7 +1,6
1	<h2><%=l(:label_version_new)%></h2>	1	<h2><%=l(:label_version_new)%></h2>
2		2
3	<%= start_form_tag :action => 'add_version', :id => @project %>	3	<% labelled_tabular_form_for :version, @version, :url => { :action => 'add_version' } do \|f\| %>
4	<%= render :partial => 'versions/form' %>	4	<%= render :partial => 'versions/form', :locals => { :f => f } %>
5	<%= submit_tag l(:button_create) %>	5	<%= submit_tag l(:button_create) %>
6	<%= end~~_form_tag~~ %>	6	<% end %> No newline at end of file
7

redmine/app/views/projects/list.rhtml +1 -1

             <h2><%=l(:label_public_projects)%></h2>
-            <table width="100%" cellspacing="1" cellpadding="2" class="listTableContent">
+            <table class="listTableContent">
               <tr class="ListHead">
             	<%= sort_header_tag('name', :caption => l(:label_project)) %>
             	<th><%=l(:field_description)%></th>

redmine/app/views/projects/list_files.rhtml +1 -1

             <% delete_allowed = authorize_for('versions', 'destroy_file') %>
-            <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
+            <table class="listTableContent">
               <tr class="ListHead">
                 <th><%=l(:field_version)%></th>
                 <th><%=l(:field_filename)%></th>

redmine/app/views/projects/list_issues.rhtml +1 -1

               </tr>
             </table>
              &nbsp;
-            <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
+            <table class="listTableContent">
                 <tr><td colspan="7" align="right">
                 <small><%= link_to l(:label_export_csv), :action => 'export_issues_csv', :id => @project.id %></small>
                 </td></tr>

redmine/app/views/projects/list_news.rhtml +2 -5

             <% for news in @news %>
             	<p>
-            	<b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small>
+            	<b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />
-            	<%= link_to_if_authorized image_tag('edit_small'), :controller => 'news', :action => 'edit', :id => news %>
+            	<%= news.summary %><br />
-            	<%= link_to_if_authorized image_tag('delete'), { :controller => 'news', :action => 'destroy', :id => news }, :confirm => 'Are you sure?' %>
-            	<br />
-            	<%= news.summary %>
             	<small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small>
             	</p>
             <% end %>

redmine/app/views/projects/settings.rhtml +4 -4

             <h2><%=l(:label_settings)%></h2>
-            <%= start_form_tag :action => 'edit', :id => @project %>
+            <% labelled_tabular_form_for :project, @project, :url => { :action => "edit", :id => @project } do |f| %>
-            <%= render :partial => 'form' %>
+            <%= render :partial => 'form', :locals => { :f => f } %>
-            <center><%= submit_tag l(:button_save) %></center>
+            <%= submit_tag l(:button_save) %>
-            <%= end_form_tag %>
+            <% end %>
             &nbsp;

redmine/app/views/reports/issue_report.rhtml +1 0

             <strong><%=l(:field_category)%></strong>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
+            &nbsp;

redmine/app/views/roles/_form.rhtml +1 -3

             <%= error_messages_for 'role' %>
             <div class="box">
             <!--[form:role]-->
-            <p><label for="role_name"><%=l(:field_name)%> <span class="required">*</span></label><br />
+            <p><%= f.text_field :name, :required => true %></p>
-            <%= text_field 'role', 'name' %></p>
             <strong><%=l(:label_permissions)%>:</strong>
             <% permissions = @permissions.group_by {|p| p.group_id } %>

redmine/app/views/roles/edit.rhtml +3 -5

@@ -1,8 +1,6
1	<h2><%=l(:label_role)%></h2>	1	<h2><%=l(:label_role)%></h2>
2		2
3	<%= ~~start_form_tag~~ ({ :action => 'edit', :id => ~~@role~~ }, :id => 'role_form') %>	3	<% labelled_tabular_form_for :role, @role, :url => { :action => 'edit' }, :html => {:id => 'role_form'} do \|f\| %>
4	<%= render :partial => 'form' %>	4	<%= render :partial => 'form', :locals => { :f => f } %>
5	<%= submit_tag l(:button_save) %>	5	<%= submit_tag l(:button_save) %>
6	<%= end~~_form_tag~~ %>	6	<% end %>
7
8

redmine/app/views/roles/list.rhtml +2 -4

             <h2><%=l(:label_role_plural)%></h2>
-            <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
+            <table class="listTableContent">
               <tr class="ListHead">
                 <th><%=l(:label_role)%></th>
             	<th></th>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to role.name, :action => 'edit', :id => role %></td>
               <td align="center">
-                <%= start_form_tag :action => 'destroy', :id => role %>
+                <%= button_to l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
-                <%= submit_tag l(:button_delete), :class => "button-small" %>
-                <%= end_form_tag %>
               </tr>
             <% end %>
             </table>

redmine/app/views/roles/new.rhtml +3 -4

@@ -1,7 +1,6
1	<h2><%=l(:label_role_new)%></h2>	1	<h2><%=l(:label_role_new)%></h2>
2		2
3	<%= ~~start_form_tag~~ ({ :action => 'new' }, :id => 'role_form') %>	3	<% labelled_tabular_form_for :role, @role, :url => { :action => 'new' }, :html => {:id => 'role_form'} do \|f\| %>
4	<%= render :partial => 'form' %>	4	<%= render :partial => 'form', :locals => { :f => f } %>
5	<%= submit_tag l(:button_create) %>	5	<%= submit_tag l(:button_create) %>
6	<%= end~~_form_tag~~ %>	6	<% end %> No newline at end of file
7

redmine/app/views/trackers/_form.rhtml +4 -7

@@ -1,10 +1,7
1	<%= error_messages_for 'tracker' %>	1	<%= error_messages_for 'tracker' %>
2		2	<div class="box">
3	<!--[form:tracker]-->	3	<!--[form:tracker]-->
4	<p><label for="tracker_name"><%=l(:field_name)%></label> <span class="required">*</span><br/>	4	<p><%= f.text_field :name, :required => true %></p>
5	<%= text_field 'tracker', 'name' %></p>	5	<p><%= f.check_box :is_in_chlog %></p>
6
7	<p><%= check_box 'tracker', 'is_in_chlog' %>
8	<label for="tracker_is_in_chlog"><%=l(:field_is_in_chlog)%></label></p>
9	<!--[eoform:tracker]-->	6	<!--[eoform:tracker]-->
10		7	</div>

redmine/app/views/trackers/edit.rhtml +3 -3

             <h2><%=l(:label_tracker)%></h2>
-            <%= start_form_tag :action => 'edit', :id => @tracker %>
+            <% labelled_tabular_form_for :tracker, @tracker, :url => { :action => 'edit' } do |f| %>
-              <%= render :partial => 'form' %>
+            <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
-            <%= end_form_tag %>
+            <% end %>
  No newline at end of file

redmine/app/views/trackers/list.rhtml +2 -4

             <h2><%=l(:label_tracker_plural)%></h2>
-            <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
+            <table class="listTableContent">
               <tr class="ListHead">
               <th><%=l(:label_tracker)%></th>
               <th></th>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to tracker.name, :action => 'edit', :id => tracker %></td>
               <td align="center">
-                <%= start_form_tag :action => 'destroy', :id => tracker %>
+                <%= button_to l(:button_delete), { :action => 'destroy', :id => tracker }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
-                <%= submit_tag l(:button_delete), :class => "button-small" %>
-                <%= end_form_tag %>
               </td>
               </tr>
             <% end %>

redmine/app/views/trackers/new.rhtml +3 -4

@@ -1,7 +1,6
1	<h2><%=l(:label_tracker_new)%></h2>	1	<h2><%=l(:label_tracker_new)%></h2>
2		2
3	<%= start_form_tag :action => 'new' %>	3	<% labelled_tabular_form_for :tracker, @tracker, :url => { :action => 'new' } do \|f\| %>
4	<%= render :partial => 'form' %>	4	<%= render :partial => 'form', :locals => { :f => f } %>
5	<%= submit_tag l(:button_create) %>	5	<%= submit_tag l(:button_create) %>
6	<%= end~~_form_tag~~ %>	6	<% end %> No newline at end of file
7

redmine/app/views/users/_form.rhtml +9 -20

             <div class="box">
             <!--[form:user]-->
-            <p><label for="user_login"><%=l(:field_login)%></label> <span class="required">*</span><br/>
+            <p><%= f.text_field :login, :required => true, :size => 25  %></p>
-            <%= text_field 'user', 'login', :size => 25  %></p>
-            <p><label for="password"><%=l(:field_password)%></label> <span class="required">*</span><br/>
+            <p><label for="password"><%=l(:field_password)%><span class="required"> *</span></label>
             <%= password_field_tag 'password', nil, :size => 25  %></p>
-            <p><label for="password_confirmation"><%=l(:field_password_confirmation)%></label> <span class="required">*</span><br/>
+            <p><label for="password_confirmation"><%=l(:field_password_confirmation)%><span class="required"> *</span></label>
             <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
-            <p><label for="user_firstname"><%=l(:field_firstname)%></label> <span class="required">*</span><br/>
+            <p><%= f.text_field :firstname, :required => true %></p>
-            <%= text_field 'user', 'firstname'  %></p>
+            <p><%= f.text_field :lastname, :required => true %></p>
+            <p><%= f.text_field :mail, :required => true %></p>
-            <p><label for="user_lastname"><%=l(:field_lastname)%></label> <span class="required">*</span><br/>
+            <p><%= f.select :language, lang_options_for_select %></p>
-            <%= text_field 'user', 'lastname'  %></p>
-            <p><label for="user_mail"><%=l(:field_mail)%></label> <span class="required">*</span><br/>
-            <%= text_field 'user', 'mail'  %></p>
-            <p><label for="user_language"><%=l(:field_language)%></label><br/>
-            <%= select("user", "language", lang_options_for_select) %></p>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
-            <div style="clear: both;"></div>
+            <p><%= f.check_box :admin %></p>
+            <p><%= f.check_box :mail_notification %></p>
-            <p><%= check_box 'user', 'admin' %> <label for="user_admin"><%=l(:field_admin)%></label></p>
-            <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
             <!--[eoform:user]-->
             </div>

redmine/app/views/users/add.rhtml +3 -3

             <h2><%=l(:label_user_new)%></h2>
-            <%= start_form_tag :action => 'add' %>
+            <% labelled_tabular_form_for :user, @user, :url => { :action => "add" } do |f| %>
-              <%= render :partial => 'form' %>
+            <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
-            <%= end_form_tag %>
+            <% end %>
  No newline at end of file

redmine/app/views/users/edit.rhtml +3 -3

             <h2><%=l(:label_user)%></h2>
-            <%= start_form_tag :action => 'edit', :id => @user %>
+            <% labelled_tabular_form_for :user, @user, :url => { :action => "edit" } do |f| %>
-              <%= render :partial => 'form' %>
+            <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
-            <%= end_form_tag %>
+            <% end %>

redmine/app/views/users/list.rhtml +1 -1

             <h2><%=l(:label_user_plural)%></h2>
-            <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
+            <table class="listTableContent">
             <tr class="ListHead">
             	<%= sort_header_tag('login', :caption => l(:field_login)) %>
             	<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>

redmine/app/views/versions/_form.rhtml +5 -10

@@ -1,13 +1,8
1	<%= error_messages_for 'version' %>	1	<%= error_messages_for 'version' %>
2		2	<div class="box">
3	<!--[form:version]-->	3	<!--[form:version]-->
4	<p><label for="version_name"><%=l(:field_name)%></label> <span class="required">*</span><br/>	4	<p><%= f.text_field :name, :size => 20, :required => true %></p>
5	<%= text_field ~~'version'~~, ~~'name'~~, :size => 20 %></p>	5	<p><%= f.text_field :description, :size => 60 %></p>
6		6	<p><%= f.date_select :effective_date, :required => true %></p>
7	<p><label for="version_description"><%=l(:field_description)%></label><br/>
8	<%= text_field 'version', 'description', :size => 60 %></p>
9
10	<p><label for="version_effective_date"><%=l(:field_effective_date)%></label><br/>
11	<%= date_select 'version', 'effective_date' %></p>
12	<!--[eoform:version]-->	7	<!--[eoform:version]-->
13		8	</div> No newline at end of file

redmine/app/views/versions/edit.rhtml +3 -4

             <h2><%=l(:label_version)%></h2>
-            <%= start_form_tag :action => 'edit', :id => @version %>
+            <% labelled_tabular_form_for :version, @version, :url => { :action => 'edit' } do |f| %>
-              <%= render :partial => 'form' %>
+            <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
-            <%= end_form_tag %>
+            <% end %>

redmine/config/environment.rb +1 -1

               :not_a_number => "activerecord_error_not_a_number"
             }
-            ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "<span class=\"fieldWithErrors\">#{html_tag}</span>" }
+            ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
             GLoc.set_config :default_language => $RDM_DEFAULT_LANG
             GLoc.clear_strings

redmine/doc/CHANGELOG +6 -2

             == xx/xx/2006 v0.3.0
-            * user authentication against multiple LDAP
+            * user authentication against multiple LDAP (optional)
             * token based "lost password" functionality
             * user self-registration functionality (optional)
             * custom fields now available for issues, users and projects
             * new custom field format "text" (displayed as a textarea field)
             * project & administration drop down menus in navigation bar for quicker access
             * "due date" field added on issues
-            * error messages internationalization
+            * tracker selection filter added on change log
             * Localization plugin replaced with GLoc 1.1.0
+            * error messages internationalization
+            * german translation added (thanks to Karim Trott)
             * new filter in issues list: "Fixed version"
             * active filters are displayed with colored background on issues list
             * custom configuration is now defined in config/config_custom.rb
             * user object no more stored in session (only user_id)
             * news summary field is no longer required
+            * tables and forms redesign
             * Fixed: boolean custom field not working
             * Fixed: error messages for custom fields are not displayed
+            * Fixed: invalid custom fields should have a red border
             * Fixed: custom fields values are not validated on issue update
             * Fixed: unable to choose an empty value for 'List' custom fields
             * Fixed: no issue categories sorting

redmine/lang/en.yml +2 -1

             field_role: Role
             field_homepage: Homepage
             field_is_public: Public
-            field_parent: Subproject de
+            field_parent: Subproject of
             field_is_in_chlog: Issues displayed in changelog
             field_login: Login
             field_mail_notification: Mail notifications
             text_possible_values_info: values separated with |
             text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
             text_workflow_edit: Select a role and a tracker to edit the workflow
+            text_are_you_sure: Are you sure ?
             default_role_manager: Manager
             default_role_developper: Developer

redmine/lang/es.yml +1 0

             #text_possible_values_info: values separated with |
             text_project_destroy_confirmation: ¿ Estás seguro de querer eliminar el proyecto ?
             text_workflow_edit: Seleccionar un workflow para actualizar
+            text_are_you_sure: ¿ Estás seguro ?
             default_role_manager: Manager
             default_role_developper: Desarrollador

redmine/lang/fr.yml +1 0

             text_possible_values_info: valeurs séparées par |
             text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et tout ce qui lui est rattaché ?
             text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow
+            text_are_you_sure: Etes-vous sûr ?
             default_role_manager: Manager
             default_role_developper: Développeur

redmine/public/stylesheets/application.css +66 -27

             text-align:center;
             color:#303030;
             background:#e8eaec;
+            margin:0;
             }
             #container{
             width:100%;
             min-width: 800px;
-            margin:5px auto;
+            margin:0;
-            padding:1px 0;
+            padding:0;
             text-align:left;
             background:#ffffff;
             color:#303030;
-            border:2px solid #a0a0a0;
             }
             #header{
-            height:5.5em;
+            height:4.5em;
             /*width:758px;*/
-            margin:0 1px 1px 1px;
+            margin:0;
             background:#467aa7;
             color:#ffffff;
+            margin-bottom:1px;
             }
             #header h1{
-            padding:14px 0 0 20px;
+            padding:10px 0 0 20px;
-            font-size:2.4em;
+            font-size:1.8em;
             background-color:inherit;
             color:#fff; /*rgb(152, 26, 33);*/
             letter-spacing:-2px;
             }
             #header h2{
-            margin:10px 0 0 40px;
+            margin:3px 0 0 40px;
             font-size:1.4em;
             background-color:inherit;
             color:#f0f2f4;
             height:2.2em;
             line-height:2.2em;
             /*width:758px;*/
-            margin:0 1px;
+            margin:0;
             background:#578bb8;
             color:#ffffff;
             }
             /**************** Content styles ****************/
+            html>body #content {
+            height: auto;
+            min-height: 300px;
+            }
             #content{
             /*float:right;*/
             /*width:530px;*/
             width: auto;
-            min-height: 500px;
+            height:300px;
             font-size:0.9em;
             padding:20px 10px 10px 20px;
             /*position: absolute;*/
-            margin: 0 0 0 140px;
+            margin-left: 120px;
             border-left: 1px dashed #c0c0c0;
             }
             #content h2{
             .noborder {
             	border:0px;
+            Exception exceptions.AssertionError: <exceptions.AssertionError instance at 0xb7c0b20c> in <bound
+            method SubversionRepository.__del__ of <vclib.svn.SubversionRepository instance at 0xb7c1252c>>
+            ignored
             	background-color:#fff;
             	width:100%;
             }
             }
             input {
-            	vertical-align: top;
+            	vertical-align: middle;
             }
             input.button-small
             }
             table.listTableContent {
-            	/*margin: 2em 2em 2em 0;	*/
+            	border:1px solid #578bb8;
-            	border:1px solid #c0c0c0;
             	width:99%;
+            	border-collapse: collapse;
             }
             table.listTableContent td {
-            	margin: 2px;
+            	padding:4px;
             }
             tr.ListHead {
             }
             tr.odd {
-            	background-color: #C1E2F7;
+            	background-color:#f0f1f2;
             }
             tr.even {
-            	background-color:#CEE1ED;
+            	background-color: #fff;
             }
             hr { border:none; border-bottom: dotted 2px #c0c0c0; }
             #subcontent{
             float:left;
             clear:both;
-            width:130px;
+            width:110px;
             padding:20px 20px 10px 5px;
-            line-height:1.4em;
             }
             #subcontent h2{
             display:block;
-            margin:0 0 15px 0;
+            margin:0 0 5px 0;
-            font-size:1.6em;
+            font-size:1.0em;
-            font-weight:normal;
+            font-weight:bold;
             text-align:left;
             letter-spacing:-1px;
-            color:#505050;
+            color:#606060;
             background-color:inherit;
             }
             /**************** Menublock styles ****************/
-            .menublock{margin:0 0 20px 8px; font-size:0.9em;}
+            .menublock{margin:0 0 20px 8px; font-size:0.8em;}
             .menublock li{list-style:none; display:block; padding:1px; margin-bottom:0px;}
             .menublock li a{font-weight:bold; text-decoration:none;}
             .menublock li a:hover{text-decoration:none;}
-            .menublock li ul{margin:3px 0 3px 15px; font-size:1em; font-weight:normal;}
+            .menublock li ul{margin:0; font-size:1em; font-weight:normal;}
             .menublock li ul li{margin-bottom:0;}
             .menublock li ul a{font-weight:normal;}
             clear:both;
             /*width:758px;*/
             padding:5px 0;
-            margin:0 1px;
+            margin:0;
             font-size:0.9em;
             color:#f0f0f0;
             background:#467aa7;
             text-align: left;
             }
+            /***** CSS FORM ******/
+            .tabular p{
+            margin: 0;
+            padding: 5px 0 8px 0;
+            padding-left: 180px; /*width of left column containing the label elements*/
+            height: 1%;
+            }
+            .tabular label{
+            font-weight: bold;
+            float: left;
+            margin-left: -180px; /*width of left column*/
+            width: 175px; /*width of labels. Should be smaller than left column to create some right
+            margin*/
+            }
+            .error {
+            color: #cc0000;
+            }
+            /*.threepxfix class below:
+            Targets IE6- ONLY. Adds 3 pixel indent for multi-line form contents.
+            to account for 3 pixel bug: http://www.positioniseverything.net/explorer/threepxtest.html
+            */
+            * html .threepxfix{
+            margin-left: 3px;
+            }
  No newline at end of file

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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