Changeset 195

Timestamp:

09/01/08 20:47:21 (10 months ago)

Author:

rgrp

Message:

[factlet][m]: fix up factlet read views to show all the new attributes.

Location:

trunk/microfacts

Files:

• controllers/factlet.py (modified) (2 diffs)
• data/napoleon.js (modified) (1 diff)
• templates/factlet/read_core.html (modified) (1 diff)
• templates/layout.html (modified) (1 diff)
• tests/functional/test_factlet.py (modified) (1 diff)

trunk/microfacts/controllers/factlet.py

@@ -61 +61 @@
             # see this thread:
             # http://groups.google.com/group/genshi/browse_thread/thread/a587cc282403aace
-            html = render('factlet/read_core', fragment=True)
+            html = render('factlet/read_core', format='xml')
             return html
         else:
@@ -72 +72 @@
         return render('factlet/read')
 
-    def edit(self, id):
+    def update(self, id):
         return self.read(id)
 

trunk/microfacts/data/napoleon.js

@@ -4 +4 @@
     {
       "title" : "Battle of Austerlitz",
+      "image" : "http://upload.wikimedia.org/wikipedia/commons/5/56/Austerlitz-baron-Pascal.jpg",
       "description" :
         "The Battle of Austerlitz (Czech: 'Battle of Slavkov'), also known as the Battle of the Three Emperors, was one of Napoleon's greatest victories, effectively destroying the Third Coalition against the French Empire. On December 2 1805, French troops, commanded by Emperor Napoleon I, decisively defeated a Russo-Austrian army, commanded by Tsar Alexander I, after nearly nine hours",

trunk/microfacts/templates/factlet/read_core.html

@@ -7 +7 @@
   >
 
-    <div id="factlet-${c.factlet.id}" class="factlet">
-      <h3 class="title editable" title="Click to edit...">${c.factlet.title}</h3>
+    <div id="factlet-${c.factlet.id}" class="factlet factlet-details">
+      <h3 class="title">${c.factlet.title}</h3>
     
+      <img src="${c.factlet.image}" />
       <p class="description">${c.factlet.description}</p>
       <dl>
         <dt>Date</dt>
-        <dd><a href="#">${c.factlet.start}</a></dd>
+        <dd>
+          Start: ${c.factlet.start} <br />
+          End: ${c.factlet.end}
+        </dd>
+        <dt>Location</dt>
+        <dd>
+          Long: ${c.factlet.location.x} <br />
+          Lat: ${c.factlet.location.y}
+        </dd>
+        <dt>Source</dt>
+        <dd><a href="${c.factlet.source}">${c.factlet.source}</a></dd>
+        <dt>License</dt>
+        <dd>${c.factlet.license}</dd>
       </dl>
 
-      <py:choose>
-        <py:when test="c.has_inline_edit">
-        <!-- TODO: this should become a generic edit link i think -->
-        <p class="factlet-description-edit"><a href="${h.url_for(controller='factlet', action='edit', id=c.factlet.id)}">Edit &raquo;</a></p>
-        </py:when>
-        <py:otherwise>
-        <p><a href="${h.url_for(controller='factlet', action='edit', id=c.factlet.id)}">Edit &raquo;</a></p>
-        </py:otherwise>
-      </py:choose>
+      <p>
+        <a href="${h.url_for(controller='factlet', action='update', id=c.factlet.id)}">Edit &raquo;</a>
+      </p>
     </div>
 </div>

trunk/microfacts/templates/layout.html

@@ -37 +37 @@
         });
       </script>
+      <!-- 2008-09-01 shove this here for time being and move into stylesheet once sass
+      stuff is sorted -->
+      <style type="text/css">
+        div.factlet-details img
+        {
+          max-width: 150px;
+          float: right;
+        }
+      </style>
       ${select('*[local-name()!="title"]')}
     </head>

trunk/microfacts/tests/functional/test_factlet.py

@@ -72 +72 @@
     def test_read_core(self):
         factletId = self.factlets[0].id
+        fct = self.factlets[0]
         path = url_for(controller='factlet', action='read_core', id=factletId)
         response = self.app.get(path)
         print response
         assert 'Battle of Austerlitz' in response
+        assert str(fct.license) in response
+        assert fct.start in response
+        assert str(fct.source) in response
+        assert fct.location.x in response
 
     def test_read(self):
+        # do not too much testing here as should be in read_core
         factletId = self.factlets[0].id
         assert factletId
         path = url_for(controller='factlet', action='read', id=factletId)
         response = self.app.get(path)
-        try:
-            assert 'Microfacts' in response
-            assert 'Battle of Austerlitz' in response
-        except:
-            print response
-            raise
+        assert 'Microfacts' in response, response
+        assert 'Battle of Austerlitz' in response, response
 
         # Delete when threads are showing again.