Few improvemnts for the tag cloud of the user's profile pages.

3 files changed, 47 insertions, 31 deletions

diff --git a/src/web/templates/feed_list.html b/src/web/templates/feed_list.html
index 04543e4c..f8e3551e 100644
--- a/src/web/templates/feed_list.html
+++ b/src/web/templates/feed_list.html
@@ -4,45 +4,37 @@
         <thead>
             <tr>
                 <th>#</th>
-                {% if current_user.is_authenticated and current_user.id == user.id %}
-                    <th>{{ _('Status') }}</th>
-                {% endif %}
+                <th>{{ _('Status') }}</th>
                 <th>{{ _('Title') }}</th>
                 <th>{{ _('Site') }}</th>
-                {% if current_user.is_authenticated and current_user.id == user.id %}
-                    <th>{{ _('Articles') }}</th>
-                    <th>{{ _('Actions') }}</th>
-                {% endif %}
+                <th>{{ _('Articles') }}</th>
+                <th>{{ _('Actions') }}</th>
             </tr>
         </thead>
         <tbody>
         {% for feed in feeds %}
-            <tr {% if not feed.enabled and current_user.is_authenticated  %}class="warning"{% endif %}>
+            <tr {% if not feed.enabled  %}class="warning"{% endif %}>
                 <td>{{ loop.index }}</td>
-                {% if current_user.is_authenticated and current_user.id == user.id %}
-                    <td>
-                        {% if feed.enabled  %}
-                            <i class="glyphicon glyphicon-eye-open" title="{{ _('Feed enabled') }}"></i>
-                        {% else %}
-                            <i class="glyphicon glyphicon-eye-close" title="{{ _('Feed disabled') }}"></i>
-                        {% endif %}
-                        {% if feed.error_count >= conf.DEFAULT_MAX_ERROR %}
-                            <i class="glyphicon glyphicon-exclamation-sign" title="{{ _('Feed encountered too much errors.') }}"></i>
-                        {% endif %}
-                    </td>
-                {% endif %}
+                <td>
+                    {% if feed.enabled  %}
+                        <i class="glyphicon glyphicon-eye-open" title="{{ _('Feed enabled') }}"></i>
+                    {% else %}
+                        <i class="glyphicon glyphicon-eye-close" title="{{ _('Feed disabled') }}"></i>
+                    {% endif %}
+                    {% if feed.error_count >= conf.DEFAULT_MAX_ERROR %}
+                        <i class="glyphicon glyphicon-exclamation-sign" title="{{ _('Feed encountered too much errors.') }}"></i>
+                    {% endif %}
+                </td>
                 <td>{% if feed.icon_url %}<img src="{{ url_for('icon.icon', url=feed.icon_url) }}" width="16px" />&nbsp;{% endif %}{{ feed.title }}</td>
                 <td><a href="{{ feed.site_link }}">{{ feed.site_link }}</a></td>
-                {% if current_user.is_authenticated and current_user.id == user.id %}
-                    <td>( {{ unread_article_count.get(feed.id, 0) }} ) {{ article_count.get(feed.id, 0) }}</td>
-                    <td>
-                        <a href="{{ url_for("feed.feed", feed_id=feed.id) }}"><i class="glyphicon glyphicon-info-sign" title="{{ _('Information') }}"></i></a>
-                        <a href="{{ url_for("feed.form", feed_id=feed.id) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
-                        <a href="{{ url_for("feed.duplicates", feed_id=feed.id) }}"><i class="glyphicon glyphicon-book" title="{{ _('Duplicate articles') }}"></i></a>
-                        <a href="{{ url_for("feed.delete", feed_id=feed.id) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
-                    </td>
-                {% endif %}
-        </tr>
+                <td>( {{ unread_article_count.get(feed.id, 0) }} ) {{ article_count.get(feed.id, 0) }}</td>
+                <td>
+                    <a href="{{ url_for("feed.feed", feed_id=feed.id) }}"><i class="glyphicon glyphicon-info-sign" title="{{ _('Information') }}"></i></a>
+                    <a href="{{ url_for("feed.form", feed_id=feed.id) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
+                    <a href="{{ url_for("feed.duplicates", feed_id=feed.id) }}"><i class="glyphicon glyphicon-book" title="{{ _('Duplicate articles') }}"></i></a>
+                    <a href="{{ url_for("feed.delete", feed_id=feed.id) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
+                </td>
+            </tr>
         {% endfor %}
         </tbody>
     </table>
diff --git a/src/web/templates/feed_list_simple.html b/src/web/templates/feed_list_simple.html
new file mode 100644
index 00000000..976c3631
--- /dev/null
+++ b/src/web/templates/feed_list_simple.html
@@ -0,0 +1,22 @@
+{% if feeds.count() != 0 %}
+<div class="table-responsive">
+    <table class="table table-striped">
+        <thead>
+            <tr>
+                <th>#</th>
+                <th>{{ _('Title') }}</th>
+                <th>{{ _('Site') }}</th>
+            </tr>
+        </thead>
+        <tbody>
+        {% for feed in feeds %}
+            <tr>
+                <td>{{ loop.index }}</td>
+                <td>{% if feed.icon_url %}<img src="{{ url_for('icon.icon', url=feed.icon_url) }}" width="16px" />&nbsp;{% endif %}{{ feed.title }}</td>
+                <td><a href="{{ feed.site_link }}">{{ feed.site_link }}</a></td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% endif %}
diff --git a/src/web/templates/profile_public.html b/src/web/templates/profile_public.html
index 04beee8e..0b12b8df 100644
--- a/src/web/templates/profile_public.html
+++ b/src/web/templates/profile_public.html
@@ -9,8 +9,10 @@
         </div>
     </div>
 
+    <div>{{ tag_cloud|safe }}</div>
+
     <h2>Feeds</h2>
-    {% include "feed_list.html" %}
+    {% include "feed_list_simple.html" %}
 
 </div><!-- /.container -->
 {% endblock %}