Changeset - 41dd3c2f820c
[Not reviewed]
kallithea/public/css/contextbar.css
Show inline comments
 
@@ -51,6 +51,8 @@ i[class^='icon-'] {
 
#content #context-bar h2 {
 
    display: inline-block;
 
    color: #FFF;
 
    margin: 8px 20px 3px;
 
    padding-bottom: 2px;
 
}
 

	
 
#header #header-inner #quick a,
kallithea/public/css/style.css
Show inline comments
 
@@ -3941,11 +3941,6 @@ div.pr-details-title.closed {
 
    background: #eee;
 
}
 

	
 
div.pr-details-title {
 
    font-size: 1.6em;
 
    padding: 5px 0px;
 
}
 

	
 
div.pr {
 
    margin: 0px 20px;
 
    padding: 4px 4px;
kallithea/templates/admin/my_account/my_account_password.html
Show inline comments
 
<div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Change Your Account Password')}</div>
 
<h4>${_('Change Your Account Password')}</h4>
 

	
 
%if c.can_change_password:
 

	
kallithea/templates/admin/my_account/my_account_repos.html
Show inline comments
 
<div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Repositories You Own')}</div>
 
<h4>${_('Repositories You Own')}</h4>
 

	
 
<div class="table">
 
    <table id="datatable_list_wrap"></table>
kallithea/templates/admin/my_account/my_account_watched.html
Show inline comments
 
<div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Repositories You are Watching')}</div>
 
<h4>${_('Repositories You are Watching')}</h4>
 

	
 
<div class="table">
 
    <table id="datatable_list_wrap"></table>
kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html
Show inline comments
 
<div style="font-size: 24px; color: #666666; padding: 0px 0px 10px 0px">${_('Repository Group: %s') % c.repo_group.group_name}</div>
 
<h4>${_('Repository Group: %s') % c.repo_group.group_name}</h4>
 

	
 
<dl class="dl-horizontal">
 
<%
kallithea/templates/admin/repos/repo_creating.html
Show inline comments
 
@@ -23,7 +23,9 @@
 
    </div>
 

	
 
    <div style="display:table; padding: 10px 0px; font-size: 14px;font-weight: bold;margin-right: auto;margin-left: auto">
 
            <h4 class="text-center">
 
                ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}
 
            </h4>
 
    </div>
 

	
 
    <div id="progress" style="width: 500px;margin-left: auto; margin-right: auto">
kallithea/templates/admin/repos/repo_edit_caches.html
Show inline comments
 
@@ -9,13 +9,13 @@ ${h.form(url('update_repo_caches', repo_
 
      </ul>
 
      </div>
 
      <div style="border:none;">
 
        ${_('List of Cached Values')}
 
           <table class="table">
 
           <tr>
 
        <h5>${_('List of Cached Values')}</h5>
 
        <table class="table">
 
          <tr>
 
            <th>${_('Prefix')}</th>
 
            <th>${_('Key')}</th>
 
            <th>${_('Active')}</th>
 
            </tr>
 
          </tr>
 
          %for cache in c.repo_info.cache_keys:
 
              <tr>
 
                <td>${cache.get_prefix() or '-'}</td>
 
@@ -23,7 +23,7 @@ ${h.form(url('update_repo_caches', repo_
 
                <td>${h.boolicon(cache.cache_active)}</td>
 
              </tr>
 
          %endfor
 
          </table>
 
        </table>
 
      </div>
 
   </div>
 
</div>
kallithea/templates/admin/repos/repo_edit_fields.html
Show inline comments
 
@@ -58,7 +58,7 @@
 
    </div>
 
    ${h.end_form()}
 
%else:
 
  <div style="font-size: 20px">
 
  <h4>
 
    ${_('Extra fields are disabled.')}
 
  </div>
 
  </h4>
 
%endif
kallithea/templates/admin/repos/repo_edit_remote.html
Show inline comments
 
%if c.repo_info.clone_uri:
 
<div style="font-size: 20px; padding: 0px 0px 10px 0px">
 
<h4>
 
   ${_('Remote repository URL')}: <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a></li>
 
</div>
 
</h4>
 
${h.form(url('edit_repo_remote_update', repo_name=c.repo_name))}
 
<div class="form">
 
    <div>
 
@@ -13,7 +13,7 @@ ${h.form(url('edit_repo_remote_update', 
 
</div>
 
${h.end_form()}
 
%else:
 
  <div style="font-size: 20px">
 
  <h3>
 
    ${_('This repository does not have a remote repository URL.')}
 
  </div>
 
  </h3>
 
%endif
kallithea/templates/admin/user_groups/user_group_edit_advanced.html
Show inline comments
 
<div style="font-size: 24px; color: #666666; padding: 0px 0px 10px 0px">${_('User Group: %s') % c.user_group.users_group_name}</div>
 
<h3>${_('User Group: %s') % c.user_group.users_group_name}</h3>
 

	
 
<dl class="dl-horizontal">
 
<%
kallithea/templates/admin/users/user_edit_advanced.html
Show inline comments
 
<div style="font-size: 24px; color: #666666; padding: 0px 0px 10px 0px">${_('User: %s') % c.user.username}</div>
 
<h3>${_('User: %s') % c.user.username}</h3>
 

	
 
<dl class="dl-horizontal">
 
<%
kallithea/templates/base/perms_summary.html
Show inline comments
 
@@ -7,7 +7,7 @@
 
<div id="perms" class="table">
 
     %for section in sorted(permissions.keys()):
 
        <div class="perms_section_head">
 
            ${section.replace("_"," ").capitalize()}
 
            <h4>${section.replace("_"," ").capitalize()}</h4>
 
            %if section != 'global':
 
              <div style="float: right">
 
                ${_('Show')}:
kallithea/templates/changeset/changeset_range.html
Show inline comments
 
@@ -54,10 +54,10 @@ ${self.repo_context_bar('changelog')}
 
                %endfor
 
                </table>
 
              </div>
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
 
              <h4>${_('Files affected')}</h4>
 
              <div class="cs_files">
 
                    %for cs in c.cs_ranges:
 
                        <div class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</div>
 
                        <h6 class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</h6>
 
                        <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
 
                        %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
 
                            <div class="cs_${op}">
kallithea/templates/compare/compare_cs.html
Show inline comments
 
@@ -95,7 +95,7 @@
 
    </div>
 

	
 
    %if c.as_form:
 
      <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
 
      <h5>
 
      ## links should perhaps use ('rev', c.a_rev) instead ...
 
      ${h.link_to(_('Show merge diff'),
 
        h.url('compare_url',
 
@@ -105,7 +105,7 @@
 
          other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name,
 
          merge='1')
 
        )}
 
      </div>
 
      </h5>
 
    %endif
 
    %if c.cs_ranges_org is not None:
 
      ## TODO: list actual changesets?
kallithea/templates/compare/compare_diff.html
Show inline comments
 
@@ -44,17 +44,16 @@ ${self.repo_context_bar('changelog')}
 

	
 
    %if c.compare_home:
 
        <div id="changeset_compare_view_content">
 
         <div class="text-muted" style="font-size: 18px">${_('Compare revisions, branches, bookmarks, or tags.')}</div>
 
         <h4 class="text-muted">${_('Compare revisions, branches, bookmarks, or tags.')}</h4>
 
        </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>
 
                <h5>${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</h5>
 
                <%include file="compare_cs.html" />
 

	
 
                ## FILES
 
                <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
 

	
 
                <h5>
 
                % if c.limited_diff:
 
                    ${ungettext('%s file changed', '%s files changed', len(c.file_diff_data)) % len(c.file_diff_data)}:
 
                % else:
 
@@ -63,8 +62,7 @@ ${self.repo_context_bar('changelog')}
 

	
 
                ${c.ignorews_url(request.GET)}
 
                ${c.context_url(request.GET)}
 

	
 
                </div>
 
                </h5>
 
                <div class="cs_files">
 
                  %if not c.file_diff_data:
 
                     <span class="empty_data">${_('No files')}</span>
kallithea/templates/errors/error_document.html
Show inline comments
 
@@ -35,7 +35,7 @@
 
        <div id="login">
 
            <div class="table">
 
                <div id="main_div">
 
                    <div style="font-size:2.0em;margin: 10px">${c.site_name}</div>
 
                    <h2>${c.site_name}</h2>
 
                    <h1 class="error_message">${c.error_message}</h1>
 

	
 
                    <p>${c.error_explanation}</p>
kallithea/templates/journal/journal_data.html
Show inline comments
 
@@ -2,7 +2,7 @@
 

	
 
%if c.journal_day_aggregate:
 
    %for day,items in c.journal_day_aggregate:
 
     <div class="journal_day">${day}</div>
 
        <h4>${day}</h4>
 
        % for user,entries in items:
 
            <div class="journal_container">
 
                ${h.gravatar_div(user.email if user else 'anonymous@kallithea-scm.org', size=24)}
kallithea/templates/pullrequests/pullrequest_data.html
Show inline comments
 
@@ -3,11 +3,11 @@
 
<%def name="pullrequest_overview(pullrequests)">
 

	
 
%if not len(pullrequests):
 
    <div class="normal-indent empty_data">${_('No entries')}</div>
 
    <div class="empty_data">${_('No entries')}</div>
 
    <% return %>
 
%endif
 

	
 
<div class="table">
 
<div>
 
  <table class="table">
 
    <thead>
 
      <tr>
kallithea/templates/pullrequests/pullrequest_show.html
Show inline comments
 
@@ -25,10 +25,12 @@ ${self.repo_context_bar('showpullrequest
 
  ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form')}
 
    <div class="form pr-box" style="float: left">
 
      <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">
 
        <h3>
 
          ${_('Title')}: ${c.pull_request.title}
 
          %if c.pull_request.is_closed():
 
              (${_('Closed')})
 
          %endif
 
        </h3>
 
      </div>
 
      <div id="pr-summary" class="form-horizontal">
 

	
 
@@ -204,8 +206,8 @@ ${self.repo_context_bar('showpullrequest
 
      </div>
 
    </div>
 
    ## REVIEWERS
 
    <div style="float:left; border-left:1px dashed #eee">
 
        <div class="pr-details-title">${_('Pull Request Reviewers')}</div>
 
    <div style="float:left">
 
        <h4 class="pr-details-title">${_('Pull Request Reviewers')}</h4>
 
        <div id="reviewers" style="padding:0px 0px 5px 10px">
 
          ## members goes here !
 
          <div>
 
@@ -251,7 +253,7 @@ ${self.repo_context_bar('showpullrequest
 
        </div>
 

	
 
        %if not c.pull_request_reviewers:
 
        <div class="pr-details-title">${_('Potential Reviewers')}</div>
 
        <h4>${_('Potential Reviewers')}</h4>
 
        <div style="margin: 10px 0 10px 10px; max-width: 250px">
 
          <div>
 
            ${_('Click to add the repository owner as reviewer:')}
 
@@ -260,6 +262,7 @@ ${self.repo_context_bar('showpullrequest
 
            %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}"
 
@@ -284,30 +287,28 @@ ${self.repo_context_bar('showpullrequest
 
    </div>
 
    <div class="table">
 
          <div id="changeset_compare_view_content">
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
 
              <h5>
 
                  ${comment.comment_count(c.inline_cnt, len(c.comments))}
 
              </div>
 
              </h5>
 
              ##CS
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
 
              <h5>
 
                ${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}
 
              </div>
 
              </h5>
 
              <%include file="/compare/compare_cs.html" />
 

	
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
 
              <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")}
 
              </div>
 
              </h5>
 

	
 
              ## FILES
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
 

	
 
              <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
 

	
 
              </div>
 
              </h5>
 
              <div class="cs_files">
 
                %if not c.file_diff_data:
 
                   <span class="empty_data">${_('No files')}</span>
kallithea/templates/pullrequests/pullrequest_show_my.html
Show inline comments
 
@@ -29,16 +29,15 @@
 
            ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('my_pullrequests',closed=1))}
 
        %endif
 
        </div>
 
    </div>
 

	
 
    <div class="pullrequests_section_head">${_('Pull Requests Created by Me')}</div>
 
    ${pullrequest_data.pullrequest_overview(c.my_pull_requests)}
 
        <h4>${_('Pull Requests Created by Me')}</h4>
 
        ${pullrequest_data.pullrequest_overview(c.my_pull_requests)}
 

	
 
    <div class="pullrequests_section_head" style="clear:both">${_('Pull Requests Needing My Review')}</div>
 
    ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests_todo)}
 
        <h4>${_('Pull Requests Needing My Review')}</h4>
 
        ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests_todo)}
 

	
 
    <div class="pullrequests_section_head" style="clear:both">${_('Pull Requests I Participate In')}</div>
 
    ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests)}
 

	
 
        <h4>${_('Pull Requests I Participate In')}</h4>
 
        ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests)}
 
    </div>
 
</div>
 
</%def>
kallithea/tests/functional/test_journal.py
Show inline comments
 
@@ -8,7 +8,7 @@ class TestJournalController(TestControll
 
        self.log_user()
 
        response = self.app.get(url(controller='journal', action='index'))
 

	
 
        response.mustcontain("""<div class="journal_day">%s</div>""" % datetime.date.today())
 
        response.mustcontain("""<h4>%s</h4>""" % datetime.date.today())
 

	
 
    def test_stop_following_repository(self):
 
        session = self.log_user()
0 comments (0 inline, 0 general)