htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix/highlight rfcs (#182)

Browse Source 
* Fix highlighting condition

* Use highlighting color that is easier on the eyes
This commit is contained in:
Maximilian Grundke
2018-06-25 12:01:31 +02:00
committed by Ann Katrin Kuessner
parent 9fbe7ec115
commit 0395d5b038
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/request-for-comments.css.scss
View File

@ -262,5 +262,5 @@ input#subscribe {
} }
.do-not-answer { .do-not-answer {
background-color: #990000; background-color: #ea2f1085;
} }

5
app/views/request_for_comments/index.html.slim
View File

@ -23,7 +23,8 @@ h1 = RequestForComment.model_name.human(count: 2)
th = t('activerecord.attributes.request_for_comments.last_update') th = t('activerecord.attributes.request_for_comments.last_update')
tbody tbody
- @request_for_comments.each do |request_for_comment| - @request_for_comments.each do |request_for_comment|
tr data-id=request_for_comment.id class=('do-not-answer' if ([:rfc_intervention_stale_rfc, :break_intervention_stale_rfc, :no_intervention_stale_rfc].include?(UserGroupSeparator.getInterventionGroup(current_user)) and current_user.internal_user?)) - do_not_answer = [:rfc_intervention_stale_rfc, :break_intervention_stale_rfc, :no_intervention_stale_rfc].include?(UserGroupSeparator.getInterventionGroup(request_for_comment.user)) and current_user.internal_user?
tr data-id=request_for_comment.id class=('do-not-answer' if do_not_answer)
- if request_for_comment.solved? - if request_for_comment.solved?
td td
span class="fa fa-check" aria-hidden="true" span class="fa fa-check" aria-hidden="true"
@ -42,4 +43,4 @@ h1 = RequestForComment.model_name.human(count: 2)
td = t('shared.time.before', time: distance_of_time_in_words_to_now(request_for_comment.created_at)) td = t('shared.time.before', time: distance_of_time_in_words_to_now(request_for_comment.created_at))
td = t('shared.time.before', time: distance_of_time_in_words_to_now(request_for_comment.last_comment.nil? ? request_for_comment.updated_at : request_for_comment.last_comment)) td = t('shared.time.before', time: distance_of_time_in_words_to_now(request_for_comment.last_comment.nil? ? request_for_comment.updated_at : request_for_comment.last_comment))
= render('shared/pagination', collection: @request_for_comments) = render('shared/pagination', collection: @request_for_comments)