kallithea Changeset - 9d34bea3059d

Changeset - 9d34bea3059d

Parent rev.

Child rev.

[Not reviewed]

default

0 16 0

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

style: various minor-ish markup changes, preparing for Bootstrap

16 files changed with 60 insertions and 34 deletions:

kallithea/public/css/style.css

kallithea/templates/admin/admin.html

kallithea/templates/admin/auth/auth_settings.html

kallithea/templates/admin/gists/new.html

kallithea/templates/admin/settings/settings_hooks.html

kallithea/templates/admin/settings/settings_system.html

kallithea/templates/admin/settings/settings_visual.html

kallithea/templates/base/base.html

kallithea/templates/changelog/changelog.html

kallithea/templates/changeset/changeset_file_comment.html

kallithea/templates/compare/compare_cs.html

kallithea/templates/files/diff_2way.html

kallithea/templates/files/files_add.html

kallithea/templates/pullrequests/pullrequest_data.html

kallithea/templates/pullrequests/pullrequest_show.html

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1887,193 +1887,193 @@ BIN_FILENODE = 6 @@
     background-color: #6D99FF;
+}
 /*chmod file*/
 .cs_files .changes .bin.bin5 {
     background-color: #6D99FF;
+}
 .cs_files .cs_added,
 .cs_files .cs_A {
     height: 16px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_changed,
 .cs_files .cs_M {
     height: 16px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_removed,
 .cs_files .cs_D {
     height: 16px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_renamed,
 .cs_files .cs_R {
     height: 16px;
     margin-top: 7px;
     text-align: left;
+}
 #graph {
     position: relative;
     overflow: hidden;
+}
 #graph_nodes {
     position: absolute;
     width: 100px;
+}
 #graph_content,
 #graph .info_box,
 #graph .container_header {
     margin-left: 100px;
+}
 #graph_content {
     position: relative;
+}
 #graph .container_header {
     padding: 10px;
     height: 25px;
+}
 #graph_content #rev_range_container {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #rev_range_clear {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #changesets {
     table-layout: fixed;
     border-collapse: collapse;
     border: 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 {
+#graph_content .container .checkbox-column {
     width: 14px;
     font-size: 0.85em;
+}
 #graph_content .container .status {
     width: 14px;
     font-size: 0.85em;
+}
 #graph_content .container .author {
    width: 105px;
+}
 #graph_content .container .hash {
     width: 100px;
     font-size: 0.85em;
+}
 #graph_content #changesets .container .date {
     width: 76px;
     color: #666;
     font-size: 10px;
+}
 #graph_content_pr .compare_view_commits .expand_commit,
 #graph_content .container .expand_commit {
     width: 24px;
     cursor: pointer;
+}
 #graph_content #changesets .container .right {
     width: 120px;
     padding-right: 0px;
     overflow: visible;
     position: relative;
+}
 #graph_content .container .mid {
     padding: 0;
+}
 #graph_content .container #singlerange,
 #graph_content .container .changeset_range {
     float: left;
     margin: 6px 3px;
+}
 #graph_content .container .author img {
     vertical-align: middle;
+}
 #graph_content .container .author .user {
     color: #444444;
+}
 #graph_content .container .mid .message {
     white-space: pre-wrap;
     padding: 0;
     overflow: hidden;
     height: 1.1em;
+}
 #graph_content_pr .compare_view_commits .message {
     padding: 0 !important;
     height: 1.1em;
+}
 #graph_content .container .mid .message.expanded,
 #graph_content_pr .compare_view_commits .message.expanded {
     height: auto;
     margin: 8px 0px 8px 0px;
     overflow: initial;
+}
 #graph_content .container .extra-container {
     display: block;
     position: absolute;
     top: -15px;
     right: 0;
     padding-left: 5px;
     background: #FFFFFF;
     height: 41px;
+}
 #pull_request_overview .comments-container,
 #changeset_compare_view_content .comments-container,
 #graph_content .comments-container,
 #shortlog_data .comments-container,
 #graph_content .logtags {
     display: block;
     float: left;
     overflow: hidden;
     padding: 0;
     margin: 0;
     white-space: nowrap;
+}
@@ @@ -2858,192 +2858,196 @@ nav.navbar, #content, #footer { @@
     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;
+}
 .label,
 .btn.btn-sm {
     padding: 3px 8px;
+}
 .btn.btn-xs {
     padding: 1px 5px;
+}
 .btn:focus {
     outline: none;
+}
 .btn:hover {
     text-decoration: none;
     color: #515151;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25), 0 0 3px #FFFFFF !important;
+}
 .btn.badge:hover {
     box-shadow: none !important;
+}
 .btn.disabled:hover {
     background-position: 0;
     color: #999;
     text-decoration: none;
     box-shadow: none !important;
+}
 .label.label-danger,
 .btn.btn-danger {
     color: #fff !important;
     background-color: #c43c35;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
     border-color: #c43c35 #c43c35 #882a25;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 .label.label-primary,
 .btn.btn-primary {
     color: #fff !important;
     background-color: #339bb9;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
     border-color: #339bb9 #339bb9 #22697d;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 .label.label-success,
 .btn.btn-success {
     color: #fff !important;
     background-color: #57a957;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #62c462, #57a957);
     border-color: #57a957 #57a957 #3d773d;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 .label.label-warning,
 .btn.btn-warning {
     color: #fff !important;
     background-color: #faa732;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #fbb450, #f89406);
     border-color: #f89406 #f89406 #ad6704;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 .text-danger {
     color: #a94442;
+}
 label.disabled {
     color: #aaa !important;
+}
 .btn.active {
     font-weight: bold;
+}
 .alert {
     padding: 15px;
     margin: 20px 0;
     border: 1px solid transparent;
     border-radius: 4px;
+}
 .alert-success {
     color: #3c763d;
     background-color: #dff0d8;
     border-color: #d6e9c6;
+}
 .alert-info {
     color: #31708f;
     background-color: #d9edf7;
     border-color: #bce8f1;
+}
 .alert-warning {
     color: #8a6d3b;
     background-color: #fcf8e3;
     border-color: #faebcc;
+}
 .alert-danger {
     color: #a94442;
     background-color: #f2dede;
     border-color: #ebccd1;
+}
 ins, div.options a:hover {
     text-decoration: none;
+}
 img,
 nav.navbar #quick li a:hover span.normal,
 #clone_url,
 #clone_url_id
+{
     border: none;
+}
 img.icon, .right .merge img {
     vertical-align: bottom;
+}
 nav.navbar ul#logged-user,
 #content div.panel div.panel-heading ul.links,
 #content div.panel div.message div.dismiss,
 #content div.panel div.traffic div.legend ul {
     float: right;
     margin: 0;
     padding: 0;
+}
 nav.navbar #home,
 nav.navbar #logo,
 #content div.panel ul.left,
 #content div.panel ol.left,
 div#commit_history,
 div#legend_data, div#legend_container, div#legend_choices {
     float: left;
+}
 nav.navbar #quick li .dropdown-menu,
 #content #left #menu ul.closed,
 #content #left #menu li ul.collapsed,
 .yui-tt-shadow {
     display: none;
+}
 .dropdown.open .dropdown-menu,
 #content #left #menu ul.opened,
 #content #left #menu li ul.expanded {
     display: block !important;
+}
 .navbar-caret:after {
     font-family: 'kallithea';
     content: ' \23f7';           /* triangle-down */
+}
 .select2-choice {
     color: black !important;
+}
 .branch-switcher .select2-choice,
@@ @@ -3647,303 +3651,313 @@ form.comment-form { @@
     background: #EEE;
     border-radius: 4px;
     padding: 5px;
     margin: 0px;
+}
 div.comment-inline-form {
     padding: 4px 0px 6px 0px;
+}
 .comment-inline-form textarea {
     width: 100%;
     height: 100px;
     font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 form.comment-inline-form {
     margin-top: 10px;
     margin-left: 10px;
+}
 .comment-inline-form-submit {
     margin-top: 5px;
     margin-left: 525px;
+}
 .file-comments {
     display: none;
+}
 .comment-inline-form .comment {
     margin-left: 10px;
+}
 .comment-inline-form .comment-help {
     padding: 5px 5px 5px 5px;
     color: #666;
+}
 .comment-inline-form .comment-button {
     padding-top: 5px;
+}
 /** comment inline **/
 .inline-comments .comment {
     margin: 3px 3px 5px 5px;
+}
 .inline-comments #comments-general-comments .comment {
     margin-left: 0;
+}
 .inline-comments .comment .comment-wrapp {
     max-width: 978px;
     border: 1px solid #ddd;
     border-radius: 4px;
     background-color: #FAFAFA;
+}
 .inline-comments .add-button-row {
     padding: 2px 4px 8px 5px;
+}
 .inline-comments .comment .meta {
     background: #f8f8f8;
     padding: 4px;
     border-bottom: 1px solid #ddd;
     min-height: 20px;
     overflow: auto;
+}
 .inline-comments .comment .meta img {
     vertical-align: middle;
+}
 .inline-comments .comment .meta .user {
     font-weight: bold;
     float: left;
     padding: 3px;
+}
 .inline-comments .comment .meta .date {
     float: left;
     padding: 3px;
+}
 .inline-comments .comment .text {
     background-color: #FAFAFA;
     margin: 6px;
+}
 .inline-comments .comments-number {
     padding: 0px 0px 10px 0px;
     color: #666;
+}
 input.status_change_checkbox,
 input.status_change_radio {
     margin: 2px 0 5px 15px;
     vertical-align: middle;
+}
 .badge {
     padding: 4px 4px !important;
     text-align: center;
     color: #888 !important;
     background-color: #DEDEDE !important;
     border-radius: 4px !important;
+}
 .notification-header {
     padding-top: 6px;
+}
 .notification-header .desc {
     font-size: 16px;
     height: 24px;
     float: left
+}
 .notification-list .container.unread {
     background: none repeat scroll 0 0 rgba(255, 255, 180, 0.6);
+}
 .notification-header .gravatar {
     background: none repeat scroll 0 0 transparent;
     padding: 0px 0px 0px 8px;
+}
 .notification-list .container .notification-header .desc {
     font-weight: bold;
     font-size: 17px;
+}
 .notification-header .delete-notifications {
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-header .read-notifications {
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-subject {
     clear: both;
     border-bottom: 1px solid #eee;
     padding: 5px 0px;
+}
 .notification-body {
     clear: both;
     margin: 34px 2px 2px 8px
+}
 /****
 PULL REQUESTS
 *****/
 .pullrequests_section_head {
     padding: 10px 10px 10px 0px;
     margin: 0 20px;
     font-size: 16px;
     font-weight: bold;
+}
 div.pr-details-title.closed {
     color: #555;
     background: #eee;
+}
 div.pr {
     margin: 0px 20px;
     padding: 4px 4px;
+}
 div.pr-desc {
     margin: 0px 20px;
+}
 tr.pr-closed td {
     background-color: #eee !important;
     color: #555 !important;
+}
 span.pr-closed-tag {
     margin-bottom: 1px;
     margin-right: 1px;
     padding: 1px 3px;
     font-size: 10px;
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     color: #577632;
     white-space: nowrap;
     border-radius: 4px;
     border: 1px solid #d9e8f8;
     line-height: 1.5em;
+}
 .panel-body .pr-box {
     max-width: 978px;
     margin-right: 20px;
+}
 #s2id_org_ref,
 #s2id_other_ref,
 #s2id_org_repo,
 #s2id_other_repo {
     min-width: 150px;
     margin: 5px;
+}
 #pr-summary .msg-div {
     margin: 5px 0;
+}
 #pr-summary > .pr-not-edit {
     min-height: 50px !important;
+}
 #pr-edit-btn {
     margin: 20px 0 0 !important;
     position: absolute;
+}
 /****
   PERMS
 *****/
 #perms .perms_section_head {
     padding: 10px 10px 10px 0px;
     font-size: 16px;
     font-weight: bold;
     text-transform: capitalize;
+}
 #perms .perms_section_head label {
     margin-left: 10px;
+}
 #perms .perm_tag {
     position: relative;
     top: -2px;
     padding: 3px 3px 1px 3px;
     font-size: 10px;
     font-weight: bold;
     text-transform: uppercase;
     white-space: nowrap;
     border-radius: 3px;
+}
 #perms .perm_tag.admin {
     background-color: #B94A48;
     color: #ffffff;
+}
 #perms .perm_tag.write {
     background-color: #DB7525;
     color: #ffffff;
+}
 #perms .perm_tag.read {
     background-color: #468847;
     color: #ffffff;
+}
 #perms .perm_tag.none {
     background-color: #bfbfbf;
     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-bottom: 20px;
+}
 .diff-collapse-button {
     cursor: pointer;
     color: #666;
     font-size: 16px;
+}
 .compare-revision-selector > div {
     display: inline-block;
     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 {
@@ @@ -4152,192 +4166,203 @@ div.comment:target>.comment-wrapp { @@
+}
 .img-preview {
     max-width: 100%;
     height: auto;
     margin: 5px;
+}
 div.comment-prev-next-links div.prev-comment,
 div.comment-prev-next-links div.next-comment {
     display: inline-block;
     min-width: 150px;
     margin: 3px 6px;
+}
 #comments-general-comments div.comment-prev-next-links div.prev-comment,
 #comments-general-comments div.comment-prev-next-links div.next-comment {
     margin-left: 0;
+}
 body table.dataTable thead .sorting {
   background-image: none;
+}
 body table.dataTable thead .sorting_asc {
   background-image: none;
+}
 body table.dataTable thead .sorting_desc {
   background-image: none;
+}
 body table.dataTable thead .sorting_asc_disabled {
   background-image: none;
+}
 body table.dataTable thead .sorting_desc_disabled {
   background-image: none;
+}
 body table.dataTable thead .sorting_asc::after {
   font-family: "kallithea";
   content: "\23f6";
+}
 body table.dataTable thead .sorting_desc::after {
   font-family: "kallithea";
   content: "\23f7";
+}
 .dataTables_wrapper .dataTables_left {
   float: left !important;
+}
 .dataTables_wrapper .dataTables_right {
   float: right;
+}
 .dataTables_wrapper .dataTables_right > div {
   padding-left: 30px;
+}
 .dataTables_wrapper .dataTables_info {
   clear: none;
   padding-top: 1em;
+}
 .dataTables_wrapper .dataTables_paginate {
   padding-top: 0;
+}
 .dataTables_wrapper .dataTables_paginate > a.paginate_button {
   padding-top: 1em;
   border: 0 !important;
+}
 .text-muted {
     color: #777777;
+}
 .grid_edit a {
     text-decoration: none;
+}
 .changes_txt {
     clear: both;
+}
 .text-nowrap {
     white-space: nowrap;
+}
 div.codeblock div.code-header div.author {
     height: auto;
     min-height: 25px;
+}
 ul.user_group_member li {
     clear: both;
+}
 select.pull-right-auto-width {
     float: right;
     width: auto;
+}
 span.expand-available {
     display: block;
     overflow: hidden;
     padding-right: 15px;
+}
 .tooltip {
     position: absolute;
     z-index: 1070;
     display: block;
     font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
     font-size: 12px;
     font-style: normal;
     font-weight: 400;
     line-height: 1.42857143;
     text-align: left;
     text-align: start;
     text-decoration: none;
     text-shadow: none;
     text-transform: none;
     letter-spacing: normal;
     word-break: normal;
     word-spacing: normal;
     word-wrap: normal;
     white-space: normal;
+}
 .tooltip-arrow {
     position: absolute;
     width: 0;
     height: 0;
     border-color: transparent;
     border-style: solid;
+}
 .tooltip-inner {
     max-width: 200px;
     padding: 3px 8px;
     color: #fff;
     text-align: center;
     background-color: #000;
     border-radius: 4px;
+}
 .tooltip.top {
     padding: 5px 0;
     margin-top: -3px;
+}
 .tooltip.top .tooltip-arrow {
     bottom: 0;
     left: 50%;
     margin-left: -5px;
     border-width: 5px 5px 0;
     border-top-color: #000;
+}
 .tooltip.bottom {
     padding: 5px 0;
     margin-top: 3px;
+}
 .tooltip.bottom .tooltip-arrow {
     top: 0;
     left: 50%;
     margin-left: -5px;
     border-width: 0 5px 5px;
     border-bottom-color: #000;
+}
 .popover {
     position: absolute;
     top: 0;
     left: 0;
     z-index: 1060;
     max-width: 276px;
     padding: 1px;
     background-color: #fff;
     background-clip: padding-box;
     border: 1px solid #ccc;
     border: 1px solid rgba(0,0,0,.2);
     border-radius: 6px;
     box-shadow: 0 5px 10px rgba(0,0,0,.2);
     font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
     font-size: 12px;
     font-style: normal;
     font-weight: 400;
     line-height: 1.42857143;
     text-align: left;
     text-align: start;
     text-decoration: none;
     text-shadow: none;
     text-transform: none;
     letter-spacing: normal;
     word-break: normal;
     word-spacing: normal;
     word-wrap: normal;
     white-space: normal;
+}
 .popover > .arrow {
     border-width: 11px;
+}
 .popover > .arrow,
 .popover > .arrow::after {

kallithea/templates/admin/admin.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('Admin Journal')}
 </%block>
 <%def name="breadcrumbs_links()">
     <form id="filter_form" class="pull-left form-inline input-group-sm">
         <input class="form-control q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('journal filter...')}"/>
         <span data-toggle="popover" data-content="${h.journal_filter_help()}">?</span>
         <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/>
         ${_('Admin Journal')} - ${ungettext('%s Entry', '%s Entries', c.users_log.item_count) % (c.users_log.item_count)}
     </form>
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div class="panel-body">
         <div id="user_log">
     <div id="user_log" class="panel-body">
             <%include file='admin_log.html'/>
         </div>
     </div>
 </div>
 <script>
 $(document).ready(function() {
   $('#j_filter').click(function(){
     var $jfilter = $('#j_filter');
     if($jfilter.hasClass('initial')){
         $jfilter.val('');
+    }
   });
   var fix_j_filter_width = function(len){
       $('#j_filter').css('width', Math.max(80, len*6.50)+'px');
   };
   $('#j_filter').keyup(function () {
     fix_j_filter_width($('#j_filter').val().length);
   });
   $('#filter_form').submit(function (e) {
       e.preventDefault();
       var val = $('#j_filter').val();
       window.location = ${h.js(url.current(filter='__FILTER__'))}.replace('__FILTER__',val);
   });
   fix_j_filter_width($('#j_filter').val().length);
 });
 </script>
 </%def>

kallithea/templates/admin/auth/auth_settings.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('Authentication Settings')}
 </%block>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${_('Authentication')}
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div class="form panel-body settings">
     ${h.form(url('auth_settings'))}
     ## enabled auth plugins
     <h1>${_('Authentication Plugins')}</h1>
     <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label>
             <div>
                 ${h.text("auth_plugins", class_='form-control')}
                 <span class="help-block">${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}</span>
             </div>
         </div>
         <div class="form-group">
             <label>${_('Available built-in plugins')}</label>
+            <label class="control-label">${_('Available built-in plugins')}</label>
             <div>
                 <ul class="list-group">
                 %for plugin_path in c.available_plugins:
                     <li class="list-group-item">
                         <span data-plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugin_names else ''}">
                             ${_('Enabled') if plugin_path in c.enabled_plugin_names else _('Disabled')}
                         </span>
                         ${plugin_path}
                     </li>
                 %endfor
                 </ul>
             </div>
         </div>
     </div>
     %for cnt, module in enumerate(c.enabled_plugin_names):
         <% pluginName = c.plugin_shortnames[module] %>
         <h1>${_('Plugin')}: ${pluginName}</h1>
         <div class="form-horizontal">
         ## autoform generation, based on plugin definition from it's settings
         %for setting in c.plugin_settings[module]:
             <% fullsetting = "auth_%s_%s" % (pluginName, setting["name"]) %>
             <% displayname = (setting["formname"] if ("formname" in setting) else setting["name"]) %>
             %if setting["type"] == "password":
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div>
                     ${h.password(fullsetting,class_='form-control')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %elif setting["type"] in ["string", "int"]:
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div>
                     ${h.text(fullsetting,class_='form-control')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %elif setting["type"] == "bool":
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div>
                     ${h.checkbox(fullsetting,True)}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %elif setting["type"] == "select":
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div>
                     ${h.select(fullsetting,setting['values'][0],setting['values'],class_='form-control')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %else:
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div>This field is of type ${setting['type']}, which cannot be displayed. Must be one of [string|int|bool|select].</div>
                 <span class="help-block">${setting["description"]}</span>
             </div>
             %endif
         %endfor
         </div>
     %endfor
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     ${h.end_form()}
     </div>
 </div>
 <script>
     $('.toggle-plugin').click(function(e){
         var $auth_plugins_input = $('#auth_plugins');
         var notEmpty = function(element, index, array) {
             return (element != "");
+        }
         var elems = $auth_plugins_input.val().split(',').filter(notEmpty);
         var $cur_button = $(e.currentTarget);
         var plugin_id = $cur_button.data('plugin_id');
         if($cur_button.hasClass('active')){
             elems.splice(elems.indexOf(plugin_id), 1);
             $auth_plugins_input.val(elems.join(','));
             $cur_button.removeClass('active');
             $cur_button.html(_TM['Disabled']);
+        }
         else{
             if(elems.indexOf(plugin_id) == -1){
                 elems.push(plugin_id);
+            }

kallithea/templates/admin/gists/new.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('New Gist')}
 </%block>
 <%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>
 <%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>
                 <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="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>
                     <select class="form-control pull-right-auto-width" id="mimetype" name="mimetype"></select>
                     <span class="expand-available">
                       ${h.text('filename', size=30, placeholder=_('Name this gist ...'), class_='form-control auto-width')}
                     </span>
                 </div>
                 <div class="panel-body no-padding">
                         <textarea id="editor" name="content"></textarea>
                 </div>
             </div>
             <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;
+                        }
+                    }
                 });
                 var $filename_input = $('#filename');
                 // on select change set new mode
                 $mimetype_select.change(function(e){
                     var selected = e.currentTarget;
                     var node = selected.options[selected.selectedIndex];
                     var detected_mode = CodeMirror.findModeByMIME(node.value);
                     setCodeMirrorMode(myCodeMirror, detected_mode);
                     var proposed_ext = CodeMirror.findExtensionByMode(detected_mode);
                     var file_data = CodeMirror.getFilenameAndExt($filename_input.val());
                     var filename = file_data['filename'] || 'filename1';
                     $filename_input.val(filename + '.' + proposed_ext);
                 });
                 // on type the new filename set mode
                 $filename_input.keyup(function(e){
                     var file_data = CodeMirror.getFilenameAndExt(this.value);
                     if(file_data['ext'] != null){
                         var detected_mode = CodeMirror.findModeByExtension(file_data['ext']) || CodeMirror.findModeByMIME('text/plain');
                         if (detected_mode){
                             setCodeMirrorMode(myCodeMirror, detected_mode);
                             $mimetype_select.val(detected_mode.mime);
+                        }
+                    }
                 });
             });
           </script>
         </div>
     </div>
 </div>
 </%def>

kallithea/templates/admin/settings/settings_hooks.html

➞

Show inline comments

 <h4>${_('Built-in Mercurial Hooks (Read-Only)')}</h4>
 <div class="form">
     <div class="form-horizontal">
       <div class="form-group">
       <h4>${_('Built-in Mercurial Hooks (Read-Only)')}</h4>
       % for hook in c.hooks:
         <% input_id = hook.ui_key.replace('.', '_') %>
         <div class="form-group">
             <label class="control-label" for="${input_id}">${hook.ui_key}</label>
             <div style="margin-left:280px">
               ${h.text(hook.ui_key,hook.ui_value,id=input_id,size=60,readonly="readonly",class_='form-control')}
             </div>
       % endfor
       <span class="help-block">${_('Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications.')}</span>
         </div>
       % endfor
     </div>
     <span class="help-block">${_('Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications.')}</span>
 </div>
 % if c.visual.allow_custom_hooks_settings:
 <h4>${_('Custom Hooks')}</h4>
 ${h.form(url('admin_settings_hooks'), method='post')}
 <div class="form">
     <div class="form-horizontal">
         <div class="form-group form-inline" id="${'id%s' % hook.ui_id }">
         <h4>${_('Custom Hooks')}</h4>
         %for hook in c.custom_hooks:
             <% input_id = hook.ui_key.replace('.', '_') %>
             <div class="form-group form-inline" id="${'id%s' % hook.ui_id }">
                 <label class="control-label" for="${input_id}">${hook.ui_key}</label>
                 <div style="margin-left:280px">
                     ${h.hidden('hook_ui_key',hook.ui_key,id='hook_ui_key_'+input_id)}
                     ${h.hidden('hook_ui_value',hook.ui_value,id='hook_ui_value_'+input_id)}
                     ${h.text('hook_ui_value_new',hook.ui_value,id=input_id,size=60,class_='form-control')}
                     <span class="btn btn-default btn-xs"
                         onclick="delete_hook(${hook.ui_id},'${'id%s' % hook.ui_id }')">
                         <i class="icon-minus-circled" style="color:#FF4444"></i>
                         ${_('Delete')}
                     </span>
                 </div>
         %endfor
             </div>
         %endfor
         <div class="form-group form-inline">
             <label>
-                ${h.text('new_hook_ui_key',size=20,class_='form-control')}
+                ${h.text('new_hook_ui_key',size=15,class_='form-control')}
             </label>
             <div style="margin-left:280px">
                 ${h.text('new_hook_ui_value',size=60,class_='form-control')}
             </div>
         </div>
         <div class="form-group">
             <div class="buttons" style="margin-left:280px">
                 ${h.submit('save',_('Save'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 </div>
 ${h.end_form()}
 % endif
 <script type="text/javascript">
 function delete_hook(hook_id, field_id) {
     var sUrl = ${h.js(h.url('admin_settings_hooks_delete'))};
     var success = function (o) {
             $('#' + field_id).remove();
         };
     var failure = function (o) {
             alert(${h.js(_('Failed to remove hook'))});
         };
     var postData = {'hook_id': hook_id};
     ajaxPOST(sUrl, postData, success, failure);
 };
 </script>

kallithea/templates/admin/settings/settings_system.html

➞

Show inline comments

 <div id="update_notice" style="display: none">
     <div style="padding: 5px 0px 5px 0px; color: #000000; font-weight: bold">${_('Checking for updates...')}</div>
 </div>
 <%
  elems = [
     (_('Kallithea version'), h.literal('%s <b><span style="color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('Check for updates'))), ''),
+    (_('Kallithea version'), h.literal('%s <b><span style="display:none; color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('Check for updates'))), ''),
     (_('Kallithea configuration file'), c.ini['__file__'], ''),
     (_('Python version'), c.py_version, ''),
     (_('Platform'), c.platform, ''),
     (_('Git version'), c.git_version, ''),
     (_('Git path'), c.ini.get('git_path'), ''),
     (_('Upgrade info endpoint'), h.literal('%s <br/><span class="text-muted">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this URL'))), ''),
+ ]
 %>
 <dl class="dl-horizontal">
 %for dt, dd, tt in elems:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
 %endfor
 </dl>
 <h4>${_('Python Packages')}</h4>
 <table class="table" style="margin:0px 0px 0px 0px">
   <colgroup>
       <col style="width:180px">
       <col>
   </colgroup>
   <tbody>
       %for key, value in c.modules:
           <tr>
               <td style="padding-right:5px;">${key}</td>
               <td>${value}</td>
           </tr>
       %endfor
   </tbody>
 </table>
 <script>
     $('#check_for_update').click(function(e){
         var $update_notice = $('#update_notice');
         $update_notice.show();
         asynchtml(${h.js(h.url('admin_settings_system_update'))}, $update_notice);
     });
 </script>

kallithea/templates/admin/settings/settings_visual.html

➞

Show inline comments

 ${h.form(url('admin_settings_visual'), method='post')}
     <div class="form">
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label">${_('General')}:</label>
                 <div>
                     <div class="checkbox">
                         <label>
                             ${h.checkbox('repository_fields','True')}
                             ${_('Use repository extra fields')}
                         </label>
                     </div>
                     <span class="help-block">${_('Allows storing additional customized fields per repository.')}</span>
                     <div class="checkbox">
                         <label>
                             ${h.checkbox('show_version','True')}
                             ${_('Show Kallithea version')}
                         </label>
                     </div>
                     <span class="help-block">${_('Shows or hides a version number of Kallithea displayed in the footer.')}</span>
                     <div class="checkbox">
                         <label>
                             ${h.checkbox('use_gravatar','True')}
                             ${_('Show user Gravatars')}
                         </label>
                     </div>
                     ${h.text('gravatar_url', size=80, class_='form-control')}
                     <span class="help-block">${_('''Gravatar URL allows you to use another avatar server application.
                                                         The following variables of the URL will be replaced accordingly.
                                                         {scheme}    'http' or 'https' sent from running Kallithea server,
                                                         {email}     user email,
                                                         {md5email}  md5 hash of the user email (like at gravatar.com),
                                                         {size}      size of the image that is expected from the server application,
                                                         {netloc}    network location/server host of running Kallithea server''')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label">${_('Clone URL')}:</label>
                 <div>
                     ${h.text('clone_uri_tmpl', size=80, class_='form-control')}
                     <span class="help-block">${_('''Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.
                                                     The following variables are available:
                                                     {scheme} 'http' or 'https' sent from running Kallithea server,
                                                     {user}   current user username,
                                                     {netloc} network location/server host of running Kallithea server,
                                                     {repo}   full repository name,
                                                     {repoid} ID of repository, can be used to construct clone-by-id''')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="dashboard_items">${_('Repository page size')}:</label>
                 <div>
                     ${h.text('dashboard_items',size=5,class_='form-control')}
                     <span class="help-block">${_('Number of items displayed in the repository pages before pagination is shown.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="admin_grid_items">${_('Admin page size')}:</label>
                 <div>
                     ${h.text('admin_grid_items',size=5,class_='form-control')}
                     <span class="help-block">${_('Number of items displayed in the admin pages grids before pagination is shown.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label">${_('Icons')}:</label>
                 <div>
                     <div class="checkbox">
                         <label>
                             ${h.checkbox('show_public_icon','True')}
                             ${_('Show public repository icon on repositories')}
                         </label>
                     </div>
                     <div class="checkbox">
                         <label>
                             ${h.checkbox('show_private_icon','True')}
                             ${_('Show private repository icon on repositories')}
                         </label>
                     </div>
                     <span class="help-block">${_('Show public/private icons next to repository names.')}</span>
                  </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="stylify_metatags">${_('Meta Tagging')}:</label>
                 <div>
                     <div class="checkbox">
                         <label>
                         ${h.checkbox('stylify_metatags','True')}
                             ${_('Parses meta tags from the repository description field and turns them into colored tags.')}
                         </label>
                     </div>
                     <span class="help-block">${_('Parses meta tags from the repository description field and turns them into colored tags.')}</span>
                     <div>
                     <div class="help-block">
                         ${_('Stylify recognised meta tags:')}
                         <ul class="list-unstyled"> <!-- Fix style here -->
                             <li>[featured] <span class="metatag" data-tag="featured">featured</span></li>
                             <li>[stale] <span class="metatag" data-tag="stale">stale</span></li>
                             <li>[dead] <span class="metatag" data-tag="dead">dead</span></li>
                             <li>[lang =&gt; lang] <span class="metatag" data-tag="lang">lang</span></li>
                             <li>[license =&gt; License] <span class="metatag" data-tag="license"><a href="http://www.opensource.org/licenses/License">License</a></span></li>
                             <li>[requires =&gt; Repo] <span class="metatag" data-tag="requires">requires =&gt; <a href="#">Repo</a></span></li>
                             <li>[recommends =&gt; Repo] <span class="metatag" data-tag="recommends">recommends =&gt; <a href="#">Repo</a></span></li>
                             <li>[see =&gt; URI] <span class="metatag" data-tag="see">see =&gt; <a href="#">URI</a> </span></li>
                         </ul>
                     </div>
                  </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -28,271 +28,271 @@ @@
             &ndash; <a class="navbar-link" href="${c.issues_url}" target="_blank">${_('Support')}</a>
         %endif
     </span>
 </div>
 <!-- END FOOTER -->
 ### MAKO DEFS ###
 <%block name="branding_title">
     %if c.site_name:
     &middot; ${c.site_name}
     %endif
 </%block>
 <%def name="flash_msg()">
     <%include file="/base/flash_msg.html"/>
 </%def>
 <%def name="breadcrumbs()">
     <div class="breadcrumbs panel-title">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 <%def name="admin_menu()">
   <ul class="dropdown-menu" role="menu">
       <li><a href="${h.url('admin_home')}"><i class="icon-book"></i> ${_('Admin Journal')}</a></li>
       <li><a href="${h.url('repos')}"><i class="icon-database"></i> ${_('Repositories')}</a></li>
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></i> ${_('Repository Groups')}</a></li>
       <li><a href="${h.url('users')}"><i class="icon-user"></i> ${_('Users')}</a></li>
       <li><a href="${h.url('users_groups')}"><i class="icon-users"></i> ${_('User Groups')}</a></li>
       <li><a href="${h.url('admin_permissions')}"><i class="icon-block"></i> ${_('Default Permissions')}</a></li>
       <li><a href="${h.url('auth_home')}"><i class="icon-key"></i> ${_('Authentication')}</a></li>
       <li><a href="${h.url('defaults')}"><i class="icon-wrench"></i> ${_('Repository Defaults')}</a></li>
       <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-gear"></i> ${_('Settings')}</a></li>
   </ul>
 </%def>
 ## admin menu used for people that have some admin resources
 <%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)">
   <ul class="dropdown-menu" role="menu">
    %if repositories:
       <li><a href="${h.url('repos')}"><i class="icon-database"></i> ${_('Repositories')}</a></li>
    %endif
    %if repository_groups:
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></i> ${_('Repository Groups')}</a></li>
    %endif
    %if user_groups:
       <li><a href="${h.url('users_groups')}"><i class="icon-users"></i> ${_('User Groups')}</a></li>
    %endif
   </ul>
 </%def>
 <%def name="repotag(repo)">
   %if h.is_hg(repo):
     <span class="repotag" title="${_('Mercurial repository')}">hg</span>
   %endif
   %if h.is_git(repo):
     <span class="repotag" title="${_('Git repository')}">git</span>
   %endif
 </%def>
 <%def name="repo_context_bar(current=None, rev=None)">
   <% rev = None if rev == 'tip' else rev %>
   <!--- CONTEXT BAR -->
   <nav id="context-bar" class="navbar navbar-inverse">
     <div class="navbar-header">
       <div class="navbar-brand">
         ${repotag(c.db_repo)}
         ## public/private
         %if c.db_repo.private:
           <i class="icon-keyhole-circled"></i>
         %else:
           <i class="icon-globe"></i>
         %endif
         %for group in c.db_repo.groups_with_parents:
           ${h.link_to(group.name, url('repos_group_home', group_name=group.group_name), class_='navbar-link')}
           &raquo;
         %endfor
         ${h.link_to(c.db_repo.just_name, url('summary_home', repo_name=c.db_repo.repo_name), class_='navbar-link')}
         %if current == 'createfork':
          - ${_('Create Fork')}
         %endif
       </div>
       <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#context-pages" aria-expanded="false">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
     </div>
-    <ul id="context-pages" class="nav navbar-nav navbar-right navbar-collapse collapse">
     <ul id="context-pages" class="nav navbar-nav navbar-right">
         <li class="${'active' if current == 'summary' else ''}" data-context="summary"><a href="${h.url('summary_home', repo_name=c.repo_name)}"><i class="icon-doc-text"></i> ${_('Summary')}</a></li>
         %if rev:
         <li class="${'active' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_file_home', repo_name=c.repo_name, revision=rev, f_path='')}"><i class="icon-clock"></i> ${_('Changelog')}</a></li>
         %else:
         <li class="${'active' if current == 'changelog' else ''}" data-context="changelog"><a href="${h.url('changelog_home', repo_name=c.repo_name)}"><i class="icon-clock"></i> ${_('Changelog')}</a></li>
         %endif
         <li class="${'active' if current == 'files' else ''}" data-context="files"><a href="${h.url('files_home', repo_name=c.repo_name, revision=rev or 'tip')}"><i class="icon-doc-inv"></i> ${_('Files')}</a></li>
         <li class="${'active' if current == 'switch-to' else ''}" data-context="switch-to">
           <input id="branch_switcher" name="branch_switcher" type="hidden">
         </li>
         <li class="${'active' if current == 'options' else ''} dropdown" data-context="options">
              %if h.HasRepoPermissionLevel('admin')(c.repo_name):
                <a href="${h.url('edit_repo',repo_name=c.repo_name)}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true"><i class="icon-wrench"></i> ${_('Options')} <i class="navbar-caret"></i></a>
              %else:
                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true"><i class="icon-wrench"></i> ${_('Options')} <i class="navbar-caret"></i></a>
              %endif
           <ul class="dropdown-menu" role="menu" aria-hidden="true">
              %if h.HasRepoPermissionLevel('admin')(c.repo_name):
                    <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}"><i class="icon-gear"></i> ${_('Settings')}</a></li>
              %endif
               %if c.db_repo.fork:
                <li><a 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)}">
                    <i class="icon-git-compare"></i> ${_('Compare Fork')}</a></li>
               %endif
               <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-git-compare"></i> ${_('Compare')}</a></li>
               <li><a href="${h.url('search_repo',repo_name=c.repo_name)}"><i class="icon-search"></i> ${_('Search')}</a></li>
               %if h.HasRepoPermissionLevel('write')(c.repo_name) and c.db_repo.enable_locking:
                 %if c.db_repo.locked[0]:
                   <li><a href="${h.url('toggle_locking', repo_name=c.repo_name)}"><i class="icon-lock"></i> ${_('Unlock')}</a></li>
                 %else:
                   <li><a href="${h.url('toggle_locking', repo_name=c.repo_name)}"><i class="icon-lock-open-alt"></i> ${_('Lock')}</li>
                 %endif
               %endif
               ## TODO: this check feels wrong, it would be better to have a check for permissions
               ## also it feels like a job for the controller
               %if request.authuser.username != 'default':
                   <li>
                    <a href="#" class="${'following' if c.repository_following else 'follow'}" onclick="toggleFollowingRepo(this, ${c.db_repo.repo_id});">
                     <span class="show-follow"><i class="icon-heart-empty"></i> ${_('Follow')}</span>
                     <span class="show-following"><i class="icon-heart"></i> ${_('Unfollow')}</span>
                    </a>
                   </li>
                   <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Fork')}</a></li>
                   <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Create Pull Request')}</a></li>
               %endif
              </ul>
         </li>
         <li class="${'active' if current == 'showpullrequest' else ''}" data-context="showpullrequest">
           <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}"> <i class="icon-git-pull-request"></i> ${_('Pull Requests')}
             %if c.repository_pull_requests:
               <span class="badge">${c.repository_pull_requests}</span>
             %endif
           </a>
         </li>
     </ul>
   </nav>
   <script type="text/javascript">
     $(document).ready(function() {
       var bcache = {};
       $("#branch_switcher").select2({
-          placeholder: '<span class="navbar-text"> <i class="icon-exchange"></i> ' + ${h.jshtml(_('Switch To'))} + ' <span class="navbar-caret"></span></span>',
           placeholder: '<i class="icon-exchange"></i> ' + ${h.jshtml(_('Switch To'))} + ' <span class="navbar-caret"></span>',
           dropdownAutoWidth: true,
           sortResults: prefixFirstSort,
           formatResult: function(obj) {
               return obj.text;
           },
           formatSelection: function(obj) {
               return obj.text;
           },
           formatNoMatches: function(term) {
               return ${h.jshtml(_('No matches found'))};
           },
           escapeMarkup: function(m) {
               // don't escape our custom placeholder
-              if (m.substr(0, 25) == '<span class="navbar-text"') {
+              if (m.substr(0, 25) == '<i class="icon-exchange">') {
                   return m;
+              }
               return Select2.util.escapeMarkup(m);
           },
           containerCssClass: "branch-switcher",
           dropdownCssClass: "repo-switcher-dropdown",
           query: function(query) {
               var key = 'cache';
               var cached = bcache[key];
               if (cached) {
                   var data = {
                       results: []
                   };
                   // filter results
                   $.each(cached.results, function() {
                       var section = this.text;
                       var children = [];
                       $.each(this.children, function() {
                           if (query.term.length === 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) {
                               children.push({
                                   'id': this.id,
                                   'text': this.text,
                                   'type': this.type,
                                   'obj': this.obj
                               });
+                          }
                       });
                       if (children.length !== 0) {
                           data.results.push({
                               'text': section,
                               'children': children
                           });
+                      }
                   });
                   query.callback(data);
               } else {
                   $.ajax({
                       url: pyroutes.url('repo_refs_data', {
                           'repo_name': ${h.js(c.repo_name)}
                       }),
                       data: {},
                       dataType: 'json',
                       type: 'GET',
                       success: function(data) {
                           bcache[key] = data;
                           query.callback(data);
+                      }
                   });
+              }
+          }
       });
       $("#branch_switcher").on('select2-selecting', function(e) {
           e.preventDefault();
           var context = $('#context-bar .active').data('context');
           if (context == 'files') {
               window.location = pyroutes.url('files_home', {
                   'repo_name': REPO_NAME,
                   'revision': e.choice.id,
                   'f_path': '',
                   'at': e.choice.text
               });
           } else if (context == 'changelog') {
               if (e.choice.type == 'tag' || e.choice.type == 'book') {
                   $("#branch_filter").append($('<'+'option/>').val(e.choice.text));
+              }
               $("#branch_filter").val(e.choice.text).change();
           } else {
               window.location = pyroutes.url('changelog_home', {
                   'repo_name': ${h.js(c.repo_name)},
                   'branch': e.choice.text
               });
+          }
       });
     });
   </script>
   <!--- END CONTEXT BAR -->
 </%def>
 <%def name="menu(current=None)">
   <ul id="quick" class="nav navbar-nav navbar-right">
     <!-- repo switcher -->
     <li class="${'active' if current == 'repositories' else ''}">
       <input id="repo_switcher" name="repo_switcher" type="hidden">
     </li>
     ##ROOT MENU
     %if request.authuser.username != 'default':
       <li class="${'active' if current == 'journal' else ''}">
         <a class="menu_link" title="${_('Show recent activity')}"  href="${h.url('journal')}">
           <i class="icon-book"></i> ${_('Journal')}
         </a>
       </li>
     %else:
@@ @@ -356,170 +356,170 @@ @@
         %else:
           href="#"
         %endif
+      >
           ${h.gravatar_div(request.authuser.email, size=20, div_class="icon")}
           %if request.authuser.username != 'default':
             <span class="menu_link_user">${request.authuser.username}</span>
             %if c.unread_notifications != 0:
               <span class="badge">${c.unread_notifications}</span>
             %endif
           %else:
               <span>${_('Not Logged In')}</span>
           %endif
       </a>
       <div class="dropdown-menu user-menu" role="menu">
         <div id="quick_login" role="form" aria-describedby="quick_login_h" aria-hidden="true" class="container-fluid">
           %if request.authuser.username == 'default' or request.authuser.user_id is None:
             ${h.form(h.url('login_home', came_from=request.path_qs), class_='form clearfix')}
                 <h4 id="quick_login_h">${_('Login to Your Account')}</h4>
                 <label>
                     ${_('Username')}:
                     ${h.text('username',class_='form-control')}
                 </label>
                 <label>
                     ${_('Password')}:
                     ${h.password('password',class_='form-control')}
                 </label>
                 <div class="password_forgotten">
                     ${h.link_to(_('Forgot password?'),h.url('reset_password'))}
                 </div>
                 <div class="register">
                     %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                         ${h.link_to(_("Don't have an account?"),h.url('register'))}
                     %endif
                 </div>
                 <div class="submit">
                     ${h.submit('sign_in',_('Log In'),class_="btn btn-default btn-xs")}
                 </div>
             ${h.end_form()}
           %else:
             <div class="pull-left">
                 ${h.gravatar_div(request.authuser.email, size=48, div_class="big_gravatar")}
                 <b class="full_name">${request.authuser.full_name_or_username}</b>
                 <div class="email">${request.authuser.email}</div>
             </div>
             <div id="quick_login_h" class="pull-right list-group text-right">
               <a class="list-group-item" href="${h.url('notifications')}">${_('Notifications')}: ${c.unread_notifications}</a>
               ${h.link_to(_('My Account'),h.url('my_account'),class_='list-group-item')}
               %if not request.authuser.is_external_auth:
                 ## Cannot log out if using external (container) authentication.
                 ${h.link_to(_('Log Out'), h.url('logout_home'),class_='list-group-item')}
               %endif
             </div>
           %endif
         </div>
       </div>
     </li>
   </ul>
     <script type="text/javascript">
         $(document).ready(function(){
             var visual_show_public_icon = ${h.js(c.visual.show_public_icon)};
             var cache = {}
             /*format the look of items in the list*/
             var format = function(state){
                 if (!state.id){
                   return state.text; // optgroup
+                }
                 var obj_dict = state.obj;
                 var tmpl = '';
                 if(obj_dict && state.type == 'repo'){
                     tmpl += '<span class="repo-icons">';
                     if(obj_dict['repo_type'] === 'hg'){
                         tmpl += '<span class="repotag">hg</span> ';
+                    }
                     else if(obj_dict['repo_type'] === 'git'){
                         tmpl += '<span class="repotag">git</span> ';
+                    }
                     if(obj_dict['private']){
                         tmpl += '<i class="icon-keyhole-circled"></i> ';
+                    }
                     else if(visual_show_public_icon){
                         tmpl += '<i class="icon-globe"></i> ';
+                    }
                     tmpl += '</span>';
+                }
                 if(obj_dict && state.type == 'group'){
                         tmpl += '<i class="icon-folder"></i> ';
+                }
                 tmpl += state.text;
                 return tmpl;
+            }
             $("#repo_switcher").select2({
-                placeholder: '<span class="navbar-text"><i class="icon-database"></i> ' + ${h.jshtml(_('Repositories'))} + ' <span class="navbar-caret"></span></span>',
                 placeholder: '<i class="icon-database"></i> ' + ${h.jshtml(_('Repositories'))} + ' <span class="navbar-caret"></span>',
                 dropdownAutoWidth: true,
                 sortResults: prefixFirstSort,
                 formatResult: format,
                 formatSelection: format,
                 formatNoMatches: function(term){
                     return ${h.jshtml(_('No matches found'))};
                 },
                 containerCssClass: "repo-switcher",
                 dropdownCssClass: "repo-switcher-dropdown",
                 escapeMarkup: function(m){
                     // don't escape our custom placeholder
-                    if(m.substr(0,55) == '<span class="navbar-text"><i class="icon-database"></i>'){
+                    if(m.substr(0,29) == '<i class="icon-database"></i>'){
                         return m;
+                    }
                     return Select2.util.escapeMarkup(m);
                 },
                 query: function(query){
                   var key = 'cache';
                   var cached = cache[key] ;
                   if(cached) {
                     var data = {results: []};
                     //filter results
                     $.each(cached.results, function(){
                         var section = this.text;
                         var children = [];
                         $.each(this.children, function(){
                             if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                                 children.push({'id': this.id, 'text': this.text, 'type': this.type, 'obj': this.obj});
+                            }
                         });
                         if(children.length !== 0){
                             data.results.push({'text': section, 'children': children});
+                        }
                     });
                     query.callback(data);
                   }else{
                       $.ajax({
                         url: ${h.js(h.url('repo_switcher_data'))},
                         data: {},
                         dataType: 'json',
                         type: 'GET',
                         success: function(data) {
                           cache[key] = data;
                           query.callback({results: data.results});
+                        }
                       });
+                  }
+                }
             });
             $("#repo_switcher").on('select2-selecting', function(e){
                 e.preventDefault();
                 window.location = pyroutes.url('summary_home', {'repo_name': e.val});
             });
             $(document).on('shown.bs.dropdown', function(event) {
                 var dropdown = $(event.target);
                 dropdown.attr('aria-expanded', true);
                 dropdown.find('.dropdown-menu').attr('aria-hidden', false);
             });
             $(document).on('hidden.bs.dropdown', function(event) {
                 var dropdown = $(event.target);
                 dropdown.attr('aria-expanded', false);
                 dropdown.find('.dropdown-menu').attr('aria-hidden', true);
             });
         });
     </script>
 </%def>

kallithea/templates/changelog/changelog.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('%s Changelog') % c.repo_name}
     %if c.changelog_for_path:
       /${c.changelog_for_path}
     %endif
 </%block>
 <%def name="breadcrumbs_links()">
     <% size = c.size if c.size <= c.total_cs else c.total_cs %>
     ${_('Changelog')}
     %if c.changelog_for_path:
      - /${c.changelog_for_path}
     %endif
     %if c.revision:
     @ ${h.short_id(c.first_revision.raw_id)}
     %endif
     - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('changelog', c.first_revision.raw_id if c.first_revision else None)}
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div class="panel-body changelog-panel">
         %if c.pagination:
                 <div class="changelog-heading clearfix" style="${'display:none' if c.changelog_for_path else ''}">
                     <div class="pull-left">
                         ${h.form(h.url.current(),method='get',class_="form-inline")}
                             ${h.submit('set',_('Show'),class_="btn btn-default btn-sm")}
                             ${h.text('size',size=3,value=c.size,class_='form-control')}
                             ${_('revisions')}
                             %if c.branch_name:
                                 ${h.hidden('branch', c.branch_name)}
                             %endif
                             <a href="#" class="btn btn-default btn-sm" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
                         ${h.end_form()}
                     </div>
                     <div class="pull-right">
                         <a href="#" class="btn btn-default btn-sm" id="rev_range_container" style="display:none"></a>
                         %if c.revision:
                             <a class="btn btn-default btn-sm" href="${h.url('changelog_home', repo_name=c.repo_name)}">
                                 ${_('Go to tip of repository')}
                             </a>
                         %endif
                         %if c.db_repo.fork:
                             <a id="compare_fork"
                                title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}"
                                href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"
                                class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a>
                         %endif
                         ## text and href of open_new_pr is controlled from javascript
                         <a id="open_new_pr" class="btn btn-default btn-sm"></a>
                         ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)}
                     </div>
                 </div>
                 <div id="graph_nodes">
                     <canvas id="graph_canvas" style="width:0"></canvas>
                 </div>
                 <div id="graph_content" style="${'margin: 0px' if c.changelog_for_path else ''}">
                 <table class="table" id="changesets">
                 <tbody>
                 %for cnt,cs in enumerate(c.pagination):
                     <tr id="chg_${cnt+1}" class="container ${'mergerow' if len(cs.parents) > 1 else ''}">
                         <td class="checkbox">
+                        <td class="checkbox-column">
                             %if c.changelog_for_path:
                                 ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")}
                             %else:
                                 ${h.checkbox(cs.raw_id,class_="changeset_range")}
                             %endif
                         <td 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)}"
                                  href="${c.comments[cs.raw_id][0].url()}">
                                   <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
                               </a>
                             %endif
                             </div>
                           %endif
                         </td>
                         <td class="author">
                             ${h.gravatar(h.email_or_none(cs.author), size=16)}
                             <span data-toggle="tooltip" title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
                         </td>
                         <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">
                             ${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), class_='changeset_hash')}
                         </td>
                         <td class="date">
                             <div class="date" data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div>
                         </td>
                         <td class="expand_commit" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
                             <i class="icon-align-left" style="color:#999"></i>
                         </td>
                         <td class="mid">
                                 <div class="message" id="C-${cs.raw_id}">${h.urlify_text(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
                                 <div class="extra-container">
                                     %if c.comments.get(cs.raw_id):
                                         <div class="comments-container">
                                             <div class="comments-cnt" data-toggle="tooltip" title="${_('Changeset has comments')}">
                                                 <a href="${c.comments[cs.raw_id][0].url()}">
                                                     ${len(c.comments[cs.raw_id])}
                                                     <i class="icon-comment-discussion"></i>
                                                 </a>
                                             </div>
                                         </div>
                                     %endif
                                     %if cs.bumped:
                                         <span class="bumpedtag" title="Bumped">
                                             Bumped
                                         </span>
                                     %endif
                                     %if cs.divergent:
                                         <span class="divergenttag" title="Divergent">
                                             Divergent
                                         </span>
                                     %endif
                                     %if cs.extinct:
                                         <span class="extincttag" title="Extinct">
                                             Extinct
                                         </span>
                                     %endif
                                     %if cs.unstable:
                                         <span class="unstabletag" title="Unstable">
                                             Unstable
                                         </span>
                                     %endif
                                     %if cs.phase:
                                         <span class="phasetag" title="Phase">
                                             ${cs.phase}
                                         </span>
                                     %endif
                                     %if h.is_hg(c.db_repo_scm_instance):
                                         %for book in cs.bookmarks:
                                             <span class="booktag" title="${_('Bookmark %s') % book}">
                                                 ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                             </span>
                                         %endfor
                                     %endif
                                     %for tag in cs.tags:
                                         <span class="tagtag" title="${_('Tag %s') % tag}">
                                             ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                         </span>
                                     %endfor
                                     %if (not c.branch_name) and cs.branch:
                                         <span class="branchtag" title="${_('Branch %s' % cs.branch)}">
                                             ${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
                                         </span>
                                     %endif
                                 </div>
                         </td>
                     </tr>
                 %endfor
                 </tbody>
                 </table>

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ## usage:
 ## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 ## ${comment.comment_block(co)}
 ##
 <%def name="comment_block(co)">
   <div class="comment" id="comment-${co.comment_id}">
     <div class="comment-prev-next-links"></div>
     <div class="comment-wrapp">
       <div class="meta">
           ${h.gravatar_div(co.author.email, size=20, div_style="float:left")}
           <div class="user">
               ${co.author.full_name_and_username}
           </div>
           <span>
               ${h.age(co.modified_at)}
               %if co.pull_request:
                 ${_('on pull request')}
                 <a href="${co.url()}">"${co.pull_request.title or _("No title")}"</a>
               %else:
                 ${_('on this changeset')}
               %endif
               <a class="permalink" href="${co.url()}">&para;</a>
           </span>
           %if co.author_id == request.authuser.user_id or h.HasRepoPermissionLevel('admin')(c.repo_name):
             %if co.deletable():
               <div onClick="confirm('${_('Delete comment?')}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-default btn-xs" style="margin:0 5px">${_('Delete')}</div>
             %endif
           %endif
       </div>
       <div class="text">
         %if co.status_change:
            <div class="automatic-comment">
              <p>
                <span title="${_('Changeset status')}" class="changeset-status-lbl">${_("Status change")}: ${co.status_change[0].status_lbl}</span>
                <span class="changeset-status-ico"><i class="icon-circle changeset-status-${co.status_change[0].status}"></i></span>
              </p>
            </div>
         %endif
         %if co.text:
           ${h.render_w_mentions(co.text, c.repo_name)|n}
         %endif
       </div>
     </div>
   </div>
 </%def>
 <%def name="comment_inline_form()">
 <div id='comment-inline-form-template' style="display:none">
   <div class="ac">
   %if request.authuser.username != 'default':
     ${h.form('#', class_='inline-form')}
       <div class="well well-sm clearfix">
         <div class="comment-help">${_('Commenting on line.')}
           <span class="text-muted">${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}</span>
         </div>
         <div class="mentions-container"></div>
         <textarea name="text" class="form-control comment-block-ta yui-ac-input"></textarea>
         <div id="status_block_container" class="status-block general-only hidden">
                 %if c.pull_request is None:
                   ${_('Set changeset status')}:
                 %else:
                   ${_('Vote for pull request status')}:
                 %endif
                 <span class="general-only cs-only">
                 </span>
                 <label class="radio-inline">
                     <input type="radio" class="status_change_radio" name="changeset_status" id="changeset_status_unchanged" value="" checked="checked" />
                     ${_('No change')}
                 </label>
                 %for status, lbl in c.changeset_statuses:
                     <label class="radio-inline">
                         <input type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">
                         ${lbl}<i class="icon-circle changeset-status-${status}"></i>
                     </label>
                 %endfor
                 %if c.pull_request is not None and ( \
                     h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionLevel('admin')(c.repo_name) \
                     or c.pull_request.owner_id == request.authuser.user_id):
                 <div>
                   ${_('Finish pull request')}:
                   <label class="checkbox-inline">
                     <input id="save_close" type="checkbox" name="save_close">
+                    <input id="save_close" type="checkbox" name="save_close" class="status_change_checkbox">
                     ${_("Close")}
                   </label>
                   <label class="checkbox-inline">
                     <input id="save_delete" type="checkbox" name="save_delete" value="delete">
+                    <input id="save_delete" type="checkbox" name="save_delete" value="delete" class="status_change_checkbox">
                     ${_("Delete")}
                   </label>
                 </div>
                 %endif
         </div>
       </div>
       <div class="comment-button">
         <div class="submitting-overlay">${_('Submitting ...')}</div>
         ${h.submit('save', _('Comment'), class_='btn btn-default btn-sm save-inline-form')}
         ${h.reset('hide-inline-form', _('Cancel'), class_='btn btn-default btn-sm hide-inline-form')}
       </div>
     ${h.end_form()}
   %else:
       ${h.form('')}
       <div class="clearfix">
           <div class="comment-help">
             ${_('You need to be logged in to comment.')} <a href="${h.url('login_home', came_from=request.path_qs)}">${_('Login now')}</a>
           </div>
       </div>
       <div class="comment-button">
       ${h.reset('hide-inline-form', _('Hide'), class_='btn btn-default btn-sm hide-inline-form')}
       </div>
       ${h.end_form()}
   %endif
   </div>
 </div>
 </%def>
 ## show comment count as "x comments (y inline, z general)"
 <%def name="comment_count(inline_cnt, general_cnt)">
     ${'%s (%s, %s)' % (
         ungettext("%d comment", "%d comments", inline_cnt + general_cnt) % (inline_cnt + general_cnt),
         ungettext("%d inline", "%d inline", inline_cnt) % inline_cnt,
         ungettext("%d general", "%d general", general_cnt) % general_cnt
     )}
     <span class="firstlink"></span>
 </%def>
 ## generate inline comments and the main ones
 <%def name="generate_comments()">
 ## original location of comments ... but the ones outside diff context remains here
 <div class="comments inline-comments">
   %for f_path, lines in c.inline_comments:
     %for line_no, comments in lines.iteritems():
       <div class="comments-list-chunk" data-f_path="${f_path}" data-line_no="${line_no}" data-target-id="${h.safeid(h.safe_unicode(f_path))}_${line_no}">
         %for co in comments:
             ${comment_block(co)}
         %endfor
       </div>
     %endfor
   %endfor
       <div class="comments-list-chunk" data-f_path="" data-line_no="" data-target-id="general-comments">
         %for co in c.comments:
             ${comment_block(co)}
         %endfor
       </div>
 </div>
 <div class="comments-number">
     ${comment_count(c.inline_cnt, len(c.comments))}
 </div>
 </%def>
 ## MAIN COMMENT FORM
 <%def name="comments(change_status=True)">
 ## global, shared for all edit boxes
 <div class="mentions-container" id="mentions_container"></div>
 <div class="inline-comments inline-comments-general
             ${'show-general-status' if change_status else ''}">
   <div id="comments-general-comments" class="">
   ## comment_div for general comments
   </div>
 </div>
 <script>
 $(document).ready(function () {
    $(window).on('beforeunload', function(){
       var $textareas = $('.comment-inline-form textarea[name=text]');
       if($textareas.size() > 1 ||
          $textareas.val()) {
          // this message will not be displayed on all browsers
          // (e.g. some versions of Firefox), but the user will still be warned
          return 'There are uncommitted comments.';
+      }
    });
 });
 </script>
 </%def>

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

 ## Changesets table !
-<div class="container">
 <div>
   %if not c.cs_ranges:
     <span class="empty_data">${_('No changesets')}</span>
   %else:
     %if c.ancestors:
       <div class="ancestor">
         %if len(c.ancestors) > 1:
         <div style="color:red; font-weight: bold">
           ${_('Criss cross merge situation with multiple merge ancestors detected!')}
         </div>
         <div style="color:red">
           ${_('Please merge the target branch to your branch before creating a pull request.')}
         </div>
         %endif
         <div>
           ${_('Merge Ancestor')}:
           %for ancestor in c.ancestors:
             ${h.link_to(h.short_id(ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=ancestor), class_="changeset_hash")}
           %endfor
         </div>
       </div>
     %endif
     <div id="graph_nodes">
         <canvas id="graph_canvas" style="width:0"></canvas>
     </div>
     <div id="graph_content_pr" style="margin-left: 100px;">
     <table class="table compare_view_commits">
     %for cnt, cs in enumerate(reversed(c.cs_ranges)):
       <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">
         <td style="width:50px">
           %if cs.raw_id in c.statuses:
             <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">
                 <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}"></i>
             </div>
           %endif
           %if c.cs_comments.get(cs.raw_id):
               <div class="comments-container">
                   <div class="comments-cnt" title="${_('Changeset has comments')}">
                       <a href="${c.cs_comments[cs.raw_id][0].url()}">
                           ${len(c.cs_comments[cs.raw_id])}
                           <i class="icon-comment"></i>
                       </a>
                   </div>
               </div>
           %endif
         </td>
         <td class="changeset-logical-index">
           <%
               num_cs = len(c.cs_ranges)
               index = num_cs - cnt
               if index == 1:
                   title = _('First (oldest) changeset in this list')
               elif index == num_cs:
                   title = _('Last (most recent) changeset in this list')
               else:
                   title = _('Position in this list of changesets')
           %>
           <span data-toggle="tooltip" title="${title}">
             ${index}
           </span>
         </td>
         <td style="width: 140px"><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
         <td class="author">
             ${h.gravatar(h.email_or_none(cs.author), size=16)}
             <span data-toggle="tooltip" title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
         </td>
         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>
         <td>
         %if cs.branch:
         <span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span>
         %endif
         </td>
         <td class="expand_commit" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
             <i class="icon-align-left" style="color:#999"></i>
         </td>
         <td class="mid">
             <div class="pull-right" style="margin-top: -4px;">
                 %for tag in cs.tags:
                     <span class="tagtag" title="${_('Tag %s') % tag}">
                         ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                     </span>
                 %endfor
             </div>
             <div id="C-${cs.raw_id}" class="message">${h.urlify_text(cs.message, c.repo_name)}</div>
         </td>
       </tr>
     %endfor
     </table>
     </div>
     %if c.is_ajax_preview:
       <h5>

kallithea/templates/files/diff_2way.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="js_extra">
   <script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
   <script type="text/javascript" src="${h.url('/js/mergely.js')}"></script>
 </%block>
 <%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="no-padding panel-body">
         <div class="panel panel-default">
             <div class="panel-heading">
+            <div class="panel-heading clearfix">
                 <div class="changeset_header">
                     <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="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))};
 $(document).ready(function () {
     $('#compare').mergely({
         width: 'auto',
         height: $(window).height() - $('#compare').offset().top - $('#footer').height() - 35,
         fgcolor: {a:'#ddffdd',c:'#cccccc',d:'#ffdddd'},
         bgcolor: '#fff',
         viewport: true,
         cmsettings: {mode: 'text/plain', readOnly: true, lineWrapping: false, lineNumbers: true},
         lhs: function(setValue) {
             if (${h.js(c.node1.is_binary)}) {
                 setValue('Binary file');
+            }
             else{
                 $.ajax(orig1_url, {dataType: 'text', success: setValue});
+            }
         },
         rhs: function(setValue) {
             if (${h.js(c.node2.is_binary)}) {
                 setValue('Binary file');
+            }
             else{
                 $.ajax(orig2_url, {dataType: 'text', success: setValue});
+            }
+        }
     });
     // recompute width - avoids overflow and horizontal scrollbar
     $('#compare').mergely('resize');
     $('#ignorews').change(function(e){
         var val = e.currentTarget.checked;
         $('#compare').mergely('options', {ignorews: val});
         $('#compare').mergely('update');
     });
     $('#edit_mode').change(function(e){
         var val = !e.currentTarget.checked;
         $('#compare').mergely('cm', 'lhs').setOption('readOnly', val);
         $('#compare').mergely('cm', 'rhs').setOption('readOnly', val);
         $('#compare').mergely('update');
     });
 });
 </script>
 </div>
 </%def>

kallithea/templates/files/files_add.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('%s Files Add') % c.repo_name}
 </%block>
 <%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">
             <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)} /
               <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="panel panel-default">
               <div class="panel-heading">
+              <div class="panel-heading clearfix">
                   <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>
               <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;
+                            }
+                        }
                     });
                     var $filename_input = $('#filename');
                     $mimetype_select.change(function(e){
                         var selected = e.currentTarget;
                         var node = selected.options[selected.selectedIndex];
                         var detected_mode = CodeMirror.findModeByMIME(node.value);
                         setCodeMirrorMode(myCodeMirror, detected_mode);
                         var proposed_ext = CodeMirror.findExtensionByMode(detected_mode);
                         var file_data = CodeMirror.getFilenameAndExt($filename_input.val());
                         var filename = file_data['filename'] || 'filename1';
                         $filename_input.val(filename + '.' + proposed_ext);
                     });
                     // on type the new filename set mode
                     $filename_input.keyup(function(e){
                         var file_data = CodeMirror.getFilenameAndExt(this.value);
                         if(file_data['ext'] != null){
                             var detected_mode = CodeMirror.findModeByExtension(file_data['ext']) || CodeMirror.findModeByMIME('text/plain');
                             if (detected_mode){
                                 setCodeMirrorMode(myCodeMirror, detected_mode);
                                 $mimetype_select.val(detected_mode.mime);
+                            }
+                        }
                     });
                 });
             </script>
         </div>
     </div>
 </div>
 </%def>

kallithea/templates/pullrequests/pullrequest_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%def name="pullrequest_overview(pullrequests)">
 %if not len(pullrequests):
     <div class="empty_data">${_('No entries')}</div>
     <% return %>
 %endif
 <div>
   <table class="table">
     <thead>
       <tr>
         <th class="left">${_('Vote')}</th>
         <th class="left">${_('Title')}</th>
         <th class="left">${_('Owner')}</th>
         <th class="left">${_('Age')}</th>
         <th class="left">${_('From')}</th>
         <th class="left">${_('To')}</th>
-        <th class="right" style="padding-right:5px">${_('Delete')}</th>
+        <th class="left">${_('Delete')}</th>
       </tr>
     </thead>
 % for pr in pullrequests:
     <tr class="${'pr-closed' if pr.is_closed() else ''}">
       <td width="80px">
         <% status = pr.user_review_status(request.authuser.user_id) %>
         %if status:
           <i class="icon-circle changeset-status-${status}" title="${_('You voted: %s') % h.changeset_status_lbl(status)}"></i>
         %else:
           <i class="icon-circle changeset-status-not_reviewed" title="${_('You didn\'t vote')}"></i>
         %endif
       </td>
       <td>
         <a href="${pr.url()}">
         ${pr.title or _("(no title)")}
         %if pr.is_closed():
           <span class="pr-closed-tag">${_('Closed')}</span>
         %endif
         </a>
       </td>
       <td>
         ${pr.owner.full_name_and_username}
       </td>
       <td>
         <span data-toggle="tooltip" title="${h.fmt_date(pr.created_on)}">
           ${h.age(pr.created_on)}
         </span>
       </td>
       <td>
         <% org_ref_name=pr.org_ref.rsplit(':', 2)[-2] %>
         <a href="${h.url('summary_home', repo_name=pr.org_repo.repo_name, anchor=org_ref_name)}">
           ${pr.org_repo.repo_name}#${org_ref_name}
         </a>
       </td>
       <td>
         <% other_ref_name=pr.other_ref.rsplit(':', 2)[-2] %>
         <a href="${h.url('summary_home', repo_name=pr.other_repo.repo_name, anchor=other_ref_name)}">
           ${pr.other_repo.repo_name}#${other_ref_name}
         </a>
       </td>
       <td style="text-align:right">
         %if pr.owner_id == request.authuser.user_id:
           ${h.form(url('pullrequest_delete', repo_name=pr.other_repo.repo_name, pull_request_id=pr.pull_request_id), style="display:inline-block")}
           <button class="btn btn-default btn-xs"
                   id="remove_${pr.pull_request_id}"
                   name="remove_${pr.pull_request_id}"
                   title="${_('Delete Pull Request')}"
                   onclick="return confirm('${_('Confirm to delete this pull request')}')
                       && ((${len(pr.comments)} == 0) ||
                           confirm('${_('Confirm again to delete this pull request with %s comments') % len(pr.comments)}'))
                       ">
             <i class="icon-minus-circled"></i>
           </button>
           ${h.end_form()}
         %endif
       </td>
     </tr>
 % endfor
   </table>
 </div>
 %if hasattr(pullrequests, 'pager'):
     <ul class="pagination">
         ${pullrequests.pager(**request.GET.mixed())}
     </ul>
 %endif
 </%def>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 <%block name="title">
     ${_('%s Pull Request %s') % (c.repo_name, c.pull_request.nice_id())}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('Pull request %s from %s#%s') % (c.pull_request.nice_id(), c.pull_request.org_repo.repo_name, c.cs_branch_name)}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 <% editable = not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionLevel('admin')(c.repo_name) or c.pull_request.owner_id == request.authuser.user_id) %>
 ${self.repo_context_bar('showpullrequest')}
 <div class="panel panel-primary">
   <div class="panel-heading clearfix">
     ${self.breadcrumbs()}
   </div>
   ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form',class_='panel-body')}
     <div class="form pr-box pull-left">
       <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">
         <h3>
           ${_('Title')}: ${c.pull_request.title}
           %if c.pull_request.is_closed():
               (${_('Closed')})
           %endif
         </h3>
       </div>
       <div id="pr-summary" class="form-horizontal">
         <div class="pr-not-edit form-group" style="min-height:47px">
             <label>${_('Description')}:</label>
             %if editable:
-            <div style="margin: 20px 0; position: absolute">
+            <div id="pr-edit-btn">
               <a class="btn btn-default btn-xs" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>
             </div>
             %endif
             <div>
-              <div class="form-control formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>
               <div class="formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>
             </div>
         </div>
         %if editable:
         <div class="pr-do-edit form-group" style="display:none">
               <label for="pullrequest_title">${_('Title')}:</label>
               <div>
                   ${h.text('pullrequest_title',class_='form-control',value=c.pull_request.title,placeholder=_('Summarize the changes'))}
               </div>
         </div>
         <div class="pr-do-edit form-group" style="display:none">
               <label for="pullrequest_desc">${_('Description')}:</label>
               <div>
                   ${h.textarea('pullrequest_desc',content=c.pull_request.description,placeholder=_('Write a short description on this pull request'),class_='form-control')}
               </div>
         </div>
         %endif
         <div class="form-group">
           <label>${_('Reviewer voting result')}:</label>
           <div>
             <div class="changeset-status-container">
             %if c.current_voting_result:
               <span class="changeset-status-ico" style="padding:0px 4px 0px 0px">
                   <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></span>
               <span class="changeset-status-lbl" data-toggle="tooltip" title="${_('Pull request status calculated from votes')}">
                 %if c.pull_request.is_closed():
                     ${_('Closed')},
                 %endif
                 ${h.changeset_status_lbl(c.current_voting_result)}
               </span>
             %endif
             </div>
           </div>
         </div>
         <div class="form-group">
           <label>${_('Still not reviewed by')}:</label>
           <div>
             % if len(c.pull_request_pending_reviewers) > 0:
                 <div data-toggle="tooltip" title="${', '.join([x.username for x in c.pull_request_pending_reviewers])}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
             % elif len(c.pull_request_reviewers) > 0:
                 <div>${_('Pull request was reviewed by all reviewers')}</div>
             %else:
                 <div>${_('There are no reviewers')}</div>
             %endif
           </div>
         </div>
         <div class="form-group">
           <label>${_('Origin')}:</label>
           <div>
             <div>
               ${h.link_to_ref(c.pull_request.org_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}
               %if c.cs_ref_type != 'branch':
                 ${_('on')} ${h.link_to_ref(c.pull_request.org_repo.repo_name, 'branch', c.cs_branch_name)}
               %endif
             </div>
           </div>
         </div>
         <div class="form-group">
           <label>${_('Target')}:</label>
           <div>
             %if c.is_range:
               ${_("This is just a range of changesets and doesn't have a target or a real merge ancestor.")}
             %else:
               ${h.link_to_ref(c.pull_request.other_repo.repo_name, c.a_ref_type, c.a_ref_name)}
               ## we don't know other rev - c.a_rev is ancestor and not necessarily on other_name_branch branch
             %endif
           </div>
         </div>
         <div class="form-group">
           <label>${_('Pull changes')}:</label>
           <div>
             %if c.cs_ranges:
               <div>
                ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases?
                %if h.is_hg(c.pull_request.org_repo):
                  <span style="font-family: monospace">hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>
                %elif h.is_git(c.pull_request.org_repo):
                  <span style="font-family: monospace">git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>
                %endif
               </div>
             %endif
           </div>
         </div>
         <div class="form-group">
           <label>${_('Created on')}:</label>
           <div>
               <div>${h.fmt_date(c.pull_request.created_on)}</div>
           </div>
         </div>
         <div class="form-group">
           <label>${_('Owner')}:</label>
           <div class="pr-not-edit">
                   ${h.gravatar_div(c.pull_request.owner.email, size=20)}
                   <span>${c.pull_request.owner.full_name_and_username}</span><br/>

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -52,193 +52,193 @@ @@
     redirect_hash_branch();
   };
   </script>
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('summary')}
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div id="summary-panel-body" class="form panel-body">
         <div id="summary" class="form-horizontal">
             <div class="form-group form-inline clearfix">
                 <label>${_('Clone URL')}:</label>
                 <div id="clone-url">
                   <div id="clone_by_name" class="input-group">
                     <span class="input-group-addon">${self.repotag(c.db_repo)}</span>
                     <input class="form-control" size="80" readonly="readonly" value="${c.clone_repo_url}"/>
                     <span class="input-group-addon btn">${_('Show by ID')}</span>
                   </div>
                   <div id="clone_by_id" class="input-group" style="display:none">
                     <span class="input-group-addon">${self.repotag(c.db_repo)}</span>
                     <input class="form-control" size="80" readonly="readonly" value="${c.clone_repo_url_id}"/>
                     <span class="input-group-addon btn">${_('Show by Name')}</span>
                   </div>
                 </div>
             </div>
             <div class="form-group clearfix">
               <label>${_('Description')}:</label>
               <div class="desc">${h.urlify_text(c.db_repo.description, stylize=c.visual.stylify_metatags)}</div>
             </div>
             <div class="form-group clearfix">
               <label>${_('Trending files')}:</label>
               <div>
                 %if c.show_stats:
                 <div id="lang_stats"></div>
                 %else:
                    ${_('Statistics are disabled for this repository')}
                    %if h.HasPermissionAny('hg.admin')('enable stats on from summary'):
                         ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_statistics'),class_="btn btn-default btn-xs")}
                    %endif
                 %endif
               </div>
             </div>
             <div class="form-group clearfix">
               <label>${_('Download')}:</label>
               <div>
                 %if len(c.db_repo_scm_instance.revisions) == 0:
                   ${_('There are no downloads yet')}
                 %elif not c.enable_downloads:
                   ${_('Downloads are disabled for this repository')}
                     %if h.HasPermissionAny('hg.admin')('enable downloads on from summary'):
                         ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_downloads'),class_="btn btn-default btn-xs")}
                     %endif
                 %else:
                     <span id="${'zip_link'}">
                         <a class="btn btn-default btn-sm" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-file-zip"></i> ${_('Download as zip')}</a>
                     </span>
                     ${h.hidden('download_options')}
                     <span style="vertical-align: bottom">
                       <label data-toggle="tooltip" title="${_('Check this to download archive with subrepos')}">
                           <input id="archive_subrepos" type="checkbox" name="subrepos" />
                           ${_('With subrepos')}
                       </label>
                     </span>
                 %endif
               </div>
             </div>
         </div>
         <ul id="summary-menu-stats" class="list-group">
             <li class="list-group-item">
                <a title="${_('Owner')} ${c.db_repo.owner.email}">
                 <i class="icon-user"></i> ${c.db_repo.owner.username}
                 ${h.gravatar_div(c.db_repo.owner.email, size=18, div_class="pull-right", div_style="margin: 0", div_title=c.db_repo.owner.full_name)}
               </a>
             </li>
             <li class="list-group-item">
                <a title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
                 <i class="icon-heart"></i> ${_('Followers')}
                 <span class="badge pull-right" id="current_followers_count">${c.repository_followers}</span>
               </a>
             </li>
             <li class="list-group-item">
               <a title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}">
                 <i class="icon-fork"></i> ${_('Forks')}
                 <span class="badge pull-right">${c.repository_forks}</span>
               </a>
             </li>
             %if request.authuser.username != 'default':
             <li class="list-group-item clearfix">
               <a href="#" onclick="javascript:showRepoSize('repo_size_2','${c.db_repo.repo_name}')">
-                <i class="icon-ruler"></i> ${_('Repository Size')}
                 <i class="icon-ruler"></i> ${_('Size')}
                 <span class="badge pull-right" id="repo_size_2"></span>
               </a>
             </li>
             %endif
             <li class="list-group-item">
             %if request.authuser.username != 'default':
               <a href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i> ${_('Feed')}</a>
             %else:
               <a href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name)}"><i class="icon-rss-squared"></i> ${_('Feed')}</a>
             %endif
             </li>
             %if c.show_stats:
             <li class="list-group-item">
               <a title="${_('Statistics')}" href="${h.url('repo_stats_home',repo_name=c.repo_name)}">
                 <i class="icon-graph"></i> ${_('Statistics')}
               </a>
             </li>
             %endif
         </ul>
     </div>
 </div>
 <div class="panel panel-primary">
     <div class="panel-heading">
         <div class="breadcrumbs panel-title">
         %if c.repo_changesets:
             ${h.link_to(_('Latest Changes'),h.url('changelog_home',repo_name=c.repo_name))}
         %else:
             ${_('Quick Start')}
          %endif
         </div>
     </div>
     <div class="panel-body">
         <div id="shortlog_data">
             <%include file='../changelog/changelog_summary_data.html'/>
         </div>
     </div>
 </div>
 %if c.readme_data:
 <div id="readme" class="anchor">
 </div>
 <div class="panel panel-primary">
     <div class="panel-heading" title="${_('Readme file from revision %s:%s') % (c.db_repo.landing_rev[0], c.db_repo.landing_rev[1])}">
         <div class="breadcrumbs panel-title">
             <a href="${h.url('files_home',repo_name=c.repo_name,revision='tip',f_path=c.readme_file)}">${c.readme_file}</a>
         </div>
     </div>
     <div class="readme panel-body">
         ${c.readme_data|n}
     </div>
 </div>
 %endif
 <script type="text/javascript">
 $(document).ready(function(){
     $('#clone-url input').click(function(e){
         if($(this).hasClass('selected')){
             $(this).removeClass('selected');
             return ;
         }else{
             $(this).addClass('selected');
             $(this).select();
+        }
     });
     var $clone_by_name = $('#clone_by_name');
     var $clone_by_id = $('#clone_by_id');
     $clone_by_name.find('.btn').click(function(e){
         $clone_by_name.hide();
         $clone_by_id.show();
     });
     $clone_by_id.find('.btn').click(function(e){
         $clone_by_id.hide();
         $clone_by_name.show();
     });
     var cache = {}
     $("#download_options").select2({
         placeholder: _TM['Select changeset'],
         dropdownAutoWidth: true,
         query: function(query){
           var key = 'cache';
           var cached = cache[key] ;
           if(cached) {
             var data = {results: []};
             //filter results
             $.each(cached.results, function(){
                 var section = this.text;
                 var children = [];
                 $.each(this.children, function(){
                     if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                         children.push({'id': this.id, 'text': this.text});

0 comments (0 inline, 0 general)