ux: add hidden comments indicators plus style tweaks

* add hidden comments indicator in diff lines
* make no new line at end of file marker red
* fixes bug where show/hide comments was not changing message

refs  #4311

rhodecode/public/css/code-block.less

@@ -1,1142 +1,1167 b''
 // Default styles
 
 .diff-collapse {
     margin: @padding 0;
     text-align: right;
 }
 
 .diff-container {
     margin-bottom: @space;
 
     .diffblock {
         margin-bottom: @space;
     }
 
     &.hidden {
         display: none;
         overflow: hidden;
     }
 }
 
 .compare_view_files {
 
     .diff-container {
 
         .diffblock {
             margin-bottom: 0;
         }
     }
 }
 
 div.diffblock .sidebyside {
  background: #ffffff;
 }
 
 div.diffblock {
     overflow-x: auto;
     overflow-y: hidden;
     clear: both;
     padding: 0px;
     background: @grey6;
     border: @border-thickness solid @grey5;
     -webkit-border-radius: @border-radius @border-radius 0px 0px;
     border-radius: @border-radius @border-radius 0px 0px;
 
 
     .comments-number {
         float: right;
     }
 
     // BEGIN CODE-HEADER STYLES
 
     .code-header {
         background: @grey6;
         padding: 10px 0 10px 0;
         height: auto;
         width: 100%;
 
         .hash {
             float: left;
             padding: 2px 0 0 2px;
         }
 
         .date {
             float: left;
             text-transform: uppercase;
             padding: 4px 0px 0px 2px;
         }
 
         div {
             margin-left: 4px;
         }
 
         div.compare_header {
             min-height: 40px;
             margin: 0;
             padding: 0 @padding;
 
             .drop-menu {
                 float:left;
                 display: block;
                 margin:0 0 @padding 0;
             }
 
             .compare-label {
                 float: left;
                 clear: both;
                 display: inline-block;
                 min-width: 5em;
                 margin: 0;
                 padding: @button-padding @button-padding @button-padding 0;
                 font-family: @text-semibold;
             }
 
             .compare-buttons {
                 float: left;
                 margin: 0;
                 padding: 0 0 @padding;
 
                 .btn {
                     margin: 0 @padding 0 0;
                 }
             }
         }
 
     }
 
     .parents {
         float: left;
         width: 100px;
         font-weight: 400;
         vertical-align: middle;
         padding: 0px 2px 0px 2px;
         background-color: @grey6;
 
         #parent_link {
            margin: 00px 2px;
 
            &.double {
                margin: 0px 2px;
             }
 
             &.disabled{
                 margin-right: @padding;
             }
         }
     }
 
     .children {
         float: right;
         width: 100px;
         font-weight: 400;
         vertical-align: middle;
         text-align: right;
         padding: 0px 2px 0px 2px;
         background-color: @grey6;
 
         #child_link {
            margin: 0px 2px;
 
            &.double {
                margin: 0px 2px;
             }
 
             &.disabled{
                 margin-right: @padding;
             }
         }
     }
 
     .changeset_header {
         height: 16px;
 
         & > div{
             margin-right: @padding;
        }
     }
 
     .changeset_file {
         text-align: left;
         float: left;
         padding: 0;
 
         a{
             display: inline-block;
             margin-right: 0.5em;
         }
 
        #selected_mode{
             margin-left: 0;
        }
     }
 
     .diff-menu-wrapper {
         float: left;
     }
 
     .diff-menu {
         position: absolute;
         background: none repeat scroll 0 0 #FFFFFF;
         border-color: #003367 @grey3 @grey3;
         border-right: 1px solid @grey3;
         border-style: solid solid solid;
         border-width: @border-thickness;
         box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);
         margin-top: 5px;
         margin-left: 1px;
     }
 
     .diff-actions, .editor-actions {
         float: left;
 
         input{
             margin: 0 0.5em 0 0;
         }
     }
 
     // END CODE-HEADER STYLES
 
     // BEGIN CODE-BODY STYLES
 
     .code-body {
         background: white;
         padding: 0;
         background-color: #ffffff;
         position: relative;
         max-width: none;
         box-sizing: border-box;
         // TODO: johbo: Parent has overflow: auto, this forces the child here
         // to have the intended size and to scroll. Should be simplified.
         width: 100%;
         overflow-x: auto;
     }
 
     pre.raw {
         background: white;
         color: @grey1;
     }
     // END CODE-BODY STYLES
 
 }
 
 
 table.code-difftable {
     border-collapse: collapse;
     width: 99%;
     border-radius: 0px !important;
 
      td {
         padding: 0 !important;
         background: none !important;
         border: 0 !important;
     }
 
     .context {
         background: none repeat scroll 0 0 #DDE7EF;
     }
 
     .add {
         background: none repeat scroll 0 0 #DDFFDD;
 
         ins {
             background: none repeat scroll 0 0 #AAFFAA;
             text-decoration: none;
         }
     }
 
     .del {
         background: none repeat scroll 0 0 #FFDDDD;
 
         del {
             background: none repeat scroll 0 0 #FFAAAA;
             text-decoration: none;
         }
     }
 
     /** LINE NUMBERS **/
     .lineno {
         padding-left: 2px !important;
         padding-right: 2px;
         text-align: right;
         width: 32px;
         -moz-user-select: none;
         -webkit-user-select: none;
         border-right: @border-thickness solid @grey5 !important;
         border-left: 0px solid #CCC !important;
         border-top: 0px solid #CCC !important;
         border-bottom: none !important;
 
         a {
             &:extend(pre);
             text-align: right;
             padding-right: 2px;
             cursor: pointer;
             display: block;
             width: 32px;
         }
     }
 
     .context {
         cursor: auto;
         &:extend(pre);
     }
 
     .lineno-inline {
         background: none repeat scroll 0 0 #FFF !important;
         padding-left: 2px;
         padding-right: 2px;
         text-align: right;
         width: 30px;
         -moz-user-select: none;
         -webkit-user-select: none;
     }
 
     /** CODE **/
     .code {
         display: block;
         width: 100%;
 
         td {
             margin: 0;
             padding: 0;
         }
 
         pre {
             margin: 0;
             padding: 0;
             margin-left: .5em;
         }
     }
 }
 
 
 // Comments
 
 div.comment:target {
     border-left: 6px solid @comment-highlight-color;
     padding-left: 3px;
     margin-left: -9px;
 }
 
 //TODO: anderson: can't get an absolute number out of anything, so had to put the
 //current values that might change. But to make it clear I put as a calculation
 @comment-max-width: 1065px;
 @pr-extra-margin: 34px;
 @pr-border-spacing: 4px;
 @pr-comment-width: @comment-max-width - @pr-extra-margin - @pr-border-spacing;
 
 // Pull Request
 .cs_files .code-difftable {
     border: @border-thickness solid @grey5; //borders only on PRs
 
     .comment-inline-form,
     div.comment {
         width: @pr-comment-width;
     }
 }
 
 // Changeset
 .code-difftable {
     .comment-inline-form,
     div.comment {
         width: @comment-max-width;
     }
 }
 
 //Style page
 @style-extra-margin: @sidebar-width + (@sidebarpadding * 3) + @padding;
 #style-page .code-difftable{
     .comment-inline-form,
     div.comment {
         width: @comment-max-width - @style-extra-margin;
     }
 }
 
 #context-bar > h2 {
     font-size: 20px;
 }
 
 #context-bar > h2> a {
     font-size: 20px;
 }
 // end of defaults
 
 .file_diff_buttons {
     padding: 0 0 @padding;
 
     .drop-menu {
         float: left;
         margin: 0 @padding 0 0;
     }
     .btn {
         margin: 0 @padding 0 0;
     }
 }
 
 .code-body.textarea.editor {
     max-width: none;
     padding: 15px;
 }
 
 td.injected_diff{
     max-width: 1178px;
     overflow-x: auto;
     overflow-y: hidden;
 
     div.diff-container,
     div.diffblock{
         max-width: 100%;
     }
 
     div.code-body {
         max-width: 1124px;
         overflow-x: auto;
         overflow-y: hidden;
         padding: 0;
     }
     div.diffblock {
         border: none;
     }
 
     &.inline-form {
         width: 99%
     }
  }
 
 
 table.code-difftable {
     width: 100%;
 }
 
 /** PYGMENTS COLORING **/
 div.codeblock {
 
     // TODO: johbo: Added interim to get rid of the margin around
     // Select2 widgets. This needs further cleanup.
     margin-top: @padding;
 
     overflow: auto;
     padding: 0px;
     border: @border-thickness solid @grey5;
     background: @grey6;
     .border-radius(@border-radius);
 
     #remove_gist {
         float: right;
     }
 
     .author {
         clear: both;
         vertical-align: middle;
         font-family: @text-bold;
     }
 
     .btn-mini {
         float: left;
         margin: 0 5px 0 0;
     }
 
     .code-header {
         padding: @padding;
         border-bottom: @border-thickness solid @grey5;
 
         .rc-user {
             min-width: 0;
             margin-right: .5em;
         }
 
         .stats {
             clear: both;
             margin: 0 0 @padding 0;
             padding: 0;
             .left {
                 float: left;
                 clear: left;
                 max-width: 75%;
                 margin: 0 0 @padding 0;
 
                 &.item {
                     margin-right: @padding;
                     &.last { border-right: none; }
                 }
             }
             .buttons { float: right; }
             .author {
                 height: 25px; margin-left: 15px; font-weight: bold;
             }
         }
 
         .commit {
             margin: 5px 0 0 26px;
             font-weight: normal;
             white-space: pre-wrap;
         }
     }
 
     .message {
         position: relative;
         margin: @padding;
 
         .codeblock-label {
             margin: 0 0 1em 0;
         }
     }
 
     .code-body {
         padding: @padding;
         background-color: #ffffff;
         min-width: 100%;
         box-sizing: border-box;
         // TODO: johbo: Parent has overflow: auto, this forces the child here
         // to have the intended size and to scroll. Should be simplified.
         width: 100%;
         overflow-x: auto;
     }
 }
 
 .code-highlighttable,
 div.codeblock {
 
     &.readme {
         background-color: white;
     }
 
     .markdown-block table {
         border-collapse: collapse;
 
         th,
         td {
             padding: .5em;
             border: @border-thickness solid @border-default-color;
         }
     }
 
     table {
         border: 0px;
         margin: 0;
         letter-spacing: normal;
 
 
         td {
             border: 0px;
             vertical-align: top;
         }
     }
 }
 
 div.codeblock .code-header .search-path { padding: 0 0 0 10px; }
 div.search-code-body {
     background-color: #ffffff; padding: 5px 0 5px 10px;
     pre {
         .match { background-color: #faffa6;}
         .break { display: block; width: 100%; background-color: #DDE7EF; color: #747474; }
     }
     .code-highlighttable {
         border-collapse: collapse;
 
         tr:hover {
             background: #fafafa;
         }
         td.code {
           padding-left: 10px;
         }
         td.line {
             border-right: 1px solid #ccc !important;
             padding-right: 10px;
             text-align: right;
             font-family: "Lucida Console",Monaco,monospace;
             span {
                 white-space: pre-wrap;
                 color: #666666;
             }
         }
     }
 }
 
 div.annotatediv { margin-left: 2px; margin-right: 4px; }
 .code-highlight {
     margin: 0; padding: 0; border-left: @border-thickness solid @grey5;
     pre, .linenodiv pre { padding: 0 5px; margin: 0; }
     pre div:target {background-color: @comment-highlight-color !important;}
 }
 
 .linenos a { text-decoration: none; }
 
 .CodeMirror-selected { background: @rchighlightblue; }
 .CodeMirror-focused .CodeMirror-selected { background: @rchighlightblue; }
 .CodeMirror ::selection { background: @rchighlightblue; }
 .CodeMirror ::-moz-selection { background: @rchighlightblue; }
 
 .code { display: block; border:0px !important; }
 .code-highlight, /* TODO: dan: merge codehilite into code-highlight */
 .codehilite {
     .hll { background-color: #ffffcc }
     .c { color: #408080; font-style: italic } /* Comment */
     .err, .codehilite .err { border: @border-thickness solid #FF0000 } /* Error */
     .k { color: #008000; font-weight: bold } /* Keyword */
     .o { color: #666666 } /* Operator */
     .cm { color: #408080; font-style: italic } /* Comment.Multiline */
     .cp { color: #BC7A00 } /* Comment.Preproc */
     .c1 { color: #408080; font-style: italic } /* Comment.Single */
     .cs { color: #408080; font-style: italic } /* Comment.Special */
     .gd { color: #A00000 } /* Generic.Deleted */
     .ge { font-style: italic } /* Generic.Emph */
     .gr { color: #FF0000 } /* Generic.Error */
     .gh { color: #000080; font-weight: bold } /* Generic.Heading */
     .gi { color: #00A000 } /* Generic.Inserted */
     .go { color: #808080 } /* Generic.Output */
     .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
     .gs { font-weight: bold } /* Generic.Strong */
     .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
     .gt { color: #0040D0 } /* Generic.Traceback */
     .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
     .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
     .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
     .kp { color: #008000 } /* Keyword.Pseudo */
     .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
     .kt { color: #B00040 } /* Keyword.Type */
     .m { color: #666666 } /* Literal.Number */
     .s { color: #BA2121 } /* Literal.String */
     .na { color: #7D9029 } /* Name.Attribute */
     .nb { color: #008000 } /* Name.Builtin */
     .nc { color: #0000FF; font-weight: bold } /* Name.Class */
     .no { color: #880000 } /* Name.Constant */
     .nd { color: #AA22FF } /* Name.Decorator */
     .ni { color: #999999; font-weight: bold } /* Name.Entity */
     .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
     .nf { color: #0000FF } /* Name.Function */
     .nl { color: #A0A000 } /* Name.Label */
     .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
     .nt { color: #008000; font-weight: bold } /* Name.Tag */
     .nv { color: #19177C } /* Name.Variable */
     .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
     .w { color: #bbbbbb } /* Text.Whitespace */
     .mf { color: #666666 } /* Literal.Number.Float */
     .mh { color: #666666 } /* Literal.Number.Hex */
     .mi { color: #666666 } /* Literal.Number.Integer */
     .mo { color: #666666 } /* Literal.Number.Oct */
     .sb { color: #BA2121 } /* Literal.String.Backtick */
     .sc { color: #BA2121 } /* Literal.String.Char */
     .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
     .s2 { color: #BA2121 } /* Literal.String.Double */
     .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
     .sh { color: #BA2121 } /* Literal.String.Heredoc */
     .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
     .sx { color: #008000 } /* Literal.String.Other */
     .sr { color: #BB6688 } /* Literal.String.Regex */
     .s1 { color: #BA2121 } /* Literal.String.Single */
     .ss { color: #19177C } /* Literal.String.Symbol */
     .bp { color: #008000 } /* Name.Builtin.Pseudo */
     .vc { color: #19177C } /* Name.Variable.Class */
     .vg { color: #19177C } /* Name.Variable.Global */
     .vi { color: #19177C } /* Name.Variable.Instance */
     .il { color: #666666 } /* Literal.Number.Integer.Long */
 }
 
 /* customized pre blocks for markdown/rst */
 pre.literal-block, .codehilite pre{
     padding: @padding;
     border: 1px solid @grey6;
     .border-radius(@border-radius);
     background-color: @grey7;
 }
 
 
 /* START NEW CODE BLOCK CSS */
 
 @cb-line-height: 18px;
 @cb-line-code-padding: 10px;
 @cb-text-padding: 5px;
 
 @pill-padding: 2px 7px;
 
 input.filediff-collapse-state {
     display: none;
 
     &:checked + .filediff { /* file diff is collapsed */
         .cb {
             display: none
         }
         .filediff-collapse-indicator {
             border-width: 9px 0 9px 15.6px;
             border-color: transparent transparent transparent #ccc;
         }
         .filediff-menu {
             display: none;
         }
         margin: -1px 0 0 0;
     }
 
     &+ .filediff { /* file diff is expanded */
         .filediff-collapse-indicator {
             border-width: 15.6px 9px 0 9px;
             border-color: #ccc transparent transparent transparent;
         }
         .filediff-menu {
             display: block;
         }
         margin: 20px 0;
         &:nth-child(2) {
             margin: 0;
         }
     }
 }
 .cs_files {
     clear: both;
 }
 
 .diffset-menu {
     margin-bottom: 20px;
 }
 .diffset {
     margin: 20px auto;
     .diffset-heading {
         border: 1px solid @grey5;
         margin-bottom: -1px;
         // margin-top: 20px;
         h2 {
             margin: 0;
             line-height: 38px;
             padding-left: 10px;
         }
         .btn {
             margin: 0;
         }
         background: @grey6;
         display: block;
         padding: 5px;
     }
     .diffset-heading-warning {
         background: @alert3-inner;
         border: 1px solid @alert3;
     }
 }
 .pill {
     display: block;
     float: left;
     padding: @pill-padding;
 }
 .pill-group {
     .pill {
         opacity: .8;
         &:first-child {
             border-radius: @border-radius 0 0 @border-radius;
         }
         &:last-child {
             border-radius: 0 @border-radius @border-radius 0;
         }
         &:only-child {
             border-radius: @border-radius;
         }
     }
 }
 
 .filediff {
     border: 1px solid @grey5;
 
     /* START OVERRIDES */
     .code-highlight {
         border: none;  // TODO: remove this border from the global
                        // .code-highlight, it doesn't belong there
     }
     label {
         margin: 0; // TODO: remove this margin definition from global label
                    // it doesn't belong there - if margin on labels
                    // are needed for a form they should be defined
                    // in the form's class
     }
     /* END OVERRIDES */
 
     * {
         box-sizing: border-box;
     }
     .filediff-anchor {
         visibility: hidden;
     }
     &:hover {
         .filediff-anchor {
             visibility: visible;
         }
     }
 
     .filediff-collapse-indicator {
         width: 0;
         height: 0;
         border-style: solid;
         float: left;
         margin: 2px 2px 0 0;
         cursor: pointer;
     }
 
     .filediff-heading {
         background: @grey7;
         cursor: pointer;
         display: block;
         padding: 5px 10px;
     }
     .filediff-heading:after {
         content: "";
         display: table;
         clear: both;
     }
     .filediff-heading:hover {
         background: #e1e9f4 !important;
     }
 
     .filediff-menu {
         float: right;
 
         &> a, &> span {
             padding: 5px;
             display: block;
             float: left
         }
     }
 
     .pill {
         &[op="name"] {
             background: none;
             color: @grey2;
             opacity: 1;
             color: white;
         }
         &[op="limited"] {
             background: @grey2;
             color: white;
         }
         &[op="binary"] {
             background: @color7;
             color: white;
         }
         &[op="modified"] {
             background: @alert1;
             color: white;
         }
         &[op="renamed"] {
             background: @color4;
             color: white;
         }
         &[op="mode"] {
             background: @grey3;
             color: white;
         }
         &[op="symlink"] {
             background: @color8;
             color: white;
         }
 
         &[op="added"] { /* added lines */
             background: @alert1;
             color: white;
         }
         &[op="deleted"] { /* deleted lines */
             background: @alert2;
             color: white;
         }
 
         &[op="created"] { /* created file */
             background: @alert1;
             color: white;
         }
         &[op="removed"] { /* deleted file */
             background: @color5;
             color: white;
         }
     }
 
     .filediff-collapse-button, .filediff-expand-button {
         cursor: pointer;
     }
     .filediff-collapse-button {
         display: inline;
     }
     .filediff-expand-button {
         display: none;
     }
     .filediff-collapsed .filediff-collapse-button {
         display: none;
     }
     .filediff-collapsed .filediff-expand-button {
         display: inline;
     }
 
     @comment-padding: 5px;
 
     /**** COMMENTS ****/
 
     .filediff-menu {
         .show-comment-button {
             display: none;
         }
     }
     &.hide-comments {
         .inline-comments {
             display: none;
         }
         .filediff-menu {
             .show-comment-button {
                 display: inline;
             }
-            .show-comment-button {
+            .hide-comment-button {
                 display: none;
             }
         }
     }
+
+    .hide-line-comments {
+        .inline-comments {
+            display: none;
+        }
+    }
     .inline-comments {
         border-radius: @border-radius;
         background: @grey6;
         .comment {
             margin: 0;
             border-radius: @border-radius;
         }
         .comment-outdated {
             opacity: 0.5;
         }
         .comment-inline {
             background: white;
             padding: (@comment-padding + 3px) @comment-padding;
             border: @comment-padding solid @grey6;
 
             .text {
                 border: none;
             }
             .meta {
                 border-bottom: 1px solid @grey6;
                 padding-bottom: 10px;
             }
         }
         .comment-selected {
             border-left: 6px solid @comment-highlight-color;
         }
         .comment-inline-form {
             padding: @comment-padding;
             display: none;
         }
         .cb-comment-add-button {
             margin: @comment-padding;
         }
          /* hide add comment button when form is open */
         .comment-inline-form-open + .cb-comment-add-button {
             display: none;
         }
         .comment-inline-form-open {
             display: block;
         }
          /* hide add comment button when form but no comments */
         .comment-inline-form:first-child + .cb-comment-add-button {
             display: none;
         }
          /* hide add comment button when no comments or form */
         .cb-comment-add-button:first-child {
             display: none;
         }
          /* hide add comment button when only comment is being deleted */
         .comment-deleting:first-child + .cb-comment-add-button {
             display: none;
         }
     }
     /**** END COMMENTS ****/
 
 }
 
 
 table.cb {
     width: 100%;
     border-collapse: collapse;
 
     .cb-text {
         padding: @cb-text-padding;
     }
     .cb-hunk {
         padding: @cb-text-padding;
     }
     .cb-expand {
         display: none;
     }
     .cb-collapse {
         display: inline;
     }
     &.cb-collapsed {
         .cb-line {
             display: none;
         }
         .cb-expand {
             display: inline;
         }
         .cb-collapse {
             display: none;
         }
     }
 
     /* intentionally general selector since .cb-line-selected must override it
        and they both use !important since the td itself may have a random color
        generated by annotation blocks. TLDR: if you change it, make sure
        annotated block selection and line selection in file view still work */
     .cb-line-fresh .cb-content {
         background: white !important;
     }
     .cb-warning {
         background: #fff4dd;
     }
 
     &.cb-diff-sideside {
         td {
             &.cb-content {
                 width: 50%;
             }
         }
     }
 
     tr {
         &.cb-annotate {
             border-top: 1px solid #eee;
 
             &+ .cb-line {
                 border-top: 1px solid #eee;
             }
 
             &:first-child {
                 border-top: none;
                 &+ .cb-line {
                     border-top: none;
                 }
             }
         }
 
         &.cb-hunk {
             font-family: @font-family-monospace;
             color: rgba(0, 0, 0, 0.3);
 
             td {
                 &:first-child {
                     background: #edf2f9;
                 }
                 &:last-child {
                     background: #f4f7fb;
                 }
             }
         }
     }
 
     td {
         vertical-align: top;
         padding: 0;
 
         &.cb-content {
             font-size: 12.35px;
 
             &.cb-line-selected .cb-code {
                 background: @comment-highlight-color !important;
             }
 
             span.cb-code {
                 line-height: @cb-line-height;
                 padding-left: @cb-line-code-padding;
                 padding-right: @cb-line-code-padding;
                 display: block;
                 white-space: pre-wrap;
                 font-family: @font-family-monospace;
                 word-break: break-word;
+                .nonl {
+                    color: @color5;
+                }
             }
 
             &> button.cb-comment-box-opener {
                 padding: 2px 6px 2px 6px;
                 margin-left: -20px;
                 margin-top: -2px;
                 border-radius: @border-radius;
                 position: absolute;
                 display: none;
             }
             .cb-comment {
                 margin-top: 10px;
                 white-space: normal;
             }
         }
         &:hover {
             button.cb-comment-box-opener {
                 display: block;
             }
             &+ td button.cb-comment-box-opener {
                 display: block
             }
         }
 
+        &.cb-data {
+            text-align: right;
+            width: 30px;
+            font-family: @font-family-monospace;
+
+            .icon-comment {
+                cursor: pointer;
+            }
+            &.cb-line-selected > div {
+                display: block;
+                background: @comment-highlight-color !important;
+                line-height: @cb-line-height;
+                color: rgba(0, 0, 0, 0.3);
+            }
+        }
+
         &.cb-lineno {
             padding: 0;
             width: 50px;
             color: rgba(0, 0, 0, 0.3);
             text-align: right;
             border-right: 1px solid #eee;
             font-family: @font-family-monospace;
 
             a::before {
                 content: attr(data-line-no);
             }
             &.cb-line-selected a {
                 background: @comment-highlight-color !important;
             }
 
             a {
                 display: block;
                 padding-right: @cb-line-code-padding;
                 padding-left: @cb-line-code-padding;
                 line-height: @cb-line-height;
                 color: rgba(0, 0, 0, 0.3);
             }
         }
 
         &.cb-empty {
             background: @grey7;
         }
 
         ins {
             color: black;
             background: #a6f3a6;
             text-decoration: none;
         }
         del {
             color: black;
             background: #f8cbcb;
             text-decoration: none;
         }
         &.cb-addition {
             background: #ecffec;
 
             &.blob-lineno {
                 background: #ddffdd;
             }
         }
         &.cb-deletion {
             background: #ffecec;
 
             &.blob-lineno {
                 background: #ffdddd;
             }
         }
 
         &.cb-annotate-info {
             width: 320px;
             min-width: 320px;
             max-width: 320px;
             padding: 5px 2px;
             font-size: 13px;
 
             strong.cb-annotate-message {
                 padding: 5px 0;
                 white-space: pre-line;
                 display: inline-block;
             }
             .rc-user {
                 float: none;
                 padding: 0 6px 0 17px;
                 min-width: auto;
                 min-height: auto;
             }
         }
 
         &.cb-annotate-revision {
             cursor: pointer;
             text-align: right;
         }
     }
 }

rhodecode/public/js/src/rhodecode.js

@@ -1,492 +1,494 b''
 // # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
 // # This program is free software: you can redistribute it and/or modify
 // # it under the terms of the GNU Affero General Public License, version 3
 // # (only), as published by the Free Software Foundation.
 // #
 // # This program is distributed in the hope that it will be useful,
 // # but WITHOUT ANY WARRANTY; without even the implied warranty of
 // # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // # GNU General Public License for more details.
 // #
 // # You should have received a copy of the GNU Affero General Public License
 // # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #
 // # This program is dual-licensed. If you wish to learn more about the
 // # RhodeCode Enterprise Edition, including its added features, Support services,
 // # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 /**
 RhodeCode JS Files
 **/
 
 if (typeof console == "undefined" || typeof console.log == "undefined"){
     console = { log: function() {} }
 }
 
 // TODO: move the following function to submodules
 
 /**
  * show more
  */
 var show_more_event = function(){
   $('table .show_more').click(function(e) {
     var cid = e.target.id.substring(1);
     var button = $(this);
     if (button.hasClass('open')) {
       $('#'+cid).hide();
       button.removeClass('open');
     } else {
       $('#'+cid).show();
       button.addClass('open one');
     }
   });
 };
 
 var compare_radio_buttons = function(repo_name, compare_ref_type){
     $('#compare_action').on('click', function(e){
         e.preventDefault();
 
         var source = $('input[name=compare_source]:checked').val();
         var target = $('input[name=compare_target]:checked').val();
         if(source && target){
             var url_data = {
                 repo_name: repo_name,
                 source_ref: source,
                 source_ref_type: compare_ref_type,
                 target_ref: target,
                 target_ref_type: compare_ref_type,
                 merge: 1
             };
             window.location = pyroutes.url('compare_url', url_data);
         }
     });
     $('.compare-radio-button').on('click', function(e){
         var source = $('input[name=compare_source]:checked').val();
         var target = $('input[name=compare_target]:checked').val();
         if(source && target){
             $('#compare_action').removeAttr("disabled");
             $('#compare_action').removeClass("disabled");
         }
     })
 };
 
 var showRepoSize = function(target, repo_name, commit_id, callback) {
     var container = $('#' + target);
     var url = pyroutes.url('repo_stats',
       {"repo_name": repo_name, "commit_id": commit_id});
 
     if (!container.hasClass('loaded')) {
         $.ajax({url: url})
             .complete(function (data) {
                 var responseJSON = data.responseJSON;
                 container.addClass('loaded');
                 container.html(responseJSON.size);
                 callback(responseJSON.code_stats)
             })
             .fail(function (data) {
                 console.log('failed to load repo stats');
             });
     }
 
 };
 
 var showRepoStats = function(target, data){
     var container = $('#' + target);
 
     if (container.hasClass('loaded')) {
         return
     }
 
     var total = 0;
     var no_data = true;
     var tbl = document.createElement('table');
     tbl.setAttribute('class', 'trending_language_tbl');
 
     $.each(data, function(key, val){
         total += val.count;
     });
 
     var sortedStats = [];
     for (var obj in data){
         sortedStats.push([obj, data[obj]])
     }
     var sortedData = sortedStats.sort(function (a, b) {
         return b[1].count - a[1].count
     });
     var cnt = 0;
     $.each(sortedData, function(idx, val){
         cnt += 1;
         no_data = false;
 
         var hide = cnt > 2;
         var tr = document.createElement('tr');
         if (hide) {
             tr.setAttribute('style', 'display:none');
             tr.setAttribute('class', 'stats_hidden');
         }
 
         var key = val[0];
         var obj = {"desc": val[1].desc, "count": val[1].count};
 
         var percentage = Math.round((obj.count / total * 100), 2);
 
         var td1 = document.createElement('td');
         td1.width = 300;
         var trending_language_label = document.createElement('div');
         trending_language_label.innerHTML = obj.desc + " (.{0})".format(key);
         td1.appendChild(trending_language_label);
 
         var td2 = document.createElement('td');
         var trending_language = document.createElement('div');
         var nr_files = obj.count +" "+ _ngettext('file', 'files', obj.count);
 
         trending_language.title = key + " " + nr_files;
 
         trending_language.innerHTML = "<span>" + percentage + "% " + nr_files
                 + "</span><b>" + percentage + "% " + nr_files + "</b>";
 
         trending_language.setAttribute("class", 'trending_language');
         $('b', trending_language)[0].style.width = percentage + "%";
         td2.appendChild(trending_language);
 
         tr.appendChild(td1);
         tr.appendChild(td2);
         tbl.appendChild(tr);
         if (cnt == 3) {
             var show_more = document.createElement('tr');
             var td = document.createElement('td');
             lnk = document.createElement('a');
 
             lnk.href = '#';
             lnk.innerHTML = _gettext('Show more');
             lnk.id = 'code_stats_show_more';
             td.appendChild(lnk);
 
             show_more.appendChild(td);
             show_more.appendChild(document.createElement('td'));
             tbl.appendChild(show_more);
         }
     });
 
     $(container).html(tbl);
     $(container).addClass('loaded');
 
     $('#code_stats_show_more').on('click', function (e) {
         e.preventDefault();
         $('.stats_hidden').each(function (idx) {
             $(this).css("display", "");
         });
         $('#code_stats_show_more').hide();
     });
 
 };
 
 
 // Toggle Collapsable Content
 function collapsableContent() {
 
     $('.collapsable-content').not('.no-hide').hide();
 
     $('.btn-collapse').unbind(); //in case we've been here before
     $('.btn-collapse').click(function() {
         var button = $(this);
         var togglename = $(this).data("toggle");
         $('.collapsable-content[data-toggle='+togglename+']').toggle();
         if ($(this).html()=="Show Less")
             $(this).html("Show More");
         else
             $(this).html("Show Less");
     });
 };
 
 var timeagoActivate = function() {
     $("time.timeago").timeago();
 };
 
 // Formatting values in a Select2 dropdown of commit references
 var formatSelect2SelectionRefs = function(commit_ref){
   var tmpl = '';
   if (!commit_ref.text || commit_ref.type === 'sha'){
     return commit_ref.text;
   }
   if (commit_ref.type === 'branch'){
     tmpl = tmpl.concat('<i class="icon-branch"></i> ');
   } else if (commit_ref.type === 'tag'){
     tmpl = tmpl.concat('<i class="icon-tag"></i> ');
   } else if (commit_ref.type === 'book'){
     tmpl = tmpl.concat('<i class="icon-bookmark"></i> ');
   }
   return tmpl.concat(commit_ref.text);
 };
 
 // takes a given html element and scrolls it down offset pixels
 function offsetScroll(element, offset) {
     setTimeout(function() {
         var location = element.offset().top;
         // some browsers use body, some use html
         $('html, body').animate({ scrollTop: (location - offset) });
     }, 100);
 }
 
 // scroll an element `percent`% from the top of page in `time` ms
 function scrollToElement(element, percent, time) {
     percent = (percent === undefined ? 25 : percent);
     time = (time === undefined ? 100 : time);
 
     var $element = $(element);
     var elOffset = $element.offset().top;
     var elHeight = $element.height();
     var windowHeight = $(window).height();
     var offset = elOffset;
     if (elHeight < windowHeight) {
         offset = elOffset - ((windowHeight / (100 / percent)) - (elHeight / 2));
     }
     setTimeout(function() {
         $('html, body').animate({ scrollTop: offset});
     }, time);
 }
 
 /**
  * global hooks after DOM is loaded
  */
 $(document).ready(function() {
     firefoxAnchorFix();
 
     $('.navigation a.menulink').on('click', function(e){
         var menuitem = $(this).parent('li');
         if (menuitem.hasClass('open')) {
             menuitem.removeClass('open');
         } else {
             menuitem.addClass('open');
             $(document).on('click', function(event) {
                 if (!$(event.target).closest(menuitem).length) {
                     menuitem.removeClass('open');
                 }
             });
         }
     });
     $('.compare_view_files').on(
         'mouseenter mouseleave', 'tr.line .lineno a',function(event) {
             if (event.type === "mouseenter") {
                 $(this).parents('tr.line').addClass('hover');
             } else {
                 $(this).parents('tr.line').removeClass('hover');
             }
         });
 
     $('.compare_view_files').on(
         'mouseenter mouseleave', 'tr.line .add-comment-line a',function(event){
             if (event.type === "mouseenter") {
                 $(this).parents('tr.line').addClass('commenting');
             } else {
                 $(this).parents('tr.line').removeClass('commenting');
             }
         });
 
     $('body').on( /* TODO: replace the $('.compare_view_files').on('click') below
                     when new diffs are integrated */
         'click', '.cb-lineno a', function(event) {
 
             if ($(this).attr('data-line-no') !== ""){
                 $('.cb-line-selected').removeClass('cb-line-selected');
                 var td = $(this).parent();
                 td.addClass('cb-line-selected'); // line number td
+                td.prev().addClass('cb-line-selected'); // line data td
                 td.next().addClass('cb-line-selected'); // line content td
 
                 // Replace URL without jumping to it if browser supports.
                 // Default otherwise
                 if (history.pushState) {
                     var new_location = location.href.rstrip('#');
                     if (location.hash) {
                         new_location = new_location.replace(location.hash, "");
                     }
 
                     // Make new anchor url
                     new_location = new_location + $(this).attr('href');
                     history.pushState(true, document.title, new_location);
 
                     return false;
                 }
             }
         });
 
     $('.compare_view_files').on( /* TODO: replace this with .cb function above
                                     when new diffs are integrated */
         'click', 'tr.line .lineno a',function(event) {
             if ($(this).text() != ""){
                 $('tr.line').removeClass('selected');
                 $(this).parents("tr.line").addClass('selected');
 
                 // Replace URL without jumping to it if browser supports.
                 // Default otherwise
                 if (history.pushState) {
                     var new_location = location.href;
                     if (location.hash){
                         new_location = new_location.replace(location.hash, "");
                     }
 
                     // Make new anchor url
                     var new_location = new_location+$(this).attr('href');
                     history.pushState(true, document.title, new_location);
 
                     return false;
                 }
             }
         });
 
     $('.compare_view_files').on(
         'click', 'tr.line .add-comment-line a',function(event) {
             var tr = $(event.currentTarget).parents('tr.line')[0];
             injectInlineForm(tr);
             return false;
         });
 
     $('.collapse_file').on('click', function(e) {
         e.stopPropagation();
         if ($(e.target).is('a')) { return; }
         var node = $(e.delegateTarget).first();
         var icon = $($(node.children().first()).children().first());
         var id = node.attr('fid');
         var target = $('#'+id);
         var tr = $('#tr_'+id);
         var diff = $('#diff_'+id);
         if(node.hasClass('expand_file')){
             node.removeClass('expand_file');
             icon.removeClass('expand_file_icon');
             node.addClass('collapse_file');
             icon.addClass('collapse_file_icon');
             diff.show();
             tr.show();
             target.show();
         } else {
             node.removeClass('collapse_file');
             icon.removeClass('collapse_file_icon');
             node.addClass('expand_file');
             icon.addClass('expand_file_icon');
             diff.hide();
             tr.hide();
             target.hide();
         }
     });
 
     $('#expand_all_files').click(function() {
         $('.expand_file').each(function() {
             var node = $(this);
             var icon = $($(node.children().first()).children().first());
             var id = $(this).attr('fid');
             var target = $('#'+id);
             var tr = $('#tr_'+id);
             var diff = $('#diff_'+id);
             node.removeClass('expand_file');
             icon.removeClass('expand_file_icon');
             node.addClass('collapse_file');
             icon.addClass('collapse_file_icon');
             diff.show();
             tr.show();
             target.show();
         });
     });
 
     $('#collapse_all_files').click(function() {
         $('.collapse_file').each(function() {
             var node = $(this);
             var icon = $($(node.children().first()).children().first());
             var id = $(this).attr('fid');
             var target = $('#'+id);
             var tr = $('#tr_'+id);
             var diff = $('#diff_'+id);
             node.removeClass('collapse_file');
             icon.removeClass('collapse_file_icon');
             node.addClass('expand_file');
             icon.addClass('expand_file_icon');
             diff.hide();
             tr.hide();
             target.hide();
         });
     });
 
     // Mouse over behavior for comments and line selection
 
     // Select the line that comes from the url anchor
     // At the time of development, Chrome didn't seem to support jquery's :target
     // element, so I had to scroll manually
 
     if (location.hash) { /* TODO: dan: remove this and replace with code block
                             below when new diffs are ready */
         var result = splitDelimitedHash(location.hash);
         var loc  = result.loc;
         if (loc.length > 1){
             var lineno = $(loc+'.lineno');
             if (lineno.length > 0){
                 var tr = lineno.parents('tr.line');
                 tr.addClass('selected');
 
                 tr[0].scrollIntoView();
 
                 $.Topic('/ui/plugins/code/anchor_focus').prepareOrPublish({
                     tr: tr,
                     remainder: result.remainder});
             }
         }
     }
 
     if (location.hash) { /* TODO: dan: use this to replace the code block above
                             when new diffs are ready */
         var result = splitDelimitedHash(location.hash);
         var loc  = result.loc;
         if (loc.length > 1) {
 
             var highlightable_line_tds = [];
 
             // source code line format
             var page_highlights = loc.substring(
                 loc.indexOf('#') + 1).split('L');
 
             if (page_highlights.length > 1) {
                 var highlight_ranges = page_highlights[1].split(",");
                 var h_lines = [];
                 for (var pos in highlight_ranges) {
                     var _range = highlight_ranges[pos].split('-');
                     if (_range.length === 2) {
                         var start = parseInt(_range[0]);
                         var end = parseInt(_range[1]);
                         if (start < end) {
                             for (var i = start; i <= end; i++) {
                                 h_lines.push(i);
                             }
                         }
                     }
                     else {
                         h_lines.push(parseInt(highlight_ranges[pos]));
                     }
                 }
                 for (pos in h_lines) {
                     var line_td = $('td.cb-lineno#L' + h_lines[pos]);
                     if (line_td.length) {
                         highlightable_line_tds.push(line_td);
                     }
                 }
             }
 
             // now check a direct id reference (diff page)
             if ($(loc).length && $(loc).hasClass('cb-lineno')) {
                 highlightable_line_tds.push($(loc));
             }
             $.each(highlightable_line_tds, function (i, $td) {
                 $td.addClass('cb-line-selected'); // line number td
+                $td.prev().addClass('cb-line-selected'); // line data
                 $td.next().addClass('cb-line-selected'); // line content
             });
 
             if (highlightable_line_tds.length) {
                 var $first_line_td = highlightable_line_tds[0];
                 scrollToElement($first_line_td);
                 $.Topic('/ui/plugins/code/anchor_focus').prepareOrPublish({
                     lineno: $first_line_td,
                     remainder: result.remainder
                 });
             }
         }
     }
     collapsableContent();
 });

rhodecode/public/js/src/rhodecode/comments.js

@@ -1,672 +1,897 b''
 // # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
 // # This program is free software: you can redistribute it and/or modify
 // # it under the terms of the GNU Affero General Public License, version 3
 // # (only), as published by the Free Software Foundation.
 // #
 // # This program is distributed in the hope that it will be useful,
 // # but WITHOUT ANY WARRANTY; without even the implied warranty of
 // # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // # GNU General Public License for more details.
 // #
 // # You should have received a copy of the GNU Affero General Public License
 // # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #
 // # This program is dual-licensed. If you wish to learn more about the
 // # RhodeCode Enterprise Edition, including its added features, Support services,
 // # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 var firefoxAnchorFix = function() {
   // hack to make anchor links behave properly on firefox, in our inline
   // comments generation when comments are injected firefox is misbehaving
   // when jumping to anchor links
   if (location.href.indexOf('#') > -1) {
     location.href += '';
   }
 };
 
 // returns a node from given html;
 var fromHTML = function(html){
   var _html = document.createElement('element');
   _html.innerHTML = html;
   return _html;
 };
 
 var tableTr = function(cls, body){
   var _el = document.createElement('div');
   var _body = $(body).attr('id');
   var comment_id = fromHTML(body).children[0].id.split('comment-')[1];
   var id = 'comment-tr-{0}'.format(comment_id);
   var _html = ('<table><tbody><tr id="{0}" class="{1}">'+
                '<td class="add-comment-line tooltip tooltip" title="Add Comment"><span class="add-comment-content"></span></td>'+
                '<td></td>'+
                '<td></td>'+
                '<td></td>'+
                '<td>{2}</td>'+
                '</tr></tbody></table>').format(id, cls, body);
   $(_el).html(_html);
   return _el.children[0].children[0].children[0];
 };
 
 var removeInlineForm = function(form) {
   form.parentNode.removeChild(form);
 };
 
 var createInlineForm = function(parent_tr, f_path, line) {
   var tmpl = $('#comment-inline-form-template').html();
   tmpl = tmpl.format(f_path, line);
   var form = tableTr('comment-form-inline', tmpl);
   var form_hide_button = $(form).find('.hide-inline-form');
 
   $(form_hide_button).click(function(e) {
      $('.inline-comments').removeClass('hide-comment-button');
      var newtr = e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode;
      if ($(newtr.nextElementSibling).hasClass('inline-comments-button')) {
          $(newtr.nextElementSibling).show();
      }
      $(newtr).parents('.comment-form-inline').remove();
      $(parent_tr).removeClass('form-open');
      $(parent_tr).removeClass('hl-comment');
   });
 
   return form;
 };
 
 var getLineNo = function(tr) {
   var line;
   // Try to get the id and return "" (empty string) if it doesn't exist
   var o = ($(tr).find('.lineno.old').attr('id')||"").split('_');
   var n = ($(tr).find('.lineno.new').attr('id')||"").split('_');
   if (n.length >= 2) {
     line = n[n.length-1];
   } else if (o.length >= 2) {
    line = o[o.length-1];
   }
   return line;
 };
 
 /**
  * make a single inline comment and place it inside
  */
 var renderInlineComment = function(json_data, show_add_button) {
   show_add_button = typeof show_add_button !== 'undefined' ? show_add_button : true;
   try {
     var html = json_data.rendered_text;
     var lineno = json_data.line_no;
     var target_id = json_data.target_id;
     placeInline(target_id, lineno, html, show_add_button);
   } catch (e) {
     console.error(e);
   }
 };
 
 function bindDeleteCommentButtons() {
     $('.delete-comment').one('click', function() {
         var comment_id = $(this).data("comment-id");
 
         if (comment_id){
             deleteComment(comment_id);
         }
     });
 }
 
 /**
  * Inject inline comment for on given TR this tr should be always an .line
  * tr containing the line. Code will detect comment, and always put the comment
  * block at the very bottom
  */
 var injectInlineForm = function(tr){
   if (!$(tr).hasClass('line')) {
       return;
   }
 
   var _td = $(tr).find('.code').get(0);
   if ($(tr).hasClass('form-open') ||
       $(tr).hasClass('context') ||
       $(_td).hasClass('no-comment')) {
       return;
   }
   $(tr).addClass('form-open');
   $(tr).addClass('hl-comment');
   var node = $(tr.parentNode.parentNode.parentNode).find('.full_f_path').get(0);
   var f_path = $(node).attr('path');
   var lineno = getLineNo(tr);
   var form = createInlineForm(tr, f_path, lineno);
 
   var parent = tr;
   while (1) {
       var n = parent.nextElementSibling;
       // next element are comments !
       if ($(n).hasClass('inline-comments')) {
           parent = n;
       }
       else {
           break;
       }
   }
   var _parent = $(parent).get(0);
   $(_parent).after(form);
   $('.comment-form-inline').prev('.inline-comments').addClass('hide-comment-button');
   var f = $(form).get(0);
 
   var _form = $(f).find('.inline-form').get(0);
 
   var pullRequestId = templateContext.pull_request_data.pull_request_id;
   var commitId = templateContext.commit_data.commit_id;
 
   var commentForm = new CommentForm(_form, commitId, pullRequestId, lineno, false);
   var cm = commentForm.getCmInstance();
 
   // set a CUSTOM submit handler for inline comments.
   commentForm.setHandleFormSubmit(function(o) {
     var text = commentForm.cm.getValue();
 
     if (text === "") {
       return;
     }
 
     if (lineno === undefined) {
       alert('missing line !');
       return;
     }
     if (f_path === undefined) {
       alert('missing file path !');
       return;
     }
 
     var excludeCancelBtn = false;
     var submitEvent = true;
     commentForm.setActionButtonsDisabled(true, excludeCancelBtn, submitEvent);
     commentForm.cm.setOption("readOnly", true);
     var postData = {
         'text': text,
         'f_path': f_path,
         'line': lineno,
         'csrf_token': CSRF_TOKEN
     };
     var submitSuccessCallback = function(o) {
       $(tr).removeClass('form-open');
       removeInlineForm(f);
       renderInlineComment(o);
       $('.inline-comments').removeClass('hide-comment-button');
 
       // re trigger the linkification of next/prev navigation
       linkifyComments($('.inline-comment-injected'));
       timeagoActivate();
       bindDeleteCommentButtons();
       commentForm.setActionButtonsDisabled(false);
 
     };
     var submitFailCallback = function(){
         commentForm.resetCommentFormState(text)
     };
     commentForm.submitAjaxPOST(
         commentForm.submitUrl, postData, submitSuccessCallback, submitFailCallback);
   });
 
   setTimeout(function() {
       // callbacks
       if (cm !== undefined) {
           cm.focus();
       }
   }, 10);
 
     $.Topic('/ui/plugins/code/comment_form_built').prepareOrPublish({
         form:_form,
         parent:_parent,
         lineno: lineno,
         f_path: f_path}
     );
 };
 
 var deleteComment = function(comment_id) {
   var url = AJAX_COMMENT_DELETE_URL.replace('__COMMENT_ID__', comment_id);
   var postData = {
     '_method': 'delete',
     'csrf_token': CSRF_TOKEN
   };
 
   var success = function(o) {
     window.location.reload();
   };
   ajaxPOST(url, postData, success);
 };
 
 var createInlineAddButton = function(tr){
   var label = _gettext('Add another comment');
   var html_el = document.createElement('div');
   $(html_el).addClass('add-comment');
   html_el.innerHTML = '<span class="btn btn-secondary">{0}</span>'.format(label);
   var add = new $(html_el);
   add.on('click', function(e) {
     injectInlineForm(tr);
   });
   return add;
 };
 
 var placeAddButton = function(target_tr){
   if(!target_tr){
     return;
   }
   var last_node = target_tr;
   // scan
   while (1){
     var n = last_node.nextElementSibling;
     // next element are comments !
     if($(n).hasClass('inline-comments')){
       last_node = n;
       // also remove the comment button from previous
       var comment_add_buttons = $(last_node).find('.add-comment');
       for(var i=0; i<comment_add_buttons.length; i++){
         var b = comment_add_buttons[i];
         b.parentNode.removeChild(b);
       }
     }
     else{
       break;
     }
   }
   var add = createInlineAddButton(target_tr);
   // get the comment div
   var comment_block = $(last_node).find('.comment')[0];
   // attach add button
   $(add).insertAfter(comment_block);
 };
 
 /**
  * Places the inline comment into the changeset block in proper line position
  */
 var placeInline = function(target_container, lineno, html, show_add_button) {
   show_add_button = typeof show_add_button !== 'undefined' ? show_add_button : true;
 
   var lineid = "{0}_{1}".format(target_container, lineno);
   var target_line = $('#' + lineid).get(0);
   var comment = new $(tableTr('inline-comments', html));
   // check if there are comments already !
   if (target_line) {
     var parent_node = target_line.parentNode;
     var root_parent = parent_node;
 
     while (1) {
       var n = parent_node.nextElementSibling;
       // next element are comments !
       if ($(n).hasClass('inline-comments')) {
         parent_node = n;
       }
       else {
         break;
       }
     }
     // put in the comment at the bottom
     $(comment).insertAfter(parent_node);
     $(comment).find('.comment-inline').addClass('inline-comment-injected');
     // scan nodes, and attach add button to last one
     if (show_add_button) {
       placeAddButton(root_parent);
     }
     addCommentToggle(target_line);
   }
 
   return target_line;
 };
 
 var addCommentToggle = function(target_line) {
   // exposes comment toggle button
   $(target_line).siblings('.comment-toggle').addClass('active');
   return;
 };
 
 var bindToggleButtons = function() {
   $('.comment-toggle').on('click', function() {
         $(this).parent().nextUntil('tr.line').toggle('inline-comments');
   });
 };
 
 var linkifyComments = function(comments) {
   /* TODO: dan: remove this - it should no longer needed */
   for (var i = 0; i < comments.length; i++) {
     var comment_id = $(comments[i]).data('comment-id');
     var prev_comment_id = $(comments[i - 1]).data('comment-id');
     var next_comment_id = $(comments[i + 1]).data('comment-id');
 
     // place next/prev links
     if (prev_comment_id) {
       $('#prev_c_' + comment_id).show();
       $('#prev_c_' + comment_id + " a.arrow_comment_link").attr(
           'href', '#comment-' + prev_comment_id).removeClass('disabled');
     }
     if (next_comment_id) {
       $('#next_c_' + comment_id).show();
       $('#next_c_' + comment_id + " a.arrow_comment_link").attr(
           'href', '#comment-' + next_comment_id).removeClass('disabled');
     }
     // place a first link to the total counter
     if (i === 0) {
       $('#inline-comments-counter').attr('href', '#comment-' + comment_id);
     }
   }
 
 };
 
 /**
  * Iterates over all the inlines, and places them inside proper blocks of data
  */
 var renderInlineComments = function(file_comments, show_add_button) {
   show_add_button = typeof show_add_button !== 'undefined' ? show_add_button : true;
 
   for (var i = 0; i < file_comments.length; i++) {
     var box = file_comments[i];
 
     var target_id = $(box).attr('target_id');
 
     // actually comments with line numbers
     var comments = box.children;
 
     for (var j = 0; j < comments.length; j++) {
       var data = {
         'rendered_text': comments[j].outerHTML,
         'line_no': $(comments[j]).attr('line'),
         'target_id': target_id
       };
       renderInlineComment(data, show_add_button);
     }
   }
 
   // since order of injection is random, we're now re-iterating
   // from correct order and filling in links
   linkifyComments($('.inline-comment-injected'));
   bindDeleteCommentButtons();
   firefoxAnchorFix();
 };
 
 
 /* Comment form for main and inline comments */
 var CommentForm = (function() {
     "use strict";
 
     function CommentForm(formElement, commitId, pullRequestId, lineNo, initAutocompleteActions) {
 
         this.withLineNo = function(selector) {
             var lineNo = this.lineNo;
             if (lineNo === undefined) {
                 return selector
             } else {
                 return selector + '_' + lineNo;
             }
         };
 
         this.commitId = commitId;
         this.pullRequestId = pullRequestId;
         this.lineNo = lineNo;
         this.initAutocompleteActions = initAutocompleteActions;
 
         this.previewButton = this.withLineNo('#preview-btn');
         this.previewContainer = this.withLineNo('#preview-container');
 
         this.previewBoxSelector = this.withLineNo('#preview-box');
 
         this.editButton = this.withLineNo('#edit-btn');
         this.editContainer = this.withLineNo('#edit-container');
 
         this.cancelButton = this.withLineNo('#cancel-btn');
 
         this.statusChange = '#change_status';
         this.cmBox = this.withLineNo('#text');
         this.cm = initCommentBoxCodeMirror(this.cmBox, this.initAutocompleteActions);
 
         this.submitForm = formElement;
         this.submitButton = $(this.submitForm).find('input[type="submit"]');
         this.submitButtonText = this.submitButton.val();
 
         this.previewUrl = pyroutes.url('changeset_comment_preview',
             {'repo_name': templateContext.repo_name});
 
         // based on commitId, or pullReuqestId decide where do we submit
         // out data
         if (this.commitId){
             this.submitUrl = pyroutes.url('changeset_comment',
                 {'repo_name': templateContext.repo_name,
                  'revision': this.commitId});
 
         } else if (this.pullRequestId) {
             this.submitUrl = pyroutes.url('pullrequest_comment',
                 {'repo_name': templateContext.repo_name,
                  'pull_request_id': this.pullRequestId});
 
         } else {
             throw new Error(
                 'CommentForm requires pullRequestId, or commitId to be specified.')
         }
 
         this.getCmInstance = function(){
             return this.cm
         };
 
         var self = this;
 
         this.getCommentStatus = function() {
           return $(this.submitForm).find(this.statusChange).val();
         };
 
         this.isAllowedToSubmit = function() {
           return !$(this.submitButton).prop('disabled');
         };
 
         this.initStatusChangeSelector = function(){
             var formatChangeStatus = function(state, escapeMarkup) {
                 var originalOption = state.element;
                 return '<div class="flag_status ' + $(originalOption).data('status') + ' pull-left"></div>' +
                        '<span>' + escapeMarkup(state.text) + '</span>';
             };
             var formatResult = function(result, container, query, escapeMarkup) {
                 return formatChangeStatus(result, escapeMarkup);
             };
 
             var formatSelection = function(data, container, escapeMarkup) {
                 return formatChangeStatus(data, escapeMarkup);
             };
 
             $(this.submitForm).find(this.statusChange).select2({
                 placeholder: _gettext('Status Review'),
                 formatResult: formatResult,
                 formatSelection: formatSelection,
                 containerCssClass: "drop-menu status_box_menu",
                 dropdownCssClass: "drop-menu-dropdown",
                 dropdownAutoWidth: true,
                 minimumResultsForSearch: -1
             });
             $(this.submitForm).find(this.statusChange).on('change', function() {
                 var status = self.getCommentStatus();
                 if (status && !self.lineNo) {
                     $(self.submitButton).prop('disabled', false);
                 }
                 //todo, fix this name
                 var placeholderText = _gettext('Comment text will be set automatically based on currently selected status ({0}) ...').format(status);
                 self.cm.setOption('placeholder', placeholderText);
             })
         };
 
         // reset the comment form into it's original state
         this.resetCommentFormState = function(content) {
             content = content || '';
 
             $(this.editContainer).show();
             $(this.editButton).hide();
 
             $(this.previewContainer).hide();
             $(this.previewButton).show();
 
             this.setActionButtonsDisabled(true);
             self.cm.setValue(content);
             self.cm.setOption("readOnly", false);
         };
 
         this.submitAjaxPOST = function(url, postData, successHandler, failHandler) {
             failHandler = failHandler || function() {};
             var postData = toQueryString(postData);
             var request = $.ajax({
                     url: url,
                     type: 'POST',
                     data: postData,
                     headers: {'X-PARTIAL-XHR': true}
                 })
                 .done(function(data) {
                     successHandler(data);
                 })
                 .fail(function(data, textStatus, errorThrown){
                     alert(
                         "Error while submitting comment.\n" +
                         "Error code {0} ({1}).".format(data.status, data.statusText));
                     failHandler()
                 });
             return request;
         };
 
         // overwrite a submitHandler, we need to do it for inline comments
         this.setHandleFormSubmit = function(callback) {
             this.handleFormSubmit = callback;
         };
 
         // default handler for for submit for main comments
         this.handleFormSubmit = function() {
             var text = self.cm.getValue();
             var status = self.getCommentStatus();
 
             if (text === "" && !status) {
                 return;
             }
 
             var excludeCancelBtn = false;
             var submitEvent = true;
             self.setActionButtonsDisabled(true, excludeCancelBtn, submitEvent);
             self.cm.setOption("readOnly", true);
             var postData = {
                 'text': text,
                 'changeset_status': status,
                 'csrf_token': CSRF_TOKEN
             };
 
             var submitSuccessCallback = function(o) {
                 if (status) {
                     location.reload(true);
                 } else {
                     $('#injected_page_comments').append(o.rendered_text);
                     self.resetCommentFormState();
                     bindDeleteCommentButtons();
                     timeagoActivate();
                 }
             };
             var submitFailCallback = function(){
                 self.resetCommentFormState(text)
             };
             self.submitAjaxPOST(
                 self.submitUrl, postData, submitSuccessCallback, submitFailCallback);
         };
 
         this.previewSuccessCallback = function(o) {
             $(self.previewBoxSelector).html(o);
             $(self.previewBoxSelector).removeClass('unloaded');
 
             // swap buttons
             $(self.previewButton).hide();
             $(self.editButton).show();
 
             // unlock buttons
             self.setActionButtonsDisabled(false);
         };
 
         this.setActionButtonsDisabled = function(state, excludeCancelBtn, submitEvent) {
             excludeCancelBtn = excludeCancelBtn || false;
             submitEvent = submitEvent || false;
 
             $(this.editButton).prop('disabled', state);
             $(this.previewButton).prop('disabled', state);
 
             if (!excludeCancelBtn) {
                 $(this.cancelButton).prop('disabled', state);
             }
 
             var submitState = state;
             if (!submitEvent && this.getCommentStatus() && !this.lineNo) {
                 // if the value of commit review status is set, we allow
                 // submit button, but only on Main form, lineNo means inline
                 submitState = false
             }
             $(this.submitButton).prop('disabled', submitState);
             if (submitEvent) {
               $(this.submitButton).val(_gettext('Submitting...'));
             } else {
               $(this.submitButton).val(this.submitButtonText);
             }
 
         };
 
         // lock preview/edit/submit buttons on load, but exclude cancel button
         var excludeCancelBtn = true;
         this.setActionButtonsDisabled(true, excludeCancelBtn);
 
         // anonymous users don't have access to initialized CM instance
         if (this.cm !== undefined){
             this.cm.on('change', function(cMirror) {
                 if (cMirror.getValue() === "") {
                     self.setActionButtonsDisabled(true, excludeCancelBtn)
                 } else {
                     self.setActionButtonsDisabled(false, excludeCancelBtn)
                 }
             });
         }
 
         $(this.editButton).on('click', function(e) {
             e.preventDefault();
 
             $(self.previewButton).show();
             $(self.previewContainer).hide();
             $(self.editButton).hide();
             $(self.editContainer).show();
 
         });
 
         $(this.previewButton).on('click', function(e) {
             e.preventDefault();
             var text = self.cm.getValue();
 
             if (text === "") {
                 return;
             }
 
             var postData = {
                 'text': text,
                 'renderer': DEFAULT_RENDERER,
                 'csrf_token': CSRF_TOKEN
             };
 
             // lock ALL buttons on preview
             self.setActionButtonsDisabled(true);
 
             $(self.previewBoxSelector).addClass('unloaded');
             $(self.previewBoxSelector).html(_gettext('Loading ...'));
             $(self.editContainer).hide();
             $(self.previewContainer).show();
 
             // by default we reset state of comment preserving the text
             var previewFailCallback = function(){
                 self.resetCommentFormState(text)
             };
             self.submitAjaxPOST(
                 self.previewUrl, postData, self.previewSuccessCallback, previewFailCallback);
 
         });
 
         $(this.submitForm).submit(function(e) {
             e.preventDefault();
             var allowedToSubmit = self.isAllowedToSubmit();
             if (!allowedToSubmit){
                return false;
             }
             self.handleFormSubmit();
         });
 
     }
 
     return CommentForm;
 })();
+
+var CommentsController = function() { /* comments controller */
+  var self = this;
+
+  this.cancelComment = function(node) {
+      var $node = $(node);
+      var $td = $node.closest('td');
+      $node.closest('.comment-inline-form').removeClass('comment-inline-form-open');
+      return false;
+  }
+  this.getLineNumber = function(node) {
+      var $node = $(node);
+      return $node.closest('td').attr('data-line-number');
+  }
+  this.scrollToComment = function(node, offset) {
+    if (!node) {
+      node = $('.comment-selected');
+      if (!node.length) {
+        node = $('comment-current')
+      }
+    }
+    $comment = $(node).closest('.comment-current');
+    $comments = $('.comment-current');
+
+    $('.comment-selected').removeClass('comment-selected');
+
+    var nextIdx = $('.comment-current').index($comment) + offset;
+    if (nextIdx >= $comments.length) {
+      nextIdx = 0;
+    }
+    var $next = $('.comment-current').eq(nextIdx);
+    var $cb = $next.closest('.cb');
+    $cb.removeClass('cb-collapsed')
+
+    var $filediffCollapseState = $cb.closest('.filediff').prev();
+    $filediffCollapseState.prop('checked', false);
+    $next.addClass('comment-selected');
+    scrollToElement($next);
+    return false;
+  }
+  this.nextComment = function(node) {
+    return self.scrollToComment(node, 1);
+  }
+  this.prevComment = function(node) {
+    return self.scrollToComment(node, -1);
+  }
+  this.deleteComment = function(node) {
+      if (!confirm(_gettext('Delete this comment?'))) {
+        return false;
+      }
+      var $node = $(node);
+      var $td = $node.closest('td');
+      var $comment = $node.closest('.comment');
+      var comment_id = $comment.attr('data-comment-id');
+      var url = AJAX_COMMENT_DELETE_URL.replace('__COMMENT_ID__', comment_id);
+      var postData = {
+        '_method': 'delete',
+        'csrf_token': CSRF_TOKEN
+      };
+
+      $comment.addClass('comment-deleting');
+      $comment.hide('fast');
+
+      var success = function(response) {
+        $comment.remove();
+        return false;
+      };
+      var failure = function(data, textStatus, xhr) {
+        alert("error processing request: " + textStatus);
+        $comment.show('fast');
+        $comment.removeClass('comment-deleting');
+        return false;
+      };
+      ajaxPOST(url, postData, success, failure);
+  }
+  this.toggleComments = function(node, show) {
+    var $filediff = $(node).closest('.filediff');
+    if (show === true) {
+      $filediff.removeClass('hide-comments');
+    } else if (show === false) {
+      $filediff.find('.hide-line-comments').removeClass('hide-line-comments');
+      $filediff.addClass('hide-comments');
+    } else {
+      $filediff.find('.hide-line-comments').removeClass('hide-line-comments');
+      $filediff.toggleClass('hide-comments');
+    }
+    return false;
+  }
+  this.toggleLineComments = function(node) {
+    self.toggleComments(node, true);
+    var $node = $(node);
+    $node.closest('tr').toggleClass('hide-line-comments');
+  }
+  this.createComment = function(node) {
+      var $node = $(node);
+      var $td = $node.closest('td');
+      var $form = $td.find('.comment-inline-form');
+
+      if (!$form.length) {
+          var tmpl = $('#cb-comment-inline-form-template').html();
+          var $filediff = $node.closest('.filediff');
+          $filediff.removeClass('hide-comments');
+          var f_path = $filediff.attr('data-f-path');
+          var lineno = self.getLineNumber(node);
+          tmpl = tmpl.format(f_path, lineno);
+          $form = $(tmpl);
+
+          var $comments = $td.find('.inline-comments');
+          if (!$comments.length) {
+            $comments = $(
+              $('#cb-comments-inline-container-template').html());
+            $td.append($comments);
+          }
+
+          $td.find('.cb-comment-add-button').before($form);
+
+          var pullRequestId = templateContext.pull_request_data.pull_request_id;
+          var commitId = templateContext.commit_data.commit_id;
+          var _form = $form[0];
+          var commentForm = new CommentForm(_form, commitId, pullRequestId, lineno, false);
+          var cm = commentForm.getCmInstance();
+
+          // set a CUSTOM submit handler for inline comments.
+          commentForm.setHandleFormSubmit(function(o) {
+            var text = commentForm.cm.getValue();
+
+            if (text === "") {
+              return;
+            }
+
+            if (lineno === undefined) {
+              alert('missing line !');
+              return;
+            }
+            if (f_path === undefined) {
+              alert('missing file path !');
+              return;
+            }
+
+            var excludeCancelBtn = false;
+            var submitEvent = true;
+            commentForm.setActionButtonsDisabled(true, excludeCancelBtn, submitEvent);
+            commentForm.cm.setOption("readOnly", true);
+            var postData = {
+                'text': text,
+                'f_path': f_path,
+                'line': lineno,
+                'csrf_token': CSRF_TOKEN
+            };
+            var submitSuccessCallback = function(json_data) {
+              $form.remove();
+              console.log(json_data)
+              try {
+                var html = json_data.rendered_text;
+                var lineno = json_data.line_no;
+                var target_id = json_data.target_id;
+
+                $comments.find('.cb-comment-add-button').before(html);
+                console.log(lineno, target_id, $comments);
+
+              } catch (e) {
+                console.error(e);
+              }
+
+
+              // re trigger the linkification of next/prev navigation
+              linkifyComments($('.inline-comment-injected'));
+              timeagoActivate();
+              bindDeleteCommentButtons();
+              commentForm.setActionButtonsDisabled(false);
+
+            };
+            var submitFailCallback = function(){
+                commentForm.resetCommentFormState(text)
+            };
+            commentForm.submitAjaxPOST(
+                commentForm.submitUrl, postData, submitSuccessCallback, submitFailCallback);
+          });
+
+          setTimeout(function() {
+              // callbacks
+              if (cm !== undefined) {
+                  cm.focus();
+              }
+          }, 10);
+
+            $.Topic('/ui/plugins/code/comment_form_built').prepareOrPublish({
+                form: _form,
+                parent: $td[0],
+                lineno: lineno,
+                f_path: f_path}
+            );
+      }
+
+      $form.addClass('comment-inline-form-open');
+  }
+
+  this.renderInlineComments = function(file_comments) {
+    show_add_button = typeof show_add_button !== 'undefined' ? show_add_button : true;
+
+    for (var i = 0; i < file_comments.length; i++) {
+      var box = file_comments[i];
+
+      var target_id = $(box).attr('target_id');
+
+      // actually comments with line numbers
+      var comments = box.children;
+
+      for (var j = 0; j < comments.length; j++) {
+        var data = {
+          'rendered_text': comments[j].outerHTML,
+          'line_no': $(comments[j]).attr('line'),
+          'target_id': target_id
+        };
+      }
+    }
+
+    // since order of injection is random, we're now re-iterating
+    // from correct order and filling in links
+    linkifyComments($('.inline-comment-injected'));
+    bindDeleteCommentButtons();
+    firefoxAnchorFix();
+  };
+
+}
  No newline at end of file

rhodecode/templates/base/root.html

@@ -1,387 +1,183 b''
 ## -*- coding: utf-8 -*-
 <!DOCTYPE html>
 
 <%
 c.template_context['repo_name'] = getattr(c, 'repo_name', '')
 
 if hasattr(c, 'rhodecode_db_repo'):
     c.template_context['repo_type'] = c.rhodecode_db_repo.repo_type
     c.template_context['repo_landing_commit'] = c.rhodecode_db_repo.landing_rev[1]
 
 if getattr(c, 'rhodecode_user', None) and c.rhodecode_user.user_id:
     c.template_context['rhodecode_user']['username'] = c.rhodecode_user.username
     c.template_context['rhodecode_user']['email'] = c.rhodecode_user.email
     c.template_context['rhodecode_user']['notification_status'] = c.rhodecode_user.get_instance().user_data.get('notification_status', True)
     c.template_context['rhodecode_user']['first_name'] = c.rhodecode_user.name
     c.template_context['rhodecode_user']['last_name'] = c.rhodecode_user.lastname
 
 c.template_context['visual']['default_renderer'] = h.get_visual_attr(c, 'default_renderer')
 %>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-lite.min.js', ver=c.rhodecode_version_hash)}"></script>
         <link rel="import" href="${h.asset('js/rhodecode-components.html', ver=c.rhodecode_version_hash)}">
         <title>${self.title()}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <%def name="robots()">
             <meta name="robots" content="index, nofollow"/>
         </%def>
         ${self.robots()}
         <link rel="icon" href="${h.asset('images/favicon.ico', ver=c.rhodecode_version_hash)}" sizes="16x16 32x32" type="image/png" />
 
         ## CSS definitions
         <%def name="css()">
             <link rel="stylesheet" type="text/css" href="${h.asset('css/style.css', ver=c.rhodecode_version_hash)}" media="screen"/>
             <!--[if lt IE 9]>
                 <link rel="stylesheet" type="text/css" href="${h.asset('css/ie.css', ver=c.rhodecode_version_hash)}" media="screen"/>
             <![endif]-->
             ## EXTRA FOR CSS
             ${self.css_extra()}
         </%def>
         ## CSS EXTRA - optionally inject some extra CSS stuff needed for specific websites
         <%def name="css_extra()">
         </%def>
 
         ${self.css()}
 
         ## JAVASCRIPT
         <%def name="js()">
             <script>
                 // setup Polymer options
                 window.Polymer = {lazyRegister: true, dom: 'shadow'};
 
                 // Load webcomponentsjs polyfill if browser does not support native Web Components
                 (function() {
                     'use strict';
                     var onload = function() {
                         // For native Imports, manually fire WebComponentsReady so user code
                         // can use the same code path for native and polyfill'd imports.
                         if (!window.HTMLImports) {
                             document.dispatchEvent(
                                     new CustomEvent('WebComponentsReady', {bubbles: true})
                             );
                         }
                     };
                     var webComponentsSupported = (
                             'registerElement' in document
                             && 'import' in document.createElement('link')
                             && 'content' in document.createElement('template')
                     );
                     if (!webComponentsSupported) {
                     } else {
                         onload();
                     }
                 })();
             </script>
 
             <script src="${h.asset('js/rhodecode/i18n/%s.js' % c.language, ver=c.rhodecode_version_hash)}"></script>
             <script type="text/javascript">
             // register templateContext to pass template variables to JS
             var templateContext = ${h.json.dumps(c.template_context)|n};
 
             var REPO_NAME = "${getattr(c, 'repo_name', '')}";
             %if hasattr(c, 'rhodecode_db_repo'):
             var REPO_LANDING_REV = '${c.rhodecode_db_repo.landing_rev[1]}';
             var REPO_TYPE = '${c.rhodecode_db_repo.repo_type}';
             %else:
             var REPO_LANDING_REV = '';
             var REPO_TYPE = '';
             %endif
             var APPLICATION_URL = "${h.url('home').rstrip('/')}";
             var ASSET_URL = "${h.asset('')}";
             var DEFAULT_RENDERER = "${h.get_visual_attr(c, 'default_renderer')}";
             var CSRF_TOKEN = "${getattr(c, 'csrf_token', '')}";
             % if getattr(c, 'rhodecode_user', None):
             var USER = {name:'${c.rhodecode_user.username}'};
             % else:
             var USER = {name:null};
             % endif
 
             var APPENLIGHT = {
               enabled: ${'true' if getattr(c, 'appenlight_enabled', False) else 'false'},
               key: '${getattr(c, "appenlight_api_public_key", "")}',
               % if getattr(c, 'appenlight_server_url', None):
                   serverUrl: '${getattr(c, "appenlight_server_url", "")}',
               % endif
               requestInfo: {
               % if getattr(c, 'rhodecode_user', None):
                   ip: '${c.rhodecode_user.ip_addr}',
                   username: '${c.rhodecode_user.username}'
               % endif
               },
               tags: {
                   rhodecode_version: '${c.rhodecode_version}',
                   rhodecode_edition: '${c.rhodecode_edition}'
               }
             };
 
-
-Rhodecode = (function() {
-    function _Rhodecode() {
-        this.comments = new (function() { /* comments controller */
-            var self = this;
-
-            this.cancelComment = function(node) {
-                var $node = $(node);
-                var $td = $node.closest('td');
-                $node.closest('.comment-inline-form').removeClass('comment-inline-form-open');
-                return false;
-            }
-            this.getLineNumber = function(node) {
-                var $node = $(node);
-                return $node.closest('td').attr('data-line-number');
-            }
-            this.scrollToComment = function(node, offset) {
-              if (!node) {
-                node = $('.comment-selected');
-                if (!node.length) {
-                  node = $('comment-current')
-                }
-              }
-              $comment = $(node).closest('.comment-current');
-              $comments = $('.comment-current');
-
-              $('.comment-selected').removeClass('comment-selected');
-
-              var nextIdx = $('.comment-current').index($comment) + offset;
-              if (nextIdx >= $comments.length) {
-                nextIdx = 0;
-              }
-              var $next = $('.comment-current').eq(nextIdx);
-              var $cb = $next.closest('.cb');
-              $cb.removeClass('cb-collapsed')
-
-              var $filediffCollapseState = $cb.closest('.filediff').prev();
-              $filediffCollapseState.prop('checked', false);
-              $next.addClass('comment-selected');
-              scrollToElement($next);
-              return false;
-            }
-            this.nextComment = function(node) {
-              return self.scrollToComment(node, 1);
-            }
-            this.prevComment = function(node) {
-              return self.scrollToComment(node, -1);
-            }
-            this.deleteComment = function(node) {
-                if (!confirm(_gettext('Delete this comment?'))) {
-                  return false;
-                }
-                var $node = $(node);
-                var $td = $node.closest('td');
-                var $comment = $node.closest('.comment');
-                var comment_id = $comment.attr('data-comment-id');
-                var url = AJAX_COMMENT_DELETE_URL.replace('__COMMENT_ID__', comment_id);
-                var postData = {
-                  '_method': 'delete',
-                  'csrf_token': CSRF_TOKEN
-                };
-
-                $comment.addClass('comment-deleting');
-                $comment.hide('fast');
-
-                var success = function(response) {
-                  $comment.remove();
-                  return false;
-                };
-                var failure = function(data, textStatus, xhr) {
-                  alert("error processing request: " + textStatus);
-                  $comment.show('fast');
-                  $comment.removeClass('comment-deleting');
-                  return false;
-                };
-                ajaxPOST(url, postData, success, failure);
-            }
-            this.createComment = function(node) {
-                var $node = $(node);
-                var $td = $node.closest('td');
-                var $form = $td.find('.comment-inline-form');
-
-                if (!$form.length) {
-                    var tmpl = $('#cb-comment-inline-form-template').html();
-                    var f_path = $node.closest('.filediff').attr('data-f-path');
-                    var lineno = self.getLineNumber(node);
-                    tmpl = tmpl.format(f_path, lineno);
-                    $form = $(tmpl);
-
-                    var $comments = $td.find('.inline-comments');
-                    if (!$comments.length) {
-                      $comments = $(
-                        $('#cb-comments-inline-container-template').html());
-                      $td.append($comments);
-                    }
-
-                    $td.find('.cb-comment-add-button').before($form);
-
-                    var pullRequestId = templateContext.pull_request_data.pull_request_id;
-                    var commitId = templateContext.commit_data.commit_id;
-                    var _form = $form[0];
-                    var commentForm = new CommentForm(_form, commitId, pullRequestId, lineno, false);
-                    var cm = commentForm.getCmInstance();
-
-                    // set a CUSTOM submit handler for inline comments.
-                    commentForm.setHandleFormSubmit(function(o) {
-                      var text = commentForm.cm.getValue();
-
-                      if (text === "") {
-                        return;
-                      }
-
-                      if (lineno === undefined) {
-                        alert('missing line !');
-                        return;
-                      }
-                      if (f_path === undefined) {
-                        alert('missing file path !');
-                        return;
-                      }
-
-                      var excludeCancelBtn = false;
-                      var submitEvent = true;
-                      commentForm.setActionButtonsDisabled(true, excludeCancelBtn, submitEvent);
-                      commentForm.cm.setOption("readOnly", true);
-                      var postData = {
-                          'text': text,
-                          'f_path': f_path,
-                          'line': lineno,
-                          'csrf_token': CSRF_TOKEN
-                      };
-                      var submitSuccessCallback = function(json_data) {
-                        $form.remove();
-                        console.log(json_data)
-                        try {
-                          var html = json_data.rendered_text;
-                          var lineno = json_data.line_no;
-                          var target_id = json_data.target_id;
-
-                          $comments.find('.cb-comment-add-button').before(html);
-                          console.log(lineno, target_id, $comments);
-
-                        } catch (e) {
-                          console.error(e);
-                        }
-
-
-                        // re trigger the linkification of next/prev navigation
-                        linkifyComments($('.inline-comment-injected'));
-                        timeagoActivate();
-                        bindDeleteCommentButtons();
-                        commentForm.setActionButtonsDisabled(false);
-
-                      };
-                      var submitFailCallback = function(){
-                          commentForm.resetCommentFormState(text)
-                      };
-                      commentForm.submitAjaxPOST(
-                          commentForm.submitUrl, postData, submitSuccessCallback, submitFailCallback);
-                    });
-
-                    setTimeout(function() {
-                        // callbacks
-                        if (cm !== undefined) {
-                            cm.focus();
-                        }
-                    }, 10);
-
-                      $.Topic('/ui/plugins/code/comment_form_built').prepareOrPublish({
-                          form: _form,
-                          parent: $td[0],
-                          lineno: lineno,
-                          f_path: f_path}
-                      );
-                }
-
-                $form.addClass('comment-inline-form-open');
-            }
-
-            this.renderInlineComments = function(file_comments) {
-              show_add_button = typeof show_add_button !== 'undefined' ? show_add_button : true;
-
-              for (var i = 0; i < file_comments.length; i++) {
-                var box = file_comments[i];
-
-                var target_id = $(box).attr('target_id');
-
-                // actually comments with line numbers
-                var comments = box.children;
-
-                for (var j = 0; j < comments.length; j++) {
-                  var data = {
-                    'rendered_text': comments[j].outerHTML,
-                    'line_no': $(comments[j]).attr('line'),
-                    'target_id': target_id
-                  };
-                }
-              }
-
-              // since order of injection is random, we're now re-iterating
-              // from correct order and filling in links
-              linkifyComments($('.inline-comment-injected'));
-              bindDeleteCommentButtons();
-              firefoxAnchorFix();
-            };
-
-        })();
-    }
-    return new _Rhodecode();
-})();
-
             </script>
             <%include file="/base/plugins_base.html"/>
             <!--[if lt IE 9]>
             <script language="javascript" type="text/javascript" src="${h.asset('js/excanvas.min.js')}"></script>
             <![endif]-->
             <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode/routes.js', ver=c.rhodecode_version_hash)}"></script>
             <script> var alertMessagePayloads = ${h.flash.json_alerts()|n}; </script>
             ## avoide escaping the %N
             <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode-components.js', ver=c.rhodecode_version_hash)}"></script>
             <script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
 
 
             ## JAVASCRIPT EXTRA - optionally inject some extra JS for specificed templates
             ${self.js_extra()}
 
             <script type="text/javascript">
+            Rhodecode = (function() {
+                function _Rhodecode() {
+                  this.comments = new CommentsController();
+                }
+                return new _Rhodecode();
+            })();
+
             $(document).ready(function(){
               show_more_event();
               timeagoActivate();
             })
             </script>
 
         </%def>
 
         ## JAVASCRIPT EXTRA - optionally inject some extra JS for specificed templates
         <%def name="js_extra()"></%def>
         ${self.js()}
 
         <%def name="head_extra()"></%def>
         ${self.head_extra()}
         ## extra stuff
         %if c.pre_code:
             ${c.pre_code|n}
         %endif
     </head>
     <body id="body">
         <noscript>
             <div class="noscript-error">
                 ${_('Please enable JavaScript to use RhodeCode Enterprise')}
             </div>
         </noscript>
      ## IE hacks
       <!--[if IE 7]>
       <script>$(document.body).addClass('ie7')</script>
       <![endif]-->
       <!--[if IE 8]>
       <script>$(document.body).addClass('ie8')</script>
       <![endif]-->
       <!--[if IE 9]>
       <script>$(document.body).addClass('ie9')</script>
       <![endif]-->
 
       ${next.body()}
       %if c.post_code:
         ${c.post_code|n}
       %endif
     <rhodecode-app></rhodecode-app>
     </body>
 </html>

rhodecode/templates/codeblocks/diffs.html

@@ -1,542 +1,567 b''
 <%def name="diff_line_anchor(filename, line, type)"><%
 return '%s_%s_%i' % (h.safeid(filename), type, line)
 %></%def>
 
 <%def name="action_class(action)"><%
     return {
         '-': 'cb-deletion',
         '+': 'cb-addition',
         ' ': 'cb-context',
         }.get(action, 'cb-empty')
 %></%def>
 
 <%def name="op_class(op_id)"><%
     return {
         DEL_FILENODE: 'deletion', # file deleted
         BIN_FILENODE: 'warning' # binary diff hidden
     }.get(op_id, 'addition')
 %></%def>
 
 <%def name="link_for(**kw)"><%
 new_args = request.GET.mixed()
 new_args.update(kw)
 return h.url('', **new_args)
 %></%def>
 
 <%def name="render_diffset(diffset, commit=None,
 
     # collapse all file diff entries when there are more than this amount of files in the diff
     collapse_when_files_over=20,
 
     # collapse lines in the diff when more than this amount of lines changed in the file diff
     lines_changed_limit=500,
 
     # add a ruler at to the output
     ruler_at_chars=0,
 
     # turn on inline comments
     use_comments=False,
 
 )">
 
 %if use_comments:
 <div id="cb-comments-inline-container-template" class="js-template">
   ${inline_comments_container([])}
 </div>
 <div class="js-template" id="cb-comment-inline-form-template">
     <div class="comment-inline-form ac">
     %if c.rhodecode_user.username != h.DEFAULT_USER:
         ${h.form('#', method='get')}
         <div id="edit-container_{1}" class="clearfix">
           <div class="comment-title pull-left">
             ${_('Create a comment on line {1}.')}
           </div>
           <div class="comment-help pull-right">
             ${(_('Comments parsed using %s syntax with %s support.') % (
                    ('<a href="%s">%s</a>' % (h.url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
                      ('<span  class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
                  )
               )|n
              }
           </div>
               <div style="clear: both"></div>
               <textarea id="text_{1}" name="text" class="comment-block-ta ac-input"></textarea>
         </div>
         <div id="preview-container_{1}" class="clearfix" style="display: none;">
            <div class="comment-help">
                 ${_('Comment preview')}
             </div>
             <div id="preview-box_{1}" class="preview-box"></div>
         </div>
         <div class="comment-footer">
           <div class="action-buttons">
             <input type="hidden" name="f_path" value="{0}">
             <input type="hidden" name="line" value="{1}">
             <button id="preview-btn_{1}" class="btn btn-secondary">${_('Preview')}</button>
             <button id="edit-btn_{1}" class="btn btn-secondary" style="display: none;">${_('Edit')}</button>
             ${h.submit('save', _('Comment'), class_='btn btn-success save-inline-form')}
           </div>
           <div class="comment-button">
            <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
             ${_('Cancel')}
            </button>
           </div>
         ${h.end_form()}
       </div>
     %else:
         ${h.form('', class_='inline-form comment-form-login', method='get')}
         <div class="pull-left">
             <div class="comment-help pull-right">
               ${_('You need to be logged in to comment.')} <a href="${h.route_path('login', _query={'came_from': h.url.current()})}">${_('Login now')}</a>
             </div>
         </div>
         <div class="comment-button pull-right">
          <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
           ${_('Cancel')}
          </button>
         </div>
         <div class="clearfix"></div>
         ${h.end_form()}
     %endif
     </div>
 </div>
 
 %endif
 <%
 collapse_all = len(diffset.files) > collapse_when_files_over
 %>
 
 %if c.diffmode == 'sideside':
 <style>
 .wrapper {
     max-width: 1600px !important;
 }
 </style>
 %endif
 %if ruler_at_chars:
 <style>
 .diff table.cb .cb-content:after {
     content: "";
     border-left: 1px solid blue;
     position: absolute;
     top: 0;
     height: 18px;
     opacity: .2;
     z-index: 10;
     ## +5 to account for diff action (+/-)
     left: ${ruler_at_chars + 5}ch;
 </style>
 %endif
 
 <div class="diffset">
     <div class="diffset-heading ${diffset.limited_diff and 'diffset-heading-warning' or ''}">
         %if commit:
             <div class="pull-right">
                 <a class="btn tooltip" title="${_('Browse Files at revision {}').format(commit.raw_id)}" href="${h.url('files_home',repo_name=diffset.repo_name, revision=commit.raw_id, f_path='')}">
                     ${_('Browse Files')}
                 </a>
             </div>
         %endif
         <h2 class="clearinner">
         %if commit:
             <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">${'r%s:%s' % (commit.revision,h.short_id(commit.raw_id))}</a> -
             ${h.age_component(commit.date)} -
         %endif
     %if diffset.limited_diff:
     ${_('The requested commit is too big and content was truncated.')}
 
         ${ungettext('%(num)s file changed.', '%(num)s files changed.', diffset.changed_files) % {'num': diffset.changed_files}}
         <a href="${link_for(fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
     %else:
         ${ungettext('%(num)s file changed: %(linesadd)s inserted, ''%(linesdel)s deleted',
                     '%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted', diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}}
     %endif
         </h2>
     </div>
 
     %if not diffset.files:
         <p class="empty_data">${_('No files')}</p>
     %endif
 
     <div class="filediffs">
     %for i, filediff in enumerate(diffset.files):
     <%
     lines_changed = filediff['patch']['stats']['added'] + filediff['patch']['stats']['deleted']
     over_lines_changed_limit = lines_changed > lines_changed_limit
     %>
         <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filediff)}" type="checkbox">
         <div
             class="filediff"
             data-f-path="${filediff['patch']['filename']}"
             id="a_${h.FID('', filediff['patch']['filename'])}">
             <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
                 <div class="filediff-collapse-indicator"></div>
                 ${diff_ops(filediff)}
             </label>
             ${diff_menu(filediff, use_comments=use_comments)}
             <table class="cb cb-diff-${c.diffmode} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
         %if not filediff.hunks:
             %for op_id, op_text in filediff['patch']['stats']['ops'].items():
                 <tr>
                     <td class="cb-text cb-${op_class(op_id)}" ${c.diffmode == 'unified' and 'colspan=3' or 'colspan=4'}>
                         %if op_id == DEL_FILENODE:
                         ${_('File was deleted')}
                         %elif op_id == BIN_FILENODE:
                         ${_('Binary file hidden')}
                         %else:
                         ${op_text}
                         %endif
                     </td>
                 </tr>
             %endfor
         %endif
         %if over_lines_changed_limit:
                 <tr class="cb-warning cb-collapser">
-                    <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=3' or 'colspan=4'}>
+                    <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=4'}>
                         ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)}
                         <a href="#" class="cb-expand"
                            onclick="$(this).closest('table').removeClass('cb-collapsed'); return false;">${_('Show them')}
                         </a>
                         <a href="#" class="cb-collapse"
                            onclick="$(this).closest('table').addClass('cb-collapsed'); return false;">${_('Hide them')}
                         </a>
                     </td>
                 </tr>
         %endif
         %if filediff.patch['is_limited_diff']:
                 <tr class="cb-warning cb-collapser">
-                    <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=3' or 'colspan=4'}>
+                    <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=4'}>
                         ${_('The requested commit is too big and content was truncated.')} <a href="${link_for(fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
                     </td>
                 </tr>
         %endif
         %for hunk in filediff.hunks:
                 <tr class="cb-hunk">
-                    <td ${c.diffmode == 'unified' and 'colspan=2' or ''}>
+                    <td ${c.diffmode == 'unified' and 'colspan=3' or ''}>
                         ## TODO: dan: add ajax loading of more context here
                         ## <a href="#">
                             <i class="icon-more"></i>
                         ## </a>
                     </td>
-                    <td ${c.diffmode == 'sideside' and 'colspan=3' or ''}>
+                    <td ${c.diffmode == 'sideside' and 'colspan=5' or ''}>
                         @@
                         -${hunk.source_start},${hunk.source_length}
                         +${hunk.target_start},${hunk.target_length}
                         ${hunk.section_header}
                     </td>
                 </tr>
             %if c.diffmode == 'unified':
                     ${render_hunk_lines_unified(hunk, use_comments=use_comments)}
             %elif c.diffmode == 'sideside':
                     ${render_hunk_lines_sideside(hunk, use_comments=use_comments)}
             %else:
                 <tr class="cb-line">
                     <td>unknown diff mode</td>
                 </tr>
             %endif
         %endfor
             </table>
         </div>
     %endfor
     </div>
 </div>
 </%def>
 
 <%def name="diff_ops(filediff)">
 <%
 stats = filediff['patch']['stats']
 from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
     MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE
 %>
     <span class="pill">
         %if filediff.source_file_path and filediff.target_file_path:
             %if filediff.source_file_path != filediff.target_file_path: # file was renamed
                   <strong>${filediff.target_file_path}</strong> ⬅ <del>${filediff.source_file_path}</del>
             %else:
                 ## file was modified
                 <strong>${filediff.source_file_path}</strong>
             %endif
         %else:
             %if filediff.source_file_path:
                 ## file was deleted
                 <strong>${filediff.source_file_path}</strong>
             %else:
                 ## file was added
                 <strong>${filediff.target_file_path}</strong>
             %endif
         %endif
     </span>
     <span class="pill-group" style="float: left">
         %if filediff.patch['is_limited_diff']:
         <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span>
         %endif
         %if RENAMED_FILENODE in stats['ops']:
         <span class="pill" op="renamed">renamed</span>
         %endif
 
         %if NEW_FILENODE in stats['ops']:
         <span class="pill" op="created">created</span>
             %if filediff['target_mode'].startswith('120'):
         <span class="pill" op="symlink">symlink</span>
             %else:
         <span class="pill" op="mode">${nice_mode(filediff['target_mode'])}</span>
             %endif
         %endif
 
         %if DEL_FILENODE in stats['ops']:
         <span class="pill" op="removed">removed</span>
         %endif
 
         %if CHMOD_FILENODE in stats['ops']:
         <span class="pill" op="mode">
             ${nice_mode(filediff['source_mode'])} ➡ ${nice_mode(filediff['target_mode'])}
         </span>
         %endif
     </span>
 
     <a class="pill filediff-anchor" href="#a_${h.FID('', filediff.patch['filename'])}">¶</a>
 
     <span class="pill-group" style="float: right">
         %if BIN_FILENODE in stats['ops']:
         <span class="pill" op="binary">binary</span>
             %if MOD_FILENODE in stats['ops']:
             <span class="pill" op="modified">modified</span>
             %endif
         %endif
         %if stats['added']:
         <span class="pill" op="added">+${stats['added']}</span>
         %endif
         %if stats['deleted']:
         <span class="pill" op="deleted">-${stats['deleted']}</span>
         %endif
     </span>
 
 </%def>
 
 <%def name="nice_mode(filemode)">
     ${filemode.startswith('100') and filemode[3:] or filemode}
 </%def>
 
 <%def name="diff_menu(filediff, use_comments=False)">
     <div class="filediff-menu">
 %if filediff.diffset.source_ref:
     %if filediff.patch['operation'] in ['D', 'M']:
         <a
             class="tooltip"
             href="${h.url('files_home',repo_name=filediff.diffset.repo_name,f_path=filediff.source_file_path,revision=filediff.diffset.source_ref)}"
             title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
         >
             ${_('Show file before')}
         </a>
     %else:
         <span
             class="tooltip"
             title="${h.tooltip(_('File no longer present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}"
         >
             ${_('Show file before')}
         </span>
     %endif
     %if filediff.patch['operation'] in ['A', 'M']:
         <a
             class="tooltip"
             href="${h.url('files_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,revision=filediff.diffset.target_ref)}"
             title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
         >
             ${_('Show file after')}
         </a>
     %else:
         <span
             class="tooltip"
             title="${h.tooltip(_('File no longer present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}"
             >
                 ${_('Show file after')}
         </span>
     %endif
         <a
             class="tooltip"
             title="${h.tooltip(_('Raw diff'))}"
             href="${h.url('files_diff_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='raw')}"
         >
             ${_('Raw diff')}
         </a>
         <a
             class="tooltip"
             title="${h.tooltip(_('Download diff'))}"
             href="${h.url('files_diff_home',repo_name=filediff.diffset.repo_name,f_path=filediff.target_file_path,diff2=filediff.diffset.target_ref,diff1=filediff.diffset.source_ref,diff='download')}"
         >
             ${_('Download diff')}
         </a>
 
         ## TODO: dan: refactor ignorews_url and context_url into the diff renderer same as diffmode=unified/sideside. Also use ajax to load more context (by clicking hunks)
         %if hasattr(c, 'ignorews_url'):
         ${c.ignorews_url(request.GET, h.FID('', filediff['patch']['filename']))}
         %endif
         %if hasattr(c, 'context_url'):
         ${c.context_url(request.GET, h.FID('', filediff['patch']['filename']))}
         %endif
 
 
         %if use_comments:
-        <a href="#" onclick="$(this).closest('.filediff').toggleClass('hide-comments'); return false;">
+        <a href="#" onclick="return Rhodecode.comments.toggleComments(this);">
             <span class="show-comment-button">${_('Show comments')}</span><span class="hide-comment-button">${_('Hide comments')}</span>
         </a>
         %endif
 %endif
     </div>
 </%def>
 
 
 <%namespace name="commentblock" file="/changeset/changeset_file_comment.html"/>
 <%def name="inline_comments_container(comments)">
 <div class="inline-comments">
     %for comment in comments:
     ${commentblock.comment_block(comment, inline=True)}
     %endfor
     <span onclick="return Rhodecode.comments.createComment(this)"
           class="btn btn-secondary cb-comment-add-button">
         ${_('Add another comment')}
     </span>
 </div>
 </%def>
 
 
 <%def name="render_hunk_lines_sideside(hunk, use_comments=False)">
     %for i, line in enumerate(hunk.sideside):
     <%
     old_line_anchor, new_line_anchor = None, None
     if line.original.lineno:
         old_line_anchor = diff_line_anchor(hunk.filediff.source_file_path, line.original.lineno, 'o')
     if line.modified.lineno:
         new_line_anchor = diff_line_anchor(hunk.filediff.target_file_path, line.modified.lineno, 'n')
     %>
     <tr class="cb-line">
+        <td class="cb-data ${action_class(line.original.action)}"
+            data-line-number="${line.original.lineno}"
+            >
+            <div>
+            %if line.original.comments:
+            <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+            %endif
+            </div>
+        </td>
         <td class="cb-lineno ${action_class(line.original.action)}"
             data-line-number="${line.original.lineno}"
             %if old_line_anchor:
             id="${old_line_anchor}"
             %endif
         >
             %if line.original.lineno:
             <a name="${old_line_anchor}" href="#${old_line_anchor}">${line.original.lineno}</a>
             %endif
         </td>
         <td class="cb-content ${action_class(line.original.action)}"
             data-line-number="o${line.original.lineno}"
             >
             %if use_comments and line.original.lineno:
             ${render_add_comment_button()}
             %endif
             <span class="cb-code">${line.original.action} ${line.original.content or '' | n}</span>
             %if use_comments and line.original.lineno and line.original.comments:
             ${inline_comments_container(line.original.comments)}
             %endif
         </td>
+        <td class="cb-data ${action_class(line.modified.action)}"
+            data-line-number="${line.modified.lineno}"
+            >
+            <div>
+            %if line.modified.comments:
+            <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+            %endif
+            </div>
+        </td>
         <td class="cb-lineno ${action_class(line.modified.action)}"
             data-line-number="${line.modified.lineno}"
             %if new_line_anchor:
             id="${new_line_anchor}"
             %endif
             >
             %if line.modified.lineno:
                 <a name="${new_line_anchor}" href="#${new_line_anchor}">${line.modified.lineno}</a>
             %endif
             </td>
         <td class="cb-content ${action_class(line.modified.action)}"
             data-line-number="n${line.modified.lineno}"
             >
             %if use_comments and line.modified.lineno:
             ${render_add_comment_button()}
             %endif
             <span class="cb-code">${line.modified.action} ${line.modified.content or '' | n}</span>
             %if use_comments and line.modified.lineno and line.modified.comments:
             ${inline_comments_container(line.modified.comments)}
             %endif
         </td>
     </tr>
     %endfor
 </%def>
 
 
 <%def name="render_hunk_lines_unified(hunk, use_comments=False)">
     %for old_line_no, new_line_no, action, content, comments in hunk.unified:
     <%
     old_line_anchor, new_line_anchor = None, None
     if old_line_no:
         old_line_anchor = diff_line_anchor(hunk.filediff.source_file_path, old_line_no, 'o')
     if new_line_no:
         new_line_anchor = diff_line_anchor(hunk.filediff.target_file_path, new_line_no, 'n')
     %>
     <tr class="cb-line">
+        <td class="cb-data ${action_class(action)}">
+            <div>
+            %if comments:
+            <i class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+            %endif
+            </div>
+        </td>
         <td class="cb-lineno ${action_class(action)}"
             data-line-number="${old_line_no}"
             %if old_line_anchor:
             id="${old_line_anchor}"
             %endif
         >
             %if old_line_anchor:
             <a name="${old_line_anchor}" href="#${old_line_anchor}">${old_line_no}</a>
             %endif
         </td>
         <td class="cb-lineno ${action_class(action)}"
             data-line-number="${new_line_no}"
             %if new_line_anchor:
             id="${new_line_anchor}"
             %endif
         >
             %if new_line_anchor:
             <a name="${new_line_anchor}" href="#${new_line_anchor}">${new_line_no}</a>
             %endif
         </td>
         <td class="cb-content ${action_class(action)}"
             data-line-number="${new_line_no and 'n' or 'o'}${new_line_no or old_line_no}"
             >
             %if use_comments:
             ${render_add_comment_button()}
             %endif
             <span class="cb-code">${action} ${content or '' | n}</span>
             %if use_comments and comments:
             ${inline_comments_container(comments)}
             %endif
         </td>
     </tr>
     %endfor
 </%def>
 
 <%def name="render_add_comment_button()">
 <button
     class="btn btn-small btn-primary cb-comment-box-opener"
     onclick="return Rhodecode.comments.createComment(this)"
->+</button>
+><span>+</span></button>
 </%def>
 
 <%def name="render_diffset_menu()">
     <div class="diffset-menu clearinner">
         <div class="pull-right">
             <div class="btn-group">
                 <a
                   class="btn ${c.diffmode == 'sideside' and 'btn-primary'} tooltip"
                   title="${_('View side by side')}"
                   href="${h.url_replace(diffmode='sideside')}">
                     <span>${_('Side by Side')}</span>
                 </a>
                 <a
                   class="btn ${c.diffmode == 'unified' and 'btn-primary'} tooltip"
                   title="${_('View unified')}" href="${h.url_replace(diffmode='unified')}">
                     <span>${_('Unified')}</span>
                 </a>
             </div>
         </div>
         <div class="pull-left">
           <div class="btn-group">
               <a
                   class="btn"
                   href="#"
                   onclick="$('input[class=filediff-collapse-state]').prop('checked', false); return false">${_('Expand All')}</a>
               <a
                   class="btn"
                   href="#"
                   onclick="$('input[class=filediff-collapse-state]').prop('checked', true); return false">${_('Collapse All')}</a>
           </div>
         </div>
     </div>
 </%def>