diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-20 22:27:40 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-20 22:27:40 +0000 |
| commit | 1667d2134c7e115dc043a555112a33787bf76968 (patch) | |
| tree | bb2c5ca8a93796498e36e78f4c3d57b7a6653c9a /app | |
| parent | fa9d306b01c16d48ca3e828aa0aed1da5c7c4079 (diff) | |
| parent | a7f2d75c5d27c0042ca79e8a71b204c2bb6f1375 (diff) | |
| download | gitlab-ce-1667d2134c7e115dc043a555112a33787bf76968.tar.gz | |
Merge branch 'show-message-to-signed-out-users-to-sign-in-if-they-want-to-comment' into 'master'
Adds disabled comment field and disabled avatar.
Fixes #3540
See merge request !2508
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 36 | ||||
| -rw-r--r-- | app/views/projects/notes/_notes_with_form.html.haml | 10 |
2 files changed, 46 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 75f2ae80a92..f033ff15f88 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -201,3 +201,39 @@ .mr-source-target { line-height: 31px; } + +.disabled-comment-area { + padding: 16px 0; + + .disabled-profile { + width: 40px; + height: 40px; + background: $border-gray-dark; + border-radius: 20px; + display: inline-block; + margin-right: 10px; + } + + .disabled-comment { + background: $gray-light; + display: inline-block; + vertical-align: top; + height: 200px; + border-radius: 4px; + border: 1px solid $border-gray-normal; + padding-top: 90px; + text-align: center; + right: 20px; + position: absolute; + left: 70px; + margin-bottom: 20px; + + span { + color: #B2B2B2; + + a { + color: $md-link-color; + } + } + } +}
\ No newline at end of file diff --git a/app/views/projects/notes/_notes_with_form.html.haml b/app/views/projects/notes/_notes_with_form.html.haml index eb378b42603..910eb6cf66e 100644 --- a/app/views/projects/notes/_notes_with_form.html.haml +++ b/app/views/projects/notes/_notes_with_form.html.haml @@ -5,6 +5,16 @@ .js-main-target-form - if can? current_user, :create_note, @project = render "projects/notes/form", view: diff_view +- else + .disabled-comment-area + .disabled-profile + .disabled-comment + %span + Please + = link_to "register",new_user_session_path + or + = link_to "login",new_user_session_path + to post a comment :javascript var notes = new Notes("#{namespace_project_notes_path(namespace_id: @project.namespace, target_id: @noteable.id, target_type: @noteable.class.name.underscore)}", #{@notes.map(&:id).to_json}, #{Time.now.to_i}, "#{diff_view}") |