Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
OHR Support
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
97
Issues
97
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
OHR Support
Commits
e4832789
Commit
e4832789
authored
Oct 28, 2011
by
Holger Just
Browse files
Options
Browse Files
Download
Plain Diff
[#667] Label all input field and control tags
parents
35c96b50
50364780
Hide whitespace changes
Inline
Side-by-side
Showing
29 changed files
with
139 additions
and
52 deletions
+139
-52
issues_helper.rb
app/helpers/issues_helper.rb
+2
-2
search_helper.rb
app/helpers/search_helper.rb
+1
-0
index.html.erb
app/views/activities/index.html.erb
+1
-1
projects.rhtml
app/views/admin/projects.rhtml
+2
-2
_form.rhtml
app/views/custom_fields/_form.rhtml
+1
-2
destroy.rhtml
app/views/enumerations/destroy.rhtml
+1
-1
_memberships.html.erb
app/views/groups/_memberships.html.erb
+1
-0
destroy.rhtml
app/views/issue_categories/destroy.rhtml
+1
-0
new.rhtml
app/views/issue_moves/new.rhtml
+5
-5
bulk_edit.rhtml
app/views/issues/bulk_edit.rhtml
+11
-11
index.rhtml
app/views/issues/index.rhtml
+1
-1
_notes_form.rhtml
app/views/journals/_notes_form.rhtml
+2
-0
base.rhtml
app/views/layouts/base.rhtml
+3
-1
_form.rhtml
app/views/messages/_form.rhtml
+5
-3
_columns.rhtml
app/views/queries/_columns.rhtml
+8
-2
_filters.rhtml
app/views/queries/_filters.rhtml
+1
-0
_form.rhtml
app/views/queries/_form.rhtml
+6
-4
_form.rhtml
app/views/roles/_form.rhtml
+1
-1
index.rhtml
app/views/search/index.rhtml
+1
-0
report.rhtml
app/views/time_entry_reports/report.rhtml
+3
-3
_date_range.rhtml
app/views/timelog/_date_range.rhtml
+19
-4
_form.rhtml
app/views/trackers/_form.rhtml
+1
-1
_mail_notifications.html.erb
app/views/users/_mail_notifications.html.erb
+2
-1
index.rhtml
app/views/users/index.rhtml
+3
-3
destroy.rhtml
app/views/wiki/destroy.rhtml
+1
-0
edit.rhtml
app/views/workflows/edit.rhtml
+4
-4
de.yml
config/locales/de.yml
+17
-0
en.yml
config/locales/en.yml
+17
-0
application.css
public/stylesheets/application.css
+18
-0
No files found.
app/helpers/issues_helper.rb
View file @
e4832789
...
...
@@ -213,8 +213,8 @@ module IssuesHelper
def
send_notification_option
content_tag
(
:p
,
content_tag
(
:label
,
l
(
:label_notify_member_plural
))
+
hidden_field_tag
(
'send_notification'
,
'0'
)
+
l
(
:label_notify_member_plural
)
,
:for
=>
'send_notification'
)
+
hidden_field_tag
(
'send_notification'
,
'0'
,
:id
=>
nil
)
+
check_box_tag
(
'send_notification'
,
'1'
,
true
))
...
...
app/helpers/search_helper.rb
View file @
e4832789
...
...
@@ -43,6 +43,7 @@ module SearchHelper
options
<<
[
l
(
:label_my_projects
),
'my_projects'
]
unless
User
.
current
.
memberships
.
empty?
options
<<
[
l
(
:label_and_its_subprojects
,
@project
.
name
),
'subprojects'
]
unless
@project
.
nil?
||
@project
.
descendants
.
active
.
empty?
options
<<
[
@project
.
name
,
''
]
unless
@project
.
nil?
label_tag
(
"scope"
,
l
(
:description_project_scope
),
:class
=>
"hidden-for-sighted"
)
+
select_tag
(
'scope'
,
options_for_select
(
options
,
params
[
:scope
].
to_s
))
if
options
.
size
>
1
end
...
...
app/views/activities/index.html.erb
View file @
e4832789
...
...
@@ -44,7 +44,7 @@
<h3>
<%=
l
(
:label_activity
)
%>
</h3>
<p>
<%
@activity
.
event_types
.
each
do
|
t
|
%>
<%=
check_box_tag
"show_
#{
t
}
"
,
1
,
@activity
.
scope
.
include?
(
t
)
%>
<
%=
link_to
(
l
(
"label_
#{
t
.
singularize
}
_plural"
),
{
"show_
#{
t
}
"
=>
1
,
:user_id
=>
params
[
:user_id
]})
%
>
<
label
for=
"show_
<%=
t
%>
"
>
<%=
link_to
(
l
(
"label_
#{
t
.
singularize
}
_plural"
),
{
"show_
#{
t
}
"
=>
1
,
:user_id
=>
params
[
:user_id
]})
%>
</label
>
<br
/>
<%
end
%>
</p>
<%
if
@project
&&
@project
.
descendants
.
active
.
any?
%>
...
...
app/views/admin/projects.rhtml
View file @
e4832789
...
...
@@ -6,9 +6,9 @@
<%
form_tag
({},
:method
=>
:get
)
do
%>
<fieldset><legend>
<%=
l
(
:label_filter_plural
)
%>
</legend>
<label>
<%=
l
(
:field_status
)
%>
:
</label>
<label
for=
'status'
>
<%=
l
(
:field_status
)
%>
:
</label>
<%=
select_tag
'status'
,
project_status_options_for_select
(
@status
),
:class
=>
"small"
,
:onchange
=>
"this.form.submit(); return false;"
%>
<label>
<%=
l
(
:label_project
)
%>
:
</label>
<label
for=
'name'
>
<%=
l
(
:label_project
)
%>
:
</label>
<%=
text_field_tag
'name'
,
params
[
:name
],
:size
=>
30
%>
<%=
submit_tag
l
(
:button_apply
),
:class
=>
"small"
,
:name
=>
nil
%>
<%=
link_to
l
(
:button_clear
),
{
:controller
=>
'admin'
,
:action
=>
'projects'
},
:class
=>
'icon icon-reload'
%>
...
...
app/views/custom_fields/_form.rhtml
View file @
e4832789
...
...
@@ -79,10 +79,9 @@ function toggle_custom_field_format() {
<div
class=
"box"
>
<%
case
@custom_field
.
class
.
name
when
"IssueCustomField"
%>
<fieldset><legend>
<%=
l
(
:label_tracker_plural
)
%>
</legend>
<%
for
tracker
in
@trackers
%>
<%=
check_box_tag
"custom_field[tracker_ids][]"
,
tracker
.
id
,
(
@custom_field
.
trackers
.
include?
tracker
)
%>
<%=
h
(
tracker
.
name
)
%
>
<%=
check_box_tag
"custom_field[tracker_ids][]"
,
tracker
.
id
,
(
@custom_field
.
trackers
.
include?
tracker
)
,
:id
=>
"custom_field_tracker_ids_
#{
tracker
.
id
}
"
%>
<label
id=
"no-css"
for=
"custom_field_tracker_ids_
<%=
tracker
.
id
%>
"
>
<%=
h
(
tracker
.
name
)
%>
</label
>
<%
end
%>
<%=
hidden_field_tag
"custom_field[tracker_ids][]"
,
''
%>
</fieldset>
...
...
app/views/enumerations/destroy.rhtml
View file @
e4832789
...
...
@@ -3,7 +3,7 @@
<%
form_tag
({})
do
%>
<div
class=
"box"
>
<p><strong>
<%=
l
(
:text_enumeration_destroy_question
,
@enumeration
.
objects_count
)
%>
</strong></p>
<p>
<
%=
l
(
:text_enumeration_category_reassign_to
)
%
>
<p><
label
for=
'reassign_to_id'
>
<%=
l
(
:text_enumeration_category_reassign_to
)
%>
</label
>
<%=
select_tag
'reassign_to_id'
,
(
"<option>---
#{
l
(
:actionview_instancetag_blank_option
)
}
---</option>"
+
options_from_collection_for_select
(
@enumerations
,
'id'
,
'name'
))
%>
</p>
</div>
...
...
app/views/groups/_memberships.html.erb
View file @
e4832789
...
...
@@ -44,6 +44,7 @@
<%
if
projects
.
any?
%>
<fieldset><legend>
<%=
l
(
:label_project_new
)
%>
</legend>
<%
remote_form_for
(
:membership
,
:url
=>
{
:action
=>
'edit_membership'
,
:id
=>
@group
})
do
%>
<%=
label_tag
"membership_project_id"
,
l
(
:description_choose_project
),
:class
=>
"hidden-for-sighted"
%>
<%=
select_tag
'membership[project_id]'
,
options_for_membership_project_select
(
@group
,
projects
)
%>
<p>
<%=
l
(
:label_role_plural
)
%>
:
<%
roles
.
each
do
|
role
|
%>
...
...
app/views/issue_categories/destroy.rhtml
View file @
e4832789
...
...
@@ -6,6 +6,7 @@
<p><label>
<%=
radio_button_tag
'todo'
,
'nullify'
,
true
%>
<%=
l
(
:text_issue_category_destroy_assignments
)
%>
</label><br
/>
<%
if
@categories
.
size
>
0
%>
<label>
<%=
radio_button_tag
'todo'
,
'reassign'
,
false
%>
<%=
l
(
:text_issue_category_reassign_to
)
%>
</label>
:
<%=
label_tag
"reassign_to_id"
,
l
(
:description_issue_category_reassign
),
:class
=>
"hidden-for-sighted"
%>
<%=
select_tag
'reassign_to_id'
,
options_from_collection_for_select
(
@categories
,
'id'
,
'name'
)
%>
</p>
<%
end
%>
</div>
...
...
app/views/issue_moves/new.rhtml
View file @
e4832789
...
...
@@ -26,17 +26,17 @@
<%=
select_tag
"new_tracker_id"
,
"<option value=
\"\"
>
#{
l
(
:label_no_change_option
)
}
</option>"
+
options_from_collection_for_select
(
@trackers
,
"id"
,
"name"
)
%>
</p>
<p>
<label>
<%=
l
(
:field_status
)
%>
</label>
<label
for=
'status_id'
>
<%=
l
(
:field_status
)
%>
</label>
<%=
select_tag
(
'status_id'
,
"<option value=
\"\"
>
#{
l
(
:label_no_change_option
)
}
</option>"
+
options_from_collection_for_select
(
@available_statuses
,
:id
,
:name
))
%>
</p>
<p>
<label>
<%=
l
(
:field_priority
)
%>
</label>
<label
for=
'priority_id'
>
<%=
l
(
:field_priority
)
%>
</label>
<%=
select_tag
(
'priority_id'
,
"<option value=
\"\"
>
#{
l
(
:label_no_change_option
)
}
</option>"
+
options_from_collection_for_select
(
IssuePriority
.
all
,
:id
,
:name
))
%>
</p>
<p>
<label>
<%=
l
(
:field_assigned_to
)
%>
</label>
<label
for=
'assigned_to_id'
>
<%=
l
(
:field_assigned_to
)
%>
</label>
<%=
select_tag
(
'assigned_to_id'
,
content_tag
(
'option'
,
l
(
:label_no_change_option
),
:value
=>
''
)
+
content_tag
(
'option'
,
l
(
:label_nobody
),
:value
=>
'none'
)
+
options_from_collection_for_select
(
@target_project
.
assignable_users
,
:id
,
:name
))
%>
...
...
@@ -45,12 +45,12 @@
<div
class=
"splitcontentright"
>
<p>
<label>
<%=
l
(
:field_start_date
)
%>
</label>
<label
for=
'start_date'
>
<%=
l
(
:field_start_date
)
%>
</label>
<%=
text_field_tag
'start_date'
,
''
,
:size
=>
10
%><%=
calendar_for
(
'start_date'
)
%>
</p>
<p>
<label>
<%=
l
(
:field_due_date
)
%>
</label>
<label
for=
'due_date'
>
<%=
l
(
:field_due_date
)
%>
</label>
<%=
text_field_tag
'due_date'
,
''
,
:size
=>
10
%><%=
calendar_for
(
'due_date'
)
%>
</p>
</div>
...
...
app/views/issues/bulk_edit.rhtml
View file @
e4832789
...
...
@@ -10,28 +10,28 @@
<div
class=
"splitcontentleft"
>
<p>
<label>
<%=
l
(
:field_tracker
)
%>
</label>
<label
for=
"issue_tracker_id"
>
<%=
l
(
:field_tracker
)
%>
</label>
<%=
select_tag
(
'issue[tracker_id]'
,
"<option value=
\"\"
>
#{
l
(
:label_no_change_option
)
}
</option>"
+
options_from_collection_for_select
(
@trackers
,
:id
,
:name
))
%>
</p>
<%
if
@available_statuses
.
any?
%>
<p>
<label>
<%=
l
(
:field_status
)
%>
</label>
<label
for=
'issue_status_id'
>
<%=
l
(
:field_status
)
%>
</label>
<%=
select_tag
(
'issue[status_id]'
,
"<option value=
\"\"
>
#{
l
(
:label_no_change_option
)
}
</option>"
+
options_from_collection_for_select
(
@available_statuses
,
:id
,
:name
))
%>
</p>
<%
end
%>
<p>
<label>
<%=
l
(
:field_priority
)
%>
</label>
<label
for=
'issue_priority_id'
>
<%=
l
(
:field_priority
)
%>
</label>
<%=
select_tag
(
'issue[priority_id]'
,
"<option value=
\"\"
>
#{
l
(
:label_no_change_option
)
}
</option>"
+
options_from_collection_for_select
(
IssuePriority
.
all
,
:id
,
:name
))
%>
</p>
<p>
<label>
<%=
l
(
:field_assigned_to
)
%>
</label>
<label
for=
'issue_assigned_to_id'
>
<%=
l
(
:field_assigned_to
)
%>
</label>
<%=
select_tag
(
'issue[assigned_to_id]'
,
content_tag
(
'option'
,
l
(
:label_no_change_option
),
:value
=>
''
)
+
content_tag
(
'option'
,
l
(
:label_nobody
),
:value
=>
'none'
)
+
options_from_collection_for_select
(
@assignables
,
:id
,
:name
))
%>
</p>
<%
if
@project
%>
<p>
<label>
<%=
l
(
:field_category
)
%>
</label>
<label
for=
'issue_category_id'
>
<%=
l
(
:field_category
)
%>
</label>
<%=
select_tag
(
'issue[category_id]'
,
content_tag
(
'option'
,
l
(
:label_no_change_option
),
:value
=>
''
)
+
content_tag
(
'option'
,
l
(
:label_none
),
:value
=>
'none'
)
+
options_from_collection_for_select
(
@project
.
issue_categories
,
:id
,
:name
))
%>
...
...
@@ -40,7 +40,7 @@
<%
#TODO: allow editing versions when multiple projects
%>
<%
if
@project
%>
<p>
<label>
<%=
l
(
:field_fixed_version
)
%>
</label>
<label
for=
'issue_fixed_version_id'
>
<%=
l
(
:field_fixed_version
)
%>
</label>
<%=
select_tag
(
'issue[fixed_version_id]'
,
content_tag
(
'option'
,
l
(
:label_no_change_option
),
:value
=>
''
)
+
content_tag
(
'option'
,
l
(
:label_none
),
:value
=>
'none'
)
+
version_options_for_select
(
@project
.
shared_versions
.
open
.
sort
))
%>
...
...
@@ -48,7 +48,7 @@
<%
end
%>
<%
@custom_fields
.
each
do
|
custom_field
|
%>
<p><label>
<%=
h
(
custom_field
.
name
)
%>
</label>
<%=
custom_field_tag_for_bulk_edit
(
'issue'
,
custom_field
)
%
>
</p>
<p><label>
<%=
h
(
custom_field
.
name
)
%>
<%=
custom_field_tag_for_bulk_edit
(
'issue'
,
custom_field
)
%>
</label
></p>
<%
end
%>
<%=
call_hook
(
:view_issues_bulk_edit_details_bottom
,
{
:issues
=>
@issues
})
%>
...
...
@@ -57,23 +57,23 @@
<div
class=
"splitcontentright"
>
<%
if
@project
&&
User
.
current
.
allowed_to?
(
:manage_subtasks
,
@project
)
%>
<p>
<label>
<%=
l
(
:field_parent_issue
)
%>
</label>
<label
for=
'issue_parent_issue_id'
>
<%=
l
(
:field_parent_issue
)
%>
</label>
<%=
text_field_tag
'issue[parent_issue_id]'
,
''
,
:size
=>
10
%>
</p>
<div
id=
"parent_issue_candidates"
class=
"autocomplete"
></div>
<%=
javascript_tag
"observeParentIssueField('
#{
auto_complete_issues_path
(
:project_id
=>
@project
)
}
')"
%>
<%
end
%>
<p>
<label>
<%=
l
(
:field_start_date
)
%>
</label>
<label
for=
'issue_start_date'
>
<%=
l
(
:field_start_date
)
%>
</label>
<%=
text_field_tag
'issue[start_date]'
,
''
,
:size
=>
10
%><%=
calendar_for
(
'issue_start_date'
)
%>
</p>
<p>
<label>
<%=
l
(
:field_due_date
)
%>
</label>
<label
for=
'issue_due_date'
>
<%=
l
(
:field_due_date
)
%>
</label>
<%=
text_field_tag
'issue[due_date]'
,
''
,
:size
=>
10
%><%=
calendar_for
(
'issue_due_date'
)
%>
</p>
<%
if
Issue
.
use_field_for_done_ratio?
%>
<p>
<label>
<%=
l
(
:field_done_ratio
)
%>
</label>
<label
for=
'issue_done_ratio'
>
<%=
l
(
:field_done_ratio
)
%>
</label>
<%=
select_tag
'issue[done_ratio]'
,
options_for_select
([[
l
(
:label_no_change_option
),
''
]]
+
(
0
..
10
).
to_a
.
collect
{
|
r
|
[
"
#{
r
*
10
}
%"
,
r
*
10
]
})
%>
</p>
<%
end
%>
...
...
app/views/issues/index.rhtml
View file @
e4832789
...
...
@@ -26,7 +26,7 @@
<td>
<%=
render
:partial
=>
'queries/columns'
,
:locals
=>
{
:query
=>
@query
}
%>
</td>
</tr>
<tr>
<td>
<
%=
l
(
:field_group_by
)
%
>
</td>
<td><
label
for=
'group_by'
>
<%=
l
(
:field_group_by
)
%>
</label
></td>
<td>
<%=
select_tag
(
'group_by'
,
options_for_select
([[]]
+
@query
.
groupable_columns
.
collect
{
|
c
|
[
c
.
caption
,
c
.
name
.
to_s
]},
@query
.
group_by
))
%>
</td>
</tr>
</table>
...
...
app/views/journals/_notes_form.rhtml
View file @
e4832789
<%
form_remote_tag
(
:url
=>
{},
:html
=>
{
:id
=>
"journal-
#{
@journal
.
id
}
-form"
})
do
%>
<%=
label_tag
"notes"
,
l
(
:description_notes
),
:class
=>
"hidden-for-sighted"
%>
<%=
text_area_tag
:notes
,
@journal
.
notes
,
:class
=>
'wiki-edit'
,
:rows
=>
(
@journal
.
notes
.
blank?
?
10
:
[[
10
,
@journal
.
notes
.
length
/
50
].
max
,
100
].
min
)
%>
<%=
call_hook
(
:view_journals_notes_form_after_notes
,
{
:journal
=>
@journal
})
%>
...
...
app/views/layouts/base.rhtml
View file @
e4832789
...
...
@@ -37,7 +37,9 @@
<div
id=
"quick-search"
>
<%
form_tag
({
:controller
=>
'search'
,
:action
=>
'index'
,
:id
=>
@project
},
:method
=>
:get
)
do
%>
<%=
hidden_field_tag
(
controller
.
default_search_scope
,
1
,
:id
=>
nil
)
if
controller
.
default_search_scope
%>
<%=
link_to
l
(
:label_search
),
{
:controller
=>
'search'
,
:action
=>
'index'
,
:id
=>
@project
},
:accesskey
=>
accesskey
(
:search
)
%>
:
<label
for=
'q'
>
<%=
link_to
l
(
:label_search
),
{
:controller
=>
'search'
,
:action
=>
'index'
,
:id
=>
@project
},
:accesskey
=>
accesskey
(
:search
)
%>
:
</label>
<%=
text_field_tag
'q'
,
@question
,
:size
=>
20
,
:class
=>
'small'
,
:accesskey
=>
accesskey
(
:quick_search
)
%>
<%
end
%>
<%=
render_project_jump_box
%>
...
...
app/views/messages/_form.rhtml
View file @
e4832789
...
...
@@ -3,8 +3,8 @@
<div
class=
"box"
>
<!--[form:message]-->
<p><label>
<%=
l
(
:field_subject
)
%>
</label><br
/>
<%=
f
.
text_field
:subject
,
:size
=>
120
%>
<p><label
for=
"message_subject"
>
<%=
l
(
:field_subject
)
%>
</label><br
/>
<%=
f
.
text_field
:subject
,
:size
=>
120
,
:id
=>
"message_subject"
%>
<%
if
!
replying
&&
User
.
current
.
allowed_to?
(
:edit_messages
,
@project
)
%>
<label>
<%=
f
.
check_box
:sticky
%><%=
l
(
:label_board_sticky
)
%>
</label>
...
...
@@ -17,7 +17,9 @@
<%=
f
.
select
:board_id
,
@project
.
boards
.
collect
{
|
b
|
[
b
.
name
,
b
.
id
]}
%>
</p>
<%
end
%>
<p>
<%=
f
.
text_area
:content
,
:cols
=>
80
,
:rows
=>
15
,
:class
=>
'wiki-edit'
,
:id
=>
'message_content'
%>
</p>
<p>
<%=
label_tag
"message_content"
,
l
(
:description_message_content
),
:class
=>
"hidden-for-sighted"
%>
<%=
f
.
text_area
:content
,
:cols
=>
80
,
:rows
=>
15
,
:class
=>
'wiki-edit'
,
:id
=>
'message_content'
%>
</p>
<%=
wikitoolbar_for
'message_content'
%>
<!--[eoform:message]-->
...
...
app/views/queries/_columns.rhtml
View file @
e4832789
<table
style=
"border-collapse: collapse; border:0;"
>
<tr>
<td
style=
"padding-left:0"
>
<%=
select_tag
'available_columns'
,
<td
style=
"padding-left:0"
>
<%=
label_tag
"available_columns"
,
l
(
:description_available_columns
)
%>
<br
\
>
<%=
select_tag
'available_columns'
,
options_for_select
((
query
.
available_columns
-
query
.
columns
).
collect
{
|
column
|
[
column
.
caption
,
column
.
name
]}),
:multiple
=>
true
,
:size
=>
10
,
:style
=>
"width:150px"
%>
</td>
...
...
@@ -10,7 +13,10 @@
<input
type=
"button"
value=
"←"
onclick=
"moveOptions(this.form.selected_columns, this.form.available_columns);"
/>
</td>
<td>
<%=
select_tag
'c[]'
,
<td>
<%=
label_tag
"selected_columns"
,
l
(
:description_selected_columns
)
%>
<br
\
>
<%=
select_tag
'c[]'
,
options_for_select
(
query
.
columns
.
collect
{
|
column
|
[
column
.
caption
,
column
.
name
]}),
:id
=>
'selected_columns'
,
:multiple
=>
true
,
:size
=>
10
,
:style
=>
"width:150px"
%>
</td>
...
...
app/views/queries/_filters.rhtml
View file @
e4832789
...
...
@@ -85,6 +85,7 @@ Event.observe(document,"dom:loaded", apply_filters_observer);
<label
for=
"cb_
<%=
field
%>
"
>
<%=
filter
[
1
][
:name
]
||
l
((
"field_"
+
field
.
to_s
.
gsub
(
/\_id$/
,
""
)).
to_sym
)
%>
</label>
</td>
<td
style=
"width:150px;"
>
<%=
label_tag
"op_
#{
field
}
"
,
l
(
:description_filter
),
:class
=>
"hidden-for-sighted"
%>
<%=
select_tag
"op[
#{
field
}
]"
,
options_for_select
(
operators_for_select
(
options
[
:type
]),
query
.
operator_for
(
field
)),
:id
=>
"operators_
#{
field
}
"
,
:onchange
=>
"toggle_operator('
#{
field
}
');"
,
:class
=>
"select-small"
,
:style
=>
"vertical-align: top;"
%>
</td>
<td>
...
...
app/views/queries/_form.rhtml
View file @
e4832789
...
...
@@ -30,10 +30,12 @@
<fieldset><legend>
<%=
l
(
:label_sort
)
%>
</legend>
<%
3
.
times
do
|
i
|
%>
<%=
i
+
1
%>
:
<%=
select_tag
(
"query[sort_criteria][
#{
i
}
][]"
,
options_for_select
([[]]
+
query
.
available_columns
.
select
(
&
:sortable?
).
collect
{
|
column
|
[
column
.
caption
,
column
.
name
.
to_s
]},
@query
.
sort_criteria_key
(
i
)))
%>
<%=
select_tag
(
"query[sort_criteria][
#{
i
}
][]"
,
options_for_select
([[],
[
l
(
:label_ascending
),
'asc'
],
[
l
(
:label_descending
),
'desc'
]],
@query
.
sort_criteria_order
(
i
)))
%>
<br
/>
<%=
i
+
1
%>
:
<%=
label_tag
"query_sort_criteria_attribute_"
+
i
.
to_s
,
l
(
:description_query_sort_criteria_attribute
),
:class
=>
"hidden-for-sighted"
%>
<%=
select_tag
(
"query[sort_criteria][
#{
i
}
][]"
,
options_for_select
([[]]
+
query
.
available_columns
.
select
(
&
:sortable?
).
collect
{
|
column
|
[
column
.
caption
,
column
.
name
.
to_s
]},
@query
.
sort_criteria_key
(
i
)),
:id
=>
"query_sort_criteria_attribute_"
+
i
.
to_s
)
%>
<%=
label_tag
"query_sort_criteria_direction_"
+
i
.
to_s
,
l
(
:description_query_sort_criteria_direction
),
:class
=>
"hidden-for-sighted"
%>
<%=
select_tag
(
"query[sort_criteria][
#{
i
}
][]"
,
options_for_select
([[],
[
l
(
:label_ascending
),
'asc'
],
[
l
(
:label_descending
),
'desc'
]],
@query
.
sort_criteria_order
(
i
)),
:id
=>
"query_sort_criteria_direction_"
+
i
.
to_s
)
%>
<br
/>
<%
end
%>
</fieldset>
...
...
app/views/roles/_form.rhtml
View file @
e4832789
...
...
@@ -5,7 +5,7 @@
<p>
<%=
f
.
text_field
:name
,
:required
=>
true
%>
</p>
<p>
<%=
f
.
check_box
:assignable
%>
</p>
<%
if
@role
.
new_record?
&&
@roles
.
any?
%>
<p><label>
<%=
l
(
:label_copy_workflow_from
)
%>
</label>
<p><label
for=
"copy_workflow_from"
>
<%=
l
(
:label_copy_workflow_from
)
%>
</label>
<%=
select_tag
(
:copy_workflow_from
,
content_tag
(
"option"
)
+
options_from_collection_for_select
(
@roles
,
:id
,
:name
))
%>
</p>
<%
end
%>
</div>
...
...
app/views/search/index.rhtml
View file @
e4832789
...
...
@@ -2,6 +2,7 @@
<div
class=
"box"
>
<%
form_tag
({},
:method
=>
:get
)
do
%>
<%=
label_tag
"search-input"
,
l
(
:description_search
),
:class
=>
"hidden-for-sighted"
%>
<p>
<%=
text_field_tag
'q'
,
@question
,
:size
=>
60
,
:id
=>
'search-input'
%>
<%=
javascript_tag
"Field.focus('search-input')"
%>
<%=
project_select_tag
%>
...
...
app/views/time_entry_reports/report.rhtml
View file @
e4832789
...
...
@@ -12,17 +12,17 @@
<%
end
%>
<%=
render
:partial
=>
'timelog/date_range'
%>
<p>
<
%=
l
(
:label_details
)
%
>
:
<%=
select_tag
'columns'
,
options_for_select
([[
l
(
:label_year
),
'year'
],
<p><
label
for=
'columns'
>
<%=
l
(
:label_details
)
%>
</label
>
:
<%=
select_tag
'columns'
,
options_for_select
([[
l
(
:label_year
),
'year'
],
[
l
(
:label_month
),
'month'
],
[
l
(
:label_week
),
'week'
],
[
l
(
:label_day_plural
).
titleize
,
'day'
]],
@columns
),
:onchange
=>
"this.form.onsubmit();"
%>
<
%=
l
(
:button_add
)
%
>
:
<%=
select_tag
(
'criterias[]'
,
options_for_select
([[]]
+
(
@available_criterias
.
keys
-
@criterias
).
collect
{
|
k
|
[
l_or_humanize
(
@available_criterias
[
k
][
:label
]),
k
]}),
<
label
for=
'criterias'
>
<%=
l
(
:button_add
)
%>
</label
>
:
<%=
select_tag
(
'criterias[]'
,
options_for_select
([[]]
+
(
@available_criterias
.
keys
-
@criterias
).
collect
{
|
k
|
[
l_or_humanize
(
@available_criterias
[
k
][
:label
]),
k
]}),
:onchange
=>
"this.form.submit();"
,
:style
=>
'width: 200px'
,
:id
=>
nil
,
:disabled
=>
(
@criterias
.
length
>=
3
))
%>
:disabled
=>
(
@criterias
.
length
>=
3
)
,
:id
=>
"criterias"
)
%>
<%=
link_to
l
(
:button_clear
),
{
:project_id
=>
@project
,
:issue_id
=>
@issue
,
:period_type
=>
params
[
:period_type
],
:period
=>
params
[
:period
],
:from
=>
@from
,
:to
=>
@to
,
:columns
=>
@columns
},
:class
=>
'icon icon-reload'
%>
</p>
<%
end
%>
...
...
app/views/timelog/_date_range.rhtml
View file @
e4832789
...
...
@@ -2,17 +2,32 @@
<legend
onclick=
"toggleFieldset(this);"
>
<%=
l
(
:label_date_range
)
%>
</legend>
<div>
<p>
<%=
radio_button_tag
'period_type'
,
'1'
,
!
@free_period
,
:onclick
=>
'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");'
%>
<%=
label_tag
"period_type_list"
,
l
(
:description_date_range_list
),
:class
=>
"hidden-for-sighted"
%>
<%=
radio_button_tag
'period_type'
,
'1'
,
!
@free_period
,
:onclick
=>
'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");'
,
:id
=>
"period_type_list"
%>
<%=
select_tag
'period'
,
options_for_period_select
(
params
[
:period
]),
:onchange
=>
'this.form.submit();'
,
:onfocus
=>
'$("period_type_1").checked = true;'
,
:disabled
=>
@free_period
%>
</p>
<p>
<%=
radio_button_tag
'period_type'
,
'2'
,
@free_period
,
:onclick
=>
'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");'
%>
<%=
label_tag
"period_type_interval"
,
l
(
:description_date_range_interval
),
:class
=>
"hidden-for-sighted"
%>
<%=
radio_button_tag
'period_type'
,
'2'
,
@free_period
,
:onclick
=>
'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");'
,
:id
=>
"period_type_interval"
%>
<span
onclick=
"$('period_type_2').checked = true;"
>
<%=
l
(
:label_date_from_to
,
:start
=>
(
text_field_tag
(
'from'
,
@from
,
:size
=>
10
,
:disabled
=>
!
@free_period
)
+
calendar_for
(
'from'
)),
:end
=>
(
text_field_tag
(
'to'
,
@to
,
:size
=>
10
,
:disabled
=>
!
@free_period
)
+
calendar_for
(
'to'
)))
%>
<%=
l
(
:label_date_from_to
,
:start
=>
(
label_tag
(
"from"
,
l
(
:description_date_from
),
:class
=>
"hidden-for-sighted"
)
+
text_field_tag
(
'from'
,
@from
,
:size
=>
10
,
:disabled
=>
!
@free_period
)
+
calendar_for
(
'from'
)
),
:end
=>
(
label_tag
(
"to"
,
l
(
:description_date_to
),
:class
=>
"hidden-for-sighted"
)
+
text_field_tag
(
'to'
,
@to
,
:size
=>
10
,
:disabled
=>
!
@free_period
)
+
calendar_for
(
'to'
)
)
)
%>
</span>
</p>
</div>
...
...
app/views/trackers/_form.rhtml
View file @
e4832789
...
...
@@ -20,7 +20,7 @@
<%
end
%>
<%
if
@tracker
.
new_record?
&&
@trackers
.
any?
%>
<p><label>
<%=
l
(
:label_copy_workflow_from
)
%>
</label>
<p><label
for=
"copy_workflow_from"
>
<%=
l
(
:label_copy_workflow_from
)
%>
</label>
<%=
select_tag
(
:copy_workflow_from
,
content_tag
(
"option"
)
+
options_from_collection_for_select
(
@trackers
,
:id
,
:name
))
%>
</p>
<%
end
%>
<!--[eoform:tracker]-->
...
...
app/views/users/_mail_notifications.html.erb
View file @
e4832789
<p>
<%=
label_tag
"user_mail_notification"
,
l
(
:description_user_mail_notification
),
:class
=>
"hidden-for-sighted"
%>
<%=
select_tag
'user[mail_notification]'
,
options_for_select
(
user_mail_notification_options
(
@user
),
@user
.
mail_notification
),
:onchange
=>
'if (this.value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}'
%>
</p>
...
...
@@ -8,5 +9,5 @@
<%
end
%>
</p>
<p><em>
<%=
l
(
:text_user_mail_option
)
%>
</em></p>
<%
end
%>
<p><label>
<%=
l
(
:label_user_mail_no_self_notified
)
%>
<
/label>
<%=
check_box_tag
'no_self_notified'
,
1
,
@user
.
pref
[
:no_self_notified
]
%
>
</p>
<p><label>
<%=
l
(
:label_user_mail_no_self_notified
)
%><
%=
check_box_tag
'no_self_notified'
,
1
,
@user
.
pref
[
:no_self_notified
]
%>
</label
></p>
app/views/users/index.rhtml
View file @
e4832789
...
...
@@ -6,15 +6,15 @@
<%
form_tag
({},
:method
=>
:get
)
do
%>
<fieldset><legend>
<%=
l
(
:label_filter_plural
)
%>
</legend>
<label>
<%=
l
(
:field_status
)
%>
:
</label>
<label
for=
'status'
>
<%=
l
(
:field_status
)
%>
:
</label>
<%=
select_tag
'status'
,
users_status_options_for_select
(
@status
),
:class
=>
"small"
,
:onchange
=>
"this.form.submit(); return false;"
%>
<%
if
@groups
.
present?
%>
<label>
<%=
l
(
:label_group
)
%>
:
</label>
<label
for=
'group_id'
>
<%=
l
(
:label_group
)
%>
:
</label>
<%=
select_tag
'group_id'
,
'<option></option>'
+
options_from_collection_for_select
(
@groups
,
:id
,
:name
,
params
[
:group_id
].
to_i
),
:onchange
=>
"this.form.submit(); return false;"
%>
<%
end
%>
<label>
<%=
l
(
:label_user
)
%>
:
</label>
<label
for=
'name'
>
<%=
l
(
:label_user
)
%>
:
</label>
<%=
text_field_tag
'name'
,
params
[
:name
],
:size
=>
30
%>
<%=
submit_tag
l
(
:button_apply
),
:class
=>
"small"
,
:name
=>
nil
%>
<%=
link_to
l
(
:button_clear
),
users_path
,
:class
=>
'icon icon-reload'
%>
...
...
app/views/wiki/destroy.rhtml
View file @
e4832789
...
...
@@ -8,6 +8,7 @@
<%
if
@reassignable_to
.
any?
%>
<br
/>
<label>
<%=
radio_button_tag
'todo'
,
'reassign'
,
false
%>
<%=
l
(
:text_wiki_page_reassign_children
)
%>
</label>
:
<%=
label_tag
"reassign_to_id"
,
l
(
:description_wiki_subpages_reassign
),
:class
=>
"hidden-for-sighted"
%>
<%=
select_tag
'reassign_to_id'
,
wiki_page_options_for_select
(
@reassignable_to
),
:onclick
=>
"$('todo_reassign').checked = true;"
%>
<%
end
%>
...
...
app/views/workflows/edit.rhtml
View file @
e4832789
...
...
@@ -6,11 +6,11 @@
<%
form_tag
({},
:method
=>
'get'
)
do
%>
<p>
<label>
<%=
l
(
:label_role
)
%>
:
</label>
<%=
select_tag
'role_id'
,
options_from_collection_for_select
(
@roles
,
"id"
,
"name"
,
@role
&&
@role
.
id
)
%>
<label>
<%=
l
(
:label_role
)
%>
:
<%=
select_tag
'role_id'
,
options_from_collection_for_select
(
@roles
,
"id"
,
"name"
,
@role
&&
@role
.
id
)
%>
</label>
<label>
<%=
l
(
:label_tracker
)
%>
:
</label>
<%=
select_tag
'tracker_id'
,
options_from_collection_for_select
(
@trackers
,
"id"
,
"name"
,
@tracker
&&
@tracker
.
id
)
%>
<label>
<%=
l
(
:label_tracker
)
%>
:
<%=
select_tag
'tracker_id'
,
options_from_collection_for_select
(
@trackers
,
"id"
,
"name"
,
@tracker
&&
@tracker
.
id
)
%>
</label>
<%=
hidden_field_tag
'used_statuses_only'
,
'0'
%>
<label>
<%=
check_box_tag
'used_statuses_only'
,
'1'
,
@used_statuses_only
%>
<%=
l
(
:label_display_used_statuses_only
)
%>
</label>
...
...
config/locales/de.yml
View file @
e4832789
...
...
@@ -982,3 +982,20 @@ de:
label_path_encoding
:
Path encoding
text_mercurial_repo_example
:
local repository (e.g. /hgrepo, c:\hgrepo)
label_diff
:
diff
description_filter
:
Filter
description_search
:
Suchfeld
description_choose_project
:
Projekte
description_project_scope
:
Suchbereich
description_notes
:
Kommentare
description_message_content
:
Nachrichteninhalt
description_query_sort_criteria_attribute
:
Sortierattribut
description_query_sort_criteria_direction
:
Sortierrichtung
description_user_mail_notification
:
Mailbenachrichtigungseinstellung
description_available_columns
:
Verfügbare Spalten
description_selected_columns
:
Ausgewählte Spalten
description_issue_category_reassign
:
Neue Kategorie wählen
description_wiki_subpages_reassign
:
Neue Elternseite wählen
description_date_range_list
:
Zeitraum aus einer Liste wählen
description_date_range_interval
:
Zeitraum durch Start- und Enddatum festlegen
description_date_from
:
Startdatum eintragen
description_date_to
:
Enddatum eintragen
config/locales/en.yml
View file @
e4832789
...
...
@@ -964,3 +964,20 @@ en:
enumeration_doc_categories
:
Document categories
enumeration_activities
:
Activities (time tracking)
enumeration_system_activity
:
System Activity
description_filter
:
Filter
description_search
:
Searchfield
description_choose_project
:
Projects
description_project_scope
:
Search scope
description_notes
:
Notes
description_message_content
:
Message content
description_query_sort_criteria_attribute
:
Sort attribute
description_query_sort_criteria_direction
:
Sort direction
description_user_mail_notification
:
Mail notification settings
description_available_columns
:
Available Columns
description_selected_columns
:
Selected Spalten
description_issue_category_reassign
:
Choose issue category
description_wiki_subpages_reassign
:
Choose new parent page
description_date_range_list
:
Choose range from list
description_date_range_interval
:
Choose range by selecting start and end date
description_date_from
:
Enter start date
description_date_to
:
Enter end date
public/stylesheets/application.css
View file @
e4832789
...
...
@@ -424,6 +424,13 @@ margin-left: 5px !important;
width
:
auto
;
}
label
#no-css
{
font-weight
:
inherit
;
float
:
none
;
text-align
:
left
;
margin-left
:
0px
;
width
:
auto
;
}
input
#time_entry_comments
{
width
:
90%
;}
#preview
fieldset
{
margin-top
:
1em
;
background
:
url(../images/draft.png)
}
...
...
@@ -973,3 +980,14 @@ h2 img { vertical-align:middle; }
table
.list
{
margin-top
:
0.5em
;}
table
.list
th
,
table
.list
td
{
border
:
1px
solid
#aaa
;}
}
/* Accessibility specific styles */
.hidden-for-sighted
{
position
:
absolute
;
left
:
-10000px
;
top
:
auto
;
width
:
1px
;
height
:
1px
;
overflow
:
hidden
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment