kallithea Changeset - 387b8d551003

Changeset - 387b8d551003

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

domruf - 8 years ago 2017-07-02 21:14:37
dominikruf@gmail.com

style: rely on css to truncate author name in tables instead of truncating to fixed length

Dynamic truncation allows us in the future to use different length on different
screen sizes.

4 files changed with 10 insertions and 10 deletions:

kallithea/public/css/style.css

kallithea/templates/changelog/changelog.html

kallithea/templates/changeset/changeset_range.html

kallithea/templates/compare/compare_cs.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -901,948 +901,948 @@ a.metatag[data-tag="license"]:hover { @@
 #summary .repo_name {
     font-size: 1.6em;
     font-weight: bold;
     vertical-align: baseline;
     clear: right
+}
 #footer {
     padding: 10px 15px;
     background-color: #577632;
     background-repeat: repeat-x;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #footer > span {
     color: #FFF;
     font-weight: 700;
+}
 #footer .navbar-link {
     color: #FFF;
+}
 #footer.navbar {
     min-height: inherit;
     padding-bottom: 8px;
+}
 #login .panel-body .icon-lock {
     font-size: 100px;
     color: #DDD;
     position: absolute;
     margin-left: -15px;
     z-index: 1;
+}
 .user-menu {
     padding: 0 !important;
+}
 .user-menu .gravatar {
     margin: 0px 0px 0px 0px;
     cursor: pointer;
+}
 .user-menu .gravatar.enabled {
     background-color: #FDF784 !important;
+}
 .user-menu .gravatar:hover {
     background-color: #FDF784 !important;
+}
 #quick_login {
     width: 330px;
     min-height: 110px;
     padding: 0;
     position: absolute;
     right: 0;
     color: #fff;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
     z-index: 999;
     border-radius: 0px 0px 4px 4px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     overflow: hidden;
+}
 #quick_login .form {
     margin: 15px;
+}
 #quick_login h4 {
     color: #fff;
     margin-bottom: 10px;
+}
 #quick_login input#username,
 #quick_login input#password {
     display: block;
     margin: 5px 0 10px;
+}
 #quick_login .password_forgotten a,
 #quick_login .register a {
     padding: 0 !important;
     line-height: 25px !important;
     float: left;
     clear: both;
+}
 #quick_login .submit {
     float: right;
+}
 #quick_login .submit input#sign_in {
     margin-top: 5px;
+}
 #quick_login > .pull-left {
     width: 170px;
+}
 #quick_login > .pull-right {
     width: 140px;
+}
 #quick_login .full_name {
     color: #FFFFFF;
     font-weight: bold;
     padding: 3px 3px 3px 15px;
+}
 #quick_login .big_gravatar {
     padding: 15px 0px 0px 15px;
+}
 #quick_login .notifications {
     padding: 2px 0px 0px 15px;
     color: #FFFFFF;
     font-weight: bold;
     line-height: 10px !important;
+}
 #quick_login .notifications a,
 #quick_login .unread a {
     color: #FFFFFF;
     display: block;
     padding: 0px !important;
+}
 #quick_login .notifications a:hover,
 #quick_login .unread a:hover {
     background-color: inherit !important;
+}
 #quick_login .email,
 #quick_login .unread {
     color: #FFFFFF;
     padding: 3px 3px 3px 15px;
+}
 #quick_login .links .logout {
+}
 #quick_login div.form div.form-group {
     padding: 5px;
+}
 #quick_login div.form div.form-group > label {
     color: #fff;
     padding-bottom: 3px;
+}
 #quick_login div.form div.form-group > div input {
     width: 236px;
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 11px;
     margin: 0;
     padding: 5px 7px 4px;
+}
 #quick_login div.form div.buttons {
     clear: both;
     overflow: hidden;
     text-align: right;
     margin: 0;
     padding: 5px 14px 0px 5px;
+}
 #quick_login div.form div.links {
     clear: both;
     overflow: hidden;
     margin: 10px 0 0;
     padding: 0 0 2px;
+}
 #quick_login ol.links {
     display: block;
     font-weight: bold;
     list-style: none outside none;
     text-align: right;
+}
 #quick_login ol.links li {
     line-height: 27px;
     margin: 0;
     padding: 0;
     color: #fff;
     display: block;
     float: none !important;
+}
 #quick_login ol.links li a {
     color: #fff;
     display: block;
     padding: 2px;
+}
 #quick_login ol.links li a:HOVER {
     background-color: inherit !important;
+}
 #register div.form div.form-group > label {
     width: 135px;
     float: left;
     text-align: right;
     margin: 2px 10px 0 0;
     padding: 5px 0 0 5px;
+}
 #register div.form div.form-group > div input {
     width: 300px;
+}
 #register div.form div.buttons {
     border-top: 1px solid #DDD;
     margin: 0;
     padding: 10px 0 0 145px;
+}
 #journal .journal_day {
     font-size: 15px;
     padding: 10px 0px;
     border-bottom: 2px solid #DDD;
     margin-left: 10px;
     margin-right: 10px;
+}
 #journal .journal_user {
     color: #747474;
     font-size: 14px;
     font-weight: bold;
     height: 30px;
+}
 #journal .journal_user.deleted {
     color: #747474;
     font-size: 14px;
     font-weight: normal;
     height: 30px;
     font-style: italic;
+}
 #journal .journal_icon {
     clear: both;
     float: left;
     padding-right: 4px;
     padding-top: 3px;
+}
 #journal .journal_action {
     padding-top: 4px;
     min-height: 2px;
     float: left
+}
 #journal .journal_action_params {
     clear: left;
     padding-left: 22px;
+}
 #journal .date {
     clear: both;
     color: #777777;
     font-size: 11px;
     padding-left: 22px;
+}
 #journal .journal_repo_name {
     font-weight: bold;
     font-size: 1.1em;
+}
 #journal .compare_view {
     padding: 5px 0px 5px 0px;
     width: 95px;
+}
 .trending_language_tbl, .trending_language_tbl td {
     border: 0 !important;
     margin: 0 !important;
     padding: 0 !important;
+}
 .trending_language_tbl, .trending_language_tbl tr {
     border-spacing: 1px;
+}
 #lang_stats .progress-bar {
     background-color: #577632;
     min-width: 15px;
     text-decoration: none;
     border-top-right-radius: 8px;
     border-bottom-right-radius: 8px;
+}
 #lang_stats table td {
     border-bottom: none !important;
     padding: 1px 0 !important;
+}
 h3.files_location {
     font-size: 1.8em;
     font-weight: 700;
     border-bottom: none !important;
     margin: 10px 0 !important;
+}
 #files_data dl dt {
     float: left;
     width: 60px;
     margin: 0 !important;
     padding: 5px;
+}
 #files_data dl dd {
     margin: 0 !important;
     padding: 5px !important;
+}
 #files_data .codeblock #editor_container .error-message {
     color: red;
     padding: 10px 10px 10px 26px
+}
 .file_history {
     padding-top: 10px;
     font-size: 16px;
+}
 .file_author {
     float: left;
+}
 .file_author .item {
     float: left;
     padding: 5px;
     color: #888;
+}
 .changeset_id {
     color: #666666;
     margin-right: -3px;
+}
 .changeset-logical-index {
     color: #666666;
     font-style: italic;
     font-size: 85%;
     padding-right: 0.5em;
     text-align: right;
+}
 #changeset_content {
     border-left: 1px solid #CCC;
     border-right: 1px solid #CCC;
     border-bottom: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_content .changeset_content_header {
     font-size: 1.2em;
     overflow: hidden;
+}
 #changeset_compare_view_content .compare_view_commits {
     width: auto !important;
+}
 #changeset_compare_view_content .compare_view_commits td {
     padding: 0px 0px 0px 12px !important;
+}
 #changeset_content .changeset_content_header .right {
     float: right;
     width: 20%;
     text-align: right;
+}
 #changeset_content .changeset_content_header .message {
     white-space: pre-wrap;
+}
 #changeset_content .changeset_content_header .message a:hover {
     text-decoration: none;
+}
 td.author {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     max-width: 210px;
+}
 .cs_files .progress {
     margin-bottom: 0;
+}
 .cs_files .cur_cs {
     margin: 10px 2px;
     font-weight: bold;
+}
 .cs_files .node {
     float: left;
+}
 .cs_files .changes {
     float: right;
     color: #577632;
+}
 .cs_files .changes .added {
     color: inherit;
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .deleted {
     background-color: #FF8888;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 /*new binary
 NEW_FILENODE = 1
 DEL_FILENODE = 2
 MOD_FILENODE = 3
 RENAMED_FILENODE = 4
 CHMOD_FILENODE = 5
 BIN_FILENODE = 6
 */
 .cs_files .changes .bin {
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .bin.bin1 {
     background-color: #BBFFBB;
+}
 /*deleted binary*/
 .cs_files .changes .bin.bin2 {
     background-color: #FF8888;
+}
 /*mod binary*/
 .cs_files .changes .bin.bin3 {
     background-color: #DDDDDD;
+}
 /*rename file*/
 .cs_files .changes .bin.bin4 {
     background-color: #6D99FF;
+}
 /*rename file*/
 .cs_files .changes .bin.bin4 {
     background-color: #6D99FF;
+}
 /*chmod file*/
 .cs_files .changes .bin.bin5 {
     background-color: #6D99FF;
+}
 .cs_files .cs_added,
 .cs_files .cs_A {
     height: 16px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_changed,
 .cs_files .cs_M {
     height: 16px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_removed,
 .cs_files .cs_D {
     height: 16px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_renamed,
 .cs_files .cs_R {
     height: 16px;
     margin-top: 7px;
     text-align: left;
+}
 #graph {
     position: relative;
     overflow: hidden;
+}
 #graph_nodes {
     position: absolute;
     width: 100px;
+}
 #graph_content,
 #graph_content_pr,
 #graph .info_box,
 #graph .container_header {
     margin-left: 100px;
+}
 #graph_content {
     position: relative;
+}
 #graph .container_header {
     padding: 10px;
     height: 25px;
+}
 #graph_content #rev_range_container {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #rev_range_clear {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #changesets {
     border-collapse: collapse;
     border: none;
     border-color: #cdcdcd;
+}
 tr.mergerow > td.author .user,
 tr.mergerow > td.mid .message,
 tr.mergerow > td.mid .message > a,
 tr.out-of-range > td.author .user,
 tr.out-of-range > td.mid .message,
 tr.out-of-range > td.mid .message > a {
     color: #aaa !important;
+}
 #graph_content #changesets td {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     height: 31px;
     border-color: #cdcdcd;
     text-align: left;
+}
 #graph_content tr .checkbox-column {
     width: 14px;
     font-size: 0.85em;
+}
 #graph_content tr .status {
     width: 14px;
     font-size: 0.85em;
+}
 #graph_content tr .author {
    width: 105px;
+}
 #graph_content tr .hash {
     width: 100px;
     font-size: 0.85em;
+}
 #graph_content tr .date {
     width: 76px;
     color: #666;
     font-size: 10px;
+}
 #graph_content_pr .compare_view_commits .expand_commit,
 #graph_content tr .expand_commit {
     width: 24px;
     cursor: pointer;
     color: #999;
+}
 #graph_content tr .right {
     width: 120px;
     padding-right: 0px;
     overflow: visible;
     position: relative;
+}
 #graph_content tr .mid {
     padding: 0;
+}
 #graph_content .log-container {
     position: relative;
     margin-top: 8px;
+}
 #graph_content tr #singlerange,
 #graph_content tr .changeset_range {
     float: left;
     margin: 2px 0;
+}
 #graph_content tr .author img {
     vertical-align: middle;
+}
 #graph_content tr .author .user {
     color: #444444;
+}
 #graph_content tr td.mid .message,
 #graph_content_pr .compare_view_commits .message {
     white-space: pre-wrap;
     padding: 0;
     overflow: hidden;
     height: 1.2em;
+}
 #graph_content_pr .compare_view_commits .message {
     padding: 0 !important;
+}
 #graph_content tr td.mid .message.expanded,
 #graph_content_pr .compare_view_commits .message.expanded {
     height: auto;
     overflow: initial;
+}
 #graph_content tr .extra-container {
     display: block;
     position: absolute;
     top: -15px;
     right: 0;
     padding-left: 5px;
     background: #FFFFFF;
     height: 41px;
+}
 #pull_request_overview .comments-container,
 #changeset_compare_view_content .comments-container,
 #graph_content .comments-container,
 #shortlog_data .comments-container,
 #graph_content .logtags {
     display: block;
     float: left;
     overflow: hidden;
     padding: 0;
     margin: 0;
     white-space: nowrap;
+}
 #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;
     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;
+}
 .pull-right .changes {
     clear: both;
+}
 .pull-right .changes .changed_total {
     display: block;
     float: right;
     text-align: center;
     min-width: 45px;
     cursor: pointer;
     color: #444444;
     background: #FEA;
     border-radius: 0px 0px 0px 6px;
     padding: 1px;
+}
 .pull-right .changes .added,
 .pull-right .changes .changed,
 .pull-right .changes .deleted {
     color: #444444;
+}
 .pull-right .changes .added {
     background: #CFC;
+}
 .pull-right .changes .changed {
     background: #FEA;
+}
 .pull-right .changes .deleted {
     background: #FAA;
+}
 .right .mergetag,
 .right .merge {
     padding: 1px 3px 1px 3px;
     background-color: #fca062;
     font-size: 10px;
     color: #ffffff;
     text-transform: uppercase;
     white-space: nowrap;
     border-radius: 3px;
     margin-right: 2px;
+}
 .right .parent {
     color: #666666;
     clear: both;
+}
 .right .logtags {
     line-height: 2.2em;
+}
 .phasetag, .bumpedtag, .divergenttag, .extincttag, .unstabletag, .repotag, .branchtag, .logtags .tagtag, .logtags .booktag {
     margin: 0px 2px;
+}
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag,
 .spantag {
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     color: #577632;
     white-space: nowrap;
     border-radius: 4px;
     border: 1px solid #d9e8f8;
     line-height: 1.5em;
+}
 #graph_content .phasetag,
 #graph_content .bumpedtag,
 #graph_content .divergenttag,
 #graph_content .extincttag,
 #graph_content .unstabletag,
 #graph_content .branchtag,
 #graph_content .tagtag,
 #graph_content .booktag {
     margin: 1.1em 0;
     margin-right: 0.5em;
+}
 .phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag,
 .repotag,
 .branchtag,
 .tagtag,
 .booktag {
     float: left;
     display: inline-block;
+}
 .right .logtags .phasetag,
 .right .logtags .bumpedtag,
 .right .logtags .divergenttag,
 .right .logtags .extincttag,
 .right .logtags .unstabletag,
 .right .logtags .branchtag,
 .right .logtags .tagtag,
 .right .logtags .booktag,
 .right .mergetag,
 .right .merge {
     float: right;
     line-height: 1em;
     margin: 1px 1px !important;
     display: block;
+}
 .repotag {
     border-color: #56A546;
     color: #46A546;
     font-size: 8px;
     text-transform: uppercase;
+}
 #context-bar .repotag,
 .repo-icons .repotag {
     border-color: white;
     color: white;
     margin-top: 3px;
+}
 .repo-icons .repotag {
     margin-top: 0px;
     padding-top: 0px;
     padding-bottom: 0px;
+}
 .booktag {
     border-color: #46A546;
     color: #46A546;
+}
 .tagtag {
     border-color: #62cffc;
     color: #62cffc;
+}
 .bumpedtag,
 .divergenttag,
 .extincttag,
 .unstabletag {
     background-color: #f00;
     border-color: #600;
     color: #fff;
+}
 .phasetag {
     border-color: #1F14CE;
     color: #1F14CE;
+}
 .logtags .branchtag a:hover,
 .logtags .branchtag a,
 .branchtag a,
 .branchtag a:hover {
     text-decoration: none;
     color: inherit;
+}
 .logtags .tagtag {
     padding: 1px 3px 1px 3px;
     background-color: #62cffc;
     font-size: 10px;
     color: #ffffff;
     white-space: nowrap;
     border-radius: 3px;
+}
 .tagtag a,
 .tagtag a:hover,
 .logtags .tagtag a,
 .logtags .tagtag a:hover {
     text-decoration: none;
     color: inherit;
+}
 .logbooks .booktag,
 .logbooks .booktag,
 .logtags .booktag,
 .logtags .booktag {
     padding: 1px 3px 1px 3px;
     background-color: #46A546;
     font-size: 10px;

kallithea/templates/changelog/changelog.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('%s Changelog') % c.repo_name}
     %if c.changelog_for_path:
       /${c.changelog_for_path}
     %endif
 </%block>
 <%def name="breadcrumbs_links()">
     <% size = c.size if c.size <= c.total_cs else c.total_cs %>
     ${_('Changelog')}
     %if c.changelog_for_path:
      - /${c.changelog_for_path}
     %endif
     %if c.revision:
     @ ${h.short_id(c.first_revision.raw_id)}
     %endif
     - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('changelog', c.first_revision.raw_id if c.first_revision else None)}
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div class="panel-body changelog-panel">
         %if c.pagination:
                 <div class="changelog-heading clearfix" style="${'display:none' if c.changelog_for_path else ''}">
                     <div class="pull-left">
                         ${h.form(h.url.current(),method='get',class_="form-inline")}
                             ${h.submit('set',_('Show'),class_="btn btn-default btn-sm")}
                             ${h.text('size',size=3,value=c.size,class_='form-control')}
                             ${_('revisions')}
                             %if c.branch_name:
                                 ${h.hidden('branch', c.branch_name)}
                             %endif
                             <a href="#" class="btn btn-default btn-sm" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
                         ${h.end_form()}
                     </div>
                     <div class="pull-right">
                         <a href="#" class="btn btn-default btn-sm" id="rev_range_container" style="display:none"></a>
                         %if c.revision:
                             <a class="btn btn-default btn-sm" href="${h.url('changelog_home', repo_name=c.repo_name)}">
                                 ${_('Go to tip of repository')}
                             </a>
                         %endif
                         %if c.db_repo.fork:
                             <a id="compare_fork"
                                title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}"
                                href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"
                                class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a>
                         %endif
                         ## text and href of open_new_pr is controlled from javascript
                         <a id="open_new_pr" class="btn btn-default btn-sm"></a>
                         ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)}
                     </div>
                 </div>
                 <div id="graph_nodes">
                     <canvas id="graph_canvas" style="width:0"></canvas>
                 </div>
                 <div id="graph_content" style="${'margin: 0px' if c.changelog_for_path else ''}">
                 <table class="table" id="changesets">
                 <tbody>
                 %for cnt,cs in enumerate(c.pagination):
                     <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">
                         <td class="checkbox-column">
                             %if c.changelog_for_path:
                                 ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")}
                             %else:
                                 ${h.checkbox(cs.raw_id,class_="changeset_range")}
                             %endif
                         </td>
                         <td class="status">
                           %if c.statuses.get(cs.raw_id):
                             %if c.statuses.get(cs.raw_id)[2]:
                               <a data-toggle="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])}">
                                 <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
                               </a>
                             %else:
                               <a data-toggle="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}"
                                  href="${c.comments[cs.raw_id][0].url()}">
                                   <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
                               </a>
                             %endif
                           %endif
                         </td>
                         <td class="author">
                             ${h.gravatar(h.email_or_none(cs.author), size=16)}
-                            <span data-toggle="tooltip" title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
                             <span data-toggle="tooltip" title="${cs.author}" class="user">${h.person(cs.author)}</span>
                         </td>
                         <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')}">
                             <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="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>
                                     %endif
                                     %if cs.bumped:
                                         <span class="bumpedtag" title="Bumped">
                                             Bumped
                                         </span>
                                     %endif
                                     %if cs.divergent:
                                         <span class="divergenttag" title="Divergent">
                                             Divergent
                                         </span>
                                     %endif
                                     %if cs.extinct:
                                         <span class="extincttag" title="Extinct">
                                             Extinct
                                         </span>
                                     %endif
                                     %if cs.unstable:
                                         <span class="unstabletag" title="Unstable">
                                             Unstable
                                         </span>
                                     %endif
                                     %if cs.phase:
                                         <span class="phasetag" title="Phase">
                                             ${cs.phase}
                                         </span>
                                     %endif
                                     %if h.is_hg(c.db_repo_scm_instance):
                                         %for book in cs.bookmarks:
                                             <span class="booktag" title="${_('Bookmark %s') % book}">
                                                 ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                             </span>
                                         %endfor
                                     %endif
                                     %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
                                     %if (not c.branch_name) and cs.branch:
                                         <span class="branchtag" title="${_('Branch %s' % cs.branch)}">
                                             ${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
                                         </span>
                                     %endif
                                 </div>
                             </div>
                         </td>
                     </tr>
                 %endfor
                 </tbody>
                 </table>
                 <input type="checkbox" id="singlerange" style="display:none"/>
                 </div>
                 ${c.pagination.pager()}
         <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>
         <script type="text/javascript">
             var jsdata = ${h.js(c.jsdata)};
             var graph = new BranchRenderer('graph_canvas', 'graph_content', 'chg_');
             $(document).ready(function(){
                 var $checkboxes = $('.changeset_range');
                 pyroutes.register('changeset_home', ${h.js(h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s'))}, ['repo_name', 'revision']);
                 var checkbox_checker = function(e) {
                     var $checked_checkboxes = $checkboxes.filter(':checked');
                     var $singlerange = $('#singlerange');
                     $('#rev_range_container').hide();
                     $checkboxes.show();
                     $singlerange.show();
                     if ($checked_checkboxes.length > 0) {
                         $checked_checkboxes.first().parent('td').append($singlerange);
                         var singlerange = $singlerange.prop('checked');
                         var rev_end = $checked_checkboxes.first().prop('name');
                         if ($checked_checkboxes.length > 1 || singlerange) {
                             var rev_start = $checked_checkboxes.last().prop('name');
                             $('#rev_range_container').prop('href',
                                 pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},
                                                                 'revision': rev_start + '...' + rev_end}));
                             $('#rev_range_container').html(
                                  _TM['Show Selected Changesets {0} &rarr; {1}'].format(rev_start.substr(0, 12), rev_end.substr(0, 12)));
                             $('#rev_range_container').show();
                             $('#open_new_pr').prop('href', pyroutes.url('pullrequest_home',
                                                                         {'repo_name': ${h.js(c.repo_name)},
                                                                          'rev_start': rev_start,
                                                                          'rev_end': rev_end}));
                             $('#open_new_pr').html(_TM['Open New Pull Request for {0} &rarr; {1}'].format(rev_start.substr(0, 12), rev_end.substr(0, 12)));
                         } else {
                             $('#open_new_pr').prop('href', pyroutes.url('pullrequest_home',
                                                                         {'repo_name': ${h.js(c.repo_name)},
                                                                          'rev_end': rev_end}));
                             $('#open_new_pr').html(_TM['Open New Pull Request from {0}'].format(rev_end.substr(0, 12)));
+                        }
                         $('#rev_range_clear').show();
                         $('#compare_fork').hide();
                         var disabled = true;
                         $checkboxes.each(function(){
                             var $this = $(this);
                             if (disabled) {
                                 if ($this.prop('checked')) {
                                     $this.closest('tr').removeClass('out-of-range');
                                     disabled = singlerange;
                                 } else {
                                     $this.closest('tr').addClass('out-of-range');
+                                }
                             } else {
                                 $this.closest('tr').removeClass('out-of-range');
                                 disabled = $this.prop('checked');
+                            }
                         });
                         if ($checked_checkboxes.length + (singlerange ? 1 : 0) >= 2) {
                             $checkboxes.hide();
                             $checked_checkboxes.show();
                             if (!singlerange)
                                 $singlerange.hide();
+                        }
                     } else {
                         $('#singlerange').hide().prop('checked', false);
                         $('#rev_range_clear').hide();
                         %if c.revision:
                             $('#open_new_pr').prop('href', pyroutes.url('pullrequest_home',
                                                                         {'repo_name': ${h.js(c.repo_name)},
                                                                          'rev_end':${h.js(c.first_revision.raw_id)}}));
                             $('#open_new_pr').html(_TM['Open New Pull Request from {0}'].format(${h.jshtml(c.revision)}));
                         %else:
                             $('#open_new_pr').prop('href', pyroutes.url('pullrequest_home',
                                                                         {'repo_name': ${h.js(c.repo_name)},
                                                                         'branch':${h.js(c.first_revision.branch)}}));
                             $('#open_new_pr').html(_TM['Open New Pull Request from {0}'].format(${h.jshtml(c.first_revision.branch)}));
                         %endif
                         $('#compare_fork').show();
                         $checkboxes.closest('tr').removeClass('out-of-range');
+                    }
                 };
                 checkbox_checker();
                 $checkboxes.click(function() {
                     checkbox_checker();
                     graph.render(jsdata);
                 });
                 $('#singlerange').click(checkbox_checker);
                 $('#rev_range_clear').click(function(e){
                     $checkboxes.prop('checked', false);
                     checkbox_checker();
                     graph.render(jsdata);
                 });
                 var $msgs = $('.message');
                 // get first element height
                 var el = $('#graph_content tr')[0];
                 var row_h = el.clientHeight;
                 $msgs.each(function() {
                     var m = this;
                     var h = m.clientHeight;
                     if(h > row_h){
                         var offset = row_h - (h+12);
                         $(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');
                     //redraw the graph, r and jsdata are bound outside function
                     graph.render(jsdata);
                 });
                 // change branch filter
                 $("#branch_filter").select2({
                     dropdownAutoWidth: true,
                     maxResults: 50,
                     sortResults: branchSort
                     });
                 $("#branch_filter").change(function(e){
                     var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;
                     if(selected_branch != ''){
                         window.location = pyroutes.url('changelog_home', {'repo_name': ${h.js(c.repo_name)},
                                                                           'branch': selected_branch});
                     }else{
                         window.location = pyroutes.url('changelog_home', {'repo_name': ${h.js(c.repo_name)}});
+                    }
                     $("#changelog").hide();
                 });
                 graph.render(jsdata);
             });
             $(window).resize(function(){
                 graph.render(jsdata);
             });
         </script>
         %else:
             ${_('There are no changes yet')}
         %endif
     </div>
 </div>
 </%def>

kallithea/templates/changeset/changeset_range.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('%s Changesets') % c.repo_name} - ${h.show_id(c.cs_ranges[0])} &gt; ${h.show_id(c.cs_ranges[-1])}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('Changesets')} -
     ${h.link_to(h.show_id(c.cs_ranges[0]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[0].raw_id))}
     <i class="icon-right"></i>
     ${h.link_to(h.show_id(c.cs_ranges[-1]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[-1].raw_id))}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         <div class="pull-left">
             ${self.breadcrumbs()}
         </div>
         <div class="pull-right">
             <a href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-default btn-sm"><i class="icon-git-compare"></i> Compare Revisions</a>
         </div>
     </div>
     <div class="panel-body">
         <div>
                 <table class="table compare_view_commits">
                 %for cnt,cs in enumerate(c.cs_ranges):
                   <tr>
                     %if c.visual.use_gravatar:
                     <td>${h.gravatar_div(h.email_or_none(cs.author), size=14)}</td>
                     %endif
                     <td>${h.link_to(h.short_id(cs.raw_id),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
-                    <td><div class="author">${h.person(cs.author)}</div></td>
                     <td class="author">${h.person(cs.author)}</td>
                     <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                     <td>
                       %if c.statuses:
                         <i class="icon-circle changeset-status-${c.statuses[cnt]}" title="${_('Changeset status: %s') % h.changeset_status_lbl(c.statuses[cnt])}"></i>
                       %endif
                     </td>
                     <td><div class="message">${h.urlify_text(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>
                   </tr>
                 %endfor
                 </table>
                 <h4>${_('Files affected')}</h4>
                 <div class="cs_files">
                     %for cs in c.cs_ranges:
                         <h6 class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</h6>
                         <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
                         %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
                             <div class="cs_${op} clearfix">
                                 <div class="node pull-left">
                                     <i class="icon-diff-${op}"></i>
                                     ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
                                 </div>
                                 <div class="changes">${h.fancy_file_stats(stats)}</div>
                             </div>
                         %endfor
                     %endfor
                 </div>
         </div>
     </div>
     <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
     ${diff_block.diff_block_js()}
     %for cs in c.cs_ranges:
         <div class="panel-body">
           ## diff block
           <div class="h3">
           ${h.gravatar_div(h.email_or_none(cs.author), size=20)}
           <a data-toggle="tooltip" title="${cs.message}" href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a>
             <div class="right">
               <span class="logtags">
                 %if len(cs.parents)>1:
                 <span class="merge">${_('Merge')}</span>
                 %endif
                 %if h.is_hg(c.db_repo_scm_instance):
                   %for book in cs.bookmarks:
                   <span class="booktag" title="${_('Bookmark %s') % book}">
                      ${h.link_to(book,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}
                   </span>
                   %endfor
                 %endif
                 %for tag in cs.tags:
                     <span class="tagtag" title="${_('Tag %s') % tag}">
                     ${h.link_to(tag,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</span>
                 %endfor
                 %if cs.branch:
                 <span class="branchtag" title="${_('Branch %s') % cs.branch}">
                    ${h.link_to(cs.branch,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}
                 </span>
                 %endif
               </span>
             </div>
           </div>
           <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
           ${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev,
                                   c.repo_name, 'rev', cs_rev, cs_rev, file_diff_data)}
         </div>
     %endfor
 </div>
 </%def>

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

 ## Changesets table !
 <div>
   %if not c.cs_ranges:
     <span class="empty_data">${_('No changesets')}</span>
   %else:
     %if c.ancestors:
       <div class="ancestor">
         %if len(c.ancestors) > 1:
         <div class="text-danger">
           ${_('Criss cross merge situation with multiple merge ancestors detected!')}
         </div>
         <div>
           ${_('Please merge the target branch to your branch before creating a pull request.')}
         </div>
         %endif
         <div>
           ${_('Merge Ancestor')}:
           %for ancestor in c.ancestors:
             ${h.link_to(h.short_id(ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=ancestor), class_="changeset_hash")}
           %endfor
         </div>
       </div>
     %endif
     <div id="graph_nodes">
         <canvas id="graph_canvas"></canvas>
     </div>
     <div id="graph_content_pr">
     <table class="table compare_view_commits">
     %for cnt, cs in enumerate(reversed(c.cs_ranges)):
       <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">
         <td>
           %if cs.raw_id in c.statuses:
               <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}" title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}"></i>
           %endif
           %if c.cs_comments.get(cs.raw_id):
               <div class="comments-container">
                   <div class="comments-cnt" title="${_('Changeset has comments')}">
                       <a href="${c.cs_comments[cs.raw_id][0].url()}">
                           ${len(c.cs_comments[cs.raw_id])}
                           <i class="icon-comment"></i>
                       </a>
                   </div>
               </div>
           %endif
         </td>
         <td class="changeset-logical-index">
           <%
               num_cs = len(c.cs_ranges)
               index = num_cs - cnt
               if index == 1:
                   title = _('First (oldest) changeset in this list')
               elif index == num_cs:
                   title = _('Last (most recent) changeset in this list')
               else:
                   title = _('Position in this list of changesets')
           %>
           <span data-toggle="tooltip" title="${title}">
             ${index}
           </span>
         </td>
         <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
         <td class="author">
             ${h.gravatar(h.email_or_none(cs.author), size=16)}
-            <span data-toggle="tooltip" title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
             <span data-toggle="tooltip" title="${cs.author}" class="user">${h.person(cs.author)}</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>
         %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')}">
             <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>
         </td>
       </tr>
     %endfor
     </table>
     </div>
     %if c.is_ajax_preview:
       <h5>
       ## links should perhaps use ('rev', c.a_rev) instead ...
       ${h.link_to(_('Show merge diff'),
         h.url('compare_url',
           repo_name=c.a_repo.repo_name,
           org_ref_type=c.a_ref_type, org_ref_name=c.a_ref_name,
           other_repo=c.cs_repo.repo_name,
           other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name,
           merge='1')
         )}
       </h5>
     %endif
     %if c.cs_ranges_org is not None:
       ## TODO: list actual changesets?
       <div>
         ${h.link_to_ref(c.cs_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}
         ${_('is')}
         <a href="${c.swap_url}">${_('%s changesets') % (len(c.cs_ranges_org))}</a>
         ${_('behind')}
         ${h.link_to_ref(c.a_repo.repo_name, c.a_ref_type, c.a_ref_name)}
       </div>
     %endif
   %endif
 </div>
 %if c.is_ajax_preview:
 <div id="jsdata" style="display:none">${h.js(c.jsdata)}</div>
 %else:
 <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>
 %endif
 <script type="text/javascript">
     var jsdata = ${h.js(c.jsdata)};
     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');
             graph.render(jsdata);
         });
     });
     $(window).resize(function(){
         graph.render(jsdata);
     });
 </script>

0 comments (0 inline, 0 general)