# HG changeset patch # User domruf # Date 1498592973 -7200 # Node ID 3fca87aa2b15e3267d6ec08d35e6aafced6f9027 # Parent 91182a358fb3b3e913e9d3f7e207474e5f8511ab templates: don't use ordinary elements as links or buttons by adding btn styling Bootstrap recommends using ${plugin_path} %endfor diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/admin/notifications/notifications.html --- a/kallithea/templates/admin/notifications/notifications.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/admin/notifications/notifications.html Tue Jun 27 21:49:33 2017 +0200 @@ -26,7 +26,7 @@ ${_('Pull Requests')} %if c.notifications: - ${_('Mark All Read')} + %endif
diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/admin/notifications/notifications_data.html --- a/kallithea/templates/admin/notifications/notifications_data.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/admin/notifications/notifications_data.html Tue Jun 27 21:49:33 2017 +0200 @@ -9,9 +9,9 @@ %if not notification.read: - ${_('Mark as read')} + %endif - ${_('Delete')} +
%endfor diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/admin/notifications/show_notification.html --- a/kallithea/templates/admin/notifications/show_notification.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/admin/notifications/show_notification.html Tue Jun 27 21:49:33 2017 +0200 @@ -27,7 +27,7 @@ ${c.notification.description} - ${_('Delete')} +
%if c.notification.subject: diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/admin/repo_groups/repo_group_edit_perms.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html Tue Jun 27 21:49:33 2017 +0200 @@ -30,9 +30,9 @@ %if r2p.user.username !='default': - + %endif %else: @@ -67,9 +67,9 @@ %endif - + %endfor @@ -77,9 +77,9 @@ - + diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/admin/repos/repo_edit_permissions.html --- a/kallithea/templates/admin/repos/repo_edit_permissions.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html Tue Jun 27 21:49:33 2017 +0200 @@ -38,9 +38,9 @@ %if r2p.user.username !='default': - + %endif @@ -63,9 +63,9 @@ %endif - + %endfor @@ -73,9 +73,9 @@ - + diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/admin/settings/settings_hooks.html --- a/kallithea/templates/admin/settings/settings_hooks.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/admin/settings/settings_hooks.html Tue Jun 27 21:49:33 2017 +0200 @@ -24,11 +24,11 @@ ${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')} - +
%endfor diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/admin/settings/settings_vcs.html --- a/kallithea/templates/admin/settings/settings_vcs.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Tue Jun 27 21:49:33 2017 +0200 @@ -62,7 +62,7 @@ ${h.text('paths_root_path',size=60,readonly="readonly",class_='form-control')} - + ${_('Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required.')} diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/admin/user_groups/user_group_edit_perms.html --- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html Tue Jun 27 21:49:33 2017 +0200 @@ -30,9 +30,9 @@ %if r2p.user.username !='default': - + %endif %else: @@ -67,9 +67,9 @@ %endif - + %endfor @@ -77,9 +77,9 @@ - + diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/changeset/changeset_file_comment.html --- a/kallithea/templates/changeset/changeset_file_comment.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/changeset/changeset_file_comment.html Tue Jun 27 21:49:33 2017 +0200 @@ -26,7 +26,7 @@ %if co.author_id == request.authuser.user_id or h.HasRepoPermissionLevel('admin')(c.repo_name): %if co.deletable(): -
${_('Delete')}
+ %endif %endif diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/compare/compare_diff.html Tue Jun 27 21:49:33 2017 +0200 @@ -38,7 +38,7 @@ %if not c.compare_home: ${_('Swap')} %endif -
${_('Compare Revisions')}
+
diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/files/files_add.html --- a/kallithea/templates/files/files_add.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/files/files_add.html Tue Jun 27 21:49:33 2017 +0200 @@ -40,11 +40,11 @@ - ${_('or')}
${_('Upload File')}
+ ${_('or')}
diff -r 91182a358fb3 -r 3fca87aa2b15 kallithea/templates/pullrequests/pullrequest_data.html --- a/kallithea/templates/pullrequests/pullrequest_data.html Mon Aug 14 00:40:04 2017 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_data.html Tue Jun 27 21:49:33 2017 +0200 @@ -61,7 +61,7 @@ %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))} -
- -
+ + ${h.end_form()} %endif