kallithea Changeset - 5a8918aba869

Changeset - 5a8918aba869

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2013-04-16 00:59:14
marcin@python-works.com

show comments in summary changelog overview

3 files changed with 18 insertions and 2 deletions:

rhodecode/public/css/style.css

rhodecode/templates/changelog/changelog.html

rhodecode/templates/changelog/changelog_summary_data.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2209,867 +2209,874 @@ a.metatag[tag="license"]:hover { @@
     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 .journal_repo {
     float: left;
     margin-left: 6px;
     padding-top: 3px;
+}
 #journal .date {
     clear: both;
     color: #777777;
     font-size: 11px;
     padding-left: 22px;
+}
 #journal .journal_repo .journal_repo_name {
     font-weight: bold;
     font-size: 1.1em;
+}
 #journal .compare_view {
     padding: 5px 0px 5px 0px;
     width: 95px;
+}
 .journal_highlight {
     font-weight: bold;
     padding: 0 2px;
     vertical-align: bottom;
+}
 .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;
+}
 .trending_language {
     background-color: #003367;
     color: #FFF;
     display: block;
     min-width: 20px;
     text-decoration: none;
     height: 12px;
     margin-bottom: 0px;
     margin-left: 5px;
     white-space: pre;
     padding: 3px;
+}
 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;
+}
 .file_history {
     padding-top: 10px;
     font-size: 16px;
+}
 .file_author {
     float: left;
+}
 .file_author .item {
     float: left;
     padding: 5px;
     color: #888;
+}
 .tablerow0 {
     background-color: #F8F8F8;
+}
 .tablerow1 {
     background-color: #FFFFFF;
+}
 .changeset_id {
     color: #666666;
     margin-right: -3px;
+}
 .changeset_hash {
     color: #000000;
+}
 #changeset_content {
     border-left: 1px solid #CCC;
     border-right: 1px solid #CCC;
     border-bottom: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_compare_view_content {
     border: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_content .container {
     min-height: 100px;
     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 .container .right {
     float: right;
     width: 20%;
     text-align: right;
+}
 #changeset_content .container .message {
     white-space: pre-wrap;
+}
 #changeset_content .container .message a:hover {
     text-decoration: none;
+}
 .cs_files .cur_cs {
     margin: 10px 2px;
     font-weight: bold;
+}
 .cs_files .node {
     float: left;
+}
 .cs_files .changes {
     float: right;
     color: #003367;
+}
 .cs_files .changes .added {
     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*/
 .cs_files .changes .bin1 {
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 /*deleted binary*/
 .cs_files .changes .bin2 {
     background-color: #FF8888;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 /*mod binary*/
 .cs_files .changes .bin3 {
     background-color: #DDDDDD;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 /*rename file*/
 .cs_files .changes .bin4 {
     background-color: #6D99FF;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .cs_added, .cs_files .cs_A {
     background: url("../images/icons/page_white_add.png") no-repeat scroll
 px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_changed, .cs_files .cs_M {
     background: url("../images/icons/page_white_edit.png") no-repeat scroll
 px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_removed, .cs_files .cs_D {
     background: url("../images/icons/page_white_delete.png") no-repeat
         scroll 3px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .table {
     position: relative;
+}
 #graph {
     position: relative;
     overflow: hidden;
+}
 #graph_nodes {
     position: absolute;
+}
 #graph_content,
 #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 {
     table-layout: fixed;
     border-collapse: collapse;
     border-left: none;
     border-right: none;
     border-color: #cdcdcd;
+}
 #graph_content #changesets td {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     height: 31px;
     border-color: #cdcdcd;
     text-align: left;
+}
 #graph_content .container .checkbox {
     width: 12px;
     font-size: 0.85em;
+}
 #graph_content .container .status {
     width: 14px;
     font-size: 0.85em;
+}
 #graph_content .container .author {
    width: 105px;
+}
 #graph_content .container .hash {
     width: 100px;
     font-size: 0.85em;
+}
 #graph_content #changesets .container .date {
     width: 76px;
     color: #666;
     font-size: 10px;
+}
 #graph_content #changesets .container .right {
     width: 120px;
     padding-right: 0px;
     overflow: visible;
     position: relative;
+}
 #graph_content .container .mid {
     padding: 0;
+}
 #graph_content .log-container {
     position: relative;
+}
 #graph_content .container .changeset_range {
     float: left;
     margin: 6px 3px;
+}
 #graph_content .container .author img {
     vertical-align: middle;
+}
 #graph_content .container .author .user {
     color: #444444;
+}
 #graph_content .container .mid .message {
     white-space: pre-wrap;
     padding: 0;
     overflow: hidden;
     height: 1.1em;
+}
 #graph_content .container .extra-container {
     display: block;
     position: absolute;
     top: -15px;
     right: 0;
     padding-left: 5px;
     background: #FFFFFF;
     height: 41px;
+}
 #graph_content .comments-container,
 #shortlog_data .comments-container,
 #graph_content .logtags {
     display: block;
     float: left;
     overflow: hidden;
     padding: 0;
     margin: 0;
+}
 #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 .container .mid .message a:hover {
     text-decoration: none;
+}
 .revision-link {
     color: #3F6F9F;
     font-weight: bold !important;
+}
 .issue-tracker-link {
     color: #3F6F9F;
     font-weight: bold !important;
+}
 .changeset-status-container {
     padding-right: 5px;
     margin-top: 1px;
     float: right;
     height: 14px;
+}
 .code-header .changeset-status-container {
     float: left;
     padding: 2px 0px 0px 2px;
+}
 .changeset-status-container .changeset-status-lbl {
     color: rgb(136, 136, 136);
     float: left;
     padding: 3px 4px 0px 0px
+}
 .code-header .changeset-status-container .changeset-status-lbl {
     float: left;
     padding: 0px 4px 0px 0px;
+}
 .changeset-status-container .changeset-status-ico {
     float: left;
+}
 .code-header .changeset-status-container .changeset-status-ico, .container .changeset-status-ico {
     float: left;
+}
 #graph_content .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 5px 0;
+}
 #graph_content .comments-cnt a {
 #shortlog_data .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 3px 0;
+}
 #graph_content .comments-cnt a,
 #shortlog_data .comments-cnt a {
     background-image: url('../images/icons/comments.png');
     background-repeat: no-repeat;
     background-position: 100% 50%;
     padding: 5px 0;
     padding-right: 20px;
+}
 .right .changes {
     clear: both;
+}
 .right .changes .changed_total {
     display: block;
     float: right;
     text-align: center;
     min-width: 45px;
     cursor: pointer;
     color: #444444;
     background: #FEA;
     -webkit-border-radius: 0px 0px 0px 6px;
     border-radius: 0px 0px 0px 6px;
     padding: 1px;
+}
 .right .changes .added, .changed, .removed {
     display: block;
     padding: 1px;
     color: #444444;
     float: right;
     text-align: center;
     min-width: 15px;
+}
 .right .changes .added {
     background: #CFC;
+}
 .right .changes .changed {
     background: #FEA;
+}
 .right .changes .removed {
     background: #FAA;
+}
 .right .merge {
     padding: 1px 3px 1px 3px;
     background-color: #fca062;
     font-size: 10px;
     color: #ffffff;
     text-transform: uppercase;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
     margin-right: 2px;
+}
 .right .parent {
     color: #666666;
     clear: both;
+}
 .right .logtags {
     line-height: 2.2em;
+}
 .branchtag, .logtags .tagtag, .logtags .booktag {
     margin: 0px 2px;
+}
 .branchtag,
 .tagtag,
 .booktag,
 .spantag {
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     color: #336699;
     white-space: nowrap;
     -webkit-border-radius: 4px;
     border-radius: 4px;
     border: 1px solid #d9e8f8;
     line-height: 1.5em;
+}
 #graph_content .branchtag,
 #graph_content .tagtag,
 #graph_content .booktag {
     margin: 1.1em 0;
     margin-right: 0.5em;
+}
 .branchtag,
 .tagtag,
 .booktag {
     float: left;
+}
 .right .logtags .branchtag,
 .right .logtags .tagtag,
 .right .logtags .booktag,
 .right .merge {
     float: right;
     line-height: 1em;
     margin: 1px 1px !important;
     display: block;
+}
 .booktag {
     border-color: #46A546;
     color: #46A546;
+}
 .tagtag {
     border-color: #62cffc;
     color: #62cffc;
+}
 .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;
     -webkit-border-radius: 3px;
     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;
     color: #ffffff;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
+}
 .logbooks .booktag, .logbooks .booktag a, .right .logtags .booktag, .logtags .booktag a {
     color: #ffffff;
+}
 .logbooks .booktag, .logbooks .booktag a:hover,
 .logtags .booktag, .logtags .booktag a:hover,
 .booktag a,
 .booktag a:hover {
     text-decoration: none;
     color: inherit;
+}
 div.browserblock {
     overflow: hidden;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 125%;
     padding: 0;
     -webkit-border-radius: 6px 6px 0px 0px;
     border-radius: 6px 6px 0px 0px;
+}
 div.browserblock .browser-header {
     background: #FFF;
     padding: 10px 0px 15px 0px;
     width: 100%;
+}
 div.browserblock .browser-nav {
     float: left
+}
 div.browserblock .browser-branch {
     float: left;
+}
 div.browserblock .browser-branch label {
     color: #4A4A4A;
     vertical-align: text-top;
+}
 div.browserblock .browser-header span {
     margin-left: 5px;
     font-weight: 700;
+}
 div.browserblock .browser-search {
     clear: both;
     padding: 8px 8px 0px 5px;
     height: 20px;
+}
 div.browserblock #node_filter_box {
+}
 div.browserblock .search_activate {
     float: left
+}
 div.browserblock .add_node {
     float: left;
     padding-left: 5px;
+}
 div.browserblock .search_activate a:hover, div.browserblock .add_node a:hover {
     text-decoration: none !important;
+}
 div.browserblock .browser-body {
     background: #EEE;
     border-top: 1px solid #CCC;
+}
 table.code-browser {
     border-collapse: collapse;
     width: 100%;
+}
 table.code-browser tr {
     margin: 3px;
+}
 table.code-browser thead th {
     background-color: #EEE;
     height: 20px;
     font-size: 1.1em;
     font-weight: 700;
     text-align: left;
     padding-left: 10px;
+}
 table.code-browser tbody td {
     padding-left: 10px;
     height: 20px;
+}
 table.code-browser .browser-file {
     background: url("../images/icons/document_16.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     text-align: left;
+}
 .diffblock .changeset_header {
     height: 16px;
+}
 .diffblock .changeset_file {
     background: url("../images/icons/file.png") no-repeat scroll 3px;
     text-align: left;
     float: left;
     padding: 2px 0px 2px 22px;
+}
 .diffblock .diff-menu-wrapper {
     float: left;
+}
 .diffblock .diff-menu {
     position: absolute;
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #003367 #666666 #666666;
     border-right: 1px solid #666666;
     border-style: solid solid solid;
     border-width: 1px;
     box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);
     margin-top: 5px;
     margin-left: 1px;
+}
 .diffblock .diff-actions {
     padding: 2px 0px 0px 2px;
     float: left;
+}
 .diffblock  .diff-menu ul li {
     padding: 0px 0px 0px 0px !important;
+}
 .diffblock  .diff-menu ul li a {
     display: block;
     padding: 3px 8px 3px 8px !important;
+}
 .diffblock  .diff-menu ul li a:hover {
     text-decoration: none;
     background-color: #EEEEEE;
+}
 table.code-browser .browser-dir {
     background: url("../images/icons/folder_16.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     text-align: left;
+}
 table.code-browser .submodule-dir {
     background: url("../images/icons/disconnect.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     text-align: left;
+}
 .box .search {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 20px 10px;
+}
 .box .search div.search_path {
     background: none repeat scroll 0 0 #EEE;
     border: 1px solid #CCC;
     color: blue;
     margin-bottom: 10px;
     padding: 10px 0;
+}
 .box .search div.search_path div.link {
     font-weight: 700;
     margin-left: 25px;
+}
 .box .search div.search_path div.link a {
     color: #003367;
     cursor: pointer;
     text-decoration: none;
+}
 #path_unlock {
     color: red;
     font-size: 1.2em;
     padding-left: 4px;
+}
 .info_box span {
     margin-left: 3px;
     margin-right: 3px;
+}
 .info_box .rev {
     color: #003367;
     font-size: 1.6em;
     font-weight: bold;
     vertical-align: sub;
+}
 .info_box input#at_rev, .info_box input#size {
     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: 12px;
     margin: 0;
     padding: 1px 5px 1px;
+}
 .info_box input#view {
     text-align: center;
     padding: 4px 3px 2px 2px;
+}
 .yui-overlay, .yui-panel-container {
     visibility: hidden;
     position: absolute;
     z-index: 2;
+}
 #tip-box {
     position: absolute;
     background-color: #FFF;
     border: 2px solid #003367;
     font: 100% sans-serif;
     width: auto;
     opacity: 1;
     padding: 8px;
     white-space: pre-wrap;
     -webkit-border-radius: 8px 8px 8px 8px;

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
 ${_('%s Changelog') % c.repo_name} &middot;
 %if c.changelog_for_path:
   /${c.changelog_for_path} &middot;
 %endif
 ${c.rhodecode_name}
 </%def>
 <%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
     - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
 ${self.context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
         % if c.pagination:
             <div id="graph">
                 <div style="display:${'none' if c.changelog_for_path else ''}">
                     <div class="info_box" style="clear: both;padding: 10px 6px;min-height: 12px;text-align: right;">
                         <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>
                         <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
                         %if c.rhodecode_db_repo.fork:
                             <a id="compare_fork" title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default',merge=1)}" class="ui-btn small">${_('Compare fork with parent')}</a>
                         %endif
                         %if h.is_hg(c.rhodecode_repo):
                         <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="ui-btn small">${_('Open new pull request')}</a>
                         %endif
                     </div>
                     <div class="container_header">
                         ${h.form(h.url.current(),method='get')}
                         <div style="float:left">
                             ${h.submit('set',_('Show'),class_="ui-btn")}
                             ${h.text('size',size=1,value=c.size)}
                             ${_('revisions')}
                         </div>
                         ${h.end_form()}
                         <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>
                     </div>
                 </div>
                 <div id="graph_nodes">
                     <canvas id="graph_canvas"></canvas>
                 </div>
                 <div id="graph_content">
                 <table id="changesets">
                 <tbody>
                 %for cnt,cs in enumerate(c.pagination):
                     <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">
                         <td class="checkbox">
                             %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 class="status">
                           %if c.statuses.get(cs.raw_id):
                             <div class="changeset-status-ico">
                             %if c.statuses.get(cs.raw_id)[2]:
                               <a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
                                 <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
                               </a>
                             %else:
                               <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
                             %endif
                             </div>
                           %endif
                         </td>
                         <td class="author">
                             <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>
                             <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
                         </td>
                         <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">
                             <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">
                                 <span class="changeset_hash">${h.show_id(cs)}</span>
                             </a>
                         </td>
                         <td class="date">
                             <div class="date">${h.age(cs.date,True)}</div>
                         </td>
                         <td class="mid">
                             <div class="log-container">
                                 <div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
                                 <div class="expand"><span class="expandtext">&darr; ${_('Show more')} &darr;</span></div>
                                 <div class="extra-container">
-                                    %if c.comments.get(cs.raw_id,[]):
                                     %if c.comments.get(cs.raw_id):
                                         <div class="comments-container">
                                             <div class="comments-cnt" title="${('comments')}">
                                                 <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
                                                     ${len(c.comments[cs.raw_id])}
                                                 </a>
                                             </div>
                                         </div>
                                     %endif
                                     %if h.is_hg(c.rhodecode_repo):
                                         %for book in cs.bookmarks:
                                             <div class="booktag" title="${_('Bookmark %s') % book}">
                                                 ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                             </div>
                                         %endfor
                                     %endif
                                     %for tag in cs.tags:
                                         <div class="tagtag" title="${_('Tag %s') % tag}">
                                             ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                         </div>
                                     %endfor
                                     %if (not c.branch_name) and cs.branch:
                                         <div class="branchtag" title="${_('Branch %s' % cs.branch)}">
                                             ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
                                         </div>
                                     %endif
                                 </div>
                             </div>
                         </td>
                     </tr>
                 %endfor
                 </tbody>
                 </table>
                 <div class="pagination-wh pagination-left">
                     ${c.pagination.pager('$link_previous ~2~ $link_next')}
                 </div>
             </div>
         </div>
         <script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
         <script type="text/javascript">
             YAHOO.util.Event.onDOMReady(function(){
                 //Monitor range checkboxes and build a link to changesets
                 //ranges
                 var checkboxes = YUD.getElementsByClassName('changeset_range');
                 var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
                 var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}";
                 var checkbox_checker = function(e){
                     var checked_checkboxes = [];
                     for (pos in checkboxes){
                         if(checkboxes[pos].checked){
                             checked_checkboxes.push(checkboxes[pos]);
+                        }
+                    }
                     if(YUD.get('open_new_pr')){
                         if(checked_checkboxes.length>1){
                             YUD.setStyle('open_new_pr','display','none');
                         } else {
                             YUD.setStyle('open_new_pr','display','');
                             if(checked_checkboxes.length>0){
                                 YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];
                             }else{
                                 YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];
+                            }
+                        }
+                    }
                     if(checked_checkboxes.length>0){
                         var rev_end = checked_checkboxes[0].name;
                         var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
                         var url = url_tmpl.replace('__REVRANGE__',
                                 rev_start+'...'+rev_end);
                         var link = (rev_start == rev_end)
                             ? _TM['Show selected changeset __S']
                             : _TM['Show selected changesets __S -> __E'];
                         link = link.replace('__S',rev_start.substr(0,6));
                         link = link.replace('__E',rev_end.substr(0,6));
                         YUD.get('rev_range_container').href = url;
                         YUD.get('rev_range_container').innerHTML = link;
                         YUD.setStyle('rev_range_container','display','');
                         YUD.setStyle('rev_range_clear','display','');
                         YUD.get('open_new_pr').href = pr_tmpl + '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end);
                         YUD.setStyle('compare_fork','display','none');
                     }else{
                         YUD.setStyle('rev_range_container','display','none');
                         YUD.setStyle('rev_range_clear','display','none');
                         if (checkboxes){
                             YUD.get('open_new_pr').href = pr_tmpl + '?rev_end={0}'.format(checkboxes[0].name);
+                        }
                         YUD.setStyle('compare_fork','display','');
+                    }
                 };
                 YUE.onDOMReady(checkbox_checker);
                 YUE.on(checkboxes,'click', checkbox_checker);
                 YUE.on('rev_range_clear','click',function(e){
                     for (var i=0; i<checkboxes.length; i++){
                         var cb = checkboxes[i];
                         cb.checked = false;
+                    }
                     checkbox_checker();
                     YUE.preventDefault(e);
                 });
                 var msgs = YUQ('.message');
                 // get first element height
                 var el = YUQ('#graph_content .container')[0];
                 var row_h = el.clientHeight;
                 for(var i=0;i<msgs.length;i++){
                     var m = msgs[i];
                     var h = m.clientHeight;
                     var pad = YUD.getStyle(m,'padding');
                     if(h > row_h){
                         var offset = row_h - (h+12);
                         YUD.setStyle(m.nextElementSibling,'display','block');
                         YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px');
                     };
+                }
                 YUE.on(YUQ('.expand'),'click',function(e){
                     var elem = e.currentTarget.parentNode.parentNode;
                     YUD.setStyle(e.currentTarget,'display','none');
                     YUD.setStyle(elem,'height','auto');
                     //redraw the graph, line_count and jsdata are global vars
                     set_canvas(100);
                     var r = new BranchRenderer();
                     r.render(jsdata,100,line_count);
                 });
                 // change branch filter
                 YUE.on(YUD.get('branch_filter'),'change',function(e){
                     var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;
                     var url_main = "${h.url('changelog_home',repo_name=c.repo_name)}";
                     var url = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}";
                     var url = url.replace('__BRANCH__',selected_branch);
                     if(selected_branch != ''){
                         window.location = url;
                     }else{
                         window.location = url_main;
+                    }
                 });
                 function set_canvas(width) {
                     var c = document.getElementById('graph_nodes');
                     var t = document.getElementById('graph_content');
                     canvas = document.getElementById('graph_canvas');
                     var div_h = t.clientHeight;
                     canvas.setAttribute('height',div_h);
                     canvas.setAttribute('width',width);
                 };
                 var heads = 1;
                 var line_count = 0;
                 var jsdata = ${c.jsdata|n};
                 for (var i=0;i<jsdata.length;i++) {
                     var in_l = jsdata[i][2];
                     for (var j in in_l) {
                         var m = in_l[j][1];
                         if (m > line_count)
                             line_count = m;
+                    }
+                }
                 set_canvas(100);
                 var r = new BranchRenderer();
                 r.render(jsdata,100,line_count);
             });
         </script>
         %else:
             ${_('There are no changes yet')}
         %endif
     </div>
 </div>
 </%def>

rhodecode/templates/changelog/changelog_summary_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 %if c.repo_changesets:
 <table class="table_disp">
     <tr>
         <th class="left">${_('Revision')}</th>
         <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}">
         <td>
           <div>
             <div class="changeset-status-container">
               %if c.comments.get(cs.raw_id,[]):
                <div class="comments-container">
                    <div class="comments-cnt" title="${('comments')}">
                        <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
                            ${len(c.comments[cs.raw_id])}
                        </a>
                    </div>
                </div>
               %endif
               %if c.statuses.get(cs.raw_id):
                 <div class="changeset-status-ico">
                 %if c.statuses.get(cs.raw_id)[2]:
                   <a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
                     <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
                   </a>
                 %else:
                   <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
                 %endif
                 </div>
               %endif
             </div>
             <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a></pre>
          </div>
         </td>
         <td>
             ${h.urlify_commit(h.truncate(cs.message,50),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
         </td>
         <td><span class="tooltip" title="${h.tooltip(h.fmt_date(cs.date))}">
                       ${h.age(cs.date)}</span>
         </td>
         <td title="${cs.author}">${h.person(cs.author)}</td>
         <td>
             %if h.is_hg(c.rhodecode_repo):
                 %for book in cs.bookmarks:
                     <div class="booktag" title="${_('Bookmark %s') % book}">
                         ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                     </div>
                 %endfor
             %endif
             %for tag in cs.tags:
              <div class="tagtag" title="${_('Tag %s') % tag}">
                  ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
              </div>
             %endfor
             %if cs.branch:
              <div class="branchtag" title="${_('Branch %s' % cs.branch)}">
                  ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
              </div>
             %endif
         </td>
     </tr>
 %endfor
 </table>
 <script type="text/javascript">
   YUE.onDOMReady(function(){
     YUE.delegate("shortlog_data","click",function(e, matchedEl, container){
         ypjax(e.target.href,"shortlog_data",function(){tooltip_activate();});
         YUE.preventDefault(e);
     },'.pager_link');
   });
 </script>
 <div class="pagination-wh pagination-left">
 ${c.repo_changesets.pager('$link_previous ~2~ $link_next')}
 </div>
 %else:
 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
 <h4>${_('Add or upload files directly via RhodeCode')}</h4>
 <div style="margin: 20px 30px;">
   <div id="add_node_id" class="add_node">
       <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='')}">${_('Add new file')}</a>
   </div>
 </div>
 %endif
 <h4>${_('Push new repo')}</h4>
 <pre>
     ${c.rhodecode_repo.alias} clone ${c.clone_repo_url}
     ${c.rhodecode_repo.alias} add README # add first file
     ${c.rhodecode_repo.alias} commit -m "Initial" # commit with message
     ${c.rhodecode_repo.alias} push ${'origin master' if h.is_git(c.rhodecode_repo) else ''} # push changes back
 </pre>
 <h4>${_('Existing repository?')}</h4>
 <pre>
 %if h.is_git(c.rhodecode_repo):
     git remote add origin ${c.clone_repo_url}
     git push -u origin master
 %else:
     hg push ${c.clone_repo_url}
 %endif
 </pre>
 %endif

0 comments (0 inline, 0 general)