Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
aoz-003
Commits
c7797c2f
Commit
c7797c2f
authored
Mar 16, 2018
by
Tugce Nur Tas
Browse files
refine volunteer comment views
parent
c3ff4cbc
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/views/volunteers/_columns.html.slim
View file @
c7797c2f
...
...
@@ -16,6 +16,7 @@
th
=
sort_link
@q
,
:education
th
=
sort_link
@q
,
:profession
th
=
sort_link
@q
,
:working_percent
th
=
sort_link
@q
,
:interests
th
=
t_attr
(
:comments
)
-
if
policy
(
Volunteer
).
show_acceptance?
th
=
sort_link
@q
,
:acceptance
...
...
app/views/volunteers/_volunteer.html.slim
View file @
c7797c2f
...
...
@@ -11,8 +11,12 @@ tr
td
=
volunteer
.
education
td
=
volunteer
.
profession
td
=
"
#{
volunteer
.
working_percent
}
%"
if
volunteer
.
working_percent
.
present?
td
=
volunteer
.
expectations
td
=
volunteer
.
interests
-
if
policy
(
Volunteer
).
superadmin_privileges?
-
if
volunteer
.
comments
=
td_truncate_content_modal
(
volunteer
.
comments
,
'Bemerkungen'
,
shorten_size:
100
)
-
else
td
-
if
policy
(
Volunteer
).
show_acceptance?
td
.button-acceptance.index-action-cell
=
link_to
t
(
".acceptance.
#{
volunteer
.
acceptance
}
"
),
'#'
,
...
...
app/views/volunteers/index.html.slim
View file @
c7797c2f
...
...
@@ -30,3 +30,5 @@ nav.navbar.section-navigation
hr
=
render
'columns'
,
volunteers:
@volunteers
=
render
'modal_truncate'
app/views/volunteers/show.html.slim
View file @
c7797c2f
...
...
@@ -112,12 +112,6 @@ h2.small Persönlicher Hintergrund
tr
td
=
t_attr
(
:interests
)
td
=
@volunteer
.
interests
tr
td
=
t_attr
(
:comments
)
td
=
@volunteer
.
comments
tr
td
=
t_attr
(
:additional_comments
)
td
=
@volunteer
.
additional_comments
-
if
@volunteer
.
internal?
tr
td
=
t_attr
(
:bank_details
)
...
...
@@ -136,6 +130,12 @@ h2.small Persönlicher Hintergrund
=
t
(
'volunteer_self_applicant'
)
-
else
=
link_to
@volunteer
.
registrar
.
full_name
,
profile_link
(
@volunteer
.
registrar
)
tr
td
=
t_attr
(
:comments
)
td
=
@volunteer
.
comments
tr
td
=
t_attr
(
:additional_comments
)
td
=
@volunteer
.
additional_comments
h2
.small
=
t_attr
(
:single_accompaniment
)
.table-responsive
...
...
Write
Preview
Supports
Markdown
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