kallithea Changeset - 5fe9bb7acee6

Changeset - 5fe9bb7acee6

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 10 years ago 2016-02-01 21:23:07
madski@unity3d.com

pullrequests: show tags in lists of included and available changesets

Further improvement: Also show bookmarks and other names (preferably by using
some helper function/template instead of duplicating code). It would perhaps
also be better to avoid using floating.

3 files changed with 21 insertions and 3 deletions:

kallithea/public/css/style.css

kallithea/templates/compare/compare_cs.html

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -947,13 +947,13 @@ tbody .yui-dt-editable { cursor: pointer @@
     overflow: hidden;
     margin: 0 20px;
     padding: 0;
+}
 #content div.box div.message {
-    clear: both;
+    float: left;
     overflow: hidden;
     margin: 0;
     padding: 5px 0;
     white-space: pre-wrap;
+}
 #content div.box div.expand {

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -60,13 +60,22 @@ @@
         <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" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
             <i class="icon-align-left" style="color:#999"></i>
         </td>
         <td><div id="C-${cs.raw_id}" class="message">${h.urlify_commit(cs.message, c.repo_name)}</div></td>
         <td>
             <div style="float: right; margin-top: -4px;">
                 %for tag in cs.tags:
                     <div class="tagtag" title="${_('Tag %s') % tag}">
                         ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                     </div>
                 %endfor
             </div>
             <div id="C-${cs.raw_id}" class="message">${h.urlify_commit(cs.message, c.repo_name)}</div>
         </td>
         </tr>
     %endfor
     </table>
     </div>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -194,13 +194,22 @@ ${self.repo_context_bar('showpullrequest @@
                           %if editable and cs.revision in c.avail_revs:
                             ${h.radio(name='updaterev', value=cs.raw_id)}
                           %endif
                         </td>
                         <td style="width: 120px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
                         <td><div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div></td>
                         <td>
                           <div style="float: right; margin-top: -4px;">
                             %for tag in cs.tags:
                               <div class="tagtag" title="${_('Tag %s') % tag}">
                                 ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                               </div>
                             %endfor
                           </div>
                           <div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div>
                         </td>
                       %endif
                     </tr>
                   %endfor
                 </table>
               </div>
               <div class="msg-div">${_("Pull requests do not change once created. Select a revision and save to replace this pull request with a new one.")}</div>

0 comments (0 inline, 0 general)