kallithea Changeset - 0d5be2668d7d

Changeset - 0d5be2668d7d

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

domruf - 9 years ago 2016-09-20 22:01:48
dominikruf@gmail.com

changeset: use Bootstrap panel for comments

Patch modified by Mads Kiilerich.

2 files changed with 10 insertions and 80 deletions:

kallithea/public/css/style.css

kallithea/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -2541,414 +2541,345 @@ div.readme table { @@
 /** RST STYLE **/
 div.rst-block {
     padding: 0px;
+}
 div.rst-block h2 {
     font-weight: normal;
+}
 div.rst-block {
     background-color: #fafafa;
+}
 div.rst-block {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 15px;
+}
 div.rst-block h1,
 div.rst-block h2,
 div.rst-block h3,
 div.rst-block h4,
 div.rst-block h5,
 div.rst-block h6 {
     border-bottom: 0 !important;
     margin: 0 !important;
     padding: 0 !important;
     line-height: 1.5em !important;
+}
 div.rst-block h1:first-child {
     padding-top: .25em !important;
+}
 div.rst-block h2,
 div.rst-block h3 {
     margin: 1em 0 !important;
+}
 div.rst-block h2 {
     margin-top: 1.5em !important;
     border-top: 4px solid #e0e0e0 !important;
     padding-top: .5em !important;
+}
 div.rst-block p {
     color: black !important;
     margin: 1em 0 !important;
     line-height: 1.5em !important;
+}
 div.rst-block ul {
     list-style: disc !important;
     margin: 1em 0 1em 2em !important;
+}
 div.rst-block ol {
     list-style: decimal;
     margin: 1em 0 1em 2em !important;
+}
 div.rst-block code {
     font-size: 12px !important;
     background-color: ghostWhite !important;
     color: #444 !important;
     padding: 0 .2em !important;
     border: 1px solid #dedede !important;
+}
 div.rst-block pre code {
     padding: 0 !important;
     font-size: 12px !important;
     background-color: #eee !important;
     border: none !important;
+}
 div.rst-block pre {
     margin: 1em 0;
     font-size: 12px;
     background-color: #eee;
     border: 1px solid #ddd;
     padding: 5px;
     color: #444;
     overflow: auto;
     border-radius: 3px;
+}
 /** comment main **/
 .comments {
 .comment .panel {
     max-width: 978px;
+}
 .comments .comment .comment-wrapp {
     border: 1px solid #ddd;
     margin-top: 10px;
     border-radius: 4px;
+}
 .comments .comment .meta {
     background: #f8f8f8;
     padding: 4px;
     border-bottom: 1px solid #ddd;
     min-height: 18px;
     overflow: auto;
+}
 .comments .comment .meta img {
     vertical-align: middle;
+}
 .comments .comment .meta .user {
     font-weight: bold;
     float: left;
     padding: 4px 2px 2px 2px;
+}
 .comments .comment .meta .date {
     float: left;
     padding: 4px 4px 0px 4px;
+}
 .comments .comment .text {
 .comment .panel-body {
     background-color: #FAFAFA;
     margin: 6px;
+}
 .comments-number {
     padding: 10px 0;
     color: #666;
+}
 .automatic-comment {
     font-style: italic;
+}
 /** comment form **/
 .status-block {
     margin: 5px;
     clear: both
+}
 .comment-form textarea {
     width: 100%;
     height: 100px;
     font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 form.comment-form {
     margin-top: 10px;
     margin-left: 10px;
+}
 .comment-inline-form .comment-block-ta,
 .comment-form .comment-block-ta {
     border: 1px solid #ccc;
     border-radius: 3px;
     box-sizing: border-box;
+}
 .comment-form-submit {
     margin-top: 5px;
     margin-left: 525px;
+}
 .file-comments {
     display: none;
+}
 .comment-form .comment {
     margin-left: 10px;
+}
 .comment-form .comment-help {
     padding: 5px 5px 5px 5px;
     color: #666;
+}
 .comment-form .comment-button {
     padding-top: 5px;
+}
 .add-another-button {
     margin-left: 10px;
     margin-top: 10px;
     margin-bottom: 10px;
+}
 .comment .buttons {
     float: right;
     margin: -1px 0px 0px 0px;
+}
 .panel-heading .pull-left input[type=checkbox],
 .panel-heading .pull-right input[type=checkbox] {
     position: relative;
     top: 4px;
     margin: -10px 2px 0;
+}
 /** comment inline form **/
 .comment-inline-form {
     margin: 4px;
     max-width: 978px;
+}
 #comments-general-comments .comment-inline-form {
     margin: 0;
+}
 .comment-inline-form .submitting-overlay {
     height: 0;
     text-align: center;
     font-size: 16px;
     opacity: 0.5;
+}
 .comment-inline-form .clearfix,
 .comment-form .clearfix {
     background: #EEE;
     border-radius: 4px;
     padding: 5px;
     margin: 0px;
+}
 div.comment-inline-form {
     padding: 4px 0px 6px 0px;
+}
 .comment-inline-form textarea {
     width: 100%;
     height: 100px;
     font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 form.comment-inline-form {
     margin-top: 10px;
     margin-left: 10px;
+}
 .comment-inline-form-submit {
     margin-top: 5px;
     margin-left: 525px;
+}
 .file-comments {
     display: none;
+}
 .comment-inline-form .comment {
     margin-left: 10px;
+}
 .comment-inline-form .comment-help {
     padding: 5px 5px 5px 5px;
     color: #666;
+}
 .comment-inline-form .comment-button {
     padding-top: 5px;
+}
 /** comment inline **/
 .inline-comments .comment {
     margin: 3px 3px 5px 5px;
+}
 .inline-comments #comments-general-comments .comment {
     margin-left: 0;
+}
 .inline-comments .comment .comment-wrapp {
     max-width: 978px;
     border: 1px solid #ddd;
     border-radius: 4px;
     background-color: #FAFAFA;
+}
 .inline-comments .add-button-row {
     padding: 2px 4px 8px 5px;
+}
 .inline-comments .comment .meta {
     background: #f8f8f8;
     padding: 4px;
     border-bottom: 1px solid #ddd;
     min-height: 15px;
     overflow: auto;
+}
 .inline-comments .comment .meta img {
     vertical-align: middle;
+}
 .inline-comments .comment .meta .user {
     font-weight: bold;
     float: left;
     padding: 3px;
+}
 .inline-comments .comment .meta .date {
     float: left;
     padding: 3px;
+}
 .inline-comments .comment .text {
     background-color: #FAFAFA;
     margin: 6px;
+}
 .inline-comments .comments-number {
     padding: 0px 0px 10px 0px;
     color: #666;
+}
 input.status_change_checkbox,
 input.status_change_radio {
     margin: 0 0 5px 15px;
+}
 .badge {
     padding: 4px 4px !important;
     text-align: center;
     color: #888 !important;
     background-color: #DEDEDE !important;
     border-radius: 4px !important;
+}
 /****
 PULL REQUESTS
 *****/
 .pullrequests_section_head {
     padding: 10px 10px 10px 0px;
     margin: 0 15px;
     font-size: 16px;
     font-weight: bold;
+}
 div.pr-details-title.closed {
     color: #555;
     background: #eee;
+}
 div.pr {
     margin: 0px 15px;
     padding: 4px 4px;
+}
 div.pr-desc {
     margin: 0px 15px;
+}
 tr.pr-closed td {
     background-color: #eee !important;
     color: #555 !important;
+}
 span.pr-closed-tag {
     margin-bottom: 1px;
     margin-right: 1px;
     padding: 1px 3px;
     font-size: 10px;
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     color: #577632;
     white-space: nowrap;
     border-radius: 4px;
     border: 1px solid #d9e8f8;
     line-height: 1.5em;
+}
 .panel-body .pr-box {
     max-width: 978px;
     margin-right: 15px;
+}
 #s2id_org_ref,
 #s2id_other_ref,
 #s2id_org_repo,
 #s2id_other_repo {
     min-width: 150px;
     margin: 5px;
+}
 #pr-summary .msg-div {
     margin: 5px 0;
+}
 #pr-summary > .pr-not-edit {
     min-height: 50px !important;
+}
 #pr-edit-btn {
     margin: 20px 0 0 !important;
     position: absolute;
+}
 /****
   PERMS
 *****/
 #perms .perms_section_head {
     padding: 10px 10px 10px 0px;
     font-size: 16px;
     font-weight: bold;
     text-transform: capitalize;
+}
 #perms .perms_section_head label {
@@ @@ -3116,195 +3047,194 @@ table.code-difftable .lineno-inline { @@
     -webkit-user-select: none;
+}
 /** CODE **/
 table.code-difftable .code {
     display: block;
     width: 100%;
+}
 table.code-difftable .code td {
     margin: 0;
     padding: 0;
+}
 table.code-difftable .code pre {
     margin: 0 0 0 12px !important;
     padding: 0;
     min-height: 17px;
     line-height: 17px;
     white-space: pre-wrap;
     word-break: break-all;
+}
 table.code-difftable .del .code pre:before {
     content: "-";
     color: #800;
     float: left;
     left: -1em;
     position: relative;
     width: 0;
+}
 table.code-difftable .add .code pre:before {
     content: "+";
     color: #080;
     float: left;
     left: -1em;
     position: relative;
     width: 0;
+}
 table.code-difftable .unmod .code pre:before {
     content: " ";
     float: left;
     left: -1em;
     position: relative;
     width: 0;
+}
 .add-bubble {
     position: relative;
     display: none;
     float: left;
     width: 0px;
     height: 0px;
     left: -8px;
     box-sizing: border-box;
+}
 /* comment bubble, only visible when in a commentable diff */
 .commentable-diff tr.line.add:hover td .add-bubble,
 .commentable-diff tr.line.del:hover td .add-bubble,
 .commentable-diff tr.line.unmod:hover td .add-bubble {
     display: block;
     z-index: 1;
+}
 .add-bubble div {
     background: #577632;
     width: 16px;
     height: 16px;
     cursor: pointer;
     padding: 0 2px 2px 0.5px;
     border: 1px solid #577632;
     border-radius: 3px;
     box-sizing: border-box;
+}
 .add-bubble div:before {
     font-size: 14px;
     color: #ffffff;
     font-family: "kallithea";
     content: '\1f5ea';
+}
 .add-bubble div:hover {
     transform: scale(1.2, 1.2);
+}
 /* show some context of link targets - but only works when the link target
    can be extended with any visual difference */
 div.comment:target:before {
   display: block;
   height: 100px;
   margin: -100px 0 0;
   content: "";
+}
-div.comment:target>.comment-wrapp {
+div.comment:target>.panel {
     border: solid 2px #ee0 !important;
     margin: 2px 2px 4px 4px;
+}
 .lineno:target a {
     border: solid 2px #ee0 !important;
     margin: -2px;
+}
 .btn-image-diff-show,
 .btn-image-diff-swap {
     margin: 5px;
+}
 .img-diff {
     max-width: 45%;
     height: auto;
     margin: 5px;
     /* http://lea.verou.me/demos/css3-patterns.html */
     background-image:
         linear-gradient(45deg, #888 25%, transparent 25%, transparent),
         linear-gradient(-45deg, #888 25%, transparent 25%, transparent),
         linear-gradient(45deg, transparent 75%, #888 75%),
         linear-gradient(-45deg, transparent 75%, #888 75%);
     background-size: 10px 10px;
     background-color: #999;
+}
 .img-preview {
     max-width: 100%;
     height: auto;
     margin: 5px;
+}
 div.comment-prev-next-links div.prev-comment,
 div.comment-prev-next-links div.next-comment {
     display: inline-block;
     min-width: 150px;
     margin: 3px 6px;
+}
 #comments-general-comments div.comment-prev-next-links div.prev-comment,
 #comments-general-comments div.comment-prev-next-links div.next-comment {
     margin-left: 0;
+}
 body table.dataTable thead .sorting {
   background-image: none;
+}
 body table.dataTable thead .sorting_asc {
   background-image: none;
+}
 body table.dataTable thead .sorting_desc {
   background-image: none;
+}
 body table.dataTable thead .sorting_asc_disabled {
   background-image: none;
+}
 body table.dataTable thead .sorting_desc_disabled {
   background-image: none;
+}
 body table.dataTable thead .sorting_asc::after {
   font-family: "kallithea";
   content: "\23f6";
+}
 body table.dataTable thead .sorting_desc::after {
   font-family: "kallithea";
   content: "\23f7";
+}
 .dataTables_wrapper .dataTables_left {
   float: left !important;
+}
 .dataTables_wrapper .dataTables_right {
   float: right;
+}
 .dataTables_wrapper .dataTables_right > div {
   padding-left: 30px;
+}
 .dataTables_wrapper .dataTables_info {
   clear: none;
   padding-top: 3px;
+}
 .dataTables_wrapper .dataTables_paginate {
   padding-top: 0;
+}
 .dataTables_wrapper .dataTables_paginate .paginate_button {
     padding: 3px 10px;
+}
 .dataTables_wrapper .dataTables_paginate > a.paginate_button {
   padding-top: 1px;

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ## usage:
 ## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 ## ${comment.comment_block(co)}
 ##
 <%def name="comment_block(co)">
   <div class="comment" id="comment-${co.comment_id}">
     <div class="comment-prev-next-links"></div>
     <div class="comment-wrapp">
       <div class="meta">
     <div class="panel panel-default">
       <div class="panel-heading">
           ${h.gravatar_div(co.author.email, size=20)}
-          <div class="user">
+          <span class="user">
               ${co.author.full_name_and_username}
-          </div>
+          </span>
           <span>
               ${h.age(co.modified_at)}
               %if co.pull_request:
                 ${_('on pull request')}
                 <a href="${co.url()}">"${co.pull_request.title or _("No title")}"</a>
               %else:
                 ${_('on this changeset')}
               %endif
               <a class="permalink" href="${co.url()}">&para;</a>
           </span>
           %if co.author_id == request.authuser.user_id or h.HasRepoPermissionLevel('admin')(c.repo_name):
             %if co.deletable():
               <div onClick="confirm('${_('Delete comment?')}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-default btn-xs">${_('Delete')}</div>
+              <div onClick="confirm('${_('Delete comment?')}') && deleteComment(${co.comment_id})" class="pull-right buttons delete-comment btn btn-default btn-xs">${_('Delete')}</div>
             %endif
           %endif
       </div>
-      <div class="text">
+      <div class="panel-body">
         %if co.status_change:
            <div class="automatic-comment">
              <p>
                ${_("Status change")}: ${co.status_change[0].status_lbl}
                <i class="icon-circle changeset-status-${co.status_change[0].status}"></i>
              </p>
            </div>
         %endif
         %if co.text:
           ${h.render_w_mentions(co.text, c.repo_name)|n}
         %endif
       </div>
     </div>
   </div>
 </%def>
 <%def name="comment_inline_form()">
 <div id='comment-inline-form-template' style="display:none">
   <div class="ac">
   %if request.authuser.username != 'default':
     ${h.form('#', class_='inline-form')}
       <div class="well well-sm clearfix">
         <div class="comment-help">${_('Commenting on line.')}
           <span class="text-muted">${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}</span>
         </div>
         <div class="mentions-container"></div>
         <textarea name="text" class="form-control comment-block-ta yui-ac-input"></textarea>
         <div id="status_block_container" class="status-block general-only hidden">
                 %if c.pull_request is None:
                   ${_('Set changeset status')}:
                 %else:
                   ${_('Vote for pull request status')}:
                 %endif
                 <span class="general-only cs-only">
                 </span>
                 <label class="radio-inline">
                     <input type="radio" class="status_change_radio" name="changeset_status" id="changeset_status_unchanged" value="" checked="checked" />
                     ${_('No change')}
                 </label>
                 %for status, lbl in c.changeset_statuses:
                     <label class="radio-inline">
                         <input type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">
                         ${lbl}<i class="icon-circle changeset-status-${status}"></i>
                     </label>
                 %endfor
                 %if c.pull_request is not None and ( \
                     h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionLevel('admin')(c.repo_name) \
                     or c.pull_request.owner_id == request.authuser.user_id):
                 <div>
                   ${_('Finish pull request')}:
                   <label class="checkbox-inline">
                     <input id="save_close" type="checkbox" name="save_close" class="status_change_checkbox">
                     ${_("Close")}
                   </label>
                   <label class="checkbox-inline">
                     <input id="save_delete" type="checkbox" name="save_delete" value="delete" class="status_change_checkbox">
                     ${_("Delete")}
                   </label>
                 </div>
                 %endif
         </div>
       </div>
       <div class="comment-button">
         <div class="submitting-overlay" style="display:none">${_('Submitting ...')}</div>
         ${h.submit('save', _('Comment'), class_='btn btn-default btn-sm save-inline-form')}
         ${h.reset('hide-inline-form', _('Cancel'), class_='btn btn-default btn-sm hide-inline-form')}
       </div>
     ${h.end_form()}
   %else:
       ${h.form('')}
       <div class="clearfix">
           <div class="comment-help">
             ${_('You need to be logged in to comment.')} <a href="${h.url('login_home', came_from=request.path_qs)}">${_('Login now')}</a>
           </div>
       </div>
       <div class="comment-button">
       ${h.reset('hide-inline-form', _('Hide'), class_='btn btn-default btn-sm hide-inline-form')}
       </div>
       ${h.end_form()}
   %endif
   </div>
 </div>
 </%def>
 ## show comment count as "x comments (y inline, z general)"
 <%def name="comment_count(inline_cnt, general_cnt)">
     ${'%s (%s, %s)' % (
         ungettext("%d comment", "%d comments", inline_cnt + general_cnt) % (inline_cnt + general_cnt),
         ungettext("%d inline", "%d inline", inline_cnt) % inline_cnt,
         ungettext("%d general", "%d general", general_cnt) % general_cnt
     )}

0 comments (0 inline, 0 general)