[cvs-annodex] commit (/annodex): cmmlwiki/trunk/cgi-bin/edit.cgi cmmlwiki/trunk/cmmlwiki/html.py cmmlwiki/trunk/htdocs/stylesheets/listpanel.css

Sun Sep 25 11:36:35 EST 2005

Update of /annodex (new revision 1474)

Modified files:
   cmmlwiki/trunk/cgi-bin/edit.cgi
   cmmlwiki/trunk/cmmlwiki/html.py
   cmmlwiki/trunk/htdocs/stylesheets/listpanel.css

Log Message:
constraint the cliplist


Modified: cmmlwiki/trunk/cgi-bin/edit.cgi
===================================================================

--- cmmlwiki/trunk/cgi-bin/edit.cgi	2005-09-24 11:17:17 UTC (rev 1473)
+++ cmmlwiki/trunk/cgi-bin/edit.cgi	2005-09-25 01:36:34 UTC (rev 1474)
@@ -154,7 +154,7 @@
 
 def attr_str (attr, dict, key):
     if (dict.has_key(key)):
-      return 'attr="%s"' % dict[key]
+      return '%s="%s"' % (attr, dict[key])
     else:
       return ''
 
@@ -184,7 +184,8 @@
 <img height="100"
 src="/cmmlwiki-htdocs/images/trashcan.jpg"/>
 </span></div>
-<div id="cliplist"><div class="pad"><div class="overflow"><div class="padside">
+<div id="listpanel"><div class="pad"><div class="overflow"><div class="padside">
+<div id="cliplist">
 """ % (name, edit_base, name, view_base, name)
 
     #sql = 'SELECT * FROM clips'
@@ -203,12 +204,14 @@
     #         """ % ixp
     cur.execute(sql)
     for row in cur.fetchall():
-        print '<div %s class="clip">' % (attr_str(id, row, 'id'))
+        divid='clip%s' % (row['ixc'])
+        #print '<div %s class="clip">' % (attr_str('id', row, 'ixc'))
+        print '<div id="%s" class="clip">' % divid
 
         if (key_isprintable (row, 'img_src')):
-            print '<img src="%(img_src)s" align="left"/>' % row
+            print '<img class="dhandle" src="%(img_src)s" align="left"/>' % row
         else:
-            print '[no image]'
+            print '<span class="dhandle">[No image]</span>'
 
         print '<h3>'
         if (key_isprintable (row, 'start_time')):
@@ -259,13 +262,21 @@
 
             print '[<a href="%s/%s?action=delete&ixc=%s">delete</a>]</p>' % (edit_base, name, row['ixc'])
 
-        print '</div>'
+        print """
+</div>
+<script type="text/javascript">
+  new Draggable ('%s',{constraing:false});
+</script>
+""" % (divid)
+  #new Draggable ('%s', {constraint:false,handle:'dhandle'});
 
     print """
+</div>
 </div></div></div>
 </div>
 </div>
 </div>
+
 """
 
     html_foot()

Modified: cmmlwiki/trunk/cmmlwiki/html.py
===================================================================
--- cmmlwiki/trunk/cmmlwiki/html.py	2005-09-24 11:17:17 UTC (rev 1473)
+++ cmmlwiki/trunk/cmmlwiki/html.py	2005-09-25 01:36:34 UTC (rev 1474)
@@ -20,8 +20,8 @@
 <link rel="stylesheet" href="/cmmlwiki-htdocs/stylesheets/script.aculo.us.css"/>
 <link rel="stylesheet" href="/cmmlwiki-htdocs/stylesheets/listpanel.css"/>
 
-<script src="/cmmlwiki-htdocs/javascripts/prototype.js" type="text/javascript"/>
-<script src="/cmmlwiki-htdocs/javascripts/scriptaculous.js" type="text/javascript"/>
+<script src="/cmmlwiki-htdocs/javascripts/prototype.js" type="text/javascript"></script>
+<script src="/cmmlwiki-htdocs/javascripts/scriptaculous.js" type="text/javascript"></script>
 </head>
 <body>
 <div id="globalWrapper">

Modified: cmmlwiki/trunk/htdocs/stylesheets/listpanel.css
===================================================================
--- cmmlwiki/trunk/htdocs/stylesheets/listpanel.css	2005-09-24 11:17:17 UTC (rev 1473)
+++ cmmlwiki/trunk/htdocs/stylesheets/listpanel.css	2005-09-25 01:36:34 UTC (rev 1474)
@@ -35,7 +35,7 @@
 	width: 120px;
 }
 
-#cliplist {
+#listpanel {
 	position: absolute; left: 264px; top: 0px;
 	width: 436px; 
 	height: 400px;


-- 
conrad

