kallithea Changeset - feef81a369b3

Changeset - feef81a369b3

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Søren Løvborg - 10 years ago 2015-08-24 22:51:07
sorenl@unity3d.com

compare: clean up revision selector HTML/CSS

This fixes margins and vertical alignment.

2 files changed with 22 insertions and 2 deletions:

kallithea/public/css/style.css

kallithea/templates/compare/compare_diff.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4365,399 +4365,413 @@ input.status_change_radio { @@
     border-radius: 4px !important;
+}
 #context-pages .forks span,
 .menu_link_notifications {
     padding: 4px 4px !important;
     text-align: center;
     color: #888 !important;
     background-color: #DEDEDE !important;
     border-radius: 4px !important;
+}
 .notification-header {
     padding-top: 6px;
+}
 .notification-header .desc {
     font-size: 16px;
     height: 24px;
     float: left
+}
 .notification-list .container.unread {
     background: none repeat scroll 0 0 rgba(255, 255, 180, 0.6);
+}
 .notification-header .gravatar {
     background: none repeat scroll 0 0 transparent;
     padding: 0px 0px 0px 8px;
+}
 .notification-list .container .notification-header .desc {
     font-weight: bold;
     font-size: 17px;
+}
 .notification-table {
     border: 1px solid #ccc;
     border-radius: 6px 6px 6px 6px;
     clear: both;
     margin: 0px 20px 0px 20px;
+}
 .notification-header .delete-notifications {
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-header .read-notifications {
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-subject {
     clear: both;
     border-bottom: 1px solid #eee;
     padding: 5px 0px 5px 38px;
+}
 .notification-body {
     clear: both;
     margin: 34px 2px 2px 8px
+}
 /****
 PULL REQUESTS
 *****/
 .pullrequests_section_head {
     padding: 10px 10px 10px 0px;
     margin: 0 20px;
     font-size: 16px;
     font-weight: bold;
+}
 div.pr-details-title.closed {
     color: #555;
     background: #eee;
+}
 div.pr-details-title {
     font-size: 1.6em;
     padding: 5px 0px 5px 10px;
+}
 div.pr {
     margin: 0px 20px;
     padding: 4px 4px;
+}
 div.pr-desc {
     margin: 0px 20px;
+}
 tr.pr-closed td {
     background-color: #eee !important;
     color: #555 !important;
+}
 span.pr-closed-tag {
     margin-bottom: 1px;
     margin-right: 1px;
     padding: 1px 3px;
     font-size: 10px;
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     color: #577632;
     white-space: nowrap;
     border-radius: 4px;
     border: 1px solid #d9e8f8;
     line-height: 1.5em;
+}
 .pr-box {
     max-width: 978px;
+}
 #s2id_org_ref,
 #s2id_other_ref,
 #s2id_org_repo,
 #s2id_other_repo {
     min-width: 150px;
     margin: 5px;
+}
 #pr-summary .msg-div {
     margin: 5px 0;
+}
 /****
   PERMS
 *****/
 #perms .perms_section_head {
     padding: 10px 10px 10px 0px;
     font-size: 16px;
     font-weight: bold;
     text-transform: capitalize;
+}
 #perms .perm_tag {
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     font-weight: bold;
     text-transform: uppercase;
     white-space: nowrap;
     border-radius: 3px;
+}
 #perms .perm_tag.admin {
     background-color: #B94A48;
     color: #ffffff;
+}
 #perms .perm_tag.write {
     background-color: #DB7525;
     color: #ffffff;
+}
 #perms .perm_tag.read {
     background-color: #468847;
     color: #ffffff;
+}
 #perms .perm_tag.none {
     background-color: #bfbfbf;
     color: #ffffff;
+}
 .perm-gravatar {
     vertical-align: middle;
     padding: 2px;
+}
 .perm-gravatar-ac {
     vertical-align: middle;
     padding: 2px;
     width: 14px;
     height: 14px;
+}
 /*****************************************************************************
                                   DIFFS CSS
 ******************************************************************************/
 .diff-collapse {
     text-align: center;
     margin-bottom: -15px;
+}
 .diff-collapse-button {
     cursor: pointer;
     color: #666;
     font-size: 16px;
+}
 .diff-container {
+}
 .diff-container.hidden {
     display: none;
     overflow: hidden;
+}
 .compare-revision-selector {
     font-weight: bold;
     font-size: 14px;
+}
 .compare-revision-selector > div {
     display: inline-block;
     margin-left: 8px;
     vertical-align: middle;
+}
 .compare-revision-selector .btn {
     margin-bottom: 0;
+}
 div.diffblock {
     overflow: auto;
     padding: 0px;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
     border-radius: 6px 6px 0px 0px;
+}
 div.diffblock.margined {
     margin: 0px 20px 0px 20px;
+}
 .compare-revision-selector,
 div.diffblock .code-header {
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
     padding: 10px 0 10px 0;
     min-height: 14px;
+}
 div.diffblock .code-header.banner {
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
     height: 14px;
     margin: 0;
     padding: 3px 100px 11px 100px;
+}
 div.diffblock .code-header-title {
     padding: 0px 0px 10px 5px !important;
     margin: 0 !important;
+}
 div.diffblock .code-header .hash {
     float: left;
     padding: 2px 0 0 2px;
+}
 div.diffblock .code-header .date {
     float: left;
     text-transform: uppercase;
     padding: 2px 0px 0px 2px;
+}
 div.diffblock .code-header div {
     margin-left: 4px;
     font-weight: bold;
     font-size: 14px;
+}
 div.diffblock .parents {
     float: left;
     min-height: 26px;
     font-size: 10px;
     font-weight: 400;
     vertical-align: middle;
     padding: 0px 2px 2px 2px;
     background-color: #eeeeee;
     border-bottom: 1px solid #CCCCCC;
+}
 div.diffblock .children {
     float: right;
     min-height: 26px;
     font-size: 10px;
     font-weight: 400;
     vertical-align: middle;
     text-align: right;
     padding: 0px 2px 2px 2px;
     background-color: #eeeeee;
     border-bottom: 1px solid #CCCCCC;
+}
 div.diffblock .code-body {
     background: #FFFFFF;
     clear: both;
+}
 div.diffblock pre.raw {
     background: #FFFFFF;
     color: #000000;
+}
 table.code-difftable {
     border-collapse: collapse;
     width: 99%;
     border-radius: 0px !important;
+}
 table.code-difftable td {
     padding: 0 !important;
     background: none !important;
     border: 0 !important;
     vertical-align: baseline !important
+}
 table.code-difftable .context {
     background: none repeat scroll 0 0 #DDE7EF;
     color: #999;
+}
 table.code-difftable .add {
     background: none repeat scroll 0 0 #DDFFDD;
+}
 table.code-difftable .add ins {
     background: none repeat scroll 0 0 #AAFFAA;
     text-decoration: none;
+}
 table.code-difftable .del {
     background: none repeat scroll 0 0 #FFDDDD;
+}
 table.code-difftable .del del {
     background: none repeat scroll 0 0 #FFAAAA;
     text-decoration: none;
+}
 table.code-highlighttable div.code-highlight pre u:before,
 table.code-difftable td.code pre u:before {
     content: "\21a6";
     display: inline-block;
     width: 0;
+}
 table.code-highlighttable div.code-highlight pre u.cr:before,
 table.code-difftable td.code pre u.cr:before {
     content: "\21a4";
     display: inline-block;
     color: rgba(0,0,0,0.5);
+}
 table.code-highlighttable div.code-highlight pre u,
 table.code-difftable td.code pre u {
     color: rgba(0,0,0,0.15);
+}
 table.code-highlighttable div.code-highlight pre i,
 table.code-difftable td.code pre i {
     border-style: solid;
     border-left-width: 1px;
     color: rgba(0,0,0,0.5);
+}
 /** LINE NUMBERS **/
 table.code-difftable .lineno {
     padding-left: 2px;
     padding-right: 2px !important;
     width: 30px;
     -moz-user-select: none;
     -webkit-user-select: none;
     border-right: 1px solid #CCC !important;
     border-left: 0px solid #CCC !important;
     border-top: 0px solid #CCC !important;
     border-bottom: none !important;
     vertical-align: middle !important;
     text-align: center;
+}
 table.code-difftable .lineno.new {
     text-align: right;
+}
 table.code-difftable .lineno.old {
     text-align: right;
+}
 table.code-difftable .lineno a {
     color: #aaa !important;
     font: 11px Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace !important;
     letter-spacing: -1px;
     padding-left: 10px;
     padding-right: 8px;
     box-sizing: border-box;
     cursor: pointer;
     display: block;
     width: 100%;
+}
 table.code-difftable .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 **/
 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;
     padding: 0;
     min-height: 17px;
     line-height: 17px;
     white-space: pre-wrap;
+}
 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;

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     %if c.compare_home:
         ${_('%s Compare') % c.repo_name}
     %else:
         ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.a_repo.repo_name, c.a_ref_name)} &gt; ${'%s@%s' % (c.cs_repo.repo_name, c.cs_ref_name)}
     %endif
 </%block>
 <%def name="breadcrumbs_links()">
   ${_('Compare Revisions')}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
         <div id="body" class="diffblock">
             <div class="code-header">
             <div class="compare-revision-selector">
                 ## divs are "inline-block" and cannot have whitespace between them.
                 <div>
                     ${h.hidden('compare_org')} <i class="icon-right"></i> ${h.hidden('compare_other')}
                     ${h.hidden('compare_org')}
                 </div><div>
                     <i class="icon-right"></i>
                 </div><div>
                     ${h.hidden('compare_other')}
                 </div><div>
                     %if not c.compare_home:
                         <a class="btn btn-small" href="${c.swap_url}"><i class="icon-arrows-cw"></i> ${_('Swap')}</a>
                     %endif
                     <div id="compare_revs" class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div>
                 </div>
             </div>
         </div>
     %if c.compare_home:
         <div id="changeset_compare_view_content">
          <div style="color:#999;font-size: 18px">${_('Compare revisions, branches, bookmarks, or tags.')}</div>
         </div>
     %else:
         <div id="changeset_compare_view_content">
                 ##CS
                 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>
                 <%include file="compare_cs.html" />
                 ## FILES
                 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
                 % if c.limited_diff:
                     ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
                 % else:
                     ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
                 %endif
                 ${c.ignorews_url(request.GET)}
                 ${c.context_url(request.GET)}
                 </div>
                 <div class="cs_files">
                   %if not c.files:
                      <span class="empty_data">${_('No files')}</span>
                   %endif
                   %for fid, change, f, stat in c.files:
                      <div class="cs_${change}">
                          <div class="node">
                              <i class="icon-diff-${change}"></i>
                              ${h.link_to(h.safe_unicode(f), '#' + fid)}
                          </div>
                          <div class="changes">${h.fancy_file_stats(stat)}</div>
                      </div>
                   %endfor
                 </div>
                 % if c.limited_diff:
                   <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h5>
                 % endif
          </div>
         ## diff block
         <%namespace name="diff_block" file="/changeset/diff_block.html"/>
         ${diff_block.diff_block_js()}
         %for fid, change, f, stat in c.files:
           ${diff_block.diff_block_simple([c.changes[fid]])}
         %endfor
         % if c.limited_diff:
           <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h4>
         % endif
     %endif
     </div>
 </div>
     <script type="text/javascript">
    $(document).ready(function(){
     var cache = {};
     function make_revision_dropdown(css_selector, placeholder, repo_name, cache_key) {
       $(css_selector).select2({
         placeholder: placeholder,
         formatSelection: function(obj){
             return '{0}@{1}'.format(repo_name, obj.text);
         },
         dropdownAutoWidth: true,
         query: function(query){
           var key = cache_key;
           var cached = cache[key] ;
           if(cached) {
             var data = {results: []};
             //filter results
             $.each(cached.results, function(){
                 var section = this.text;
                 var children = [];
                 $.each(this.children, function(){
                     if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                         children.push(this);
+                    }
                 });
                 data.results.push({'text': section, 'children': children});
             });
             //push the typed in changeset
             data.results.push({'text':_TM['Specify changeset'],
                                'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]});
             query.callback(data);
           }else{
               $.ajax({
                 url: pyroutes.url('repo_refs_data', {'repo_name': repo_name}),
                 data: {},
                 dataType: 'json',
                 type: 'GET',
                 success: function(data) {
                   cache[key] = data;
                   query.callback(data);
+                }
               });
+          }
+        }
     });
+    }
     make_revision_dropdown("#compare_org",   "${'%s@%s' % (c.a_repo.repo_name, c.a_ref_name)}",   "${c.a_repo.repo_name}",  'cache');
     make_revision_dropdown("#compare_other", "${'%s@%s' % (c.cs_repo.repo_name, c.cs_ref_name)}", "${c.cs_repo.repo_name}", 'cache2');
     var values_changed = function() {
         var values = $('#compare_org').select2('data') && $('#compare_other').select2('data');
         if (values) {
              $('#compare_revs').removeClass("disabled");
              // TODO: the swap button ... if any
         } else {
              $('#compare_revs').addClass("disabled");
              // TODO: the swap button ... if any
+        }
+    }
     values_changed();
     $('#compare_org').change(values_changed);
     $('#compare_other').change(values_changed);
     $('#compare_revs').on('click', function(e){
         var org = $('#compare_org').select2('data');
         var other = $('#compare_other').select2('data');
         if (!org || !other) {
             return;
+        }
         var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='__other_ref_type__',org_ref_name='__org__',other_ref_type='__org_ref_type__',other_ref_name='__other__', other_repo=c.cs_repo.repo_name)}";
         var u = compare_url.replace('__other_ref_type__',org.type)
                            .replace('__org__',org.text)
                            .replace('__org_ref_type__',other.type)
                            .replace('__other__',other.text);
         window.location = u;
     });
    });
     </script>
 </%def>

0 comments (0 inline, 0 general)