kallithea Changeset - 5e3adb20839d

Changeset - 5e3adb20839d

Parent rev.

Child rev.

[Not reviewed]

default

0 20 0

Mads Kiilerich - 8 years ago 2017-06-11 15:02:09
mads@kiilerich.com

style: replace code-body etc with Bootstrap-ish panel and panel-heading, using panel-default for headers and tweak them grey

Based on work by Dominik Ruf.

20 files changed with 271 insertions and 394 deletions:

kallithea/public/css/pygments.css

kallithea/public/css/style.css

173

kallithea/public/js/base.js

kallithea/templates/admin/gists/edit.html

kallithea/templates/admin/gists/new.html

kallithea/templates/admin/gists/show.html

kallithea/templates/changelog/changelog.html

kallithea/templates/changeset/changeset.html

kallithea/templates/changeset/changeset_range.html

kallithea/templates/changeset/diff_block.html

kallithea/templates/compare/compare_diff.html

kallithea/templates/files/diff_2way.html

kallithea/templates/files/files_add.html

kallithea/templates/files/files_browser.html

kallithea/templates/files/files_delete.html

kallithea/templates/files/files_edit.html

kallithea/templates/files/files_source.html

kallithea/templates/search/search_commit.html

kallithea/templates/search/search_content.html

kallithea/templates/search/search_path.html

0 comments (0 inline, 0 general)

kallithea/public/css/pygments.css

➞

Show inline comments

@@ @@ -61,53 +61,48 @@ div.codeblock .code-header .commit { @@
+}
 div.codeblock .code-header .editing-files {
     margin-left: 15px;
+}
 .code-highlighttable,
 div.codeblock .code-body table {
     width: 0 !important;
     border: 0px !important;
+}
 .code-highlighttable,
 div.codeblock .code-body table td {
     border: 0px !important;
+}
 div.code-body {
     background-color: #FFFFFF;
+}
 div.codeblock .code-header .search-path {
     padding: 0px 0px 0px 10px;
+}
 div.search-code-body {
     background-color: #FFFFFF;
     padding: 5px 0px 5px 10px;
+}
 div.search-code-body pre .match {
     background-color: #FAFFA6;
+}
 div.search-code-body pre .break {
     background-color: #DDE7EF;
     width: 100%;
     color: #747474;
     display: block;
+}
 div.annotatediv {
     margin-left: 2px;
     margin-right: 4px;
+}
 .code-highlight {
     padding: 0px;
     margin-top: 5px;
     margin-bottom: 5px;
     border-left: 1px solid #ccc;
+}
 .code-highlight pre, .linenodiv pre {
     padding: 5px 2px 0px 5px;
     margin: 0;
+}
 .code-highlight pre div:target {

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -504,103 +504,144 @@ nav.navbar #quick .repo_switcher_type { @@
 #content #right {
     margin: 0 60px 10px 290px;
+}
 #content nav.navbar,
 div.panel-primary {
     clear: both;
     background: #fff;
     margin: 0 0 10px;
     border-radius: 4px 4px 4px 4px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 div.panel div.panel-heading {
     clear: both;
     overflow: hidden;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
     padding: 10px 20px;
     border-radius: 4px 4px 0 0;
+}
 #content div.panel div.panel-heading .panel-title,
 #content div.panel div.panel-heading a {
     color: #FFFFFF;
+}
 #content div.panel div.panel-heading ul.links li {
     list-style: none;
     float: left;
     margin: 0;
     padding: 0;
+}
 #content div.panel div.panel-heading ul.links li a {
     font-size: 13px;
     font-weight: 700;
     height: 1%;
     text-decoration: none;
+}
 #content div.panel div.panel-heading ul.links.nav-tabs li a {
     float: left;
     color: #fff;
     margin: 0;
     padding: 11px 10px 11px 10px;
+}
 div.panel.panel-default {
     border: 1px solid #ccc;
     box-shadow: none;
     border-radius: 6px 6px 0px 0px;
     margin-bottom: 20px;
+}
 div.panel.panel-default:last-child {
     margin-bottom: 0;
+}
 div.panel.panel-default > div.panel-heading {
     background: #eee;
     border-bottom: 1px solid #ccc;
     font-size: 14px;
     font-weight: 700;
+}
 div.panel.panel-default div.panel-heading a,
 div.panel.panel-default div.panel-heading .pull-left,
 div.panel.panel-default div.panel-heading .pull-left a,
 div.panel.panel-default div.panel-heading .pull-right,
 div.panel.panel-default div.panel-heading .pull-right a {
     color: black !important;
+}
 div.panel.panel-default div.panel-heading .diff-actions a,
 div.panel.panel-default div.panel-heading .diff-actions span.no-file,
 div.panel.panel-default div.panel-heading .diff-actions span.arrow {
     color: #577632 !important;
+}
 div.panel.panel-default div.panel-heading .diff-actions span.no-file,
 div.panel.panel-default div.panel-heading .diff-actions span.arrow {
     opacity: 0.5;
+}
 .clearfix::before, .clearfix::after, .dl-horizontal dd::before, .dl-horizontal dd::after, .container::before, .container::after, .container-fluid::before, .container-fluid::after, .row::before, .row::after, .form-horizontal .form-group::before, .form-horizontal .form-group::after, .btn-toolbar::before, .btn-toolbar::after, .btn-group-vertical > .btn-group::before, .btn-group-vertical > .btn-group::after, .nav::before, .nav::after, .navbar::before, .navbar::after, .navbar-header::before, .navbar-header::after, .navbar-collapse::before, .navbar-collapse::after, .pager::before, .pager::after, .panel::before, .panel::after, .panel-body::before, .panel-body::after, .modal-header::before, .modal-header::after, .modal-footer::before, .modal-footer::after, td.inline-comments::before, td.inline-comments::after {
     content: " ";
     display: table;
+}
 .clearfix::after, .dl-horizontal dd::after, .container::after, .container-fluid::after, .row::after, .form-horizontal .form-group::after, .btn-toolbar::after, .btn-group-vertical > .btn-group::after, .nav::after, .navbar::after, .navbar-header::after, .navbar-collapse::after, .pager::after, .panel::after, .panel-body::after, .modal-header::after, .modal-footer::after, td.inline-comments::after {
     clear: both;
+}
 /* avoid conflict with .container in changeset tables */
 #content div.panel table .container::before,
 #content div.panel table .container::after {
     content: inherit;
     display: inherit;
+}
 .pull-left {
     float: left;
+}
 .pull-right {
     float: right;
+}
 #content div.panel div.panel-heading a,
 #content div.panel div.panel-heading .pull-left,
 #content div.panel div.panel-heading .pull-right {
     color: white;
+}
 #content div.panel div.panel-heading .pull-left {
     margin-right: 10px;
+}
 #content div.panel div.panel-heading .pull-right {
     margin-left: 10px;
+}
 #content div.panel h1,
 #content div.panel h2,
 #content div.panel h3,
 #content div.panel h4,
 #content div.panel h5,
 #content div.panel h6,
 #content div.panel div.h1,
 #content div.panel div.h2,
 #content div.panel div.h3,
 #content div.panel div.h4,
 #content div.panel div.h5,
 #content div.panel div.h6 {
     clear: both;
     overflow: hidden;
     margin: 8px 0 3px;
     padding-bottom: 2px;
+}
 #content div.panel p {
     color: #5f5f5f;
     font-size: 12px;
     line-height: 150%;
     margin: 0 0 10px;
+}
@@ @@ -1732,53 +1773,48 @@ h3.files_location { @@
     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_compare_view_content {
     border: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_content .container {
     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;
@@ @@ -1901,50 +1937,49 @@ BIN_FILENODE = 6 @@
+}
 #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: 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 .container .checkbox {
     width: 14px;
     font-size: 0.85em;
@@ @@ -2142,79 +2177,79 @@ div.panel-body #files_data .revision-lin @@
 .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;
+}
 .right .changes .changed_total {
+.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;
+}
 .right .changes .added,
+.pull-right .changes .added,
 .changed, .removed {
     display: block;
     padding: 1px;
     color: #444444;
     float: right;
     text-align: center;
     min-width: 15px;
+}
 .right .changes .added {
+.pull-right .changes .added {
     background: #CFC;
+}
 .right .changes .changed {
+.pull-right .changes .changed {
     background: #FEA;
+}
 .right .changes .removed {
+.pull-right .changes .removed {
     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;
@@ @@ -2444,105 +2479,49 @@ table.code-browser { @@
 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 {
     height: 16px;
     padding-left: 5px;
     text-align: left;
+}
 .diffblock .changeset_header {
     height: 16px;
+}
 .diffblock .changeset_file {
     float: left;
+}
 .diffblock .diff-menu-wrapper {
     float: left;
+}
 .diffblock .diff-menu {
     position: absolute;
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #577632 #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 {
     float: left;
+}
 .diffblock .diff-actions span.no-file,
 .diffblock .diff-actions span.arrow {
     opacity: 0.5;
+}
 .diffblock .diff-actions span.arrow {
     margin: 0 -3px;
+}
 .diffblock .diff-actions a i {
     margin: 0 2px;
+}
 .diffblock.twoway {
     overflow: visible;
+}
 .diffblock.twoway .diff-actions {
     padding-top: 0;
+}
 .diffblock.twoway .diff-actions label input {
     margin: -5px 5px 0 10px;
     position: relative;
     top: 3px;
+}
 .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 {
     height: 16px;
     padding-left: 5px;
     text-align: left;
+}
 table.code-browser .submodule-dir {
     height: 16px;
     padding-left: 5px;
     text-align: left;
+}
 /* add some padding to the right of the file, folder, or submodule icon and
 before the text */
 table.code-browser i[class^='icon-'] {
     padding-right: .3em;
+}
 .panel .search div.search_path {
     background: none repeat scroll 0 0 #EEE;
     border: 1px solid #CCC;
     color: blue;
     margin-bottom: 10px;
     padding: 10px 0;
@@ @@ -2905,54 +2884,63 @@ nav.navbar, #content, #footer { @@
     position: relative;
     color: inherit;
+}
 .panel-body.settings > ul.nav-stacked li.active > a,
 .panel-body.settings > ul.nav-stacked li.active:hover > a {
     color: #fff;
     background-color: #577632;
+}
 .panel-body.settings > ul.nav-stacked li:hover > a {
     text-decoration: none;
     background-color: #eee;
+}
 .panel-body.settings > div,
 .panel-body.settings > form {
     float: left;
     width: 750px;
     margin: 0;
+}
 .panel-body {
     padding: 20px;
+}
 .panel-body.no-padding {
     padding: 0;
+}
 .panel-body ~ .panel-body {
     padding-top: 0;
+}
 .panel-body.no-padding ~ .panel-body {
     padding-top: 20px;
+}
 .panel-body.settings .text-muted {
     margin: 5px 0;
+}
 /* make .btn inputs and buttons and divs look the same */
 button.btn,
 input.btn {
     font-family: inherit;
     font-size: inherit;
     line-height: inherit;
+}
 .btn::-moz-focus-inner {
     border: 0;
     padding: 0;
+}
 .btn.badge {
     cursor: default !important;
+}
 input[disabled].btn,
 .btn.disabled {
     opacity: 0.5;
@@ @@ -3127,49 +3115,50 @@ nav.navbar #quick li .dropdown-menu, @@
     height: 100%;
+}
 .branch-switcher .select2-container,
 .branch-switcher .select2-choice,
 .branch-switcher .select2-choice span,
 .repo-switcher .select2-container,
 .repo-switcher .select2-choice,
 .repo-switcher .select2-choice span {
     background: transparent !important;
     border: 0 !important;
     box-shadow: none !important;
     color: #FFFFFF !important;
+}
 .branch-switcher .select2-arrow,
 .repo-switcher .select2-arrow {
     display: none !important;
+}
 .branch-switcher-dropdown.select2-drop.select2-drop-active,
 .repo-switcher-dropdown.select2-drop.select2-drop-active {
     box-shadow: none;
     color: #fff;
     background-color: #576622;
     background-color: #577632;
     border-color: #577632;
+}
 .branch-switcher-dropdown.select2-drop.select2-drop-active .select2-results .select2-highlighted,
 .repo-switcher-dropdown.select2-drop.select2-drop-active .select2-results .select2-highlighted {
     background-color: #6388ad;
+}
 #content div.graph {
     padding: 0 10px 10px;
     height: 450px;
+}
 #content div.panel ol.lower-roman,
 #content div.panel ol.upper-roman,
 #content div.panel ol.lower-alpha,
 #content div.panel ol.upper-alpha,
 #content div.panel ol.decimal {
     margin: 10px 24px 10px 44px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div input.error,
 #login div.form div.form-horizontal div.form-group > div input.error,
 #register div.form div.form-horizontal div.form-group > div input.error {
     background: #FBE3E4;
@@ @@ -3669,51 +3658,53 @@ form.comment-form { @@
 .comment-form .comment {
     margin-left: 10px;
+}
 .comment-form .comment-help {
     padding: 5px 5px 5px 5px;
     color: #666;
+}
 .comment-form .comment-button {
     padding-top: 5px;
+}
 .add-another-button {
     margin-left: 10px;
     margin-top: 10px;
     margin-bottom: 10px;
+}
 .comment .buttons {
     float: right;
     margin: -1px 0px 0px 0px;
+}
 .show-inline-comments {
 .panel-heading .pull-left input[type=checkbox],
 .panel-heading .pull-right input[type=checkbox] {
     position: relative;
     top: 1px
     top: 4px;
     margin: -10px 2px 0;
+}
 /** comment inline form **/
 .comment-inline-form {
     margin: 4px;
     max-width: 978px;
+}
 #comments-general-comments .comment-inline-form {
     margin: 0;
+}
 .comment-inline-form .submitting-overlay {
     display: none;
     height: 0;
     text-align: center;
     font-size: 16px;
     opacity: 0.5;
+}
 .comment-inline-form .clearfix,
 .comment-form .clearfix {
     background: #EEE;
     border-radius: 4px;
@@ @@ -3967,151 +3958,62 @@ span.pr-closed-tag { @@
     color: #ffffff;
+}
 input.perm_filter {
     position: relative;
     top: 2px;
+}
 .perm-gravatar {
     vertical-align: middle;
     padding: 2px;
+}
 .perm-gravatar-ac {
     vertical-align: middle;
     padding: 2px;
     width: 14px;
     height: 14px;
+}
 /*****************************************************************************
                                   DIFFS CSS
 ******************************************************************************/
 .diff-collapse {
     text-align: center;
     margin: 0 0 -10px;
+}
     margin-bottom: 20px;
+}
 .diff-collapse-button {
     cursor: pointer;
     color: #666;
     font-size: 16px;
+}
 .diff-container {
+}
 .compare-revision-selector {
     font-weight: bold;
     font-size: 14px;
+}
 .compare-revision-selector > div {
     display: inline-block;
     margin-left: 8px;
     vertical-align: middle;
+}
 .compare-revision-selector .btn {
     margin-bottom: 0;
+}
 div.diffblock {
     overflow: auto;
     padding: 0px;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
     border-radius: 6px 6px 0px 0px;
+}
 .compare-revision-selector,
 div.diffblock .code-header {
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
     padding: 10px 0 10px 0;
     min-height: 14px;
+}
 div.diffblock .code-header.banner {
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
     height: 14px;
     margin: 0;
     padding: 3px 100px 11px 100px;
+}
 div.diffblock .code-header-title {
     padding: 0px 0px 10px 5px !important;
     margin: 0 !important;
+}
 div.diffblock .code-header .hash {
     float: left;
     padding: 2px 0 0 2px;
+}
 div.diffblock .code-header .date {
     float: left;
     text-transform: uppercase;
     padding: 2px 0px 0px 2px;
+}
 div.diffblock .code-header div {
     margin-left: 4px;
     font-weight: bold;
     font-size: 14px;
+}
 div.diffblock .parents {
     float: left;
     min-height: 26px;
     font-size: 10px;
     font-weight: 400;
     vertical-align: middle;
     padding: 0px 2px 2px 2px;
     background-color: #eeeeee;
     border-bottom: 1px solid #CCCCCC;
+}
 div.diffblock .children {
     float: right;
     min-height: 26px;
     font-size: 10px;
     font-weight: 400;
     vertical-align: middle;
     text-align: right;
     padding: 0px 2px 2px 2px;
     background-color: #eeeeee;
     border-bottom: 1px solid #CCCCCC;
+}
 div.diffblock .code-body {
     background: #FFFFFF;
     clear: both;
+}
 div.diffblock pre.raw {
     background: #FFFFFF;
     color: #000000;
+}
     margin-right: 8px;
+}
 table.code-difftable {
     border-collapse: collapse;
     width: 99%;
     border-radius: 0px !important;
+}
 table.code-difftable td {
     padding: 0 !important;
     background: none !important;
     border: 0 !important;
     vertical-align: baseline !important
+}
 table.code-difftable .context {
     background: none repeat scroll 0 0 #DDE7EF;
     color: #999;
+}
 table.code-difftable .add {
     background: none repeat scroll 0 0 #DDFFDD;
+}
 table.code-difftable .add ins {
     background: none repeat scroll 0 0 #AAFFAA;
     text-decoration: none;
+}
 table.code-difftable .del {
     background: none repeat scroll 0 0 #FFDDDD;
@@ @@ -4534,24 +4436,34 @@ ul.user_group_member li { @@
     border-bottom-width: 0;
+}
 .popover.bottom {
     margin-top: 10px;
+}
 .popover.bottom > .arrow {
     top: -11px;
     left: 50%;
     margin-left: -11px;
     border-top-width: 0;
     border-bottom-color: #999;
     border-bottom-color: rgba(0,0,0,.25);
+}
 #clone_by_name.input-group > span,
 #clone_by_id.input-group > span {
     display: inline-block;
+}
 #clone_by_name.input-group > input,
 #clone_by_id.input-group > input {
     width: 80% !important;
+}
 #content div.panel .changelog-panel > .changelog-heading,
 #content div.panel .changelog-panel > ul.pagination {
     margin-left: 100px;
+}
 textarea.commit-message {
     width: 100%;
     box-sizing: border-box;
+}

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -859,59 +859,57 @@ var fileBrowserListeners = function(curr @@
                 $node_filter.removeClass('init');
+            }
         });
     $node_filter.keyup(function(e){
             clearTimeout(filterTimeout);
             filterTimeout = setTimeout(updateFilter(e),600);
         });
 };
 var initCodeMirror = function(textarea_id, baseUrl, resetUrl){
     var myCodeMirror = CodeMirror.fromTextArea($('#' + textarea_id)[0], {
             mode: "null",
             lineNumbers: true,
             indentUnit: 4,
             autofocus: true
         });
     CodeMirror.modeURL = baseUrl + "/codemirror/mode/%N/%N.js";
     $('#reset').click(function(e){
             window.location=resetUrl;
         });
     $('#file_enable').click(function(){
             $('#editor_container').show();
             $('#upload_file_container').hide();
             $('#filename_container').show();
-            $('#mimetype_header').show();
+            $('#body').show();
         });
     $('#upload_file_enable').click(function(){
             $('#editor_container').hide();
             $('#upload_file_container').show();
             $('#filename_container').hide();
-            $('#mimetype_header').hide();
+            $('#body').hide();
         });
     return myCodeMirror
 };
 var setCodeMirrorMode = function(codeMirrorInstance, mode) {
     CodeMirror.autoLoadMode(codeMirrorInstance, mode);
+}
 var _getIdentNode = function(n){
     //iterate thrugh nodes until matching interesting node
     if (typeof n == 'undefined'){
         return -1
+    }
     if(typeof n.id != "undefined" && n.id.match('L[0-9]+')){
         return n
+    }
     else{
         return _getIdentNode(n.parentNode);
+    }
 };

kallithea/templates/admin/gists/edit.html

➞

Show inline comments

@@ @@ -26,76 +26,77 @@ @@
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div class="panel-body">
         <div id="edit_error" style="display: none" class="flash_msg">
             <div class="alert alert-dismissable alert-warning">
               <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><i class="icon-cancel-circled"></i></button>
               ${h.literal(_('Gist was update since you started editing. Copy your changes and click %(here)s to reload new version.')
                              % {'here': h.link_to('here',h.url('edit_gist', gist_id=c.gist.gist_access_id))})}
             </div>
             <script>
             if (typeof jQuery != 'undefined') {
                 $(".alert").alert();
+            }
             </script>
         </div>
         <div id="files_data">
           ${h.form(h.url('edit_gist', gist_id=c.gist.gist_access_id), method='post', id='eform')}
             <div>
                 ${h.gravatar_div(request.authuser.email, size=32)}
                 <input type="hidden" value="${c.file_changeset.raw_id}" name="parent_hash">
-                <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;"
+                <textarea class="form-control commit-message"
                           id="description" name="description"
                           placeholder="${_('Gist description ...')}">${c.gist.gist_description}</textarea>
                 <div>
                     <label>
                         ${_('Gist lifetime')}
                         ${h.select('lifetime', '0', c.lifetime_options)}
                     </label>
                     <span class="text-muted">
                      %if c.gist.gist_expires == -1:
                       ${_('Expires')}: ${_('Never')}
                      %else:
                       ${_('Expires')}: ${h.age(h.time_to_datetime(c.gist.gist_expires))}
                      %endif
                    </span>
                 </div>
             </div>
             % for cnt, file in enumerate(c.files):
                 <div id="body" class="codeblock" style="margin-bottom: 4px">
                     <div style="padding: 10px 10px 10px 26px;color:#666666">
                 <div id="body" class="panel panel-default form-inline">
                     <div class="panel-heading">
                         <input type="hidden" value="${h.safe_unicode(file.path)}" name="org_files">
                         <input id="filename_${h.FID('f',file.path)}" name="files" size="30" type="text" value="${h.safe_unicode(file.path)}">
                         <select id="mimetype_${h.FID('f',file.path)}" name="mimetypes"></select>
                         <input class="form-control" id="filename_${h.FID('f',file.path)}" name="files" size="30" type="text" value="${h.safe_unicode(file.path)}">
                         <select class="form-control" id="mimetype_${h.FID('f',file.path)}" name="mimetypes"></select>
                     </div>
                     <div class="editor_container">
                         <pre id="editor_pre"></pre>
                         <textarea id="editor_${h.FID('f',file.path)}" name="contents" style="display:none">${file.content}</textarea>
                     <div class="panel-body">
                         <div id="editor_container">
                             <textarea id="editor_${h.FID('f',file.path)}" name="contents" style="display:none">${file.content}</textarea>
                         </div>
                     </div>
                 </div>
                 ## dynamic edit box.
                 <script type="text/javascript">
                     $(document).ready(function(){
                         var myCodeMirror = initCodeMirror(${h.js('editor_' + h.FID('f',file.path))}, ${h.jshtml(request.script_name)}, '');
                         //inject new modes
                         var $mimetype_select = $(${h.js('#mimetype_' + h.FID('f',file.path))});
                         $mimetype_select.each(function(){
                             var modes_select = this;
                             var index = 1;
                             for(var i=0;i<CodeMirror.modeInfo.length;i++) {
                                 var m = CodeMirror.modeInfo[i];
                                 var opt = new Option(m.name, m.mime);
                                 $(opt).attr('mode', m.mode);
                                 if (m.mime == 'text/plain') {
                                     // default plain text
                                     $(opt).prop('selected', true);
                                     modes_select.options[0] = opt;
                                 } else {
                                     modes_select.options[index++] = opt;
+                                }

kallithea/templates/admin/gists/new.html

➞

Show inline comments

@@ @@ -11,68 +11,66 @@ @@
   <script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 </%block>
 <%block name="css_extra">
   <link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('New Gist')}
 </%def>
 <%block name="header_menu">
     ${self.menu('gists')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div class="panel-body">
         <div id="files_data">
           ${h.form(h.url('gists'), method='post',id='eform')}
             <div>
                 ${h.gravatar_div(request.authuser.email, size=32)}
                 <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;" id="description" name="description" placeholder="${_('Gist description ...')}"></textarea>
                 <textarea class="form-control commit-message" id="description" name="description" placeholder="${_('Gist description ...')}"></textarea>
                 <div>
                     <label>
                         ${_('Gist lifetime')}
                         ${h.select('lifetime', '', c.lifetime_options)}
                     </label>
                 </div>
             </div>
             <div id="body" class="codeblock">
                 <div style="padding: 10px 10px 10px 26px;color:#666666">
                     ${h.text('filename', size=30, placeholder=_('name this file...'))}
                     <select id="mimetype" name="mimetype"></select>
             <div id="body" class="panel panel-default">
                 <div class="panel-heading">
                     ${h.text('filename', size=30, placeholder=_('Name this gist ...'), class_='form-control')}
                     <select class="form-control" id="mimetype" name="mimetype"></select>
                 </div>
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
                     <textarea id="editor" name="content" style="display:none"></textarea>
                 <div class="panel-body no-padding">
                         <textarea id="editor" name="content"></textarea>
                 </div>
             </div>
-            <div style="padding-top: 5px">
             <div>
             ${h.submit('private',_('Create Private Gist'),class_="btn btn-success btn-xs")}
             ${h.submit('public',_('Create Public Gist'),class_="btn btn-default btn-xs")}
             ${h.reset('reset',_('Reset'),class_="btn btn-default btn-xs")}
             </div>
           ${h.end_form()}
           <script type="text/javascript">
             $(document).ready(function(){
                 var myCodeMirror = initCodeMirror('editor', ${h.jshtml(request.script_name)}, '');
                 //inject new modes
                 var $mimetype_select = $('#mimetype');
                 $mimetype_select.each(function(){
                     var modes_select = this;
                     var index = 1;
                     for(var i=0;i<CodeMirror.modeInfo.length;i++) {
                         var m = CodeMirror.modeInfo[i];
                         var opt = new Option(m.name, m.mime);
                         $(opt).attr('mode', m.mode);
                         if (m.mime == 'text/plain') {
                             // default plain text
                             $(opt).prop('selected', true);
                             modes_select.options[0] = opt;
                         } else {
                             modes_select.options[index++] = opt;

kallithea/templates/admin/gists/show.html

➞

Show inline comments

@@ @@ -7,90 +7,88 @@ @@
 <%def name="breadcrumbs_links()">
     ${_('Gist')} &middot; ${c.gist.gist_access_id}
     / ${_('URL')}: ${c.gist.gist_url()}
 </%def>
 <%block name="header_menu">
     ${self.menu('gists')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         <div class="pull-left">
             ${self.breadcrumbs()}
         </div>
         %if request.authuser.username != 'default':
         <div class="pull-right">
             <a href="${h.url('new_gist')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Create New Gist')}</a>
         </div>
         %endif
     </div>
     <div class="panel-body">
         <div id="files_data">
             <div id="body" class="codeblock">
                 <div class="code-header">
                     <div class="stats">
             <div id="body" class="panel panel-default">
                 <div class="panel-heading clearfix">
                         <div class="pull-left">
                           %if c.gist.gist_type == 'public':
                             <div class="label label-success">${_('Public Gist')}</div>
                           %else:
                             <div class="label label-warning">${_('Private Gist')}</div>
                           %endif
                         </div>
                         <div class="pull-left">
                             ${c.gist.gist_description}
                         </div>
                         <div class="pull-left text-muted">
                          %if c.gist.gist_expires == -1:
                           ${_('Expires')}: ${_('Never')}
                          %else:
                           ${_('Expires')}: ${h.age(h.time_to_datetime(c.gist.gist_expires))}
                          %endif
                         </div>
                         %if h.HasPermissionAny('hg.admin')() or c.gist.owner_id == request.authuser.user_id:
                         <div class="pull-right">
                             ${h.form(url('gist_delete', gist_id=c.gist.gist_id))}
                                 ${h.submit('remove_gist', _('Delete'),class_="btn btn-danger btn-xs",onclick="return confirm('"+_('Confirm to delete this Gist')+"');")}
                             ${h.end_form()}
                         </div>
                         %endif
                         <div class="pull-right">
                           ## only owner should see that
                           %if h.HasPermissionAny('hg.admin')() or c.gist.owner_id == request.authuser.user_id:
                             ${h.link_to(_('Edit'),h.url('edit_gist', gist_id=c.gist.gist_access_id),class_="btn btn-default btn-xs")}
                           %endif
                           ${h.link_to(_('Show as Raw'),h.url('formatted_gist', gist_id=c.gist.gist_access_id, format='raw'),class_="btn btn-default btn-xs")}
                         </div>
                     </div>
                 </div>
                 <div class="panel-body">
                     <div class="author">
                         ${h.gravatar_div(h.email_or_none(c.file_changeset.author), size=16)}
                         <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)} - ${_('created')} ${h.age(c.file_changeset.date)}</div>
                     </div>
-                    <div class="commit">${h.urlify_text(c.file_changeset.message,c.repo_name)}</div>
                     <div>${h.urlify_text(c.file_changeset.message,c.repo_name)}</div>
                 </div>
             </div>
                ## iterate over the files
                % for file in c.files:
                <div style="border: 1px solid #EEE;margin-top:20px">
                 <div id="${h.FID('G', file.path)}" class="stats" style="border-bottom: 1px solid #DDD;padding: 8px 14px;">
                     <a href="${c.gist.gist_url()}">¶</a>
                     <b style="margin:0px 0px 0px 4px">${h.safe_unicode(file.path)}</b>
                     <div class="pull-right" style="margin: -5px">
                        ${h.link_to(_('Show as raw'),h.url('formatted_gist_file', gist_id=c.gist.gist_access_id, format='raw', revision=file.changeset.raw_id, f_path=h.safe_unicode(file.path)),class_="btn btn-default btn-xs")}
             %for file in c.files:
               <div class="panel panel-default">
                 <div id="${h.FID('G', file.path)}" class="panel-heading clearfix">
                     <div class="pull-left">
                       <b>${h.safe_unicode(file.path)}</b>
                     </div>
                     <div class="pull-right">
                       ${h.link_to(_('Show as raw'),h.url('formatted_gist_file', gist_id=c.gist.gist_access_id, format='raw', revision=file.changeset.raw_id, f_path=h.safe_unicode(file.path)),class_="btn btn-default btn-xs")}
                     </div>
                 </div>
-                <div class="code-body">
+                <div class="panel-body no-padding">
                     ${h.pygmentize(file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
                 </div>
               </div>
-               %endfor
             %endfor
         </div>
     </div>
 </div>
 </%def>

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -10,83 +10,81 @@ @@
 </%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">
+    <div class="panel-body changelog-panel">
         %if c.pagination:
             <div>
               <div class="clearfix" style="${'display:none' if c.changelog_for_path else ''}">
                 <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>
               <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="container ${'mergerow' if len(cs.parents) > 1 else ''}">
                         <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 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)}"
@@ @@ -158,50 +156,48 @@ ${self.repo_context_bar('changelog', c.f @@
                                     %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>
                         </td>
                     </tr>
                 %endfor
                 </tbody>
                 </table>
                 <input type="checkbox" id="singlerange" style="display:none"/>
                 </div>
                 <ul class="pagination">
                     ${c.pagination.pager()}
                 </ul>
               </div>
             </div>
         <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>
         <script type="text/javascript">
             $(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)},

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -8,88 +8,85 @@ @@
     ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('Changeset')} - <span class='hash'>${h.show_id(c.changeset)}</span>
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('changelog', c.changeset.raw_id)}
 <div class="panel panel-primary">
   <div class="panel-heading clearfix">
     ${self.breadcrumbs()}
   </div>
   <script>
     var _USERS_AC_DATA = ${h.js(c.users_array)};
     var _GROUPS_AC_DATA = ${h.js(c.user_groups_array)};
     AJAX_COMMENT_URL = ${h.js(url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id))};
     AJAX_COMMENT_DELETE_URL = ${h.js(url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__'))};
   </script>
   <div class="panel-body">
     <div>
         <div class="diffblock">
     <div class="panel panel-default">
         <div class="panel-heading clearfix">
             <div class="parents pull-left">
                 <div id="parent_link" class="changeset_hash">
-                    <i style="color:#036185" class="icon-left-open"></i> <a href="#">${_('Parent rev.')}</a>
                     <i class="icon-left-open"></i> <a href="#">${_('Parent rev.')}</a>
                 </div>
             </div>
             <div class="pull-right children">
                 <div id="child_link" class="changeset_hash">
-                    <a href="#">${_('Child rev.')}</a> <i style="color:#036185" class="icon-right-open"></i>
                     <a href="#">${_('Child rev.')}</a> <i class="icon-right-open"></i>
                 </div>
             </div>
             <div class="pull-left code-header banner">
                 <div class="pull-left changeset-status-container">
             <div class="pull-left">
                 <div class="pull-left">
                     %if c.statuses:
                         <span class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[0]}"></i></span>
                         <span title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</span>
                     %endif
                 </div>
                 <div class="diff-actions pull-left">
                   <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" data-toggle="tooltip" title="${_('Raw diff')}">
                       <i class="icon-diff"></i>
                   </a>
                   <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" data-toggle="tooltip" title="${_('Patch diff')}">
                       <i class="icon-file-powerpoint"></i>
                   </a>
                   <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" data-toggle="tooltip" title="${_('Download diff')}">
                       <i class="icon-floppy"></i>
                   </a>
                   ${c.ignorews_url(request.GET)}
                   ${c.context_url(request.GET)}
                 </div>
                 <div class="text-right pull-right comments-number" style="padding-right:5px">
                     ${comment.comment_count(c.inline_cnt, len(c.comments))}
                 </div>
             </div>
         </div>
-        <div id="changeset_content">
+        <div class="panel-body">
             <div class="form-group container">
                 <div class="pull-right">
                     <span class="logtags">
                         %if len(c.changeset.parents)>1:
                         <span class="mergetag">${_('Merge')}</span>
                         %endif
                         %if h.is_hg(c.db_repo_scm_instance):
                           %for book in c.changeset.bookmarks:
                           <span class="booktag" title="${_('Bookmark %s') % book}">
                              ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
                           </span>
                           %endfor
                         %endif
                         %for tag in c.changeset.tags:
                          <span class="tagtag"  title="${_('Tag %s') % tag}">
                          ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
                         %endfor
                         %if c.changeset.branch:
                          <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}">
                          ${h.link_to(c.changeset.branch,h.url('changelog_home',repo_name=c.repo_name,branch=c.changeset.branch))}
@@ @@ -136,98 +133,102 @@ ${self.repo_context_bar('changelog', c.c @@
                            comma = ""
                            if i != len(c.changeset.successors)-1:
                              comma = ", "
                            %>
                          <a class='successors_hash' href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}
                        % endfor
                      </div>
                      % endif
                      % if hasattr(c.changeset, 'precursors') and c.changeset.precursors:
                      <div class='precursors'>
                        <span class='precursors_header'>${_('Preceded by:')} </span>
                        % for i, s in enumerate(c.changeset.precursors):
                            <%
                            comma = ""
                            if i != len(c.changeset.precursors)-1:
                              comma = ", "
                            %>
                            <a class="precursors_hash" href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}
                        % endfor
                      </div>
                      % endif
                 </div>
             </div>
-            <div class="message form-group">${h.urlify_text(c.changeset.message, c.repo_name)}</div>
             <div class="form-group">${h.urlify_text(c.changeset.message, c.repo_name)}</div>
             <div class="changes_txt">
               <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %>
               % if c.limited_diff:
                   ${ungettext('%s file changed', '%s files changed', len(file_diff_data)) % len(file_diff_data)}:
               % else:
                   ${ungettext('%s file changed with %s insertions and %s deletions', '%s files changed with %s insertions and %s deletions', len(file_diff_data)) % (len(file_diff_data), c.lines_added, c.lines_deleted)}:
               %endif
               </div>
               <div class="cs_files">
                 %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 pull-right">${h.fancy_file_stats(stats)}</div>
                     </div>
                 %endfor
                 %if c.limited_diff:
                   <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>
                 %endif
             </div>
             <div class="comments-number">
                 ${comment.comment_count(c.inline_cnt, len(c.comments))}
             </div>
         </div>
     </div>
   </div>
   ## diff block
   <div class="panel-body">
   <div class="commentable-diff">
     ## diff block
     <div class="commentable-diff">
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
     ${diff_block.diff_block_js()}
     <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.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)}
     % if c.limited_diff:
       <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>
     % endif
     </div>
     ## template for inline comment form
     ${comment.comment_inline_form()}
     ## render comments and inlines
     ${comment.generate_comments()}
     ## main comment form and it status
     ${comment.comments()}
     </div>
     ## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS
     <script type="text/javascript">
       $(document).ready(function(){
           $('.code-difftable').on('click', '.add-bubble', function(e){
               show_comment_form($(this));
           });
           move_comments($(".comments .comments-list-chunk"));
           pyroutes.register('changeset_home',
                             ${h.js(h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s'))},
                             ['repo_name', 'revision']);
           //next links
           $('#child_link').on('click', function(e){
               //fetch via ajax what is going to be the next link, if we have
               //>1 links show them to user to choose
               if(!$('#child_link').hasClass('disabled')){
                   $.ajax({
                     url: ${h.js(h.url('changeset_children',repo_name=c.repo_name, revision=c.changeset.raw_id))},
                     success: function(data) {
                       if(data.results.length === 0){
                           $('#child_link').addClass('disabled');
                           $('#child_link').html(${h.jshtml(_('No revisions'))});
@@ @@ -282,26 +283,25 @@ ${self.repo_context_bar('changelog', c.c @@
                                   .replace('__title__', data.results[0].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[0].raw_id}));
                           _html +='<br/>'
                           _html +='<i style="color:#036185" class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
                                   .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[1].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[1].raw_id}));
                           $('#parent_link').html(_html);
+                      }
+                    }
                   });
               e.preventDefault();
+              }
           });
           // hack: re-navigate to target after JS is done ... if a target is set and setting href thus won't reload
           if (window.location.hash != "") {
               window.location.href = window.location.href;
+          }
       });
     </script>
   </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">
         ${self.breadcrumbs()}
         <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>
         <div id="body" class="diffblock">
             <div class="code-header">
                 <div>
                     ${h.show_id(c.cs_ranges[0])}
                     <i class="icon-right"></i>
                     ${h.show_id(c.cs_ranges[-1])}
                     <a style="font-weight: bold" 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>
         <div id="changeset_compare_view_content">
               <div class="container">
         <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('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
                     <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><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                     <td>
                       %if c.statuses:
                         <div title="${_('Changeset status')}" class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[cnt]}"></i></div>
                       %endif
                     </td>
                     <td><div class="message">${h.urlify_text(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>
                   </tr>
                 %endfor
                 </table>
               </div>
               <h4>${_('Files affected')}</h4>
               <div class="cs_files">
                 <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>
       </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">
           <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>
             ${h.gravatar_div(h.email_or_none(cs.author), size=20)}
             <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}">

kallithea/templates/changeset/diff_block.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%def name="diff_block(a_repo_name, a_ref_type, a_ref_name, a_rev,
                        cs_repo_name, cs_ref_name, cs_ref_type, cs_rev,
                        file_diff_data)">
 <div class="diff-collapse">
-    <span data-target="${'diff-container-%s' % (id(file_diff_data))}" class="diff-collapse-button">&uarr; ${_('Collapse Diff')} &uarr;</span>
+    <span data-target="${'no-padding-%s' % (id(file_diff_data))}" class="diff-collapse-button">&uarr; ${_('Collapse Diff')} &uarr;</span>
 </div>
 <div class="diff-container" id="${'diff-container-%s' % (id(file_diff_data))}">
 %for id_fid, url_fid, op, a_filename, cs_filename, diff, stats in file_diff_data:
     ${diff_block_diffblock(id_fid, url_fid, op, diff,
         a_repo_name, a_rev, a_ref_type, a_ref_name, a_filename,
         cs_repo_name, cs_rev, cs_ref_type, cs_ref_name, cs_filename)}
         cs_repo_name, cs_rev, cs_ref_type, cs_ref_name, cs_filename,
         'no-padding-%s' % id(file_diff_data))}
 %endfor
 </div>
 </%def>
 <%def name="diff_block_diffblock(id_fid, url_fid, op, diff,
     a_repo_name, a_rev, a_ref_type, a_ref_name, a_filename,
     cs_repo_name, cs_rev, cs_ref_type, cs_ref_name, cs_filename)"
+    cs_repo_name, cs_rev, cs_ref_type, cs_ref_name, cs_filename, cls)"
+>
     <div id="${id_fid}_target" style="clear:both;margin-top:25px"></div>
     <div id="${id_fid}" class="diffblock margined comm">
         <div class="code-header">
             <div class="changeset_header">
                 <div class="changeset_file">
     <div id="${id_fid}_target"></div>
     <div id="${id_fid}" class="panel panel-default ${cls}">
         <div class="panel-heading clearfix">
                 <div class="pull-left">
                     ${h.safe_unicode(cs_filename)}
                 </div>
                 <div class="diff-actions">
+                <div class="pull-left diff-actions">
                   <span style="margin: 0 10px">
                     %if op == 'A':
                       <span class="no-file" data-toggle="tooltip" title="${_('No file before')}">
                         <i class="icon-minus-circled"></i></span>
                     %else:
                       <a href="${h.url('files_home', repo_name=a_repo_name, f_path=a_filename, revision=a_rev)}" data-toggle="tooltip" title="${_('File before')}">
                         <i class="icon-doc"></i></a>
                     %endif
                     %if op == 'A':
                       <span class="arrow" data-toggle="tooltip" title="${_('Added')}">&#10142;</span>
                     %elif op == 'M':
                       <span class="arrow" data-toggle="tooltip" title="${_('Modified')}">&#10142;</span>
                     %elif op == 'D':
                       <span class="arrow" data-toggle="tooltip" title="${_('Deleted')}">&#10142;</span>
                     %elif op == 'R':
                       <span class="arrow" data-toggle="tooltip" title="${_('Renamed')}">&#10142;</span>
                     %elif op is None:
                       <span class="arrow" data-toggle="tooltip" title="${_('No change')}">&#10142;</span>
                     %else:
                       <span class="arrow" data-toggle="tooltip" title="${_('Unknown operation: %r') % op}">&#10142;</span>
                     %endif
                     %if op == 'D':
                       <span class="no-file" data-toggle="tooltip" title="${_('No file after')}">
                         <i class="icon-minus-circled"></i></span>
                     %else:
                       <a href="${h.url('files_home', repo_name=cs_repo_name, f_path=cs_filename, revision=cs_rev)}" data-toggle="tooltip" title="${_('File after')}">
                         <i class="icon-doc"></i></a>
                     %endif
                   </span>
                   <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" data-toggle="tooltip" title="${_('Show full diff for this file')}">
                       <i class="icon-file-code"></i></a>
                   <a href="${h.url('files_diff_2way_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" data-toggle="tooltip" title="${_('Show full side-by-side diff for this file')}">
                       <i class="icon-docs"></i></a>
                   <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='raw')}" data-toggle="tooltip" title="${_('Raw diff')}">
                       <i class="icon-diff"></i></a>
                   <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='download')}" data-toggle="tooltip" title="${_('Download diff')}">
                       <i class="icon-floppy"></i></a>
                   ${c.ignorews_url(request.GET, url_fid)}
                   ${c.context_url(request.GET, url_fid)}
                 </div>
                 <span class="pull-right" style="margin-top:-3px">
                     <label>
                         ${_('Show inline comments')}
                         ${h.checkbox('checkbox-show-inline-' + id_fid, checked="checked",class_="show-inline-comments",**{'data-id_for':id_fid})}
                     </label>
                 </span>
             </div>
                 <div class="pull-right">
                     ${_('Show inline comments')}
                     ${h.checkbox('checkbox-show-inline-' + id_fid, checked="checked",class_="show-inline-comments",**{'data-id_for':id_fid})}
                 </div>
         </div>
-        <div class="code-body" data-f_path="${h.safe_unicode(cs_filename)}">
+        <div class="no-padding panel-body" data-f_path="${h.safe_unicode(cs_filename)}">
             ${diff|n}
             %if cs_filename.rsplit('.')[-1] in ['png', 'gif', 'jpg', 'bmp']:
               <div class="btn btn-image-diff-show">Show images</div>
               %if op == 'M':
                 <div id="${id_fid}_image-diff" class="btn btn-image-diff-swap" style="display:none">Press to swap images</div>
               %endif
-              <div style="font-size: 0">
               <div>
                 %if op in 'DM':
                   <img id="${id_fid}_image-diff-img-a" class="img-diff img-diff-swapable" style="display:none"
                       realsrc="${h.url('files_raw_home',repo_name=a_repo_name,revision=a_rev,f_path=a_filename)}" />
                 %endif
                 %if op in 'AM':
                   <img id="${id_fid}_image-diff-img-b" class="img-diff img-diff-swapable" style="display:none"
                       realsrc="${h.url('files_raw_home',repo_name=cs_repo_name,revision=cs_rev,f_path=cs_filename)}" />
                 %endif
               </div>
             %endif
         </div>
     </div>
 </%def>
 <%def name="diff_block_js()">
 <script type="text/javascript">
 $(document).ready(function(){
     $('.btn-image-diff-show').click(function(e){
         $('.btn-image-diff-show').hide();
         $('.btn-image-diff-swap').show();
         $('.img-diff-swapable')
             .each(function(i,e){
                     $(e).prop('src', $(e).attr('realsrc'));
                 })
             .show();
         });
     $('.btn-image-diff-swap').mousedown(function(e){
         $('#'+e.currentTarget.id+'-img-a.img-diff-swapable')
           .before($('#'+e.currentTarget.id+'-img-b.img-diff-swapable'));
     });
     var reset = function(e){
         $('#'+e.currentTarget.id+'-img-a.img-diff-swapable')
           .after($('#'+e.currentTarget.id+'-img-b.img-diff-swapable'));
     };
     $('.btn-image-diff-swap').mouseup(reset);
     $('.btn-image-diff-swap').mouseleave(reset);
     $('.diff-collapse-button').click(function(e) {
         $('.diff_block').toggleClass('hidden');
         var $button = $(e.currentTarget);
-        var $target = $('#' + $button.data('target'));
+        var $target = $('.' + $button.data('target'));
         if($target.hasClass('hidden')){
             $target.removeClass('hidden');
             $button.html("&uarr; {0} &uarr;".format(_TM['Collapse Diff']));
+        }
         else if(!$target.hasClass('hidden')){
             $target.addClass('hidden');
             $button.html("&darr; {0} &darr;".format(_TM['Expand Diff']));
+        }
     });
     $('.show-inline-comments').change(function(e){
         var target = e.currentTarget;
         if(target == null){
             target = this;
+        }
         var boxid = $(target).data('id_for');
         if(target.checked){
             $('#{0} .inline-comments'.format(boxid)).show();
         }else{
             $('#{0} .inline-comments'.format(boxid)).hide();
+        }
     });
 });
 </script>
 </%def>

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -3,116 +3,118 @@ @@
 <%block name="title">
     %if c.compare_home:
         ${_('%s Compare') % c.repo_name}
     %else:
         ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.a_repo.repo_name, c.a_ref_name)} &gt; ${'%s@%s' % (c.cs_repo.repo_name, c.cs_ref_name)}
     %endif
 </%block>
 <%def name="breadcrumbs_links()">
   ${_('Compare Revisions')}
 </%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">
         ${self.breadcrumbs()}
     </div>
     <div class="panel-body">
       <div>
         <div id="body" class="diffblock">
       <div class="panel panel-default">
         <div id="body" class="panel-heading">
             <div class="compare-revision-selector">
                 ## divs are "inline-block" and cannot have whitespace between them.
                 <div>
                     ${h.hidden('compare_org')}
                 </div><div>
                     <i class="icon-right"></i>
                 </div><div>
                     ${h.hidden('compare_other')}
                 </div><div>
                     %if not c.compare_home:
                         <a class="btn btn-default btn-sm" href="${c.swap_url}"><i class="icon-arrows-cw"></i> ${_('Swap')}</a>
                     %endif
                     <div id="compare_revs" class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div>
                 </div>
             </div>
         </div>
     %if c.compare_home:
         <div id="changeset_compare_view_content">
+        <div id="changeset_compare_view_content" class="panel-body">
          <h4 class="text-muted">${_('Compare revisions, branches, bookmarks, or tags.')}</h4>
         </div>
     %else:
         <div id="changeset_compare_view_content">
+        <div id="changeset_compare_view_content" class="panel-body">
                 ##CS
                 <h5>${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</h5>
                 <%include file="compare_cs.html" />
                 ## FILES
                 <h5>
                 % if c.limited_diff:
                     ${ungettext('%s file changed', '%s files changed', len(c.file_diff_data)) % len(c.file_diff_data)}:
                 % else:
                     ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.file_diff_data)) % (len(c.file_diff_data),c.lines_added,c.lines_deleted)}:
                 %endif
                 ${c.ignorews_url(request.GET)}
                 ${c.context_url(request.GET)}
                 </h5>
                 <div class="cs_files">
                   %if not c.file_diff_data:
                      <span class="empty_data">${_('No files')}</span>
                   %endif
                   %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data:
                     <div class="cs_${op}">
                       <div class="node">
                           <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
                   %if c.limited_diff:
                     <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>
                   %endif
                 </div>
         </div>
       </div>
     %endif
     %if not c.compare_home:
         ## diff block
         <%namespace name="diff_block" file="/changeset/diff_block.html"/>
         ${diff_block.diff_block_js()}
         ${diff_block.diff_block(c.a_repo.repo_name, c.a_ref_type, c.a_ref_name, c.a_rev,
                                 c.cs_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev, c.file_diff_data)}
         % if c.limited_diff:
           <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h4>
         % endif
       </div>
     %endif
     </div>
 </div>
     <script type="text/javascript">
    $(document).ready(function(){
     var cache = {};
     function make_revision_dropdown(css_selector, repo_name, ref_name, cache_key) {
       $(css_selector).select2({
         placeholder: '{0}@{1}'.format(repo_name, ref_name || ${h.jshtml(_('Select changeset'))}),
         formatSelection: function(obj){
             return '{0}@{1}'.format(repo_name, obj.text);
         },
         dropdownAutoWidth: true,
         maxResults: 50,
         query: function(query){
           var key = cache_key;
           var cached = cache[key] ;
           if(cached) {
             var data = {results: []};
             var queryLower = query.term.toLowerCase();
             //filter results

kallithea/templates/files/diff_2way.html

➞

Show inline comments

@@ @@ -9,57 +9,57 @@ @@
 <%block name="css_extra">
   <link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
   <link rel="stylesheet" type="text/css" href="${h.url('/css/mergely.css')}"/>
 </%block>
 <%block name="title">
     ${_('%s File side-by-side diff') % c.repo_name}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('File diff')} ${h.show_id(c.changeset_1)} &rarr; ${h.show_id(c.changeset_2)}
 </%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">
         ${self.breadcrumbs()}
     </div>
     <div class="diff-container">
         <div class="diffblock comm twoway">
             <div class="code-header">
     <div class="no-padding panel-body">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <div class="changeset_header">
-                    <div class="changeset_file">
+                    <div class="pull-left">
                         ${h.link_to(h.safe_unicode(c.node1.path),h.url('files_home',repo_name=c.repo_name,
                         revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))}
                     </div>
                     <div class="diff-actions">
+                    <div class="pull-left diff-actions">
                       <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" data-toggle="tooltip" title="${_('Show full diff for this file')}">
                           <i class="icon-file-code"></i>
                       </a>
                       <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" data-toggle="tooltip" title="${_('Show full side-by-side diff for this file')}">
                           <i class="icon-docs"></i>
                       </a>
                       <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" data-toggle="tooltip" title="${_('Raw diff')}">
                           <i class="icon-diff"></i>
                       </a>
                       <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" data-toggle="tooltip" title="${_('Download diff')}">
                           <i class="icon-floppy"></i>
                       </a>
                       ${h.checkbox('ignorews', label=_('Ignore whitespace'))}
                       ${h.checkbox('edit_mode', label=_('Edit'))}
                     </div>
                 </div>
             </div>
             <div id="compare"></div>
         </div>
     </div>
 <script>
 var orig1_url = ${h.jshtml(h.url('files_raw_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),revision=c.cs1.raw_id))};
 var orig2_url = ${h.jshtml(h.url('files_raw_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node2.path),revision=c.cs2.raw_id))};

kallithea/templates/files/files_add.html

➞

Show inline comments

@@ @@ -7,84 +7,88 @@ @@
 <%block name="js_extra">
   <script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
   <script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>
   <script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 </%block>
 <%block name="css_extra">
   <link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 </%block>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('Add New File')} @ ${h.show_id(c.cs)}
 </%def>
 <%def name="main()">
 ${self.repo_context_bar('files')}
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         <div class="pull-left">
             ${self.breadcrumbs()}
         </div>
-        <div class="pull-right panel-title">
         <div class="pull-right">
             <a href="#">${_('Branch')}: ${c.cs.branch}</a>
         </div>
     </div>
     <div class="panel-body" id="edit">
         <div id="files_data">
           ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-horizontal form-inline")}
           <h3 class="files_location">
             ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.f_path)} /
             ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-horizontal form-inline")}
             <h3 class="files_location">
               ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.f_path)} /
               <span id="filename_container" class="file reviewer_ac">
                   <input class="form-control input-small" type="text" value="" size="30" name="filename" id="filename" placeholder="${_('Enter filename...')}">
                   <input type="hidden" value="${c.f_path}" name="location" id="location">
                   ${_('or')} <div class="btn btn-default btn-sm" id="upload_file_enable">${_('Upload File')}</div>
               </span>
               <span id="upload_file_container" class="reviewer_ac" style="display:none">
                   <input class="form-control" type="file" size="20" name="upload_file" id="upload_file">
                   ${_('or')} <span class="btn btn-default btn-sm" id="file_enable">${_('Create New File')}</span>
               </span>
           </h3>
             <div id="body" class="codeblock">
             <div class="code-header" id="mimetype_header">
                 <label class="commit">
                     ${_('New file type')}
                     <select class="form-control" id="mimetype" name="mimetype"></select>
                 </label>
             </h3>
             <div id="body" class="panel panel-default">
               <div class="panel-heading">
                   <div class="pull-left">
                     <label>${_('New file type')}
                         <select class="form-control" id="mimetype" name="mimetype"></select>
                     </label>
                   </div>
               </div>
               <div class="panel-body no-padding">
                 <textarea id="editor" name="content" style="display:none"></textarea>
               </div>
             </div>
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
                     <textarea id="editor" name="content" style="display:none"></textarea>
                 </div>
                 <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>
                 <textarea class="form-control" name="message" style="height: 100px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
             </div>
             <div style="text-align: left;padding-top: 5px">
             ${h.submit('commit',_('Commit Changes'),class_="btn btn-success btn-sm")}
             ${h.reset('reset',_('Reset'),class_="btn btn-default btn-sm")}
             <div>
               <div>
                   <div>${_('Commit Message')}</div>
                   <textarea class="form-control commit-message" name="message" placeholder="${c.default_message}"></textarea>
               </div>
               <div class="buttons">
                 ${h.submit('commit',_('Commit Changes'),class_="btn btn-success")}
                 ${h.reset('reset',_('Reset'),class_="btn btn-default")}
               </div>
             </div>
             ${h.end_form()}
             <script type="text/javascript">
                 $(document).ready(function(){
                     var reset_url = ${h.jshtml(h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path))};
                     var myCodeMirror = initCodeMirror('editor', ${h.jshtml(request.script_name)}, reset_url);
                     //inject new modes, based on codeMirrors modeInfo object
                     var $mimetype_select = $('#mimetype');
                     $mimetype_select.each(function(){
                         var modes_select = this;
                         var index = 1;
                         for(var i=0;i<CodeMirror.modeInfo.length;i++){
                             var m = CodeMirror.modeInfo[i];
                             var opt = new Option(m.name, m.mime);
                             $(opt).attr('mode', m.mode);
                             if (m.mime == 'text/plain') {
                                 // default plain text
                                 $(opt).prop('selected', true);
                                 modes_select.options[0] = opt;
                             } else {
                                 modes_select.options[index++] = opt;
+                            }
+                        }

kallithea/templates/files/files_browser.html

➞

Show inline comments

@@ @@ -34,49 +34,49 @@ @@
               <div class="info_box_elem">${h.text('at_rev',value=c.changeset.revision,size=5)}</div>
               <div class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_next}" title="${_('Next revision')}"><i class="icon-right-open"></i></a></div>
             </div>
             ${h.end_form()}
         </div>
         <div class="browser-branch">
             <label>
                 ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
                 ${_('Follow current branch')}
             </label>
         </div>
         <div id="search_activate_id" class="search_activate">
             <a class="btn btn-default btn-xs" id="filter_activate" href="#">${_('Search File List')}</a>
         </div>
         <div class="browser-search">
             <div>
                 <div id="node_filter_box_loading" style="display:none">${_('Loading file list...')}</div>
                 <div id="node_filter_box" style="display:none">
                 ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.file.path)}/<input class="init" type="text" value="type to search..." name="filter" size="25" id="node_filter">
                 </div>
             </div>
         </div>
     </div>
-    <div class="panel-body">
     <div>
         <table class="table code-browser">
             <thead>
                 <tr>
                     <th>${_('Name')}</th>
                     <th>${_('Size')}</th>
                     <th>${_('Last Revision')}</th>
                     <th>${_('Last Modified')}</th>
                     <th>${_('Last Committer')}</th>
                 </tr>
             </thead>
             <tbody id="tbody">
                 %if c.file.parent:
                 <tr class="parity0">
                     <td>
                         ${h.link_to(h.literal('<i class="icon-folder-open"></i><span>..</span>'),h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")}
                     </td>
                     <td></td>
                     <td></td>
                     <td></td>
                     <td></td>
                 </tr>
                 %endif

kallithea/templates/files/files_delete.html

➞

Show inline comments

@@ @@ -9,41 +9,39 @@ @@
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('Delete file')} @ ${h.show_id(c.cs)}
 </%def>
 <%def name="main()">
 ${self.repo_context_bar('files')}
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         <div class="pull-left">
             ${self.breadcrumbs()}
         </div>
         <div class="pull-right">
             <a href="#">${_('Branch')}: ${c.cs.branch}</a>
         </div>
     </div>
     <div class="panel-body" id="edit">
         <div id="files_data">
             ${h.form(h.url.current(),method='post',class_="form-horizontal")}
             <h3 class="files_location">
                 ${_('Delete file')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.f_path)}
             </h3>
             <div id="body" class="codeblock">
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
                     <textarea class="form-control" id="editor" name="content" style="display:none"></textarea>
             <div id="body" class="panel panel-default">
                 <div class="panel-heading">${_('Commit Message')}</div>
                 <div class="panel-body">
                     <textarea class="form-control commit-message" name="message" placeholder="${c.default_message}"></textarea>
                 </div>
                 <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>
                 <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
             </div>
-            <div style="text-align: left;padding-top: 5px">
             <div>
                 ${h.submit('commit',_('Commit Changes'),class_="btn btn-success btn-sm")}
                 ${h.reset('reset',_('Reset'),class_="btn btn-default btn-sm")}
             </div>
             ${h.end_form()}
         </div>
     </div>
 </div>
 </%def>

kallithea/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -13,83 +13,85 @@ @@
   <link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 </%block>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('Edit file')} @ ${h.show_id(c.cs)}
 </%def>
 <%def name="main()">
 ${self.repo_context_bar('files')}
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         <div class="pull-left">
             ${self.breadcrumbs()}
         </div>
         <div class="pull-right">
             <a href="#">${_('Branch')}: ${c.cs.branch}</a>
         </div>
     </div>
     <div class="panel-body" id="edit">
         <div id="files_data">
             <h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.file.path)}</h3>
             ${h.form(h.url.current(),method='post',id='eform',class_='form-inline')}
             <div id="body" class="codeblock">
             <div class="code-header">
                 <div class="stats">
                 <div class="pull-left">
                     <div class="left"><i class="icon-doc-inv"></i></div>
                     <div class="left item">${h.link_to(h.show_id(c.file.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</div>
                     <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>
                     <div class="left item last">${c.file.mimetype}</div>
             <h3 class="files_location">
               ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.file.path)}
             </h3>
             <div id="body" class="panel panel-default">
               <div class="panel-heading clearfix">
                     <div class="pull-left">
                         <div class="pull-left"><i class="icon-doc-inv"></i></div>
                         <div class="pull-left">${h.link_to(h.show_id(c.file.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</div>
                         <div class="pull-left">${h.format_byte_size(c.file.size,binary=True)}</div>
                         <div class="pull-left">${c.file.mimetype}</div>
                         <select class="form-control" id="mimetype" name="mimetype"></select>
                     </div>
                     <div class="pull-right buttons">
                       ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                       ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                       ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                       % if h.HasRepoPermissionLevel('write')(c.repo_name):
                        % if not c.file.is_binary:
                         ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                        % endif
                       % endif
                     </div>
                 </div>
                 </div>
                 <label class="editing-files">
                     ${_('Editing file')}: ${c.file.unicode_path}
                     <select class="form-control" id="mimetype" name="mimetype"></select>
                 </label>
               </div>
               <div class="panel-body no-padding">
                 <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>
               </div>
             </div>
                 <pre id="editor_pre"></pre>
                 <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>
                 <div class="text-muted" style="padding: 10px">${_('Commit Message')}</div>
                 <textarea class="form-control" id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
             </div>
             <div style="text-align: left;padding-top: 5px">
             ${h.submit('commit',_('Commit Changes'),class_="btn btn-success")}
             ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             <div>
               <div>
                   <div>${_('Commit Message')}</div>
                   <textarea class="form-control commit-message" id="commit" name="message" placeholder="${c.default_message}"></textarea>
               </div>
               <div class="buttons">
                 ${h.submit('commit',_('Commit Changes'),class_="btn btn-success")}
                 ${h.reset('reset',_('Reset'),class_="btn btn-default")}
               </div>
             </div>
             ${h.end_form()}
         </div>
     </div>
 </div>
 <script type="text/javascript">
     $(document).ready(function(){
         var reset_url = ${h.jshtml(h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.file.path))};
         var myCodeMirror = initCodeMirror('editor', ${h.jshtml(request.script_name)}, reset_url);
        //inject new modes, based on codeMirrors modeInfo object
         var $mimetype_select = $('#mimetype');
         $mimetype_select.each(function(){
             var modes_select = this;
             var index = 1;
             for(var i=0;i<CodeMirror.modeInfo.length;i++){
                 var m = CodeMirror.modeInfo[i];
                 var opt = new Option(m.name, m.mime);
                 $(opt).attr('mode', m.mode);
                 if (m.mime == 'text/plain') {
                     // default plain text
                     $(opt).prop('selected', true);
                     modes_select.options[0] = opt;

kallithea/templates/files/files_source.html

➞

Show inline comments

 <div id="node_history" style="padding: 0px 0px 10px 0px">
     <div>
         <div class="pull-left">
 <div id="node_history" class="clearfix" style="padding: 0px 0px 10px 0px">
     <div class="pull-left">
         ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
         ${h.hidden('diff2',c.changeset.raw_id)}
         ${h.hidden('diff1')}
         ${h.submit('diff',_('Diff to Revision'),class_="btn btn-default btn-sm")}
         ${h.submit('show_rev',_('Show at Revision'),class_="btn btn-default btn-sm")}
         ${h.hidden('annotate', c.annotate)}
         ${h.link_to(_('Show Full History'),h.url('changelog_file_home',repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=c.f_path),class_="btn btn-default btn-sm")}
         ${h.link_to(_('Show Authors'),'#',class_="btn btn-default btn-sm" ,id="show_authors")}
         ${h.end_form()}
         </div>
         <div id="file_authors" class="file_author" style="clear:both; display: none"></div>
     </div>
     <div style="clear:both"></div>
+    <div id="file_authors" class="file_author" style="clear:both; display: none"></div>
 </div>
 <div id="body" class="codeblock">
     <div class="code-header">
         <div class="stats">
           <div class="pull-left">
             <div class="left img"><i class="icon-doc-inv"></i></div>
             <div class="left item"><pre data-toggle="tooltip" title="${h.fmt_date(c.changeset.date)}">${h.link_to(h.show_id(c.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</pre></div>
             <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div>
             <div class="left item last"><pre>${c.file.mimetype}</pre></div>
           </div>
           <div class="pull-right buttons">
 <div id="body" class="panel panel-default">
     <div class="panel-heading clearfix">
         <div class="pull-left">
             <div class="pull-left img"><i class="icon-doc-inv"></i></div>
             <div class="pull-left"><pre data-toggle="tooltip" title="${h.fmt_date(c.changeset.date)}">${h.link_to(h.show_id(c.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</pre></div>
             <div class="pull-left"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div>
             <div class="pull-left"><pre>${c.file.mimetype}</pre></div>
         </div>
         <div class="pull-right buttons">
               %if c.annotate:
                 ${h.link_to(_('Show Source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
               %else:
                 ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
               %endif
               ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
               ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
               %if h.HasRepoPermissionLevel('write')(c.repo_name):
                %if c.on_branch_head and not c.file.is_binary:
                 ${h.link_to(_('Edit on Branch: %s') % c.changeset.branch, h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-default btn-xs")}
                 ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-danger btn-xs")}
                %elif c.on_branch_head and c.file.is_binary:
                 ${h.link_to(_('Edit'), '#', class_="btn btn-default btn-xs disabled", title=_('Editing binary files not allowed'),**{'data-toggle':'tooltip'})}
                 ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-danger btn-xs")}
                %else:
                 ${h.link_to(_('Edit'), '#', class_="btn btn-default btn-xs disabled", title=_('Editing files allowed only when on branch head revision'),**{'data-toggle':'tooltip'})}
                 ${h.link_to(_('Delete'), '#', class_="btn btn-danger btn-xs disabled", title=_('Deleting files allowed only when on branch head revision'),**{'data-toggle':'tooltip'})}
                %endif
               %endif
           </div>
         </div>
         <div class="author">
     </div>
     <div class="panel-body">
       <div class="author">
             ${h.gravatar_div(h.email_or_none(c.changeset.author), size=16)}
             <div title="${c.changeset.author}" class="user">${h.person(c.changeset.author)}</div>
         </div>
         <div class="commit">${h.urlify_text(c.changeset.message,c.repo_name)}</div>
       </div>
       <div class="commit">${h.urlify_text(c.changeset.message,c.repo_name)}</div>
     </div>
     <ul class="list-group">
       <li class="list-group-item">
     <div class="panel-body no-padding">
       %if c.file.is_browser_compatible_image():
         <img src="${h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}" class="img-preview"/>
       %elif c.file.is_binary:
         <div>
           ${_('Binary file (%s)') % c.file.mimetype}
         </div>
       %else:
         %if c.file.size < c.cut_off_limit or c.fulldiff:
             %if c.annotate:
               ${h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
             %else:
               ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
             %endif
         %else:
-            <h4>
           <h4>
             ${_('File is too big to display.')}
             %if c.annotate:
               ${h.link_to(_('Show full annotation anyway.'), h.url.current(fulldiff=1, **request.GET.mixed()))}
             %else:
               ${h.link_to(_('Show as raw.'), h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
             %endif
-            </h4>
           </h4>
         %endif
       %endif
       </li>
     </ul>
     </div>
 </div>
 <script>
     $(document).ready(function(){
         // fake html5 history state
         var _State = {
            url: ${h.js(h.url.current())},
            data: {
              node_list_url: node_list_url.replace('__REV__',${h.js(c.changeset.raw_id)}).replace('__FPATH__', ${h.js(h.safe_unicode(c.file.path))}),
              url_base: url_base.replace('__REV__',${h.js(c.changeset.raw_id)}),
              rev:${h.js(c.changeset.raw_id)},
              f_path: ${h.js(h.safe_unicode(c.file.path))}
+           }
+        }
         callbacks(_State); // defined in files.html, main callbacks. Triggered in pjax calls
     });
 </script>

kallithea/templates/search/search_commit.html

➞

Show inline comments

 ##commit highlighting
 %for cnt,sr in enumerate(c.formated_results):
     %if h.HasRepoPermissionLevel('read')(sr['repository'],'search results check'):
         <div id="body${cnt}" class="codeblock">
             <div class="code-header">
                 <div class="search-path">${h.link_to(h.literal('%s &raquo; %s' % (sr['repository'],sr['raw_id'])),
                 h.url('changeset_home',repo_name=sr['repository'],revision=sr['raw_id']))}
         <div class="panel panel-default">
             <div class="panel-heading">
                 ${h.link_to(h.literal('%s &raquo; %s' % (sr['repository'],sr['raw_id'])),
                     h.url('changeset_home',repo_name=sr['repository'],revision=sr['raw_id']))}
                 ${h.fmt_date(h.time_to_datetime(sr['date']))}
                 </div>
             </div>
-            <div class="left">
+            <div class="panel-body">
                 <div class="author">
                     ${h.gravatar_div(h.email_or_none(sr['author']), size=20)}
                     <span>${h.person(sr['author'])}</span><br/>
                     <span>${h.email_or_none(sr['author'])}</span><br/>
                 </div>
                 %if sr['message_hl']:
                 <div class="search-code-body">
                     <pre>${h.literal(sr['message_hl'])}</pre>
                 </div>
                 %else:
                 <div class="message">${h.urlify_text(sr['message'], sr['repository'])}</div>
                 %endif
             </div>
         </div>
     %else:
         %if cnt == 0:
             <div id="body${cnt}" class="codeblock">
                 <div class="error">${_('Permission denied')}</div>
             <div class="alert alert-warning" role="alert">
                 ${_('Permission denied')}
             </div>
         %endif
     %endif
 %endfor
 %if c.cur_query and c.formated_results:
     <ul class="pagination">
         ${c.formated_results.pager()}
     </ul>
 %endif

kallithea/templates/search/search_content.html

➞

Show inline comments

 ##content highlighting
 %for cnt,sr in enumerate(c.formated_results):
     %if h.HasRepoPermissionLevel('read')(sr['repository'],'search results check'):
         <div id="body${cnt}" class="codeblock">
             <div class="code-header">
                 <div class="search-path">${h.link_to(h.literal('%s &raquo; %s' % (sr['repository'],sr['f_path'])),
                 h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))}
                 </div>
         <div class="panel panel-default">
             <div class="panel-heading">
                 ${h.link_to(h.literal('%s &raquo; %s' % (sr['repository'],sr['f_path'])),
                     h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))}
             </div>
             <div class="search-code-body">
+            <div class="panel-body search-code-body">
                 <pre>${h.literal(sr['content_short_hl'])}</pre>
             </div>
         </div>
     %else:
         %if cnt == 0:
         <div>
             <div id="body${cnt}" class="codeblock">
                 <div class="error">${_('Permission denied')}</div>
             <div class="alert alert-warning" role="alert">
                 ${_('Permission denied')}
             </div>
         </div>
         %endif
     %endif
 %endfor
 %if c.cur_query and c.formated_results:
     <ul class="pagination">
         ${c.formated_results.pager()}
     </ul>
 %endif

kallithea/templates/search/search_path.html

➞

Show inline comments

 ##path search
 %for cnt,sr in enumerate(c.formated_results):
     %if h.HasRepoPermissionLevel('read')(sr['repository'],'search results check'):
         <div class="panel panel-default">
             <div class="panel-heading">
                 ${h.link_to(h.literal('%s &raquo; %s' % (sr['repository'],sr['f_path'])),
                     h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))}
             </div>
         </div>
     %else:
         %if cnt == 0:
             <div class="error">
                 <div class="link">
                     ${_('Permission denied')}
                 </div>
             <div class="alert alert-warning" role="alert">
                 ${_('Permission denied')}
             </div>
         %endif
     %endif
 %endfor
 %if c.cur_query and c.formated_results:
     <ul class="pagination">
         ${c.formated_results.pager()}
     </ul>
 %endif

0 comments (0 inline, 0 general)