diff --git a/kallithea/lib/helpers.py b/kallithea/lib/helpers.py --- a/kallithea/lib/helpers.py +++ b/kallithea/lib/helpers.py @@ -258,14 +258,14 @@ class CodeHtmlFormatter(HtmlFormatter): # some configurations seem to mess up the formatting... if nocls: yield 0, ('' % self.cssclass + - '' + '
' - '
' +
-                      ls + '
') + '
' + '
' + ls + '
') else: yield 0, ('' % self.cssclass + - '' + '
' +
-                      ls + '
') + '
' + '
' + ls + '
') yield 0, dummyoutfile.getvalue() yield 0, '
' diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -1931,6 +1931,7 @@ BIN_FILENODE = 6 } #graph_content, +#graph_content_pr, #graph .info_box, #graph .container_header { margin-left: 100px; @@ -2009,6 +2010,7 @@ tr.out-of-range > td.mid > .message > a #graph_content .container .expand_commit { width: 24px; cursor: pointer; + color: #999; } #graph_content #changesets .container .right { diff --git a/kallithea/templates/admin/gists/edit.html b/kallithea/templates/admin/gists/edit.html --- a/kallithea/templates/admin/gists/edit.html +++ b/kallithea/templates/admin/gists/edit.html @@ -142,7 +142,7 @@ %endfor -
+
${h.submit('update',_('Update Gist'),class_="btn btn-success")} ${_('Cancel')}
diff --git a/kallithea/templates/admin/gists/index.html b/kallithea/templates/admin/gists/index.html --- a/kallithea/templates/admin/gists/index.html +++ b/kallithea/templates/admin/gists/index.html @@ -41,13 +41,13 @@
%if c.gists_pager.item_count>0: % for gist in c.gists_pager: -
+
${h.gravatar_div(gist.owner.email, size=28)} -
+
${h.person(gist.owner.full_contact)} / gist: ${gist.gist_access_id}
-
+
${_('Created')} ${h.age(gist.created_on)} / %if gist.gist_expires == -1: @@ -58,7 +58,7 @@
-
${gist.gist_description}
+
${gist.gist_description}
% endfor diff --git a/kallithea/templates/admin/my_account/my_account_api_keys.html b/kallithea/templates/admin/my_account/my_account_api_keys.html --- a/kallithea/templates/admin/my_account/my_account_api_keys.html +++ b/kallithea/templates/admin/my_account/my_account_api_keys.html @@ -1,6 +1,6 @@ - + @@ -19,9 +19,9 @@ %if c.user_api_keys: %for api_key in c.user_api_keys: - + - diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html b/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html @@ -11,8 +11,8 @@ ] %> %for dt, dd, tt in elems: -
${dt}:
-
${dd}
+
${dt}:
+
${dd}
%endfor diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html @@ -30,7 +30,7 @@ ${h.form(url('edit_repo_group_perms', gr @@ -77,7 +77,7 @@ ${h.form(url('edit_repo_group_perms', gr diff --git a/kallithea/templates/admin/repos/repo_creating.html b/kallithea/templates/admin/repos/repo_creating.html --- a/kallithea/templates/admin/repos/repo_creating.html +++ b/kallithea/templates/admin/repos/repo_creating.html @@ -27,10 +27,10 @@ ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})} -
+
+ aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">
diff --git a/kallithea/templates/admin/repos/repo_edit_fields.html b/kallithea/templates/admin/repos/repo_edit_fields.html --- a/kallithea/templates/admin/repos/repo_edit_fields.html +++ b/kallithea/templates/admin/repos/repo_edit_fields.html @@ -15,7 +15,7 @@
@@ -74,7 +74,7 @@ ${h.form(url('edit_repo_perms_update', r diff --git a/kallithea/templates/admin/settings/settings_hooks.html b/kallithea/templates/admin/settings/settings_hooks.html --- a/kallithea/templates/admin/settings/settings_hooks.html +++ b/kallithea/templates/admin/settings/settings_hooks.html @@ -5,7 +5,7 @@ % for hook in c.hooks: <% input_id = hook.ui_key.replace('.', '_') %> -
+
${h.text(hook.ui_key,hook.ui_value,id=input_id,size=60,readonly="readonly",class_='form-control')}
% endfor @@ -23,13 +23,13 @@ ${h.form(url('admin_settings_hooks'), me %for hook in c.custom_hooks: <% input_id = hook.ui_key.replace('.', '_') %> -
+
${h.hidden('hook_ui_key',hook.ui_key,id='hook_ui_key_'+input_id)} ${h.hidden('hook_ui_value',hook.ui_value,id='hook_ui_value_'+input_id)} ${h.text('hook_ui_value_new',hook.ui_value,id=input_id,size=60,class_='form-control')} - + ${_('Delete')}
@@ -40,12 +40,12 @@ ${h.form(url('admin_settings_hooks'), me -
+
${h.text('new_hook_ui_value',size=60,class_='form-control')}
-
+
${h.submit('save',_('Save'),class_="btn btn-default")}
diff --git a/kallithea/templates/admin/settings/settings_system.html b/kallithea/templates/admin/settings/settings_system.html --- a/kallithea/templates/admin/settings/settings_system.html +++ b/kallithea/templates/admin/settings/settings_system.html @@ -1,10 +1,10 @@ <% elems = [ - (_('Kallithea version'), h.literal('%s ' % (c.kallithea_version, _('Check for updates'))), ''), + (_('Kallithea version'), h.literal('%s ' % (c.kallithea_version, _('Check for updates'))), ''), (_('Kallithea configuration file'), c.ini['__file__'], ''), (_('Python version'), c.py_version, ''), (_('Platform'), c.platform, ''), @@ -15,21 +15,21 @@ %>
%for dt, dd, tt in elems: -
${dt}:
-
${dd}
+
${dt}:
+
${dd}
%endfor

${_('Python Packages')}

-
${c.user.api_key}
${c.user.api_key}
 ${_('Built-in')}
${api_key.api_key}
${api_key.api_key}
 ${api_key.description} + %if api_key.expires == -1: ${_('Expires')}: ${_('Never')} %else: diff --git a/kallithea/templates/admin/my_account/my_account_emails.html b/kallithea/templates/admin/my_account/my_account_emails.html --- a/kallithea/templates/admin/my_account/my_account_emails.html +++ b/kallithea/templates/admin/my_account/my_account_emails.html @@ -19,7 +19,7 @@ ${h.form(url('my_account_emails_delete'))} ${h.hidden('del_email_id',em.email_id)} - + ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")} ${h.end_form()} diff --git a/kallithea/templates/admin/permissions/permissions_ips.html b/kallithea/templates/admin/permissions/permissions_ips.html --- a/kallithea/templates/admin/permissions/permissions_ips.html +++ b/kallithea/templates/admin/permissions/permissions_ips.html @@ -8,7 +8,7 @@ ${h.form(url('edit_user_ips_delete', id=c.user.user_id))} ${h.hidden('del_ip_id',ip.ip_id)} ${h.hidden('default_user', 'True')} - ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id, + ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} ${h.end_form()} %if r2p.user.username !='default': - + ${_('Revoke')} %endif @@ -67,7 +67,7 @@ ${h.form(url('edit_repo_group_perms', gr %endif - + ${_('Revoke')}
- + ${_('Add new')} ${field.field_type} ${h.form(url('delete_repo_fields', repo_name=c.repo_info.repo_name, field_id=field.repo_field_id))} - + ${h.submit('remove_%s' % field.repo_field_id, _('Delete'), id="remove_field_%s" % field.repo_field_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this field: %s') % field.field_key+"');")} ${h.end_form()} diff --git a/kallithea/templates/admin/repos/repo_edit_permissions.html b/kallithea/templates/admin/repos/repo_edit_permissions.html --- a/kallithea/templates/admin/repos/repo_edit_permissions.html +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html @@ -39,7 +39,7 @@ ${h.form(url('edit_repo_perms_update', r %if r2p.user.username !='default': - + ${_('Revoke')} %endif @@ -64,7 +64,7 @@ ${h.form(url('edit_repo_perms_update', r %endif - + ${_('Revoke')}
- + ${_('Add new')}
+
- + %for key, value in c.modules: - + %endfor diff --git a/kallithea/templates/admin/settings/settings_system_update.html b/kallithea/templates/admin/settings/settings_system_update.html --- a/kallithea/templates/admin/settings/settings_system_update.html +++ b/kallithea/templates/admin/settings/settings_system_update.html @@ -2,8 +2,7 @@ ## upgrade block rendered afte on-click check
-

- +

%if c.should_upgrade: A new version is available: %if c.latest_data.get('title'): diff --git a/kallithea/templates/admin/user_groups/user_group_edit_advanced.html b/kallithea/templates/admin/user_groups/user_group_edit_advanced.html --- a/kallithea/templates/admin/user_groups/user_group_edit_advanced.html +++ b/kallithea/templates/admin/user_groups/user_group_edit_advanced.html @@ -9,8 +9,8 @@ ] %> %for dt, dd, tt in elems: -

${dt}:
-
${dd}
+
${dt}:
+
${dd}
%endfor diff --git a/kallithea/templates/admin/user_groups/user_group_edit_perms.html b/kallithea/templates/admin/user_groups/user_group_edit_perms.html --- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html @@ -30,7 +30,7 @@ ${h.form(url('edit_user_group_perms_upda
diff --git a/kallithea/templates/admin/user_groups/user_group_edit_settings.html b/kallithea/templates/admin/user_groups/user_group_edit_settings.html --- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html +++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html @@ -23,21 +23,20 @@ ${h.form(url('update_users_group', id=c.
-
-
${_('Chosen group members')}
+
+
${_('Chosen group members')}
${h.select('users_group_members',[],c.group_members,multiple=True,size=8,style="min-width:210px",class_='form-control')}
-
- -
- +
+ +
+
-
-
${_('Available members')}
+
+
${_('Available members')}
${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px",class_='form-control')}
-
diff --git a/kallithea/templates/admin/users/user_edit_advanced.html b/kallithea/templates/admin/users/user_edit_advanced.html --- a/kallithea/templates/admin/users/user_edit_advanced.html +++ b/kallithea/templates/admin/users/user_edit_advanced.html @@ -11,8 +11,8 @@ ] %> %for dt, dd, tt in elems: -
${dt}:
-
${dd}
+
${dt}:
+
${dd}
%endfor diff --git a/kallithea/templates/admin/users/user_edit_api_keys.html b/kallithea/templates/admin/users/user_edit_api_keys.html --- a/kallithea/templates/admin/users/user_edit_api_keys.html +++ b/kallithea/templates/admin/users/user_edit_api_keys.html @@ -1,6 +1,6 @@
${key}${key} ${value}
%if r2p.user.username !='default': - + ${_('Revoke')} %endif @@ -67,7 +67,7 @@ ${h.form(url('edit_user_group_perms_upda %endif - + ${_('Revoke')}
- + @@ -19,9 +19,9 @@ %if c.user_api_keys: %for api_key in c.user_api_keys: - + - diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html --- a/kallithea/templates/changelog/changelog.html +++ b/kallithea/templates/changelog/changelog.html @@ -99,14 +99,14 @@ ${self.repo_context_bar('changelog', c.f ${h.gravatar(h.email_or_none(cs.author), size=16)} ${h.shorter(h.person(cs.author),22)} -
${c.user.api_key}
${c.user.api_key}
 ${_('Built-in')}
${api_key.api_key}
${api_key.api_key}
 ${api_key.description} + %if api_key.expires == -1: ${_('Expires')}: ${_('Never')} %else: diff --git a/kallithea/templates/admin/users/user_edit_emails.html b/kallithea/templates/admin/users/user_edit_emails.html --- a/kallithea/templates/admin/users/user_edit_emails.html +++ b/kallithea/templates/admin/users/user_edit_emails.html @@ -19,7 +19,7 @@ ${h.form(url('edit_user_emails_delete', id=c.user.user_id))} ${h.hidden('del_email_id',em.email_id)} - + ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")} ${h.end_form()} diff --git a/kallithea/templates/admin/users/user_edit_ips.html b/kallithea/templates/admin/users/user_edit_ips.html --- a/kallithea/templates/admin/users/user_edit_ips.html +++ b/kallithea/templates/admin/users/user_edit_ips.html @@ -17,9 +17,9 @@ ${h.form(url('edit_user_ips_delete', id=c.user.user_id))} ${h.hidden('del_ip_id',ip.ip_id)} - + ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id, - class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} + class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} ${h.end_form()}
+ ${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), class_='changeset_hash')}
${h.age(cs.date,True)}
 - +
${h.urlify_text(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
diff --git a/kallithea/templates/changelog/changelog_summary_data.html b/kallithea/templates/changelog/changelog_summary_data.html --- a/kallithea/templates/changelog/changelog_summary_data.html +++ b/kallithea/templates/changelog/changelog_summary_data.html @@ -82,7 +82,7 @@ %if h.HasRepoPermissionLevel('write')(c.repo_name):

${_('Add or upload files directly via Kallithea')}

-
+
diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html +++ b/kallithea/templates/changeset/changeset.html @@ -241,12 +241,12 @@ ${self.repo_context_bar('changelog', c.c $('#child_link').addClass('disabled'); $('#child_link').addClass('double'); var _html = ''; - _html +='__rev__ ' + _html +='__rev__ ' .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6))) .replace('__title__', data.results[0].message) .replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[0].raw_id})); _html +='
' - _html +='__rev__ ' + _html +='__rev__ ' .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6))) .replace('__title__', data.results[1].message) .replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[1].raw_id})); @@ -278,12 +278,12 @@ ${self.repo_context_bar('changelog', c.c $('#parent_link').addClass('disabled'); $('#parent_link').addClass('double'); var _html = ''; - _html +=' __rev__' + _html +=' __rev__' .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6))) .replace('__title__', data.results[0].message) .replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[0].raw_id})); _html +='
' - _html +=' __rev__' + _html +=' __rev__' .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6))) .replace('__title__', data.results[1].message) .replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[1].raw_id})); diff --git a/kallithea/templates/changeset/changeset_file_comment.html b/kallithea/templates/changeset/changeset_file_comment.html --- a/kallithea/templates/changeset/changeset_file_comment.html +++ b/kallithea/templates/changeset/changeset_file_comment.html @@ -26,7 +26,7 @@ %if co.author_id == request.authuser.user_id or h.HasRepoPermissionLevel('admin')(c.repo_name): %if co.deletable(): -
${_('Delete')}
+
${_('Delete')}
%endif %endif
diff --git a/kallithea/templates/changeset/diff_block.html b/kallithea/templates/changeset/diff_block.html --- a/kallithea/templates/changeset/diff_block.html +++ b/kallithea/templates/changeset/diff_block.html @@ -25,7 +25,7 @@ ${h.safe_unicode(cs_filename)}
- + %if op == 'A': diff --git a/kallithea/templates/compare/compare_cs.html b/kallithea/templates/compare/compare_cs.html --- a/kallithea/templates/compare/compare_cs.html +++ b/kallithea/templates/compare/compare_cs.html @@ -7,10 +7,10 @@ %if c.ancestors:
%if len(c.ancestors) > 1: -
+
${_('Criss cross merge situation with multiple merge ancestors detected!')}
-
+
${_('Please merge the target branch to your branch before creating a pull request.')}
%endif @@ -24,15 +24,15 @@ %endif
- +
-
+
%for cnt, cs in enumerate(reversed(c.cs_ranges)): - - + -
+ %if cs.raw_id in c.statuses:
@@ -64,7 +64,7 @@ ${index}
${cs.date}${cs.date} ${h.gravatar(h.email_or_none(cs.author), size=16)} ${h.shorter(h.person(cs.author),22)} @@ -76,10 +76,10 @@ %endif - + -
+
%for tag in cs.tags: ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))} @@ -109,7 +109,7 @@ %endif %if c.cs_ranges_org is not None: ## TODO: list actual changesets? -
+
${h.link_to_ref(c.cs_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)} ${_('is')} ${_('%s changesets') % (len(c.cs_ranges_org))} diff --git a/kallithea/templates/data_table/_dt_elements.html b/kallithea/templates/data_table/_dt_elements.html --- a/kallithea/templates/data_table/_dt_elements.html +++ b/kallithea/templates/data_table/_dt_elements.html @@ -24,8 +24,6 @@ %elif not private and c.visual.show_public_icon: - %else: - %endif ${get_name(name)} @@ -77,7 +75,7 @@
${h.form(h.url('delete_repo', repo_name=repo_name))} - + ${h.submit('remove_%s' % repo_name,_('Delete'),class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo_name+"');")} ${h.end_form()} @@ -105,7 +103,7 @@
${h.form(h.url('delete_user', id=user_id))} - + ${h.submit('remove_',_('Delete'),id="remove_user_%s" % user_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this user: %s') % username+"');")} ${h.end_form()} @@ -120,7 +118,7 @@
${h.form(h.url('delete_users_group', id=user_group_id))} - + ${h.submit('remove_',_('Delete'),id="remove_group_%s" % user_group_id, class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this user group: %s') % user_group_name+"');")} ${h.end_form()} @@ -135,7 +133,7 @@
${h.form(h.url('delete_repos_group', group_name=repo_group_name))} - + ${h.submit('remove_%s' % repo_group_name,_('Delete'),class_="btn btn-default btn-xs", onclick="return confirm('"+ungettext('Confirm to delete this group: %s with %s repository','Confirm to delete this group: %s with %s repositories',gr_count) % (repo_group_name, gr_count)+"');")} ${h.end_form()} diff --git a/kallithea/templates/files/files_history_box.html b/kallithea/templates/files/files_history_box.html --- a/kallithea/templates/files/files_history_box.html +++ b/kallithea/templates/files/files_history_box.html @@ -1,4 +1,4 @@ -
+
${h.literal(ungettext(u'%s author',u'%s authors',len(c.authors)) % ('%s' % len(c.authors))) }
%for email, user in c.authors:
diff --git a/kallithea/templates/files/files_source.html b/kallithea/templates/files/files_source.html --- a/kallithea/templates/files/files_source.html +++ b/kallithea/templates/files/files_source.html @@ -1,4 +1,4 @@ -
+
${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')} ${h.hidden('diff2',c.changeset.raw_id)} @@ -10,7 +10,7 @@ ${h.link_to(_('Show Authors'),'#',class_="btn btn-default btn-sm" ,id="show_authors")} ${h.end_form()}
- +
diff --git a/kallithea/templates/files/files_ypjax.html b/kallithea/templates/files/files_ypjax.html --- a/kallithea/templates/files/files_ypjax.html +++ b/kallithea/templates/files/files_ypjax.html @@ -8,7 +8,7 @@ % if h.HasRepoPermissionLevel('write')(c.repo_name): / - + % endif %endif diff --git a/kallithea/templates/followers/followers_data.html b/kallithea/templates/followers/followers_data.html --- a/kallithea/templates/followers/followers_data.html +++ b/kallithea/templates/followers/followers_data.html @@ -4,12 +4,12 @@
${h.gravatar_div(f.user.email, size=24)} - ${f.user.username} (${f.user.name} ${f.user.lastname}) + ${f.user.username} (${f.user.name} ${f.user.lastname})
-
+
${_('Started following -')} ${h.age(f.follows_from)}
-
+
% endfor diff --git a/kallithea/templates/forks/forks_data.html b/kallithea/templates/forks/forks_data.html --- a/kallithea/templates/forks/forks_data.html +++ b/kallithea/templates/forks/forks_data.html @@ -5,20 +5,19 @@
${h.gravatar_div(f.owner.email, size=24)} - + ${f.owner.username} (${f.owner.name} ${f.owner.lastname}) / ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))} -
${f.description}
+
${f.description}
-
+
${_('Forked')} - ${h.age(f.created_on)} ${_('Compare Fork')}
-
% endfor
    diff --git a/kallithea/templates/journal/journal_data.html b/kallithea/templates/journal/journal_data.html --- a/kallithea/templates/journal/journal_data.html +++ b/kallithea/templates/journal/journal_data.html @@ -43,7 +43,7 @@ ${c.journal_pager.pager()}
%else: -
+
${_('No entries yet')}
%endif diff --git a/kallithea/templates/pullrequests/pullrequest.html b/kallithea/templates/pullrequests/pullrequest.html --- a/kallithea/templates/pullrequests/pullrequest.html +++ b/kallithea/templates/pullrequests/pullrequest.html @@ -44,29 +44,29 @@ ${self.repo_context_bar('showpullrequest ##ORG
-
+
${_('Origin repository')}: ${c.db_repo.description.split('\n')[0]}
${h.select('org_repo','',c.cs_repos,class_='refs')}:${h.select('org_ref',c.default_cs_ref,c.cs_refs,class_='refs')}
-
+
${_('Revision')}: -
##OTHER, most Probably the PARENT OF THIS FORK -
+
## filled with JS -
+
${_('Destination repository')}: ${c.a_repo.description.split('\n')[0]}
${h.select('other_repo',c.a_repo.repo_name,c.a_repos,class_='refs')}:${h.select('other_ref',c.default_a_ref,c.a_refs,class_='refs')}
-
+
${_('Revision')}: -
diff --git a/kallithea/templates/pullrequests/pullrequest_data.html b/kallithea/templates/pullrequests/pullrequest_data.html --- a/kallithea/templates/pullrequests/pullrequest_data.html +++ b/kallithea/templates/pullrequests/pullrequest_data.html @@ -58,9 +58,9 @@ ${pr.other_repo.repo_name}#${other_ref_name}
+ %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), style="display:inline-block")} + ${h.form(url('pullrequest_delete', repo_name=pr.other_repo.repo_name, pull_request_id=pr.pull_request_id))}