kallithea Changeset - 647e7e0ce812

Changeset - 647e7e0ce812

Parent rev.

Child rev.

[Not reviewed]

default

0 9 0

domruf - 8 years ago 2017-10-27 20:05:18
dominikruf@gmail.com

less: use bootstrap class .text-muted instead of custom one

9 files changed with 11 insertions and 16 deletions:

kallithea/public/css/style.css

kallithea/public/less/style.less

kallithea/templates/admin/user_groups/user_group_edit_members.html

kallithea/templates/base/perms_summary.html

kallithea/templates/compare/compare_cs.html

kallithea/templates/compare/compare_diff.html

kallithea/templates/pullrequests/pullrequest_data.html

kallithea/templates/pullrequests/pullrequest_show.html

kallithea/tests/functional/test_compare_local.py

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

 /*!
  * Don't edit the css file directly.
+ *
  * Instead, edit the less file(s) and regenerate the css:
+ *
  * npm --prefix kallithea/public/less install
  * npm --prefix kallithea/public/less run less
+ *
  */
 body {
   background: url("../images/background.png") repeat scroll 0 0 #B0B0B0;
   font-family: Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
+}
 /* Undo unfortunate Bootstrap default styling */
 body pre {
   display: inherit;
   padding: inherit;
   margin: inherit;
   font-size: inherit;
   line-height: inherit;
   color: inherit;
   word-break: inherit;
   word-wrap: inherit;
   background-color: inherit;
   border: inherit;
   border-radius: inherit;
   overflow: inherit;
+}
 a {
   color: #577632;
   text-decoration: none;
+}
 a:hover {
   color: #576622;
   text-decoration: underline;
+}
 code,
 .code pre,
 .linenos pre,
 div.readme pre,
 div.formatted-fixed,
 .CodeMirror .CodeMirror-code pre {
   font-size: 12px;
   font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 /* class for texts where newlines should be preserved, for very light-weight ascii art markup (like pull request descriptions) */
 .formatted-fixed {
   white-space: pre-wrap;
+}
 .changeset_hash {
   font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 .empty_data {
   color: #B9B9B9;
+}
 .inline-comments-general.show-general-status .hidden.general-only {
   display: block !important;
+}
 .truncate {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   -o-text-overflow: ellipsis;
   -ms-text-overflow: ellipsis;
+}
 .truncate.autoexpand:hover {
   overflow: visible;
+}
 /* show comment anchors when hovering over panel-heading */
 a.permalink {
   visibility: hidden;
+}
 .panel-heading:hover .permalink {
   visibility: visible;
+}
 .radio-inline,
 .checkbox-inline {
   vertical-align: inherit;
+}
 .navbar-inverse {
   border: none;
+}
 .navbar-inverse .navbar-nav > .active > a,
 .navbar-inverse .navbar-nav > .active > a:hover,
 .navbar-inverse .navbar-nav > .active > a:focus {
   background-color: inherit;
+}
 nav.navbar .navbar-brand:hover,
 nav.navbar .navbar-brand {
   font-size: 20px;
   padding-top: 12px;
   color: white !important;
   height: 44px;
+}
 nav.navbar {
   min-height: 44px;
   background-color: #577632;
+}
 nav.navbar #logo > .navbar-brand > img {
   margin-top: -9px;
   margin-right: 5px;
+}
 .form-group > label {
   float: left;
+}
 label {
   font-weight: inherit;
+}
 label.control-label {
   font-weight: bold;
+}
 .groups_breadcrumbs a {
   color: #fff;
+}
 .groups_breadcrumbs a:hover {
   color: #bfe3ff;
   text-decoration: none;
+}
 .dt_repo {
   white-space: nowrap;
   color: #577632;
+}
 .dt_repo_pending {
   opacity: 0.5;
+}
 .dt_repo i.icon-keyhole-circled,
 .dt_repo i.icon-globe {
   font-size: 16px;
   vertical-align: -2px;
   margin: 0px 1px 0px 3px;
+}
 div.panel-primary {
   box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
   border: none;
+}
 div.panel div.panel-heading {
   background-color: #577632;
   background-repeat: repeat-x;
   background-image: linear-gradient(to bottom, #577632, #577632);
   border-radius: 4px 4px 0 0;
+}
 #content div.panel div.panel-heading ul.links li {
   list-style: none;
   float: left;
   margin: 0;
   padding: 0;
+}
 div.panel.panel-default {
   border: 1px solid #ccc;
   box-shadow: none;
   border-radius: 6px 6px 0px 0px;

kallithea/public/less/style.less

➞

Show inline comments

 /*!
  * Don't edit the css file directly.
+ *
  * Instead, edit the less file(s) and regenerate the css:
+ *
  * npm --prefix kallithea/public/less install
  * npm --prefix kallithea/public/less run less
+ *
  */
 body {
   background: url("../images/background.png") repeat scroll 0 0 #B0B0B0;
   font-family: Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
+}
 /* Undo unfortunate Bootstrap default styling */
 body pre {
   display: inherit;
   padding: inherit;
   margin: inherit;
   font-size: inherit;
   line-height: inherit;
   color: inherit;
   word-break: inherit;
   word-wrap: inherit;
   background-color: inherit;
   border: inherit;
   border-radius: inherit;
   overflow: inherit;
+}
 a {
   color: #577632;
   text-decoration: none;
+}
 a:hover {
   color: #576622;
   text-decoration: underline;
+}
 code,
 .code pre,
 .linenos pre,
 div.readme pre,
 div.formatted-fixed,
 .CodeMirror .CodeMirror-code pre {
   font-size: 12px;
   font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 /* class for texts where newlines should be preserved, for very light-weight ascii art markup (like pull request descriptions) */
 .formatted-fixed {
   white-space: pre-wrap;
+}
 .changeset_hash {
   font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
+}
 .empty_data {
   color: #B9B9B9;
+}
 .inline-comments-general.show-general-status .hidden.general-only {
   display: block !important;
+}
 .truncate {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   -o-text-overflow: ellipsis;
   -ms-text-overflow: ellipsis;
+}
 .truncate.autoexpand:hover {
   overflow: visible;
+}
 /* show comment anchors when hovering over panel-heading */
 a.permalink {
   visibility: hidden;
+}
 .panel-heading:hover .permalink {
   visibility: visible;
+}
 .radio-inline,
 .checkbox-inline {
   vertical-align: inherit;
+}
 .navbar-inverse {
   border: none;
+}
 .navbar-inverse .navbar-nav > .active > a,
 .navbar-inverse .navbar-nav > .active > a:hover,
 .navbar-inverse .navbar-nav > .active > a:focus {
   background-color: inherit;
+}
 nav.navbar .navbar-brand:hover,
 nav.navbar .navbar-brand {
   font-size: 20px;
   padding-top: 12px;
   color: white !important;
   height: 44px;
+}
 nav.navbar {
   min-height: 44px;
   background-color: #577632;
+}
 nav.navbar #logo > .navbar-brand > img {
   margin-top: -9px;
   margin-right: 5px;
+}
 .form-group > label {
   float: left;
+}
 label {
   font-weight: inherit;
+}
 label.control-label {
   font-weight: bold;
+}
 .groups_breadcrumbs a {
   color: #fff;
+}
 .groups_breadcrumbs a:hover {
   color: #bfe3ff;
   text-decoration: none;
+}
 .dt_repo {
   white-space: nowrap;
   color: #577632;
+}
 .dt_repo_pending {
   opacity: 0.5;
+}
 .dt_repo i.icon-keyhole-circled,
 .dt_repo i.icon-globe {
   font-size: 16px;
   vertical-align: -2px;
   margin: 0px 1px 0px 3px;
+}
 div.panel-primary {
   box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
   border: none;
+}
 div.panel div.panel-heading {
   background-color: #577632;
   background-repeat: repeat-x;
   background-image: linear-gradient(to bottom, #577632, #577632);
   border-radius: 4px 4px 0 0;
+}
 #content div.panel div.panel-heading ul.links li {
   list-style: none;
   float: left;
   margin: 0;
   padding: 0;
+}
 div.panel.panel-default {

kallithea/templates/admin/user_groups/user_group_edit_members.html

➞

Show inline comments

 % if c.group_members_obj:
   <ul class="user_group_member">
   %for user in c.group_members_obj:
     <li>
         ${h.gravatar_div(user.email, size=24)}
         <div>${h.link_to(user.full_name_and_username, h.url('edit_user',id=user.user_id))}</div>
     </li>
   %endfor
   </ul>
 %else:
-    <span class="empty_data">${_('No members yet')}</span>
+    <span class="text-muted">${_('No members yet')}</span>
 %endif

kallithea/templates/base/perms_summary.html

➞

Show inline comments

 ## snippet for displaying permissions overview for users
 ## usage:
 ##    <%namespace name="p" file="/base/perms_summary.html"/>
 ##    ${p.perms_summary(c.perm_user.permissions)}
 <%def name="perms_summary(permissions, show_all=False, actions=True)">
 <div id="perms">
      %for section in sorted(permissions.keys()):
         <div class="perms_section_head">
             <h4>${section.replace("_"," ").capitalize()}</h4>
             %if section != 'global':
               <div class="pull-right">
                 ${_('Show')}:
                 <label>${h.checkbox('perms_filter_none_%s' % section, 'none', 'checked', class_='perm_filter filter_%s' % section, **{'data-section':section, 'data-perm_type':'none'})}<span class="perm_tag none">${_('None')}</span></label>
                 <label>${h.checkbox('perms_filter_read_%s' % section, 'read', 'checked', class_='perm_filter filter_%s' % section, **{'data-section':section, 'data-perm_type':'read'})}<span class="perm_tag read">${_('Read')}</span></label>
                 <label>${h.checkbox('perms_filter_write_%s' % section, 'write', 'checked', class_='perm_filter filter_%s' % section, **{'data-section':section, 'data-perm_type':'write'})}<span class="perm_tag write">${_('Write')}</span></label>
                 <label>${h.checkbox('perms_filter_admin_%s' % section, 'admin', 'checked', class_='perm_filter filter_%s' % section, **{'data-section':section, 'data-perm_type':'admin'})}<span class="perm_tag admin">${_('Admin')}</span></label>
               </div>
             %endif
         </div>
         %if not permissions[section]:
-            <span class="empty_data">${_('No permissions defined yet')}</span>
+            <span class="text-muted">${_('No permissions defined yet')}</span>
         %else:
         <div id='tbl_list_wrap_${section}'>
          <table id="tbl_list_${section}" class="table">
           ## global permission box
           %if section == 'global':
               <thead>
                 <tr>
                   <th class="left">${_('Permission')}</th>
                   %if actions:
                   <th class="left">${_('Edit Permission')}</th>
                   %endif
                 </tr>
               </thead>
               <tbody>
               %for k in permissions[section]:
                   <tr>
                       <td>
                           ${h.get_permission_name(k)}
                       </td>
                       %if actions:
                       <td>
                            <a href="${h.url('admin_permissions')}">${_('Edit')}</a>
                       </td>
                       %endif
                   </tr>
               %endfor
               </tbody>
           %else:
              ## none/read/write/admin permissions on groups/repos etc
               <thead>
                 <tr>
                   <th class="left">${_('Name')}</th>
                   <th class="left">${_('Permission')}</th>
                   %if actions:
                   <th class="left">${_('Edit Permission')}</th>
                   %endif
                 </tr>
               </thead>
               <tbody class="section_${section}">
               %for k, section_perm in sorted(permissions[section].items(), key=lambda s: {'none':0, 'read':1,'write':2,'admin':3}.get(s[1].split('.')[-1])):
                   %if section_perm.split('.')[-1] != 'none' or show_all:
                   <tr class="perm_row ${'%s_%s' % (section, section_perm.split('.')[-1])}">
                       <td>
                           %if section == 'repositories':
                               <a href="${h.url('summary_home',repo_name=k)}">${k}</a>
                           %elif section == 'repositories_groups':
                               <a href="${h.url('repos_group_home',group_name=k)}">${k}</a>
                           %elif section == 'user_groups':
                               ##<a href="${h.url('edit_users_group',id=k)}">${k}</a>
                               ${k}
                           %endif
                       </td>
                       <td>
                            <span class="perm_tag ${section_perm.split('.')[-1]}">${section_perm}</span>
                       </td>
                       %if actions:
                       <td>
                           %if section == 'repositories':
                               <a href="${h.url('edit_repo_perms',repo_name=k,anchor='permissions_manage')}">${_('Edit')}</a>
                           %elif section == 'repositories_groups':
                               <a href="${h.url('edit_repo_group_perms',group_name=k,anchor='permissions_manage')}">${_('Edit')}</a>
                           %elif section == 'user_groups':
                               ##<a href="${h.url('edit_users_group',id=k)}">${_('Edit')}</a>
                           %endif
                       </td>
                       %endif
                   </tr>
                   %endif
               %endfor
               <tr id="empty_${section}" style="display: none"><td colspan="${3 if actions else 2}">${_('No permission defined')}</td></tr>
               </tbody>
           %endif
          </table>
         </div>
         %endif
      %endfor
 </div>
 <script>
     $(document).ready(function(){
         var show_empty = function(section){
             var visible = $('.section_{0} tr.perm_row:visible'.format(section)).length;
             if(visible == 0){
                 $('#empty_{0}'.format(section)).show();
+            }
             else{
                 $('#empty_{0}'.format(section)).hide();
+            }
+        }
         var update_show = function($checkbox){
             var section = $checkbox.data('section');
             var elems = $('.filter_' + section).each(function(el){
                 var perm_type = $checkbox.data('perm_type');
                 var checked = $checkbox.prop('checked');
                 if(checked){
                     $('.'+section+'_'+perm_type).show();

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

 ## Changesets table with graph
 <%namespace name="changelog_table" file="/changelog/changelog_table.html"/>
 <div>
   %if not c.cs_ranges:
-    <span class="empty_data">${_('No changesets')}</span>
+    <span class="text-muted">${_('No changesets')}</span>
   %else:
     %if c.ancestors:
       <div class="ancestor">
         %if len(c.ancestors) > 1:
         <div class="text-danger">
           ${_('Criss cross merge situation with multiple merge ancestors detected!')}
         </div>
         <div>
           ${_('Please merge the target branch to your branch before creating a pull request.')}
         </div>
         %endif
         <div>
           ${_('Merge Ancestor')}:
           %for ancestor in c.ancestors:
             ${h.link_to(h.short_id(ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=ancestor), class_="changeset_hash")}
           %endfor
         </div>
       </div>
     %endif
     <div id="graph_nodes">
         <canvas id="graph_canvas"></canvas>
     </div>
     <div id="graph_content_pr">
       ${changelog_table.changelog(c.cs_repo.repo_name, list(reversed(c.cs_ranges)), c.cs_statuses, c.cs_comments,
                                   show_index=True,
                                   resize_js='graph.render(jsdata)')}
     </div>
     %if c.is_ajax_preview:
       <h5>
       ## links should perhaps use ('rev', c.a_rev) instead ...
       ${h.link_to(_('Show merge diff'),
         h.url('compare_url',
           repo_name=c.a_repo.repo_name,
           org_ref_type=c.a_ref_type, org_ref_name=c.a_ref_name,
           other_repo=c.cs_repo.repo_name,
           other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name,
           merge='1')
         )}
       </h5>
     %endif
     %if c.cs_ranges_org is not None:
       ## TODO: list actual changesets?
       <div>
         ${h.link_to_ref(c.cs_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}
         ${_('is')}
         <a href="${c.swap_url}">${_('%s changesets') % (len(c.cs_ranges_org))}</a>
         ${_('behind')}
         ${h.link_to_ref(c.a_repo.repo_name, c.a_ref_type, c.a_ref_name)}
       </div>
     %endif
   %endif
 </div>
 %if c.is_ajax_preview:
 <div id="jsdata" style="display:none">${h.js(c.jsdata)}</div>
 %else:
 <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>
 %endif
 <script type="text/javascript">
     var jsdata = ${h.js(c.jsdata)};
     var graph = new BranchRenderer('graph_canvas', 'graph_content_pr', 'chg_');
     $(document).ready(function(){
         graph.render(jsdata);
         $('.expand_commit').click(function(e){
             $(this).next('.mid').find('.message').toggleClass('expanded');
             graph.render(jsdata);
         });
     });
     $(window).resize(function(){
         graph.render(jsdata);
     });
 </script>

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

kallithea/templates/pullrequests/pullrequest_data.html

➞

Show inline comments

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

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -210,191 +210,191 @@ ${self.repo_context_bar('showpullrequest @@
             %for member,status in c.pull_request_reviewers:
               <input type="hidden" value="${member.user_id}" name="org_review_members" />
             %endfor
             <ul id="review_members" class="list-unstyled">
             %for member,status in c.pull_request_reviewers:
               ## WARNING: the HTML below is duplicate with
               ## kallithea/public/js/base.js
               ## If you change something here it should be reflected in the template too.
               <li id="reviewer_${member.user_id}">
                 <span class="reviewers_member">
                   <span class="reviewer_status" data-toggle="tooltip" title="${h.changeset_status_lbl(status)}">
                       <i class="icon-circle changeset-status-${status}"></i>
                   </span>
                   ${h.gravatar(member.email, size=14)}
                   <span>
                     ${member.full_name_and_username}
                     %if c.pull_request.owner_id == member.user_id:
                       (${_('Owner')})
                     %endif
                   </span>
                   <input type="hidden" value="${member.user_id}" name="review_members" />
                   %if editable:
                   <a href="#" class="reviewer_member_remove" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">
                       <i class="icon-minus-circled"></i>
                   </a>
                   %endif
                 </span>
               </li>
             %endfor
             </ul>
           </div>
           %if editable:
           <div>
              ${h.text('user', class_='form-control',placeholder=_('Type name of reviewer to add'))}
           </div>
           %endif
         </div>
         %if not c.pull_request_reviewers:
         <h4>${_('Potential Reviewers')}</h4>
         <div>
           <div>
             ${_('Click to add the repository owner as reviewer:')}
           </div>
           <ul class="list-unstyled">
             %for u in [c.pull_request.other_repo.owner]:
               <li>
                 <a class="missing_reviewer missing_reviewer_${u.user_id}"
                   href="#"
                   data-user_id="${u.user_id}"
                   data-fname="${u.name}"
                   data-lname="${u.lastname}"
                   data-nname="${u.username}"
                   data-gravatar_lnk="${h.gravatar_url(u.email, size=28, default='default')}"
                   data-gravatar_size="14"
                   title="Click to add reviewer to the list, then Save Changes.">${u.full_name}</a>
               </li>
             %endfor
           </ul>
         </div>
         %endif
     </div>
   ${h.end_form()}
 </div>
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
       <div class="breadcrumbs">${_('Pull Request Content')}</div>
     </div>
     <div class="panel-body">
         <div>
             <div id="changeset_compare_view_content">
               <h5>
                   ${comment.comment_count(c.inline_cnt, len(c.comments))}
               </h5>
               ##CS
               <h5>
                 ${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}
               </h5>
               <%include file="/compare/compare_cs.html" />
               <h5>
               ${_('Common ancestor')}:
               ${h.link_to(h.short_id(c.a_rev),h.url('changeset_home',repo_name=c.a_repo.repo_name,revision=c.a_rev), class_="changeset_hash")}
               </h5>
               ## FILES
               <h5>
               % if c.limited_diff:
                   ${ungettext('%s file changed', '%s files changed', len(c.file_diff_data)) % len(c.file_diff_data)}:
               % else:
                   ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.file_diff_data)) % (len(c.file_diff_data),c.lines_added,c.lines_deleted)}:
               %endif
               </h5>
               <div class="cs_files">
                 %if not c.file_diff_data:
-                   <span class="empty_data">${_('No files')}</span>
+                   <span class="text-muted">${_('No files')}</span>
                 %endif
                 %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data:
                     <div class="cs_${op} clearfix">
                       <span class="node">
                           <i class="icon-diff-${op}"></i>
                           ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
                       </span>
                       <div class="changes">${h.fancy_file_stats(stats)}</div>
                     </div>
                 %endfor
                 %if c.limited_diff:
                   <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>
                 %endif
               </div>
             </div>
         </div>
     </div>
     <script>
     var _USERS_AC_DATA = ${h.js(c.users_array)};
     // TODO: switch this to pyroutes
     AJAX_COMMENT_URL = ${h.js(url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id))};
     AJAX_COMMENT_DELETE_URL = ${h.js(url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__'))};
     pyroutes.register('pullrequest_comment', ${h.js(url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s'))}, ['repo_name', 'pull_request_id']);
     pyroutes.register('pullrequest_comment_delete', ${h.js(url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s'))}, ['repo_name', 'comment_id']);
     </script>
     ## diff block
     <div class="panel-body">
     <div class="commentable-diff">
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
     ${diff_block.diff_block_js()}
     ${diff_block.diff_block(c.a_repo.repo_name, c.a_ref_type, c.a_ref_name, c.a_rev,
                             c.cs_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev, c.file_diff_data)}
     % if c.limited_diff:
       <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>
     % endif
     </div>
     ## template for inline comment form
     ${comment.comment_inline_form()}
     ## render comments and inlines
     ${comment.generate_comments()}
     ## main comment form and it status
     ${comment.comments(change_status=c.allowed_to_change_status)}
     <script type="text/javascript">
       $(document).ready(function(){
           PullRequestAutoComplete($('#user'));
           SimpleUserAutoComplete($('#owner'));
           $('.code-difftable').on('click', '.add-bubble', function(e){
               show_comment_form($(this));
           });
           var avail_jsdata = ${h.js(c.avail_jsdata)};
           var avail_r = new BranchRenderer('avail_graph_canvas', 'updaterevs-table', 'chg_available_');
           avail_r.render(avail_jsdata);
           move_comments($(".comments .comments-list-chunk"));
           $('#updaterevs input').change(function(e){
               var update = !!e.target.value;
               $('#pr-form-save').prop('disabled',update);
               $('#pr-form-clone').prop('disabled',!update);
           });
           var $org_review_members = $('#review_members').clone();
           $('#pr-form-reset').click(function(e){
               $('.pr-do-edit').hide();
               $('.pr-not-edit').show();
               $('#pr-form-save').prop('disabled',false);
               $('#pr-form-clone').prop('disabled',true);
               $('#review_members').html($org_review_members);
           });
           // hack: re-navigate to target after JS is done ... if a target is set and setting href thus won't reload
           if (window.location.hash != "") {
               window.location.href = window.location.href;
+          }
           $('.missing_reviewer').click(function(){
             var $this = $(this);
             addReviewMember($this.data('user_id'), $this.data('fname'), $this.data('lname'), $this.data('nname'), $this.data('gravatar_lnk'), $this.data('gravatar_size'));
           });
       });
     </script>
     </div>
 </div>
 </%def>

kallithea/tests/functional/test_compare_local.py

➞

Show inline comments

@@ @@ -33,199 +33,199 @@ class TestCompareController(TestControll @@
                    '''<span class="node">
                           <i class="icon-diff-added"></i>
                           <a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>
                       </span>''')
         response.mustcontain(
                    '''<span class="node">
                           <i class="icon-diff-added"></i>
                           <a href="#C--e3305437df55">test_and_report.sh</a>''')
         response.mustcontain(
                    '''<span class="node">
                           <i class="icon-diff-modified"></i>
                           <a href="#C--c8e92ef85cd1">.hgignore</a>''')
         response.mustcontain(
                    '''<span class="node">
                           <i class="icon-diff-modified"></i>
                           <a href="#C--6e08b694d687">.hgtags</a>''')
         response.mustcontain(
                    '''<span class="node">
                           <i class="icon-diff-modified"></i>
                           <a href="#C--2c14b00f3393">docs/api/index.rst</a>''')
         response.mustcontain(
                    '''<span class="node">
                           <i class="icon-diff-modified"></i>
                           <a href="#C--430ccbc82bdf">vcs/__init__.py</a>''')
         response.mustcontain(
                    '''<span class="node">
                           <i class="icon-diff-modified"></i>
                           <a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''')
         response.mustcontain(
                    '''<span class="node">
                           <i class="icon-diff-modified"></i>
                           <a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''')
         response.mustcontain(
                    '''<span class="node">
                           <i class="icon-diff-modified"></i>
                           <a href="#C--7abc741b5052">vcs/utils/annotate.py</a>''')
         response.mustcontain(
                    '''<span class="node">
                           <i class="icon-diff-modified"></i>
                           <a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a>''')
         response.mustcontain(
                    '''<span class="node">
                           <i class="icon-diff-modified"></i>
                           <a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a>''')
     def test_compare_tag_git(self):
         self.log_user()
         tag1 = 'v0.1.2'
         tag2 = 'v0.1.3'
         response = self.app.get(url('compare_url',
                                     repo_name=GIT_REPO,
                                     org_ref_type="tag",
                                     org_ref_name=tag1,
                                     other_ref_type="tag",
                                     other_ref_name=tag2,
                                     ), status=200)
         response.mustcontain('%s@%s' % (GIT_REPO, tag1))
         response.mustcontain('%s@%s' % (GIT_REPO, tag2))
         ## outgoing changesets between tags
         response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/794bbdd31545c199f74912709ea350dedcd189a2">r113:794bbdd31545</a>''' % GIT_REPO)
         response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/e36d8c5025329bdd4212bd53d4ed8a70ff44985f">r115:e36d8c502532</a>''' % GIT_REPO)
         response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/5c9ff4f6d7508db0e72b1d2991c357d0d8e07af2">r116:5c9ff4f6d750</a>''' % GIT_REPO)
         response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/b7187fa2b8c1d773ec35e9dee12f01f74808c879">r117:b7187fa2b8c1</a>''' % GIT_REPO)
         response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/5f3b74262014a8de2dc7dade1152de9fd0c8efef">r118:5f3b74262014</a>''' % GIT_REPO)
         response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/17438a11f72b93f56d0e08e7d1fa79a378578a82">r119:17438a11f72b</a>''' % GIT_REPO)
         response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/5a3a8fb005554692b16e21dee62bf02667d8dc3e">r120:5a3a8fb00555</a>''' % GIT_REPO)
         response.mustcontain('11 files changed with 94 insertions and 64 deletions')
         # files
         response.mustcontain('''<a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>''')
         response.mustcontain('''<a href="#C--e3305437df55">test_and_report.sh</a>''')
         response.mustcontain('''<a href="#C--c8e92ef85cd1">.hgignore</a>''')
         response.mustcontain('''<a href="#C--6e08b694d687">.hgtags</a>''')
         response.mustcontain('''<a href="#C--2c14b00f3393">docs/api/index.rst</a>''')
         response.mustcontain('''<a href="#C--430ccbc82bdf">vcs/__init__.py</a>''')
         response.mustcontain('''<a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''')
         response.mustcontain('''<a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''')
         response.mustcontain('''<a href="#C--7abc741b5052">vcs/utils/annotate.py</a>''')
         response.mustcontain('''<a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a>''')
         response.mustcontain('''<a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a>''')
     def test_index_branch_hg(self):
         self.log_user()
         response = self.app.get(url('compare_url',
                                     repo_name=HG_REPO,
                                     org_ref_type="branch",
                                     org_ref_name='default',
                                     other_ref_type="branch",
                                     other_ref_name='default',
                                     ))
         response.mustcontain('%s@default' % (HG_REPO))
         response.mustcontain('%s@default' % (HG_REPO))
         # branch are equal
         response.mustcontain('<span class="empty_data">No files</span>')
         response.mustcontain('<span class="empty_data">No changesets</span>')
         response.mustcontain('<span class="text-muted">No files</span>')
         response.mustcontain('<span class="text-muted">No changesets</span>')
     def test_index_branch_git(self):
         self.log_user()
         response = self.app.get(url('compare_url',
                                     repo_name=GIT_REPO,
                                     org_ref_type="branch",
                                     org_ref_name='master',
                                     other_ref_type="branch",
                                     other_ref_name='master',
                                     ))
         response.mustcontain('%s@master' % (GIT_REPO))
         response.mustcontain('%s@master' % (GIT_REPO))
         # branch are equal
         response.mustcontain('<span class="empty_data">No files</span>')
         response.mustcontain('<span class="empty_data">No changesets</span>')
         response.mustcontain('<span class="text-muted">No files</span>')
         response.mustcontain('<span class="text-muted">No changesets</span>')
     def test_compare_revisions_hg(self):
         self.log_user()
         rev1 = 'b986218ba1c9'
         rev2 = '3d8f361e72ab'
         response = self.app.get(url('compare_url',
                                     repo_name=HG_REPO,
                                     org_ref_type="rev",
                                     org_ref_name=rev1,
                                     other_ref_type="rev",
                                     other_ref_name=rev2,
                                     ))
         response.mustcontain('%s@%s' % (HG_REPO, rev1))
         response.mustcontain('%s@%s' % (HG_REPO, rev2))
         ## outgoing changesets between those revisions
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev2))
         response.mustcontain('1 file changed with 7 insertions and 0 deletions')
         ## files
         response.mustcontain("""<a href="#C--c8e92ef85cd1">.hgignore</a>""")
     def test_compare_revisions_git(self):
         self.log_user()
         rev1 = 'c1214f7e79e02fc37156ff215cd71275450cffc3'
         rev2 = '38b5fe81f109cb111f549bfe9bb6b267e10bc557'
         response = self.app.get(url('compare_url',
                                     repo_name=GIT_REPO,
                                     org_ref_type="rev",
                                     org_ref_name=rev1,
                                     other_ref_type="rev",
                                     other_ref_name=rev2,
                                     ))
         response.mustcontain('%s@%s' % (GIT_REPO, rev1))
         response.mustcontain('%s@%s' % (GIT_REPO, rev2))
         ## outgoing changesets between those revisions
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12]))
         response.mustcontain('1 file changed with 7 insertions and 0 deletions')
         ## files
         response.mustcontain("""<a href="#C--c8e92ef85cd1">.hgignore</a>""")
     def test_compare_revisions_hg_is_ajax_preview(self):
         self.log_user()
         rev1 = 'b986218ba1c9'
         rev2 = '3d8f361e72ab'
         response = self.app.get(url('compare_url',
                                     repo_name=HG_REPO,
                                     org_ref_type="rev",
                                     org_ref_name=rev1,
                                     other_ref_type="rev",
                                     other_ref_name=rev2,
                                     is_ajax_preview=True,
                                     ),
                                 extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)
         ## outgoing changesets between those revisions
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/3d8f361e72ab303da48d799ff1ac40d5ac37c67e">r1:%s</a>""" % (HG_REPO, rev2))
         response.mustcontain('Merge Ancestor')
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/b986218ba1c9b0d6a259fac9b050b1724ed8e545">%s</a>""" % (HG_REPO, rev1))
     def test_compare_revisions_git_is_ajax_preview(self):
         self.log_user()
         rev1 = 'c1214f7e79e02fc37156ff215cd71275450cffc3'
         rev2 = '38b5fe81f109cb111f549bfe9bb6b267e10bc557'
         response = self.app.get(url('compare_url',
                                     repo_name=GIT_REPO,
                                     org_ref_type="rev",
                                     org_ref_name=rev1,
                                     other_ref_type="rev",
                                     other_ref_name=rev2,
                                     is_ajax_preview=True,
                                     ),
                                 extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)
         ## outgoing changesets between those revisions
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/38b5fe81f109cb111f549bfe9bb6b267e10bc557">r1:%s</a>""" % (GIT_REPO, rev2[:12]))
         response.mustcontain('Merge Ancestor')
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/c1214f7e79e02fc37156ff215cd71275450cffc3">%s</a>""" % (GIT_REPO, rev1[:12]))

0 comments (0 inline, 0 general)