Changeset - 40f65bfc04d0
Parent rev.
Child rev.
[Not reviewed]
default
4 10 0
Sean Farley - 11 years ago 2014-10-29 23:23:16
sean.michael.farley@gmail.com
flag_status: replace with icon-circle
14 files changed with 18 insertions and 18 deletions:
kallithea/public/images/icons/flag_status_approved.png
bin+del
kallithea/public/images/icons/flag_status_not_reviewed.png
bin+del
kallithea/public/images/icons/flag_status_rejected.png
bin+del
kallithea/public/images/icons/flag_status_under_review.png
bin+del
kallithea/public/js/base.js
1
1
kallithea/templates/changelog/changelog.html
2
2
kallithea/templates/changelog/changelog_summary_data.html
2
2
kallithea/templates/changeset/changeset.html
1
1
kallithea/templates/changeset/changeset_file_comment.html
2
2
kallithea/templates/changeset/changeset_range.html
1
1
kallithea/templates/compare/compare_cs.html
1
1
kallithea/templates/pullrequests/pullrequest_data.html
2
2
kallithea/templates/pullrequests/pullrequest_show.html
2
2
kallithea/templates/pullrequests/pullrequest_show_my_data.html
4
4
0 comments (0 inline, 0 general)
kallithea/public/images/icons/flag_status_approved.png
➞
Show inline comments
 
deleted file
 
binary diff not shown
Show images
kallithea/public/images/icons/flag_status_not_reviewed.png
➞
Show inline comments
 
deleted file
 
binary diff not shown
Show images
kallithea/public/images/icons/flag_status_rejected.png
➞
Show inline comments
 
deleted file
 
binary diff not shown
Show images
kallithea/public/images/icons/flag_status_under_review.png
➞
Show inline comments
 
deleted file
 
binary diff not shown
Show images
kallithea/public/js/base.js
➞
Show inline comments
 
@@ -1470,13 +1470,13 @@ var MentionsAutoComplete = function (div
 
var addReviewMember = function(id,fname,lname,nname,gravatar_link){
 
    var displayname = "{0} {1} ({2})".format(fname, lname, nname);
 
    var element = (
 
        '     <li id="reviewer_{2}">\n'+
 
        '       <div class="reviewers_member">\n'+
 
        '           <div class="reviewer_status tooltip" title="not_reviewed">\n'+
 
        '             <img src="/images/icons/flag_status_not_reviewed.png"/>\n'+
 
        '             <i class="icon-circle changeset-status-not_reviewed"></i>\n'+
 
        '           </div>\n'+
 
        '         <div class="reviewer_gravatar gravatar"><img alt="gravatar" src="{0}"/> </div>\n'+
 
        '         <div style="float:left;">{1}</div>\n'+
 
        '         <input type="hidden" value="{2}" name="review_members" />\n'+
 
        '         <div class="reviewer_member_remove action_button" onclick="removeReviewMember({2})">\n'+
 
        '             <i class="icon-minus-circled" style="color: #FF4444;"></i>\n'+
kallithea/templates/changelog/changelog.html
➞
Show inline comments
 
@@ -90,17 +90,17 @@ ${self.repo_context_bar('changelog', c.f
 
                            %endif
 
                        <td class="status">
 
                          %if c.statuses.get(cs.raw_id):
 
                            <div class="changeset-status-ico">
 
                            %if c.statuses.get(cs.raw_id)[2]:
 
                              <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request #%s') % (h.changeset_status_lbl(c.statuses.get(cs.raw_id)[0]), c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
 
                                <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
 
                                <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
 
                              </a>
 
                            %else:
 
                              <a class="tooltip" title="${_('Changeset status: %s') % h.changeset_status_lbl(c.statuses.get(cs.raw_id)[0])}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
 
                                  <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
 
                                  <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
 
                              </a>
 
                            %endif
 
                            </div>
 
                          %endif
 
                        </td>
 
                        <td class="author">
kallithea/templates/changelog/changelog_summary_data.html
➞
Show inline comments
 
@@ -14,16 +14,16 @@
 
          <div>
 
            <div class="changeset-status-container">
 
              %if c.statuses.get(cs.raw_id):
 
                <div class="changeset-status-ico shortlog">
 
                %if c.statuses.get(cs.raw_id)[2]:
 
                  <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
 
                    <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
 
                    <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
 
                  </a>
 
                %else:
 
                  <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
 
                  <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
 
                %endif
 
                </div>
 
              %endif
 
              %if c.comments.get(cs.raw_id,[]):
 
               <div class="comments-container">
 
                   <div title="${('comments')}">
kallithea/templates/changeset/changeset.html
➞
Show inline comments
 
@@ -44,13 +44,13 @@ ${self.repo_context_bar('changelog', c.c
 
                </div>
 
            </div>
 

			




	
	
	
		
 
            <div class="code-header banner">

			




	
	
	
		
 
                <div class="changeset-status-container">

			




	
	
	
		
 
                    %if c.statuses:

			




	
	
	
		
 
                        <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[0])}" /></div>

			




	
	
	
		
 
                        <div class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[0]}"></i></div>

			




	
	
	
		
 
                        <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</div>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Raw diff'))}">

			




	
	
	
		
 
                      <img class="icon" src="${h.url('/images/icons/page_white.png')}"/>

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_file_comment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -36,13 +36,13 @@

			




	
	
	
		
 
       </div>

			




	
	
	
		
 

			




	
	
	
		
 
        %if co.status_change:

			




	
	
	
		
 
           <div  style="float:left" class="changeset-status-container">

			




	
	
	
		
 
             <div style="float:left;padding:10px 2px 0px 2px"></div>

			




	
	
	
		
 
             <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change[0].status_lbl}</div>

			




	
	
	
		
 
             <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change[0].status))}" /></div>

			




	
	
	
		
 
             <div class="changeset-status-ico"><i class="icon-circle changeset-status-${co.status_change[0].status}"></i></div>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 

			




	
	
	
		
 
      <a class="permalink" href="#comment-${co.comment_id}">&para;</a>

			




	
	
	
		
 
      %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or co.author.user_id == c.authuser.user_id:

			




	
	
	
		
 
          <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-mini">${_('Delete')}</div>

			




	
	
		
 
@@ -163,13 +163,13 @@

			




	
	
	
		
 
                <label for="changeset_status_unchanged">

			




	
	
	
		
 
                  ${_('No change')}

			




	
	
	
		
 
                </label>

			




	
	
	
		
 
                %for status,lbl in c.changeset_statuses:

			




	
	
	
		
 
                    <span style="margin-left: 15px;">

			




	
	
	
		
 
                        <input type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">

			




	
	
	
		
 
                        <label for="${status}"><img src="${h.url('/images/icons/flag_status_%s.png' % status)}" />${lbl}</label>

			




	
	
	
		
 
                        <label for="${status}"><i class="icon-circle changeset-status-${status}" /></i>${lbl}</label>

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if is_pr and change_status:

			




	
	
	
		
 
                <input id="save_close" type="checkbox" name="save_close">

			




	
	
	
		
 
                <label id="save_close_label" for="save_close">${_("Close")}</label>

			




	
	
	
		
 
                %endif

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -45,13 +45,13 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
                <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>

			




	
	
	
		
 
                <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>

			




	
	
	
		
 
                <td><div class="author">${h.person(cs.author)}</div></td>

			




	
	
	
		
 
                <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

			




	
	
	
		
 
                <td>

			




	
	
	
		
 
                  %if c.statuses:

			




	
	
	
		
 
                    <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cnt])}" /></div>

			




	
	
	
		
 
                    <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[cnt]}"></i></div>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </td>

			




	
	
	
		
 
                <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </table>

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,13 +19,13 @@

			




	
	
	
		
 
    <table class="compare_view_commits noborder">

			




	
	
	
		
 
    %for cnt, cs in enumerate(reversed(c.cs_ranges)):

			




	
	
	
		
 
        <tr id="chg_${cnt+1}">

			




	
	
	
		
 
        <td style="width:50px">

			




	
	
	
		
 
          %if cs.raw_id in c.statuses:

			




	
	
	
		
 
            <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">

			




	
	
	
		
 
                <img height="16" width="16" src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" />

			




	
	
	
		
 
                <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}"></i>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
          %if c.cs_comments.get(cs.raw_id):

			




	
	
	
		
 
              <div class="comments-container">

			




	
	
	
		
 
                  <div class="comments-cnt" title="${_('Changeset has comments')}">

			




	
	
	
		
 
                      <a href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.cs_comments[cs.raw_id][0].comment_id)}">

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 

			




	
	
	
		
 
% for pr in c.pullrequests_pager:

			




	
	
	
		
 
  <div class="pr ${'pr-closed' if pr.is_closed() else ''}">

			




	
	
	
		
 
    <div class="pr-title">

			




	
	
	
		
 
    %if pr.last_review_status:

			




	
	
	
		
 
      <img src="${h.url('/images/icons/flag_status_%s.png' % pr.last_review_status)}" title="${_("Someone voted: %s") % pr.last_review_status}"/>

			




	
	
	
		
 
      <i class="icon-circle changeset-status-${pr.last_review_status}" title="${_("Someone voted: %s") % pr.last_review_status}"></i>

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
      <img src="${h.url('/images/icons/flag_status_not_reviewed.png')}" title="${_("Nobody voted")}"/>

			




	
	
	
		
 
      <i class="icon-circle changeset-status-not_reviewed" title="${_("Nobody voted")}"></i>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
      <a href="${pr.url()}">

			




	
	
	
		
 
      ${pr.title or _("(no title)")}

			




	
	
	
		
 
       %if pr.is_closed():

			




	
	
	
		
 
         <span class="pr-closed-tag">${_('Closed')}</span>

			




	
	
	
		
 
       %endif

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -81,13 +81,13 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
              <label>${_('Reviewer voting result')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            <div class="changeset-status-container" style="float:none;clear:both">

			




	
	
	
		
 
            %if c.current_voting_result:

			




	
	
	
		
 
              <div class="changeset-status-ico" style="padding:0px 4px 0px 0px">

			




	
	
	
		
 
                  <img src="${h.url('/images/icons/flag_status_%s.png' % c.current_voting_result)}" title="${_('Pull request status calculated from votes')}"/></div>

			




	
	
	
		
 
                  <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></div>

			




	
	
	
		
 
              <div class="changeset-status-lbl tooltip" title="${_('Pull request status calculated from votes')}">

			




	
	
	
		
 
                %if c.pull_request.is_closed():

			




	
	
	
		
 
                    ${_('Closed')},

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                ${h.changeset_status_lbl(c.current_voting_result)}

			




	
	
	
		
 
              </div>

			




	
	
		
 
@@ -212,13 +212,13 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            <ul id="review_members" class="group_members">

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




	
	
	
		
 
              <li id="reviewer_${member.user_id}">

			




	
	
	
		
 
                <div class="reviewers_member">

			




	
	
	
		
 
                    <div class="reviewer_status tooltip" title="${h.tooltip(h.changeset_status_lbl(status.status if status else 'not_reviewed'))}">

			




	
	
	
		
 
                      <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status.status if status else 'not_reviewed')))}"/>

			




	
	
	
		
 
                      <i class="icon-circle changeset-status-${status.status if status else 'not_reviewed'}"></i>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                  <div class="reviewer_gravatar gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>

			




	
	
	
		
 
                  <div style="float:left;">${member.full_name} (${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})</div>

			




	
	
	
		
 
                  <input type="hidden" value="${member.user_id}" name="review_members" />

			




	
	
	
		
 
                  %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.user_id == c.authuser.user_id):

			




	
	
	
		
 
                  <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show_my_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3,15 +3,15 @@ ${h.checkbox('show_closed',checked="chec

			




	
	
	
		
 
<ul>

			




	
	
	
		
 
  %if c.my_pull_requests:

			




	
	
	
		
 
    %for pull_request in c.my_pull_requests:

			




	
	
	
		
 
      <li class="${'closed' if pull_request.is_closed() else ''}">

			




	
	
	
		
 
        <div style="height: 12px">

			




	
	
	
		
 
            %if pull_request.last_review_status:

			




	
	
	
		
 
              <img src="${h.url('/images/icons/flag_status_%s.png' % pull_request.last_review_status)}" title="${_("Someone voted: %s") % pull_request.last_review_status}"/>

			




	
	
	
		
 
              <i class="icon-circle changeset-status-${pull_request.last_review_status}" title="${_("Someone voted: %s") % pull_request.last_review_status}"></i>

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
              <img src="${h.url('/images/icons/flag_status_not_reviewed.png')}" title="${_("Nobody voted")}"/>

			




	
	
	
		
 
              <i class="icon-circle changeset-status-not_reviewed" title="${_("Nobody voted")}"></i>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            <a href="${pull_request.url()}">

			




	
	
	
		
 
              ${pull_request.title or _("(no title)")}

			




	
	
	
		
 
            </a>

			




	
	
	
		
 
            ${_('created on %s from') % (h.fmt_date(pull_request.created_on))}

			




	
	
	
		
 
            <% org_ref_name=pull_request.org_ref.rsplit(':', 2)[-2] %>

			




	
	
		
 
@@ -42,15 +42,15 @@ ${h.checkbox('show_closed',checked="chec

			




	
	
	
		
 
<ul>

			




	
	
	
		
 
  %if c.participate_in_pull_requests:

			




	
	
	
		
 
    %for pull_request in c.participate_in_pull_requests:

			




	
	
	
		
 
      <li class="${'closed' if pull_request.is_closed() else ''}">

			




	
	
	
		
 
        <div style="height: 12px">

			




	
	
	
		
 
            %if pull_request.last_review_status:

			




	
	
	
		
 
              <img src="${h.url('/images/icons/flag_status_%s.png' % pull_request.last_review_status)}" title="${_("Someone voted: %s") % pull_request.last_review_status}"/>

			




	
	
	
		
 
              <i class="icon-circle changeset-status-${pull_request.last_review_status}" title="${_("Someone voted: %s") % pull_request.last_review_status}"></i>

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
              <img src="${h.url('/images/icons/flag_status_not_reviewed.png')}" title="${_("Nobody voted")}"/>

			




	
	
	
		
 
              <i class="icon-circle changeset-status-not_reviewed" title="${_("Nobody voted")}"></i>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            <a href="${pull_request.url()}">

			




	
	
	
		
 
              ${pull_request.title or _("(no title)")}

			




	
	
	
		
 
            </a>

			




	
	
	
		
 
            ${_('from')}

			




	
	
	
		
 
            <% org_ref_name=pull_request.org_ref.rsplit(':', 2)[-2] %>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.