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
bf23c06d
Commit
bf23c06d
authored
Oct 20, 2011
by
Romano Licker
Committed by
Holger Just
Oct 28, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[#667] added invisible labels for queries
parent
cd7b30da
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
6 deletions
+23
-6
_columns.rhtml
app/views/queries/_columns.rhtml
+6
-2
_filters.rhtml
app/views/queries/_filters.rhtml
+1
-0
_form.rhtml
app/views/queries/_form.rhtml
+6
-4
de.yml
config/locales/de.yml
+5
-0
en.yml
config/locales/en.yml
+5
-0
No files found.
app/views/queries/_columns.rhtml
View file @
bf23c06d
<table
style=
"border-collapse: collapse; border:0;"
>
<table
style=
"border-collapse: collapse; border:0;"
>
<tr>
<tr>
<td
style=
"padding-left:0"
>
<%=
select_tag
'available_columns'
,
<td
style=
"padding-left:0"
>
<%=
label_tag
"available_columns"
,
l
(
:description_available_columns
),
:class
=>
"hidden-for-sighted"
%>
<%=
select_tag
'available_columns'
,
options_for_select
((
query
.
available_columns
-
query
.
columns
).
collect
{
|
column
|
[
column
.
caption
,
column
.
name
]}),
options_for_select
((
query
.
available_columns
-
query
.
columns
).
collect
{
|
column
|
[
column
.
caption
,
column
.
name
]}),
:multiple
=>
true
,
:size
=>
10
,
:style
=>
"width:150px"
%>
:multiple
=>
true
,
:size
=>
10
,
:style
=>
"width:150px"
%>
</td>
</td>
...
@@ -10,7 +12,9 @@
...
@@ -10,7 +12,9 @@
<input
type=
"button"
value=
"←"
<input
type=
"button"
value=
"←"
onclick=
"moveOptions(this.form.selected_columns, this.form.available_columns);"
/>
onclick=
"moveOptions(this.form.selected_columns, this.form.available_columns);"
/>
</td>
</td>
<td>
<%=
select_tag
'c[]'
,
<td>
<%=
label_tag
"selected_columns"
,
l
(
:description_selected_columns
),
:class
=>
"hidden-for-sighted"
%>
<%=
select_tag
'c[]'
,
options_for_select
(
query
.
columns
.
collect
{
|
column
|
[
column
.
caption
,
column
.
name
]}),
options_for_select
(
query
.
columns
.
collect
{
|
column
|
[
column
.
caption
,
column
.
name
]}),
:id
=>
'selected_columns'
,
:multiple
=>
true
,
:size
=>
10
,
:style
=>
"width:150px"
%>
:id
=>
'selected_columns'
,
:multiple
=>
true
,
:size
=>
10
,
:style
=>
"width:150px"
%>
</td>
</td>
...
...
app/views/queries/_filters.rhtml
View file @
bf23c06d
...
@@ -85,6 +85,7 @@ Event.observe(document,"dom:loaded", apply_filters_observer);
...
@@ -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>
<label
for=
"cb_
<%=
field
%>
"
>
<%=
filter
[
1
][
:name
]
||
l
((
"field_"
+
field
.
to_s
.
gsub
(
/\_id$/
,
""
)).
to_sym
)
%>
</label>
</td>
</td>
<td
style=
"width:150px;"
>
<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;"
%>
<%=
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>
<td>
<td>
...
...
app/views/queries/_form.rhtml
View file @
bf23c06d
...
@@ -30,10 +30,12 @@
...
@@ -30,10 +30,12 @@
<fieldset><legend>
<%=
l
(
:label_sort
)
%>
</legend>
<fieldset><legend>
<%=
l
(
:label_sort
)
%>
</legend>
<%
3
.
times
do
|
i
|
%>
<%
3
.
times
do
|
i
|
%>
<%=
i
+
1
%>
:
<%=
select_tag
(
"query[sort_criteria][
#{
i
}
][]"
,
<%=
i
+
1
%>
:
options_for_select
([[]]
+
query
.
available_columns
.
select
(
&
:sortable?
).
collect
{
|
column
|
[
column
.
caption
,
column
.
name
.
to_s
]},
@query
.
sort_criteria_key
(
i
)))
%>
<%=
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
}
][]"
,
<%=
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
)
%>
options_for_select
([[],
[
l
(
:label_ascending
),
'asc'
],
[
l
(
:label_descending
),
'desc'
]],
@query
.
sort_criteria_order
(
i
)))
%>
<br
/>
<%=
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
%>
<%
end
%>
</fieldset>
</fieldset>
...
...
config/locales/de.yml
View file @
bf23c06d
...
@@ -982,5 +982,10 @@ de:
...
@@ -982,5 +982,10 @@ de:
label_path_encoding
:
Path encoding
label_path_encoding
:
Path encoding
text_mercurial_repo_example
:
local repository (e.g. /hgrepo, c:\hgrepo)
text_mercurial_repo_example
:
local repository (e.g. /hgrepo, c:\hgrepo)
label_diff
:
diff
label_diff
:
diff
description_filter
:
Filter
description_search
:
Suchfeld
description_search
:
Suchfeld
description_project_scope
:
Suchbereich
description_project_scope
:
Suchbereich
description_query_sort_criteria_attribute
:
Sortierattribut
description_query_sort_criteria_direction
:
Sortierrichtung
description_available_columns
:
Verfügbare Spalten
description_selected_columns
:
Ausgewählte Spalten
config/locales/en.yml
View file @
bf23c06d
...
@@ -964,5 +964,10 @@ en:
...
@@ -964,5 +964,10 @@ en:
enumeration_doc_categories
:
Document categories
enumeration_doc_categories
:
Document categories
enumeration_activities
:
Activities (time tracking)
enumeration_activities
:
Activities (time tracking)
enumeration_system_activity
:
System Activity
enumeration_system_activity
:
System Activity
description_filter
:
Filter
description_search
:
Searchfield
description_search
:
Searchfield
description_project_scope
:
Search scope
description_project_scope
:
Search scope
description_query_sort_criteria_attribute
:
Sort attribute
description_query_sort_criteria_direction
:
Sort direction
description_available_columns
:
Available Columns
description_selected_columns
:
Selected Spalten
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