diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 22:05:44 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 22:05:44 +0200 |
commit | 88b8b15dbdc1247b349c9fc6f8d71377322890b9 (patch) | |
tree | e40be6c4ac79d401973a2cc995205a58b0a51f7f /app/helpers | |
parent | 7e42084fb800546070d3c5d0d704320d1785fdda (diff) | |
download | gitlab-ce-88b8b15dbdc1247b349c9fc6f8d71377322890b9.tar.gz |
Improve UI for Issue/MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/issues_helper.rb | 8 | ||||
-rw-r--r-- | app/helpers/merge_requests_helper.rb | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 16981edd980..0374992ebfc 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -84,4 +84,12 @@ module IssuesHelper def milestone_options object options_from_collection_for_select(@project.milestones.active, 'id', 'title', object.milestone_id) end + + def issue_alert_class(issue) + if issue.closed? + 'alert-danger' + else + 'alert-success' + end + end end diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 5e3f82fe9ce..62f061bb079 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -41,4 +41,14 @@ module MergeRequestsHelper "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}" end end + + def merge_request_alert_class(merge_request) + if merge_request.merged? + 'alert-info' + elsif merge_request.closed? + 'alert-danger' + else + 'alert-success' + end + end end |