kallithea Changeset - ffb70a338ce1

Changeset - ffb70a338ce1

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich (mads) - 9 years ago 2017-07-05 01:57:32
mads@kiilerich.com

style: fix display of the PR graph of changesets available for update

88ce09daea37 dropped explicit html styling - fix it by adding css styling.

2 files changed with 10 insertions and 1 deletions:

kallithea/public/css/style.css

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1561,96 +1561,105 @@ tr.out-of-range > td.mid .message > a { @@
     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;
     height: 1.1em;
     position: absolute;
     left: 0px;
     width: auto;
     top: 0px;
+}
 #graph_content .logtags.tags {
     top: 14px;
+}
 #graph_content .logtags:hover {
     overflow: visible;
     position: absolute;
     width: auto;
     right: 0;
     left: initial;
+}
 #graph_content .logtags .booktag,
 #graph_content .logtags .tagtag {
     float: left;
     line-height: 1em;
     margin-bottom: 1px;
     margin-right: 1px;
     padding: 1px 3px;
     font-size: 10px;
+}
 #graph_content tr .mid .message a:hover {
     text-decoration: none;
+}
 #updaterevs-graph {
     position: absolute;
     width: 40px;
+}
 #updaterevs-table {
     margin-left: 40px !important;
+}
 #compare_branches + div.panel-body .revision-link,
 #compare_tags + div.panel-body .revision-link,
 #compare_bookmarks + div.panel-body .revision-link,
 div.panel-body #files_data .revision-link,
 #repos_list_wrap .revision-link,
 #shortlog_data .revision-link {
     font-weight: normal !important;
     font-family: monospace;
     font-size: 12px;
     color: #577632;
+}
 .revision-link {
     color: #3F6F9F;
     font-weight: bold !important;
+}
 .issue-tracker-link {
     color: #3F6F9F;
     font-weight: bold !important;
+}
 /* changeset statuses (must be the same name as the status) */
 .changeset-status-not_reviewed {
     color: #bababa;
+}
 .changeset-status-approved {
     color: #81ba51;
+}
 .changeset-status-rejected {
     color: #d06060;
+}
 .changeset-status-under_review {
     color: #ffc71e;
+}
 #graph_content .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 5px 0;
+}
 #shortlog_data .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 3px 0;
+}
 .right .changes {
     clear: both;

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -105,97 +105,97 @@ ${self.repo_context_bar('showpullrequest @@
             %if c.is_range:
               ${_("This is just a range of changesets and doesn't have a target or a real merge ancestor.")}
             %else:
               ${h.link_to_ref(c.pull_request.other_repo.repo_name, c.a_ref_type, c.a_ref_name)}
               ## we don't know other rev - c.a_rev is ancestor and not necessarily on other_name_branch branch
             %endif
           </div>
         </div>
         <div class="form-group">
           <label>${_('Pull changes')}:</label>
           <div>
             %if c.cs_ranges:
               <div>
                ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases?
                %if h.is_hg(c.pull_request.org_repo):
                  <span>hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>
                %elif h.is_git(c.pull_request.org_repo):
                  <span>git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>
                %endif
               </div>
             %endif
           </div>
         </div>
         <div class="form-group">
           <label>${_('Created on')}:</label>
           <div>
               <div>${h.fmt_date(c.pull_request.created_on)}</div>
           </div>
         </div>
         <div class="form-group">
           <label>${_('Owner')}:</label>
           <div class="pr-not-edit">
                   ${h.gravatar_div(c.pull_request.owner.email, size=20)}
                   <span>${c.pull_request.owner.full_name_and_username}</span><br/>
                   <span><a href="mailto:${c.pull_request.owner.email}">${c.pull_request.owner.email}</a></span><br/>
           </div>
           <div class="pr-do-edit ac" style="display:none">
                ${h.text('owner', class_='form-control', value=c.pull_request.owner.username, placeholder=_('Username'))}
                <div id="owner_completion_container"></div>
           </div>
         </div>
         <div class="form-group">
           <label>${_('Next iteration')}:</label>
             <div>
               <div class="msg-div">${c.update_msg}</div>
               %if c.avail_revs:
               <div id="updaterevs" class="clearfix">
                 <div>
+                <div id="updaterevs-graph">
                   <canvas id="avail_graph_canvas"></canvas>
                 </div>
                 <table class="table" id="updaterevs-table">
                   %for cnt, cs in enumerate(c.avail_cs):
                     <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:
                         %if editable:
                         <td>
                             ${h.radio(name='updaterev', value='', checked=True)}
                         </td>
                         %endif
                         <td colspan="4"><span>${_("Current revision - no change")}</span></td>
                       %else:
                         %if editable:
                         <td>
                           ${h.radio(name='updaterev', value=cs.raw_id, style=None if cs.revision in c.avail_revs else 'visibility: hidden')}
                         </td>
                         %endif
                         <td><span data-toggle="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), class_='changeset_hash')}</td>
                         <td>
                           <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 class="message">${h.urlify_text(cs.message, c.repo_name)}</div>
                         </td>
                       %endif
                     </tr>
                   %endfor
                 </table>
               </div>
               <div class="msg-div">(${_("Pull request iterations do not change content once created. Select a revision and save to make a new iteration.")})</div>
               %endif
               <div class="msg-div">${c.update_msg_other}</div>
             </div>
         </div>
         %if editable:
         <div class="form-group">
           <div class="buttons">
             ${h.submit('pr-form-save',_('Save Changes'),class_="btn btn-default btn-sm")}
             ${h.submit('pr-form-clone',_('Create New Iteration with Changes'),class_="btn btn-default btn-sm",disabled='disabled')}
             ${h.reset('pr-form-reset',_('Cancel Changes'),class_="btn btn-default btn-sm")}
           </div>
         </div>

0 comments (0 inline, 0 general)