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 @@ -4537,3 +4537,7 @@ body table.dataTable thead .sorting_desc .dataTables_wrapper .dataTables_filter { float: left !important; } + +.text-muted { + color: #777777; +} 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 @@ -54,7 +54,7 @@
${h.select('lifetime', '0', c.lifetime_options)} - + %if c.gist.gist_expires == -1: ${_('Expires')}: ${_('Never')} %else: 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 @@ -50,7 +50,7 @@
${_('Created')} ${h.age(gist.created_on)} / - + %if gist.gist_expires == -1: ${_('Expires')}: ${_('Never')} %else: @@ -59,7 +59,7 @@
-
${gist.gist_description}
+
${gist.gist_description}
% endfor diff --git a/kallithea/templates/admin/gists/show.html b/kallithea/templates/admin/gists/show.html --- a/kallithea/templates/admin/gists/show.html +++ b/kallithea/templates/admin/gists/show.html @@ -42,7 +42,7 @@
${c.gist.gist_description}
-
+
%if c.gist.gist_expires == -1: ${_('Expires')}: ${_('Never')} %else: diff --git a/kallithea/templates/admin/repos/repo_edit_advanced.html b/kallithea/templates/admin/repos/repo_edit_advanced.html --- a/kallithea/templates/admin/repos/repo_edit_advanced.html +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html @@ -3,7 +3,7 @@ ${h.form(url('edit_repo_advanced_fork',
${h.select('id_fork_of','',c.repos_list,class_="medium")} ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-default btn-sm")} -
+
  • ${_('''Manually set this repository as a fork of another from the list.''')}
@@ -35,7 +35,7 @@ ${h.form(url('edit_repo_advanced_journal %endif
-
+
  • ${_('All actions done in this repository will be visible to everyone in the public journal.')}
@@ -63,7 +63,7 @@ ${h.form(url('edit_repo_advanced_locking ${_('Repository is not locked')} %endif -
+
  • ${_('Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push.')}
  • @@ -85,7 +85,7 @@ ${h.form(url('delete_repo', repo_name=c. %endif -
    +
    • ${_('The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it.')}
    diff --git a/kallithea/templates/admin/repos/repo_edit_caches.html b/kallithea/templates/admin/repos/repo_edit_caches.html --- a/kallithea/templates/admin/repos/repo_edit_caches.html +++ b/kallithea/templates/admin/repos/repo_edit_caches.html @@ -2,7 +2,7 @@ ${h.form(url('update_repo_caches', repo_
    ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate Repository Cache'),class_="btn btn-default btn-sm")} -
    +
    • ${_('Manually invalidate cache for this repository. On first access, the repository will be cached again.')}
    • diff --git a/kallithea/templates/admin/repos/repo_edit_statistics.html b/kallithea/templates/admin/repos/repo_edit_statistics.html --- a/kallithea/templates/admin/repos/repo_edit_statistics.html +++ b/kallithea/templates/admin/repos/repo_edit_statistics.html @@ -1,7 +1,7 @@ ${h.form(url('edit_repo_statistics_update', repo_name=c.repo_info.repo_name))}
      -
      +
      • ${_('Processed commits')}: ${c.stats_revision}/${c.repo_last_rev}
      • ${_('Processed progress')}: ${c.stats_percentage}%
      • 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 @@ -7,7 +7,7 @@ (_('Platform'), c.platform, ''), (_('Git version'), c.git_version, ''), (_('Git path'), c.ini.get('git_path'), ''), - (_('Upgrade info endpoint'), h.literal('%s
        %s.' % (c.update_url, _('Note: please make sure this server can access this URL'))), ''), + (_('Upgrade info endpoint'), h.literal('%s
        %s.' % (c.update_url, _('Note: please make sure this server can access this URL'))), ''), ] %> 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 @@ -55,7 +55,7 @@ ${h.form('#', class_='inline-form')}
        ${_('Commenting on line.')} - ${_('Comments are in plain text. Use @username inside this text to notify another user.')|n} + ${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}
        diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html +++ b/kallithea/templates/compare/compare_diff.html @@ -45,7 +45,7 @@ ${self.repo_context_bar('changelog')} %if c.compare_home:
        -
        ${_('Compare revisions, branches, bookmarks, or tags.')}
        +
        ${_('Compare revisions, branches, bookmarks, or tags.')}
        %else:
        diff --git a/kallithea/templates/files/files_edit.html b/kallithea/templates/files/files_edit.html --- a/kallithea/templates/files/files_edit.html +++ b/kallithea/templates/files/files_edit.html @@ -60,7 +60,7 @@ ${self.repo_context_bar('files')}
        
                         
        -                
        ${_('Commit Message')}
        +
        ${_('Commit Message')}