[Cvs-annodex] commit (annodex): cmmlwiki/trunk/cmmlwiki/handler.py cmmlwiki/trunk/cmmlwiki/itemsummary.py cmmlwiki/trunk/cmmlwiki/toc.py

[conrad]

Update of /var/local/lib/svn/annodex (new revision 2476)

Modified files:
   cmmlwiki/trunk/cmmlwiki/handler.py
   cmmlwiki/trunk/cmmlwiki/itemsummary.py
   cmmlwiki/trunk/cmmlwiki/toc.py

Log Message:
make separate ItemSummary with link to detail, rename old ItemSummary to ItemFormat


Modified: cmmlwiki/trunk/cmmlwiki/handler.py
===================================================================
--- cmmlwiki/trunk/cmmlwiki/handler.py	2006-09-12 12:37:56 UTC (rev 2475)
+++ cmmlwiki/trunk/cmmlwiki/handler.py	2006-09-12 12:59:29 UTC (rev 2476)
@@ -210,7 +210,7 @@
         actions = Substitution (a, (w_play, w_cortado, w, w_delete))
 
         s += "%s"
-        repl_list += [ItemSummary (self.inspector, row['ixi'], actions)]
+        repl_list += [ItemSummary (self.inspector, row['ixi'], name, actions)]
 
     subs = Substitution (s, tuple(repl_list))
 

Modified: cmmlwiki/trunk/cmmlwiki/itemsummary.py
===================================================================
--- cmmlwiki/trunk/cmmlwiki/itemsummary.py	2006-09-12 12:37:56 UTC (rev 2475)
+++ cmmlwiki/trunk/cmmlwiki/itemsummary.py	2006-09-12 12:59:29 UTC (rev 2476)
@@ -16,8 +16,9 @@
 import re
 
 from cmmlwiki.infocache import InfoCache
+from cmmlwiki.location import WikiURL
 
-class ItemSummary (object):
+class ItemFormat:
 
   def __init__ (self, inspector, ixi, actions=None):
     self.inspector = inspector
@@ -52,3 +53,37 @@
     s += '<p><span class="bold">CMML</span>: %d clips</p>' % (clips)
 
     return s
+
+class ItemSummary:
+
+  def __init__ (self, inspector, ixi, iname, actions=None):
+    self.inspector = inspector
+    self.ixi = ixi
+    self.iname = iname
+    self.actions = actions
+
+  def template (self, vars):
+    item_url = WikiURL(self.iname).template(vars)
+    img_url = WikiURL(self.iname, type='image').template(vars)
+
+    s = """
+<div class="searchblock">
+<div class="monitor-small">
+<p class="centre-small-video"><a href="%s"><img width="160" src="%s"/></a></p>
+<div class="tools-main-clip">
+<ul>
+</ul>
+</div>
+</div><!-- end monitor-small -->
+<div class="searchresult-text">
+<h2 class="bold">%s</h2>
+""" % (item_url, img_url, self.iname)
+
+    s += ItemFormat(self.inspector, self.ixi, self.actions).template(vars)
+
+    s += """
+</div><!-- end searchresult-text -->
+</div><!-- end searchblock -->
+"""
+
+    return s

Modified: cmmlwiki/trunk/cmmlwiki/toc.py
===================================================================
--- cmmlwiki/trunk/cmmlwiki/toc.py	2006-09-12 12:37:56 UTC (rev 2475)
+++ cmmlwiki/trunk/cmmlwiki/toc.py	2006-09-12 12:59:29 UTC (rev 2476)
@@ -16,7 +16,7 @@
 
 from cmmlwiki.clipsummary import ClipSummary
 from cmmlwiki.itemmetadata import ItemMetadata
-from cmmlwiki.itemsummary import ItemSummary
+from cmmlwiki.itemsummary import ItemFormat
 from cmmlwiki.pagenumbers import PageNumbers
 from cmmlwiki.cortado import Cortado
 
@@ -31,7 +31,7 @@
   def sidebar(self, vars):
     actions = ''
     s = '<div class="metadata-box">\n'
-    s += ItemSummary (self.inspector, self.ixi, actions).template(vars)
+    s += ItemFormat (self.inspector, self.ixi, actions).template(vars)
     s += '</div><!-- metadata-box -->\n'
     s += ItemMetadata(self.inspector, self.ixi, editable=False).template(vars)
     return s


-- 
conrad