Mercurial > kallithea
changeset 4048:1e7befa639cc
pull request comments: implement 'close' as a checkbox that always is visible but sometimes disabled
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 12 Jun 2013 02:13:05 +0200 |
parents | 3608f15f51ed |
children | 3b5f32aeed36 |
files | rhodecode/public/css/style.css rhodecode/templates/changeset/changeset_file_comment.html |
diffstat | 2 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Thu Jun 27 22:45:56 2013 +0200 +++ b/rhodecode/public/css/style.css Wed Jun 12 02:13:05 2013 +0200 @@ -3698,6 +3698,10 @@ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } +label.disabled { + color: #aaa; +} + .ui-btn.blue.hidden { display: none; }
--- a/rhodecode/templates/changeset/changeset_file_comment.html Thu Jun 27 22:45:56 2013 +0200 +++ b/rhodecode/templates/changeset/changeset_file_comment.html Wed Jun 12 02:13:05 2013 +0200 @@ -159,6 +159,10 @@ <label for="${status}">${lbl}</label> </div> %endfor + %if close_btn and change_status: + <input id="save_close" type="checkbox" name="save_close" disabled="${'1' if cur_status in ['not_reviewed','under_review'] else ''}"> + <label id="save_close_label" for="save_close" class="${'disabled' if cur_status in ['not_reviewed','under_review'] else ''}">${_("Close (when approved or rejected)")}</label> + %endif </div> %endif <div class="mentions-container" id="mentions_container"></div> @@ -175,9 +179,6 @@ <div class="comment-button"> ${h.submit('save', _('Comment'), class_="ui-btn large")} - %if close_btn and change_status: - ${h.submit('save_close', _('Comment and close'), class_='ui-btn blue large %s' % ('hidden' if cur_status in ['not_reviewed','under_review'] else ''))} - %endif </div> ${h.end_form()} </div> @@ -196,9 +197,11 @@ YUE.on(YUQ('.status_change_radio'), 'change',function(e){ var val = e.currentTarget.value; if (val == 'approved' || val == 'rejected') { - YUD.removeClass('save_close', 'hidden'); + YUD.removeClass('save_close_label', 'disabled'); + YUD.get('save_close').disabled = false; }else{ - YUD.addClass('save_close', 'hidden'); + YUD.addClass('save_close_label', 'disabled'); + YUD.get('save_close').disabled = true; } }) YUE.on('preview-btn', 'click', function(e){