kallithea Changeset - 3c1cdd1c1736

Changeset - 3c1cdd1c1736

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 8 years ago 2017-08-24 02:50:04
mads@kiilerich.com

changelog: simplify message expansion toggling

Slightly simpler, slightly less html, slightly smaller DOM.

2 files changed with 6 insertions and 8 deletions:

kallithea/templates/changelog/changelog.html

kallithea/templates/compare/compare_cs.html

0 comments (0 inline, 0 general)

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -101,18 +101,18 @@ ${self.repo_context_bar('changelog', c.f @@
                         <td class="hash">
                             ${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), class_='changeset_hash')}
                         </td>
                         <td class="date">
                             <div class="date" data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div>
                         </td>
-                        <td class="expand_commit" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
                         <td class="expand_commit" title="${_('Expand commit message')}">
                             <i class="icon-align-left"></i>
                         </td>
                         <td class="mid">
                             <div class="log-container">
-                                <div class="message" id="C-${cs.raw_id}">${h.urlify_text(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
                                 <div class="message">${h.urlify_text(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
                                 <div class="extra-container">
                                     %if c.comments.get(cs.raw_id):
                                         <a class="comments-container comments-cnt" href="${c.comments[cs.raw_id][0].url()}" data-toggle="tooltip" title="${_('%s comments') % len(c.comments[cs.raw_id])}">
                                             ${len(c.comments[cs.raw_id])}
                                             <i class="icon-comment-discussion"></i>
                                         </a>
@@ @@ -283,14 +283,13 @@ ${self.repo_context_bar('changelog', c.f @@
                         $(m.nextElementSibling).css('display', 'block');
                         $(m.nextElementSibling).css('margin-top', offset+'px');
+                    }
                 });
                 $('.expand_commit').on('click',function(e){
                     var cid = $(this).data('commit_id');
                     $('#C-'+cid).toggleClass('expanded');
                     $(this).next('.mid').find('.message').toggleClass('expanded');
                     //redraw the graph, r and jsdata are bound outside function
                     graph.render(jsdata);
                 });
                 // change branch filter

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -70,24 +70,24 @@ @@
         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>
         <td>
         %if cs.branch:
         <span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span>
         %endif
         </td>
-        <td class="expand_commit" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
         <td class="expand_commit" title="${_('Expand commit message')}">
             <i class="icon-align-left"></i>
         </td>
         <td class="mid">
             <div class="pull-right">
                 %for tag in cs.tags:
                     <span class="tagtag" title="${_('Tag %s') % tag}">
                         ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                     </span>
                 %endfor
             </div>
-            <div id="C-${cs.raw_id}" class="message">${h.urlify_text(cs.message, c.repo_name)}</div>
             <div class="message">${h.urlify_text(cs.message, c.repo_name)}</div>
         </td>
       </tr>
     %endfor
     </table>
     </div>
@@ @@ -129,14 +129,13 @@ @@
     var graph = new BranchRenderer('graph_canvas', 'graph_content_pr', 'chg_');
     $(document).ready(function(){
         graph.render(jsdata);
         $('.expand_commit').click(function(e){
             var cid = $(this).data('commit_id');
             $('#C-'+cid).toggleClass('expanded');
             $(this).next('.mid').find('.message').toggleClass('expanded');
             graph.render(jsdata);
         });
     });
     $(window).resize(function(){
         graph.render(jsdata);
     });

0 comments (0 inline, 0 general)