@@ -1207,7 +1207,7 @@ class hEntry(models.Model):
self.updated.strftime('%c')
)
-class hNews(hEntry):
+class hNews(hEntry, LocationAwareMicroformat):
"""
The hNews model is used for representing online news content.
models.py
@@ -2,7 +2,17 @@
<div class="hnews hentry item">
<p class="entry-title">{% if instance.bookmark %}<a rel="bookmark" href="{{instance.bookmark}}">{% endif %}{{instance.entry_title}}{% if instance.bookmark %}</a>{% endif %}
<span class="vcard author"><span class="fn n">{{instance.author}}</span></span>
- <span class="source-org vcard"><span class="org fn">{{instance.source_org}}</span></span>
+ <span class="source-org vcard">
+ {% if instance.source_url %}
+ <a class="url org fn" href="{{instance.source_url}}">
+ {{instance.source_org}}
+ </a>
+ {% else %}
+ <span class="org fn">
+ {{instance.source_org}}
+ </span>
+ {% endif %}
+ </span>
<a href="{{instance.principles_url}}" rel="principles"><img src="{{instance.principles_img}}" /></a>
<abbr class="updated" title="{{instance.updated.isoformat}}">{{instance.updated|date:"D d M Y"}}</abbr></p>
{% if instance.entry_summary %}
@@ -13,12 +23,12 @@
{% if instance.dateline %}
{% if instance.latitude and instance.longitude %}
<abbr title="{{instance.latitude}},{{instance.longitude}}" class="dateline geo">
- {{instance.dateline}}
- </abbr>
+ {{instance.dateline|upper}}
+ </abbr> —
{% else %}
<span class="dateline">
- {{instance.dateline}}
- </span>
+ {{instance.dateline|upper}}
+ </span> —
{% endif %}
{% endif %}
{{instance.entry_content}}
templates/hnews.html
@@ -66,6 +66,9 @@ Add-on</a> for Firefox (that supports more types of microformat).</p>
<h3>A single hEntry</h3>
{{entry|hentry}}
+<h3>A single hNews item</h3>
+{{item|hnews}}
+
<h2>Some Free Text Examples</h2>
<!-- loc2 is another geo instance -->
templates/test.html
@@ -413,3 +413,21 @@ def hentry(value, arg=None, autoescape=None):
template_name = getattr(settings, 'HENTRY_MICROFORMAT_TEMPLATE', False) and settings.HENTRY_MICROFORMAT_TEMPLATE or HENTRY_MICROFORMAT_TEMPLATE
return mark_safe(render_microformat(value, template_name))
hentry.needs_autoescape = True
+
+@register.filter
+def hnews(value, arg=None, autoescape=None):
+ """
+ Formats a value to conform with the hNews Microformat fragment
+
+ Inspired by the markup found here:
+
+ http://microformats.org/wiki/hnews-examples
+ """
+ if isinstance(value, datetime.datetime) or isinstance(value, str) or isinstance(value, unicode) or isinstance(value, float) or isinstance(value, int) or isinstance(value, long) or isinstance(value, complex):
+ return fragment(value, arg, autoescape)
+ else:
+ # lets try rendering something with the correct attributes for this
+ # microformat
+ template_name = getattr(settings, 'HNEWS_MICROFORMAT_TEMPLATE', False) and settings.HNEWS_MICROFORMAT_TEMPLATE or HNEWS_MICROFORMAT_TEMPLATE
+ return mark_safe(render_microformat(value, template_name))
+hentry.needs_autoescape = True
\ No newline at end of file
templatetags/microformat_extras.py
@@ -444,6 +444,43 @@ Add-on</a> for Firefox (that supports more types of microformat).</p>
</div>
+<h3>A single hNews item</h3>
+
+<div class="hnews hentry item">
+ <p class="entry-title"><a rel="bookmark" href="http://www.latimes.com/news/local/la-me-chandler-obit,0,7195252.story">L.A. Icon Otis Chandler Dies at 78</a>
+ <span class="vcard author"><span class="fn n">David Shaw and Mitchell Landsberg</span></span>
+ <span class="source-org vcard">
+
+ <a class="url org fn" href="http://www.latimes.com">
+ Los Angeles Times
+ </a>
+
+ </span>
+ <a href="http://www.latimes.com/news/nationworld/nation/la-0705lat_ethics_code-pdf,0,7257671.acrobat" rel="principles"><img src="http://labs.ap.org/principles-button-blue.png" /></a>
+ <abbr class="updated" title="2006-02-27T00:00:00">Mon 27 Feb 2006</abbr></p>
+
+ <div class="entry-summary"><em>An obituary of Los Angeles Times Publisher Otis Chandler</em></div>
+
+
+ <div class="entry-content">
+
+
+ <abbr title="34.0444444,-118.2666667" class="dateline geo">
+ LOS ANGELES, UNITED STATES
+ </abbr> —
+
+
+ Otis Chandler, whose vision and determination as publisher of the Los Angeles Times from 1960 to 1980 catapulted the paper from mediocrity into the front ranks of American journalism, died today of a degenerative illness called Lewy body disease. He was 78.
+ </div>
+
+ <div>
+ <a rel="item-license" href="http://www.latimes.com/services/site/lat-terms,0,6713384.htmlstory">
+ Terms of service
+ </a>
+ </div>
+</div>
+
+
<h2>Some Free Text Examples</h2>
<!-- loc2 is another geo instance -->
unit_tests/html_test/microformat_test.html
@@ -668,6 +668,8 @@ class TemplateTagsTestCase(TestCase):
item1.license_description = 'Terms of service'
item1.locality = 'Los Angeles'
item1.country_name = 'US'
+ item1.longitude = -118.2666667
+ item1.latitude = 34.0444444
item1.save()
# All the data is defined so lets render the test template...
unit_tests/test_templatetags.py
9cf583d544fcb9bace21ffb2d7dee4959783c6d1
Ben Welsh
benwelsh@tuohy.local
http://github.com/ntoll/microformats/commit/9336c07bda5f1237827919d3f3d7ebeed0587840
9336c07bda5f1237827919d3f3d7ebeed0587840
2009-10-22T20:40:02-07:00
2009-10-22T20:40:02-07:00
Refactored hNews model so it now also draws from the geo base model; Added my test item to the test.html; It passed the test and looks decent
2e14582c97d94da81c0388f1291bb6bcb58d2bc6
Ben Welsh
benwelsh@tuohy.local