kallithea Changeset - 9a523af15c9f

Changeset - 9a523af15c9f

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 9 years ago 2016-09-12 17:41:19
madski@unity3d.com

changelog: show merges as semi opaque in more places

Follow up to 8c5d1e94f9ee.

PRs available for updates (those that have a radio button) are not greyed out -
that would make it look too much like they were disabled.

These merges should perhaps be shown in a different way - perhaps not greying
the whole line. But for now, this makes it more consistent.

4 files changed with 7 insertions and 4 deletions:

kallithea/public/css/style.css

kallithea/templates/changelog/changelog_summary_data.html

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

@@ @@ -2117,15 +2117,18 @@ BIN_FILENODE = 6 @@
     border-collapse: collapse;
     border-left: none;
     border-right: none;
     border-color: #cdcdcd;
+}
 #updaterevs-table tr.mergerow,
 #graph_content_pr tr.mergerow,
 #shortlog_data tr.mergerow,
 #graph_content #changesets tr.out-of-range,
 #graph_content #changesets tr.mergerow {
-    opacity: 0.5;
+    opacity: 0.6;
+}
 #graph_content #changesets td {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
         <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}">
+    <tr class="parity${cnt%2} ${'mergerow' if len(cs.parents) > 1 else ''}">
         <td class="compact">
             <div class="changeset-status-container">
               %if c.statuses.get(cs.raw_id):
                 <span class="changeset-status-ico shortlog">
                 %if c.statuses.get(cs.raw_id)[2]:
                   <a class="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -15,13 +15,13 @@ @@
     </div>
     <div id="graph_content_pr" style="margin-left: 100px;">
     <table class="compare_view_commits noborder">
     %for cnt, cs in enumerate(reversed(c.cs_ranges)):
         <tr id="chg_${cnt+1}">
+        <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">
         <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">
                 <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}"></i>
             </div>
           %endif

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -178,13 +178,13 @@ ${self.repo_context_bar('showpullrequest @@
               <div id="updaterevs" style="max-height:200px; overflow-y:auto; overflow-x:hidden; margin-bottom: 10px; padding: 1px 0">
                 <div style="height:0">
                   <canvas id="avail_graph_canvas" style="width:0"></canvas>
                 </div>
                 <table id="updaterevs-table" class="noborder" style="padding-left:50px">
                   %for cnt, cs in enumerate(c.avail_cs):
                     <tr id="chg_available_${cnt+1}">
+                    <tr id="chg_available_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 and not (editable and cs.revision in c.avail_revs) else ''}">
                       %if c.cs_ranges and cs.revision == c.cs_ranges[-1].revision:
                         <td>
                           %if editable:
                             ${h.radio(name='updaterev', value='', checked=True)}
                           %endif
                         </td>

0 comments (0 inline, 0 general)