kallithea Changeset - 5a8918aba869

Changeset - 5a8918aba869

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2013-04-16 00:59:14
marcin@python-works.com

show comments in summary changelog overview

3 files changed with 18 insertions and 2 deletions:

rhodecode/public/css/style.css

rhodecode/templates/changelog/changelog.html

rhodecode/templates/changelog/changelog_summary_data.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2569,48 +2569,49 @@ h3.files_location { @@
+}
 #graph_content .container .author .user {
     color: #444444;
+}
 #graph_content .container .mid .message {
     white-space: pre-wrap;
     padding: 0;
     overflow: hidden;
     height: 1.1em;
+}
 #graph_content .container .extra-container {
     display: block;
     position: absolute;
     top: -15px;
     right: 0;
     padding-left: 5px;
     background: #FFFFFF;
     height: 41px;
+}
 #graph_content .comments-container,
 #shortlog_data .comments-container,
 #graph_content .logtags {
     display: block;
     float: left;
     overflow: hidden;
     padding: 0;
     margin: 0;
+}
 #graph_content .comments-container {
     margin: 0.8em 0;
     margin-right: 0.5em;
+}
 #graph_content  .tagcontainer {
     width: 80px;
     position: relative;
     float: right;
     height: 100%;
     top: 7px;
     margin-left: 0.5em;
+}
 #graph_content .logtags {
     min-width: 80px;
@@ @@ -2667,49 +2668,55 @@ h3.files_location { @@
     float: left;
     padding: 2px 0px 0px 2px;
+}
 .changeset-status-container .changeset-status-lbl {
     color: rgb(136, 136, 136);
     float: left;
     padding: 3px 4px 0px 0px
+}
 .code-header .changeset-status-container .changeset-status-lbl {
     float: left;
     padding: 0px 4px 0px 0px;
+}
 .changeset-status-container .changeset-status-ico {
     float: left;
+}
 .code-header .changeset-status-container .changeset-status-ico, .container .changeset-status-ico {
     float: left;
+}
 #graph_content .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 5px 0;
+}
 #graph_content .comments-cnt a {
 #shortlog_data .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 3px 0;
+}
 #graph_content .comments-cnt a,
 #shortlog_data .comments-cnt a {
     background-image: url('../images/icons/comments.png');
     background-repeat: no-repeat;
     background-position: 100% 50%;
     padding: 5px 0;
     padding-right: 20px;
+}
 .right .changes {
     clear: both;
+}
 .right .changes .changed_total {
     display: block;
     float: right;
     text-align: center;
     min-width: 45px;
     cursor: pointer;
     color: #444444;
     background: #FEA;
     -webkit-border-radius: 0px 0px 0px 6px;
     border-radius: 0px 0px 0px 6px;
     padding: 1px;
+}

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -80,49 +80,49 @@ ${self.context_bar('changelog')} @@
                               </a>
                             %else:
                               <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
                             %endif
                             </div>
                           %endif
                         </td>
                         <td class="author">
                             <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>
                             <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
                         </td>
                         <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">
                             <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">
                                 <span class="changeset_hash">${h.show_id(cs)}</span>
                             </a>
                         </td>
                         <td class="date">
                             <div class="date">${h.age(cs.date,True)}</div>
                         </td>
                         <td class="mid">
                             <div class="log-container">
                                 <div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
                                 <div class="expand"><span class="expandtext">&darr; ${_('Show more')} &darr;</span></div>
                                 <div class="extra-container">
-                                    %if c.comments.get(cs.raw_id,[]):
                                     %if c.comments.get(cs.raw_id):
                                         <div class="comments-container">
                                             <div class="comments-cnt" title="${('comments')}">
                                                 <a 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)}">
                                                     ${len(c.comments[cs.raw_id])}
                                                 </a>
                                             </div>
                                         </div>
                                     %endif
                                     %if h.is_hg(c.rhodecode_repo):
                                         %for book in cs.bookmarks:
                                             <div class="booktag" title="${_('Bookmark %s') % book}">
                                                 ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                             </div>
                                         %endfor
                                     %endif
                                     %for tag in cs.tags:
                                         <div class="tagtag" title="${_('Tag %s') % tag}">
                                             ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                         </div>
                                     %endfor
                                     %if (not c.branch_name) and cs.branch:
                                         <div class="branchtag" title="${_('Branch %s' % cs.branch)}">
                                             ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
                                         </div>

rhodecode/templates/changelog/changelog_summary_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 %if c.repo_changesets:
 <table class="table_disp">
     <tr>
         <th class="left">${_('Revision')}</th>
         <th class="left">${_('Commit message')}</th>
         <th class="left">${_('Age')}</th>
         <th class="left">${_('Author')}</th>
         <th class="left">${_('Refs')}</th>
     </tr>
 %for cnt,cs in enumerate(c.repo_changesets):
     <tr class="parity${cnt%2}">
         <td>
           <div>
             <div class="changeset-status-container">
               %if c.comments.get(cs.raw_id,[]):
                <div class="comments-container">
                    <div class="comments-cnt" title="${('comments')}">
                        <a 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)}">
                            ${len(c.comments[cs.raw_id])}
                        </a>
                    </div>
                </div>
               %endif
               %if c.statuses.get(cs.raw_id):
                 <div class="changeset-status-ico">
                 %if c.statuses.get(cs.raw_id)[2]:
                   <a class="tooltip" title="${_('Click to open associated pull request #%s' % 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])}" />
                   </a>
                 %else:
                   <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
                 %endif
                 </div>
               %endif
             </div>
             <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a></pre>
          </div>
         </td>
         <td>
             ${h.urlify_commit(h.truncate(cs.message,50),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
         </td>
         <td><span class="tooltip" title="${h.tooltip(h.fmt_date(cs.date))}">
                       ${h.age(cs.date)}</span>
         </td>
         <td title="${cs.author}">${h.person(cs.author)}</td>
         <td>
             %if h.is_hg(c.rhodecode_repo):

0 comments (0 inline, 0 general)