Changeset 1712

Timestamp:

07/24/08 13:52:28 (11 months ago)

Author:

JensDiemer

Message:

blog plugin:

• add a tag cloud ;)
  
• display only tag feeds witched used in a displayed entry
  
• tag ordering via django meta class
  
• update the templates/CSS
  

Location:

trunk/pylucid

Files:

• media/PyLucid/internal_page/blog/display_blog.css (modified) (10 diffs)
• media/PyLucid/internal_page/blog/display_blog.html (modified) (5 diffs)
• PyLucid/plugins_internal/blog/blog.py (modified) (2 diffs)
• PyLucid/plugins_internal/blog/blog_cfg.py (modified) (1 diff)
• PyLucid/plugins_internal/blog/models.py (modified) (3 diffs)

trunk/pylucid/media/PyLucid/internal_page/blog/display_blog.css

@@ +1 @@
+/* -------------------------------------------------------------------------- */
 .blog fieldset {
+  background-color: #FFF;
   padding: 0.2em 0em 0.5em 1em;
   margin: 0px;
@@ -16 +18 @@
 /* -------------------------------------------------------------------------- */
 .blog fieldset.entry {
-  background-color: #fff;
   margin: 1em 0 1em 0;
   padding: 0;
@@ -29 +30 @@
   border: 1px solid #888;
 }
-.content, .comment_link {
+.blog .content, .blog .comment_link {
   padding: 0.1em 0.5em 0.1em 0.5em;
 }
@@ -43 +44 @@
 }
 /* -------------------------------------------------------------------------- */
-.dateinfo, .admin_links {
-  font-size: 0.9em;
+.blog .headline_info, .blog .date_info, .blog .admin_links {
+  font-size: 0.8em;
+  color: #666;
   padding: 0px;
   margin: 0px;
+}
+.blog .date_info, .blog .admin_links {
   line-height: 0px;
   text-align: right;
 }
-.admin_links {
+.blog .admin_links {
   float:right;
 }
-.admin_links a {
+.blog .admin_links a {
   color: #fff;
   padding: 2px;
@@ -63 +67 @@
   background-color: #eee;
 }
-.dateinfo {
-  color: #666;
-}
 .blog .taglist {
   text-decoration: none;
@@ -74 +75 @@
 }
 /* -------------------------------------------------------------------------- */
-.comment_link {
+.blog .comment_link {
   display: block;
   border: 0px;
@@ -81 +82 @@
 }
 /* -------------------------------------------------------------------------- */
-.comments li {
+.blog .comments li {
   list-style: none;
 }
-.comments ul {
+.blog .comments ul {
   padding-left: 0px;
 }
-.comment {
+.blog .comment {
   border: 0px;
-  padding: 0px;
+  padding: 0.1em 1em 0.1em 1em;
   margin: 0px;
   margin-top: 1em;
 }
-.user_comment * {
-  background-color: #e0e0e0;
+.blog .comment legend {
+  padding: 1px;
+  border: 1px solid #ccc;
+  margin-left: 2em;
+  padding: 0.1em 1em 0.1em 1em;
 }
-.anonymous_comment * {
-  background-color: #f5f5f5;
-}
-.comment legend {
-  padding: 1px;
-  border: 0px;
-  margin-left: 2em;
-  padding: 0em 2em 0em 2em;
-}
-.comment pre {
+.blog .comment pre {
   font-size: 1.2em;
   border: 0px;
@@ -111 +106 @@
   margin: 0px;
 }
-.comment .admin_info_line {
+.blog .admin_info_line {
   color:red;
   line-height: 0px;
+}
+.blog .user_comment, .blog .user_comment legend {
+  background-color: #e0e0e0;
+}
+.blog .anonymous_comment, .blog .anonymous_comment legend {
+  background-color: #f5f5f5;
 }
 /* -------------------------------------------------------------------------- */
@@ -124 +125 @@
 }
 #input_fields .field_help_text {
-    font-size:0.9em;
+    font-size:0.8em;
     display: block;
-    padding-left: 9em;
+    padding-left: 11em;
+    color: #888;
 }
 #input_fields label {
@@ -145 +147 @@
     border: 1px solid red;
 }
+.blog input, .blog textarea {
+  border: 1px solid #ccc;
+}
+.blog input:hover, .blog textarea:hover {
+  border-color: #333;
+}
 /* -------------------------------------------------------------------------- */
-.feeds ul, .feeds * {
+.blog .feeds ul, .blog .tag_cloud ul {
   list-style-type:none;
   padding: 0px;
   margin: 0px;
 }
-.feeds, .feeds li {
-  display:inline;
+.blog .feeds li, .blog .tag_cloud li {
+  display: inline;
 }
 /* -------------------------------------------------------------------------- */

trunk/pylucid/media/PyLucid/internal_page/blog/display_blog.html

@@ -4 +4 @@
 {% if not entries %}no blog entry exists{% endif %}
 {% for entry in entries %}
-    <fieldset class="entry"><legend class="headline"><a href="{{ entry.detail_url }}">{{ entry.headline }}</a></legend>
+    <fieldset class="entry">
+        <legend class="headline">
+             <a href="{{ entry.detail_url }}">{{ entry.headline }}<br />
+             <small class="headline_info">{% blocktrans with entry.createtime|timesince as time %}Before {{ time }} published by{% endblocktrans %} {{ entry.createby }}.</small>
+             </a>
+        </legend>
         {% if not entry.is_public %}
             <p class="admin_info_line">not public</p>
@@ -20 +25 @@
         <div class="content">{{ entry.html }}</div>
 
-        <small><p class="dateinfo">
-            created {{ entry.createtime }} by {{ entry.createby }}
-            {% if entry.lastupdateby %}(Last update {{ entry.lastupdatetime }} by {{ entry.lastupdateby }}){% endif %}
+        <small><p class="date_info">
+            {% if entry.lastupdateby %}(Last update: {{ entry.lastupdatetime|date:"D d M Y H:i" }} by {{ entry.lastupdateby }}.){% endif %}
         </p></small>
 
@@ -40 +44 @@
             <ul>
             {% for comment in entry.all_comments %}
-                <li class="{% if comment.createby %}user{% else %}anonymous{% endif %}_comment">
-                  <fieldset class="comment">
-                      <legend>
-                      {% if comment.homepage %}<a href="{{ comment.homepage }}">{% endif %}
-                        {{ comment.person_name }}{% if comment.homepage %}</a>{% endif %}:
-                      </legend>
-                      {% if not comment.is_public %}
-                          <p class="admin_info_line">not public</p>
-                      {% endif %}
+                <li>
+                  <fieldset class="comment {% if comment.createby %}user{% else %}anonymous{% endif %}_comment">
+                    <legend class="headline">
+                      {% if comment.homepage %}<a href="{{ comment.homepage }}" title="{{ comment.homepage }}">{% endif %}
+                        {{ comment.person_name }}
+                        {% if comment.homepage %}</a>{% endif %}<br />
+                        <small class="headline_info">
+                          {% blocktrans with comment.createtime|timesince as time %}Before {{ time }}{% endblocktrans %}
+                          IP: {{ comment.ip_address }}
+                          {% if comment.lastupdateby %}<br />(Last update {{ comment.lastupdatetime }} by {{ comment.lastupdateby }}){% endif %}
+                        </small>
+                    </legend>
+
+                      {% if not comment.is_public %}<p class="admin_info_line">not public</p>{% endif %}
 
                       <div class="admin_links">
@@ -56 +65 @@
 
                       {{ comment.html_content }}
-
-                      <small><p class="dateinfo">
-                        created {{ comment.createtime }} by {% if comment.createby %}{{ comment.createby }}{% else %}{{ comment.ip_address }}{% endif %}
-                        {% if comment.lastupdateby %}(Last update {{ comment.lastupdatetime }} by {{ comment.lastupdateby }}){% endif %}
-                      </p></small>
                   </fieldset>
                 </li>
@@ -96 +100 @@
 {% endfor %}
 
+<fieldset class="tag_cloud"><legend>{% trans 'tag cloud' %}</legend>
+    <ul>
+    {% for tag in tag_cloud %}
+        <li><a href="{{ tag.url }}" style="font-size:{{ tag.font_size }}em;">{{ tag.name }}</a></li>
+    {% endfor %}
+    </ul>
+</fieldset>
+
+
 <fieldset class="feeds"><legend>{% trans 'available syndication feeds' %}</legend>
     <ul>{% trans 'normal feeds:' %}

trunk/pylucid/PyLucid/plugins_internal/blog/blog.py

@@ -108 +108 @@
         As a list of entries and as a detail view (see internal page).
         """
-        used_tags = []
+        used_tags = set()
         for entry in entries:
             # add tag_info
             tags = []
             for tag in entry.tags.all():
-                used_tags.append(tag) # Used in self._get_tag_feeds_info()
+                used_tags.add(tag) # Used in self._get_tag_feeds_info()
                 tags.append({
                     "name": tag.name,
@@ -717 +717 @@
         Build the tag cloud context.
         """
-
-        return []
+        tags = BlogTag.objects.all()
+
+        frequency = set()
+        # get the counter information
+        for tag in tags:
+            count = tag.blogentry_set.count()
+            tag.count = count
+            #self.page_msg(tag, count)
+            frequency.add(count)
+
+        min_frequency = float(min(frequency))
+        max_frequency = float(max(frequency))
+        diff_frequency = float(max_frequency - min_frequency)
+
+        max_font_size = self.preferences.get("max_cloud_size", 2.0)
+        min_font_size = self.preferences.get("min_cloud_size", 0.7)
+
+        # Calculate and add the font size
+        for tag in tags:
+            count = float(tag.count)
+            tag.font_size = (
+                (
+                    (max_font_size-min_font_size) * (count - min_frequency)
+                ) / diff_frequency
+            ) + min_font_size
+
+            tag.url = self.URLs.methodLink("tag", tag.slug)
+            #self.page_msg(tag, count, tag.font_size)
+
+        return tags
 
     def select_feed_format(self, raw_feed_name=None):

trunk/pylucid/PyLucid/plugins_internal/blog/blog_cfg.py

@@ -82 +82 @@
         help_text=_(
             "The maximal numbers of tag feeds, displayed together."
+        ),
+    )
+
+    max_cloud_size = forms.FloatField(
+        initial = 2.0,
+        min_value = 1,
+        help_text=_(
+            "max font size in the tag cloud (CSS 'em' unit)"
+        ),
+    )
+    min_cloud_size = forms.FloatField(
+        initial = 0.7,
+        min_value = 0.1,
+        help_text=_(
+            "min font size in the tag cloud (CSS 'em' unit)"
         ),
     )

trunk/pylucid/PyLucid/plugins_internal/blog/models.py

@@ -82 +82 @@
     class Meta:
         app_label = 'PyLucidPlugins'
+        ordering = ('createtime', 'lastupdatetime')
 
 #______________________________________________________________________________
@@ -112 +113 @@
 class BlogTag(models.Model):
     """
-    FIXME: How can we add ordering?
+    A blog entry tag
     """
     objects = BlogTagManager()
@@ -129 +130 @@
     class Meta:
         app_label = 'PyLucidPlugins'
-
+        ordering = ('name',)
 
 #______________________________________________________________________________