diff --git a/rhodecode/templates/journal/journal.html b/rhodecode/templates/journal/journal.html
--- a/rhodecode/templates/journal/journal.html
+++ b/rhodecode/templates/journal/journal.html
@@ -15,16 +15,13 @@
${_('Journal')}
-
-
+
+ -
+
+
+
+
+
${c.journal_data}
@@ -44,6 +41,7 @@
+ %if c.user_repos:
@@ -52,7 +50,6 @@
${_('action')} |
- %if c.user_repos:
%for repo in c.user_repos:
@@ -86,6 +83,8 @@
|
%endfor
+
+
%else:
${_('No repositories yet')}
@@ -93,29 +92,26 @@
${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-button-small")}
%endif
- %endif
-
-
+ %endif
-
-
-
- ${_('Name')} |
-
-
%if c.following:
- %for entry in c.following:
-
-
+
+
+
+ ${_('Name')} |
+
+
+ %for entry in c.following:
+
+
%if entry.follows_user_id:
${entry.follows_user.full_contact}
%endif
%if entry.follows_repo_id:
-
@@ -137,15 +133,19 @@
${h.link_to(entry.follows_repository.repo_name,h.url('summary_home',repo_name=entry.follows_repository.repo_name))}
%endif
- |
-
- %endfor
+
+
+ %endfor
+
+
%else:
- |
+
${_('You are not following any users or repositories')}
- %endif
-
+
+ %endif
+
+
%def>
diff --git a/rhodecode/templates/journal/journal_data.html b/rhodecode/templates/journal/journal_data.html
--- a/rhodecode/templates/journal/journal_data.html
+++ b/rhodecode/templates/journal/journal_data.html
@@ -31,17 +31,19 @@
%endfor
%endfor
-
+
%else:
- ${_('No entries yet')}
+
+ ${_('No entries yet')}
+
%endif
\ No newline at end of file