[Cvs-annodex] commit (annodex): cmmlwiki/trunk/cmmlwiki/clipsummary.py cmmlwiki/trunk/htdocs/stylesheets/main.css

[conrad]

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

Modified files:
   cmmlwiki/trunk/cmmlwiki/clipsummary.py
   cmmlwiki/trunk/htdocs/stylesheets/main.css

Log Message:
move |edit|delete| tools back under image frames in clip summary, fix padding


Modified: cmmlwiki/trunk/cmmlwiki/clipsummary.py
===================================================================
--- cmmlwiki/trunk/cmmlwiki/clipsummary.py	2006-09-14 01:25:38 UTC (rev 2485)
+++ cmmlwiki/trunk/cmmlwiki/clipsummary.py	2006-09-14 01:39:16 UTC (rev 2486)
@@ -86,6 +86,27 @@
 """ % (play_url, start_time, img_url, start_time)
 
         s += """
+<div class="tools">
+<ul>
+"""
+
+#        if (key_isprintable (row, 'id')):
+#            s += '<li>| <a href="%s?id=%s">play</a> |</li>' % (play_url, xmlescape(row['id']))
+#        elif (key_isprintable (row, 'start_time')):
+#            s += '<li>| <a href="%s?t=%s">play</a> |</li>' % (play_url, start_time)
+            
+        if (self.editable and key_isprintable (row, 'ixc')):
+            url = WikiURL('Edit:Clip/%s?ixc=%s' % (self.name, row['ixc'])).template(vars)
+            s += '<li>| <a href="%s">edit</a> |</li>' % (url)
+
+            url = WikiURL('Edit:DeleteClip/%s?ixc=%s' % (self.name, row['ixc'])).template(vars)
+            s += '<li><a href="%s">delete</a> |</li>' % (url)
+
+        s += """
+</ul></div><!-- end tools -->
+"""
+
+        s += """
 </div><!-- end monitor-clips -->
 <div class="clips-result">
 """
@@ -114,28 +135,6 @@
             s += """<p>%20s</p>
 """ % (field_summary(xmlescape(row['desc']),160))
 
-        s += """
-<div class="tools">
-<ul>
-"""
-
-#        if (key_isprintable (row, 'id')):
-#            s += '<li>| <a href="%s?id=%s">play</a> |</li>' % (play_url, xmlescape(row['id']))
-#        elif (key_isprintable (row, 'start_time')):
-#            s += '<li>| <a href="%s?t=%s">play</a> |</li>' % (play_url, start_time)
-            
-        if (self.editable and key_isprintable (row, 'ixc')):
-            url = WikiURL('Edit:Clip/%s?ixc=%s' % (self.name, row['ixc'])).template(vars)
-            s += '<li>| <a href="%s">edit</a> |</li>' % (url)
-
-            url = WikiURL('Edit:DeleteClip/%s?ixc=%s' % (self.name, row['ixc'])).template(vars)
-            s += '<li><a href="%s">delete</a> |</li>' % (url)
-
-        s += """
-</ul>
-</div><!-- end tools -->
-"""
-
         s += '</div></div><!-- end block-clips -->\n'
 
     return s

Modified: cmmlwiki/trunk/htdocs/stylesheets/main.css
===================================================================
--- cmmlwiki/trunk/htdocs/stylesheets/main.css	2006-09-14 01:25:38 UTC (rev 2485)
+++ cmmlwiki/trunk/htdocs/stylesheets/main.css	2006-09-14 01:39:16 UTC (rev 2486)
@@ -462,7 +462,7 @@
 	font-size: .6em;
 	font-weight: bold;
 	padding-top: 3px;
-	padding-left: 1.5em;
+	padding-left: 2.5em;
 	}
 .tools ul, .tools-main-clip ul {
 	Float: left;
@@ -471,7 +471,6 @@
 .tools li, .tools-main-clip li{
 	Float: left;
 	list-style:none;
-	padding-right: 0.5em;
 	color: #666666;
 	}
 .tools li a, .tools-main-clip li a{


-- 
conrad