kallithea Changeset - 1e7befa639cc

Changeset - 1e7befa639cc

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 12 years ago 2013-06-12 02:13:05
madski@unity3d.com

Grafted from: def4a0a688b3

pull request comments: implement 'close' as a checkbox that always is visible but sometimes disabled

2 files changed with 12 insertions and 5 deletions:

rhodecode/public/css/style.css

rhodecode/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -3689,24 +3689,28 @@ div.gravatar img { @@
     background-image: -khtml-gradient(linear, left top, left bottom, from(#fbb450), to(#f89406));
     background-image: -moz-linear-gradient(top, #fbb450, #f89406);
     background-image: -ms-linear-gradient(top, #fbb450, #f89406);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fbb450), color-stop(100%, #f89406));
     background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
     background-image: -o-linear-gradient(top, #fbb450, #f89406);
     background-image: linear-gradient(to bottom, #fbb450, #f89406);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
     border-color: #f89406 #f89406 #ad6704;
     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;
+}
 .ui-btn.active {
     font-weight: bold;
+}
 ins, div.options a:hover {
     text-decoration: none;
+}

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -150,64 +150,67 @@ @@
                   <input id="show_changeset_status_box" type="checkbox" name="change_changeset_status" style="display: none;" />
               %endif
               <div id="preview-btn" class="preview-btn ui-btn small">${_('Preview')}</div>
             </div>
             %if change_status:
             <div id="status_block_container" class="status-block" style="display:none">
                 %for status,lbl in c.changeset_statuses:
                     <div class="">
                         <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">
                         <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>
              ${h.textarea('text', class_="comment-block-ta")}
         </div>
         <div id="preview-container" class="clearfix" style="display:none">
            <div class="comment-help">
                 ${_('Comment preview')}
               <div id="edit-btn" class="edit-btn ui-btn small">${_('Edit')}</div>
             </div>
             <div id="preview-box" class="preview-box"></div>
         </div>
         <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>
     %endif
 </div>
 <script>
 var change_status_show = function(){
     var show = ! YUD.get('show_changeset_status_box').checked;
     YUD.get('show_changeset_status_box').checked = show;
     YUD.setStyle('status_block_container', 'display', show?'':'none');
 };
 YUE.onDOMReady(function () {
    MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
    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){
        var _text = YUD.get('text').value;
        if(!_text){
            return
+       }
        var post_data = {'text': _text};
        YUD.addClass('preview-box', 'unloaded');
        YUD.get('preview-box').innerHTML = _TM['Loading ...'];
        YUD.setStyle('edit-container', 'display', 'none');
        YUD.setStyle('preview-container', 'display', '');

0 comments (0 inline, 0 general)