[xiph-commits] r3208 - in arkaiv/trunk: . arkaiv arkaiv/config
arkaiv/controllers arkaiv/lib arkaiv/model arkaiv/public
arkaiv/templates data/templates
dcrowdy at svn.annodex.net
dcrowdy at svn.annodex.net
Tue Aug 28 22:26:52 PDT 2007
Author: dcrowdy
Date: 2007-08-28 22:26:52 -0700 (Tue, 28 Aug 2007)
New Revision: 3208
Modified:
arkaiv/trunk/README.txt
arkaiv/trunk/arkaiv/__init__.pyc
arkaiv/trunk/arkaiv/config/__init__.pyc
arkaiv/trunk/arkaiv/config/environment.pyc
arkaiv/trunk/arkaiv/config/middleware.pyc
arkaiv/trunk/arkaiv/config/routing.pyc
arkaiv/trunk/arkaiv/controllers/__init__.pyc
arkaiv/trunk/arkaiv/controllers/error.pyc
arkaiv/trunk/arkaiv/controllers/page.py
arkaiv/trunk/arkaiv/controllers/page.pyc
arkaiv/trunk/arkaiv/lib/__init__.pyc
arkaiv/trunk/arkaiv/lib/app_globals.pyc
arkaiv/trunk/arkaiv/lib/base.pyc
arkaiv/trunk/arkaiv/lib/helpers.pyc
arkaiv/trunk/arkaiv/model/__init__.pyc
arkaiv/trunk/arkaiv/model/cmmlparser.pyc
arkaiv/trunk/arkaiv/model/oggzinfo.pyc
arkaiv/trunk/arkaiv/public/quick.css
arkaiv/trunk/arkaiv/templates/autohandler
arkaiv/trunk/arkaiv/templates/displayitem.mak
arkaiv/trunk/arkaiv/templates/mainpage.mak
arkaiv/trunk/arkaiv/templates/search.mak
arkaiv/trunk/arkaiv/templates/searchresults.mak
arkaiv/trunk/arkaiv/websetup.pyc
arkaiv/trunk/data/templates/addannodexform.mak.py
arkaiv/trunk/data/templates/addannodexform.mak.pyc
arkaiv/trunk/data/templates/autohandler.py
arkaiv/trunk/data/templates/autohandler.pyc
arkaiv/trunk/data/templates/collectionexpanded.mak.py
arkaiv/trunk/data/templates/collectionexpanded.mak.pyc
arkaiv/trunk/data/templates/collections.mak.py
arkaiv/trunk/data/templates/collections.mak.pyc
arkaiv/trunk/data/templates/displayitem.mak.py
arkaiv/trunk/data/templates/displayitem.mak.pyc
arkaiv/trunk/data/templates/mainpage.mak.py
arkaiv/trunk/data/templates/mainpage.mak.pyc
arkaiv/trunk/production.ini
Log:
Cleaned up display of media item and updated readme.
Modified: arkaiv/trunk/README.txt
===================================================================
--- arkaiv/trunk/README.txt 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/README.txt 2007-08-29 05:26:52 UTC (rev 3208)
@@ -1,3 +1,10 @@
+Arkaiv:
+
+A web based application for building, annotating and accessing archives of
+audio and video media.
+
+The name is pronounced "archive".
+
REQUIREMENTS:
The python build tools for your distribution.
@@ -58,7 +65,7 @@
In the particular approach I have taken here, the sql database is really only
used for searching - the information is mirrored in the cmml files. There is
-an obvius disadvantage compared to cmmlwiki here in that the database could get
+an obvious disadvantage compared to cmmlwiki here in that the database could get
out of sync with the cmml, but there is the advantage that an archive can be
lifted by simply moving the cmml and ogg files, then pointing a new instance of
the application at it.
Modified: arkaiv/trunk/arkaiv/__init__.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/config/__init__.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/config/environment.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/config/middleware.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/config/routing.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/controllers/__init__.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/controllers/error.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/controllers/page.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/page.py 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/arkaiv/controllers/page.py 2007-08-29 05:26:52 UTC (rev 3208)
@@ -65,43 +65,6 @@
return render('/addform.mak')
-# def addmedia(self):
-# # Not used anymore?
-# if not request.environ.has_key('REMOTE_USER'):
-# raise NotAuthenticatedError('Not Authenticated')
-# else:
-# newitemname = request.params['itemname']
-#
-# # copy file to the media directory
-# curr_dir = os.getcwd() # FIXME - should be able to set from a config file
-# media_dir = os.path.join (curr_dir, "arkaiv/public/media")
-# #print media_dir
-# media_upload_dir = os.path.join (media_dir, newitemname)
-# #print media_upload_dir
-#
-# if (not os.path.exists (media_upload_dir)):
-# os.makedirs (media_upload_dir, mode=0755)
-#
-# myfile = request.POST['myfile']
-# permanent_file = open(os.path.join(media_upload_dir,
-# myfile.filename), 'w')
-#
-# shutil.copyfileobj(myfile.file, permanent_file)
-# myfile.file.close()
-# permanent_file.close()
-# sourcename = os.path.join(media_upload_dir, myfile.filename)
-#
-# # then add its name to the source database
-# headinfo = {}
-# headinfo['itemid']= model.addsource(newitemname, sourcename)
-# headinfo['id'] = request.params['headid']
-# headinfo['title'] = request.params['headtitle']
-# model.addhead(headinfo)
-# # And add the collection info:
-# collection = request.params['collection']
-# model.additemtocollection(headinfo['itemid'], collection)
-#
-# return render('/confirmadd.mak')
def displaycollection(self):
collid = request.params['id']
Modified: arkaiv/trunk/arkaiv/controllers/page.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/lib/__init__.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/lib/app_globals.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/lib/base.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/lib/helpers.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/model/__init__.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/model/cmmlparser.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/model/oggzinfo.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/public/quick.css
===================================================================
--- arkaiv/trunk/arkaiv/public/quick.css 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/arkaiv/public/quick.css 2007-08-29 05:26:52 UTC (rev 3208)
@@ -1,8 +1,10 @@
body {
+ font-family: sans-serif;
background-color: #888;
margin: 25px;
}
div.content{
+ font-family: sans-serif;
margin: 0;
margin-bottom: 10px;
background-color: #d3e0ea;
Modified: arkaiv/trunk/arkaiv/templates/autohandler
===================================================================
--- arkaiv/trunk/arkaiv/templates/autohandler 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/arkaiv/templates/autohandler 2007-08-29 05:26:52 UTC (rev 3208)
@@ -8,18 +8,15 @@
<body>
<p class="header">
<h1>Arkaiv</h1>
-<table>
+<table cellpadding="10">
<tr>
<td>${ h.link_to("All Items", h.url(action="mainpage")) } </td>
<td>${ h.link_to("Collections", h.url(action="collections")) } </td>
-<!-- ${ h.link_to("Add media", h.url(action="displayadd")) }-->
<td>${ h.link_to("Add annodex media", h.url(action="addannodexform")) }</td>
-<!--${ h.link_to("Add all annodex media in dir", h.url(action="addannodexindirform")) }-->
<td>
${ h.form(h.url(action='search'), multipart=True) }
-Search terms:
-${ h.text_field('searchterms') }
-${ h.submit('Submit') }
+${ h.text_field('searchterms', value="Search") }
+<!--${ h.submit('Submit') }-->
${ h.end_form() }
</td>
</tr>
Modified: arkaiv/trunk/arkaiv/templates/displayitem.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/displayitem.mak 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/arkaiv/templates/displayitem.mak 2007-08-29 05:26:52 UTC (rev 3208)
@@ -1,6 +1,6 @@
<%inherit file="/autohandler"/>
<div id="video">
-Item: <p id="edititemname">${c.itemname}</p>
+<p id="edititemname">${c.itemname}</p>
<script type="text/javascript">
new Ajax.InPlaceEditor('edititemname', '/page/edititemname', { callback: function(form, value) { return 'itemid=${c.itemid}&myparam=' + escape(value) }});
</script>
@@ -15,21 +15,30 @@
src="${c.sourcedict['urlpath']}"
width="320" height="240"/>
<form name="api">
-<table>
+<table style="font-size:small">
<tr>
-<td><input type="button" value="Skip back" onclick='skip(-1)'/></td>
+<td><input type="button" value="<<" onclick='skip(-1)'/></td>
<td><input type="button" value="Play" onclick='Play()'/></td>
<td><input type="button" value="Pause" onclick='Pause()'/></td>
-<td><input type="button" value="Skip forward" onclick='skip(1)'/></td>
+<td><input type="button" value=">>" onclick='skip(1)'/></td>
+</tr>
+<tr>
<td><input type="button" value="Get position" onclick='GetPlayPosition()'/></td>
-<td><input type="button" value="Go to pos" onclick='GotoPosition()'/>
-<input type="text" name="gotofield" size="5"/></td>
+<td><input type="button" value="Go to pos" onclick='GotoPosition()'/></td>
+<td><input type="text" name="gotofield" size="5"/></td>
+<td>(secs)</td>
</tr>
</table>
-Output:
-<textarea name="ofield" cols="40" rows="4"></textarea>
-Input:
-<input type="text" name="ifield" size="20"/><br>
+<table style="font-size:small">
+<tr>
+<td>Output:</td>
+<td><textarea name="ofield" cols="40" rows="2"></textarea></td>
+</tr>
+<tr>
+<td>Amount to move << and >> (msecs):</td>
+<td><input type="text" name="ifield" size="20"/></td>
+</tr>
+</table>
</form>
<hr>
@@ -71,21 +80,20 @@
<hr>
Add new meta tag:
${ h.form(h.url(action='addmetainfo'), multipart=True) }
-<table>
+<table style="font-size:small">
<tr>
<td>Id</td>
<td>Name</td>
<td>Content</td>
- <td>Scheme</td>
</tr>
<tr>
<td> ${ h.text_field('metaid', size=5) }</td>
<td>${ h.text_field('metaname') }</td>
<td>${ h.text_field('metacontent') }</td>
- <td>${ h.hidden_field('metascheme') }</td>
</tr>
</table>
+${ h.hidden_field('metascheme') }
${ h.hidden_field('headindex', value = c.headdict['ixh']) }
${ h.hidden_field('itemid', value=c.itemid) }
@@ -156,7 +164,7 @@
Add new clip:
${ h.form(h.url(action='addclip'), multipart=True) }
-<table>
+<table style="font-size:small">
<tr>
<td>Start time</td>
<td>${ h.text_field('starttime', size=5) }</td>
@@ -234,6 +242,7 @@
function GotoPosition() {
i = getGoto();
+ i = i * 1000;
plugin.setPlayPosition(i);
}
Modified: arkaiv/trunk/arkaiv/templates/mainpage.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/mainpage.mak 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/arkaiv/templates/mainpage.mak 2007-08-29 05:26:52 UTC (rev 3208)
@@ -5,7 +5,7 @@
% for item in c.items:
<li>
- ${item.ixi}
+ <!--${item.ixi}-->
${ h.link_to(item.name, h.url(action="displayitem", edit="no", id=item[0])) }
</li>
% endfor
Modified: arkaiv/trunk/arkaiv/templates/search.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/search.mak 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/arkaiv/templates/search.mak 2007-08-29 05:26:52 UTC (rev 3208)
@@ -1,5 +1,5 @@
<%inherit file="/autohandler"/>
-<h1 class="main">Search</h1>
+<h2 class="main">Search</h2>
<p>
${ h.form(h.url(action='search'), multipart=True) }
<table>
Modified: arkaiv/trunk/arkaiv/templates/searchresults.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/searchresults.mak 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/arkaiv/templates/searchresults.mak 2007-08-29 05:26:52 UTC (rev 3208)
@@ -1,6 +1,8 @@
<%inherit file="/autohandler"/>
-<h1>Search results</h1>
+<h2>Search results</h2>
+<hr>
+<p>Items:</p>
% for item in c.items:
<li>
${item.ixi}
@@ -8,7 +10,7 @@
</li>
% endfor
<hr>
-Meta names:<p>
+<p>Meta names:</p>
<table>
<tr>
<td>Name</td>
Modified: arkaiv/trunk/arkaiv/websetup.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/addannodexform.mak.py
===================================================================
--- arkaiv/trunk/data/templates/addannodexform.mak.py 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/data/templates/addannodexform.mak.py 2007-08-29 05:26:52 UTC (rev 3208)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1188348748.196075
-_template_filename='/home/dcrowdy/src/working/arkaiv/arkaiv/templates/addannodexform.mak'
+_modified_time = 1188350179.570833
+_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/addannodexform.mak'
_template_uri='/addannodexform.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
Modified: arkaiv/trunk/data/templates/addannodexform.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/autohandler.py
===================================================================
--- arkaiv/trunk/data/templates/autohandler.py 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/data/templates/autohandler.py 2007-08-29 05:26:52 UTC (rev 3208)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1188266307.842114
-_template_filename=u'/home/dcrowdy/src/working/svn/arkaiv/templates/autohandler'
+_modified_time = 1188364190.6814849
+_template_filename=u'/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/autohandler'
_template_uri=u'/autohandler'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
@@ -19,35 +19,29 @@
context.write(u'<html>\n <head>\n <title>Arkaiv</title>\n <link rel="stylesheet" href="/quick.css"></link>\n')
# SOURCE LINE 5
context.write(unicode( h.javascript_include_tag('/javascripts/effects.js', builtins=True) ))
- context.write(u' \n\n </head>\n <body>\n <p class="header">\n<h1>Arkaiv</h1>\n<table>\n<tr>\n<td>')
+ context.write(u' \n\n </head>\n <body>\n <p class="header">\n<h1>Arkaiv</h1>\n<table cellpadding="10">\n<tr>\n<td>')
# SOURCE LINE 13
context.write(unicode( h.link_to("All Items", h.url(action="mainpage")) ))
context.write(u' </td>\n<td>')
# SOURCE LINE 14
context.write(unicode( h.link_to("Collections", h.url(action="collections")) ))
- context.write(u' </td>\n<!-- ')
+ context.write(u' </td>\n<td>')
# SOURCE LINE 15
- context.write(unicode( h.link_to("Add media", h.url(action="displayadd")) ))
- context.write(u'-->\n<td>')
- # SOURCE LINE 16
context.write(unicode( h.link_to("Add annodex media", h.url(action="addannodexform")) ))
- context.write(u'</td>\n<!--')
+ context.write(u'</td>\n<td>\n')
# SOURCE LINE 17
- context.write(unicode( h.link_to("Add all annodex media in dir", h.url(action="addannodexindirform")) ))
- context.write(u'-->\n<td>\n')
- # SOURCE LINE 19
context.write(unicode( h.form(h.url(action='search'), multipart=True) ))
- context.write(u' \nSearch terms:\n')
- # SOURCE LINE 21
- context.write(unicode( h.text_field('searchterms') ))
context.write(u' \n')
- # SOURCE LINE 22
+ # SOURCE LINE 18
+ context.write(unicode( h.text_field('searchterms', value="Search") ))
+ context.write(u' \n<!--')
+ # SOURCE LINE 19
context.write(unicode( h.submit('Submit') ))
- context.write(u' \n')
- # SOURCE LINE 23
+ context.write(u'-->\n')
+ # SOURCE LINE 20
context.write(unicode( h.end_form() ))
context.write(u' \n</td>\n</tr>\n</table>\n </p>\n <!--div class="content"-->\n')
- # SOURCE LINE 29
+ # SOURCE LINE 26
context.write(unicode(next.body()))
context.write(u'\n <p class="footer">\n </p>\n <!--/div-->\n </body>\n</html>\n\n')
return ''
Modified: arkaiv/trunk/data/templates/autohandler.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/collectionexpanded.mak.py
===================================================================
--- arkaiv/trunk/data/templates/collectionexpanded.mak.py 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/data/templates/collectionexpanded.mak.py 2007-08-29 05:26:52 UTC (rev 3208)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1188348772.403481
-_template_filename='/home/dcrowdy/src/working/arkaiv/arkaiv/templates/collectionexpanded.mak'
+_modified_time = 1188350471.7409589
+_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/collectionexpanded.mak'
_template_uri='/collectionexpanded.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
Modified: arkaiv/trunk/data/templates/collectionexpanded.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/collections.mak.py
===================================================================
--- arkaiv/trunk/data/templates/collections.mak.py 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/data/templates/collections.mak.py 2007-08-29 05:26:52 UTC (rev 3208)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1187671713.365315
-_template_filename='/home/dcrowdy/src/working/svn/arkaiv/templates/collections.mak'
+_modified_time = 1188350170.5511739
+_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/collections.mak'
_template_uri='/collections.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
Modified: arkaiv/trunk/data/templates/collections.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/displayitem.mak.py
===================================================================
--- arkaiv/trunk/data/templates/displayitem.mak.py 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/data/templates/displayitem.mak.py 2007-08-29 05:26:52 UTC (rev 3208)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1188280722.8129909
-_template_filename='/home/dcrowdy/src/working/svn/arkaiv/templates/displayitem.mak'
+_modified_time = 1188364632.2161951
+_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/displayitem.mak'
_template_uri='/displayitem.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
@@ -27,7 +27,7 @@
h = context.get('h', UNDEFINED)
c = context.get('c', UNDEFINED)
# SOURCE LINE 1
- context.write(u' \n<div id="video">\nItem: <p id="edititemname">')
+ context.write(u' \n<div id="video">\n<p id="edititemname">')
# SOURCE LINE 3
context.write(unicode(c.itemname))
context.write(u'</p>\n<script type="text/javascript">\n new Ajax.InPlaceEditor(\'edititemname\', \'/page/edititemname\', { callback: function(form, value) { return \'itemid=')
@@ -48,166 +48,166 @@
context.write(u' \n \n <embed type="application/liboggplay"\n src="')
# SOURCE LINE 15
context.write(unicode(c.sourcedict['urlpath']))
- context.write(u'"\n width="320" height="240"/>\n<form name="api">\n<table>\n<tr>\n<td><input type="button" value="Skip back" onclick=\'skip(-1)\'/></td>\n<td><input type="button" value="Play" onclick=\'Play()\'/></td>\n<td><input type="button" value="Pause" onclick=\'Pause()\'/></td>\n<td><input type="button" value="Skip forward" onclick=\'skip(1)\'/></td>\n<td><input type="button" value="Get position" onclick=\'GetPlayPosition()\'/></td>\n<td><input type="button" value="Go to pos" onclick=\'GotoPosition()\'/>\n<input type="text" name="gotofield" size="5"/></td>\n</tr>\n</table>\nOutput:\n<textarea name="ofield" cols="40" rows="4"></textarea>\nInput:\n<input type="text" name="ifield" size="20"/><br>\n</form>\n\n<hr>\nHead:\n')
- # SOURCE LINE 37
+ context.write(u'"\n width="320" height="240"/>\n<form name="api">\n<table style="font-size:small">\n<tr>\n<td><input type="button" value="<<" onclick=\'skip(-1)\'/></td>\n<td><input type="button" value="Play" onclick=\'Play()\'/></td>\n<td><input type="button" value="Pause" onclick=\'Pause()\'/></td>\n<td><input type="button" value=">>" onclick=\'skip(1)\'/></td>\n</tr>\n<tr>\n<td><input type="button" value="Get position" onclick=\'GetPlayPosition()\'/></td>\n<td><input type="button" value="Go to pos" onclick=\'GotoPosition()\'/></td>\n<td><input type="text" name="gotofield" size="5"/></td>\n<td>(secs)</td>\n</tr>\n</table>\n<table style="font-size:small">\n<tr>\n<td>Output:</td>\n<td><textarea name="ofield" cols="40" rows="2"></textarea></td>\n</tr>\n<tr>\n<td>Amount to move << and >> (msecs):</td>\n<td><input type="text" name="ifield" size="20"/></td>\n</tr>\n</table>\n</form>\n\n<hr>\nHead:\n')
+ # SOURCE LINE 46
context.write(unicode( h.form(h.url(action='editheadinfo'), multipart=True) ))
context.write(u'\nid:\n')
- # SOURCE LINE 39
+ # SOURCE LINE 48
context.write(unicode( h.text_field('headid', value=c.headdict['id']) ))
context.write(u'\nTitle:\n')
- # SOURCE LINE 41
+ # SOURCE LINE 50
context.write(unicode( h.text_field('headtitle', value=c.headdict['title']) ))
context.write(u'\n')
- # SOURCE LINE 42
+ # SOURCE LINE 51
context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
context.write(u'\n\n')
- # SOURCE LINE 44
+ # SOURCE LINE 53
context.write(unicode( h.submit('Edit') ))
context.write(u' \n')
- # SOURCE LINE 45
+ # SOURCE LINE 54
context.write(unicode( h.end_form() ))
context.write(u' \n<br />\n<hr>\nMeta information:<br />\n<table style="font-size:small">\n<tr>\n <td>Name</td>\n <td>Content</td>\n</tr>\n')
- # SOURCE LINE 54
+ # SOURCE LINE 63
for metainfo in c.metalist:
- # SOURCE LINE 55
+ # SOURCE LINE 64
context.write(u'<tr>\n<td>\n<p id="editmetaname">')
- # SOURCE LINE 57
+ # SOURCE LINE 66
context.write(unicode(metainfo['name']))
context.write(u'</p>\n<script type="text/javascript">\n new Ajax.InPlaceEditor(\'editmetaname\', \'/page/editheadmetaname\', { callback: function(form, value) { return \'id=')
- # SOURCE LINE 59
+ # SOURCE LINE 68
context.write(unicode(metainfo['id']))
context.write(u'&field=name&itemid=')
context.write(unicode(c.itemid))
context.write(u'&myparam=\' + escape(value) }});\n</script>\n</td>\n<td>\n<p id="editmetacontent">')
- # SOURCE LINE 63
+ # SOURCE LINE 72
context.write(unicode(metainfo['content']))
context.write(u'</p>\n<script type="text/javascript">\n new Ajax.InPlaceEditor(\'editmetacontent\', \'/page/editheadmetaname\', { callback: function(form, value) { return \'id=')
- # SOURCE LINE 65
+ # SOURCE LINE 74
context.write(unicode(metainfo['id']))
context.write(u'&field=content&itemid=')
context.write(unicode(c.itemid))
context.write(u"&myparam=' + escape(value) }});\n</script>\n</td>\n</tr> \n")
- # SOURCE LINE 70
+ # SOURCE LINE 79
context.write(u'</table>\n<hr>\nAdd new meta tag:\n')
- # SOURCE LINE 73
+ # SOURCE LINE 82
context.write(unicode( h.form(h.url(action='addmetainfo'), multipart=True) ))
- context.write(u'\n<table>\n<tr>\n <td>Id</td>\n <td>Name</td>\n <td>Content</td>\n <td>Scheme</td>\n</tr>\n\n<tr>\n <td> ')
- # SOURCE LINE 83
+ context.write(u'\n<table style="font-size:small">\n<tr>\n <td>Id</td>\n <td>Name</td>\n <td>Content</td>\n</tr>\n\n<tr>\n <td> ')
+ # SOURCE LINE 91
context.write(unicode( h.text_field('metaid', size=5) ))
context.write(u'</td>\n <td>')
- # SOURCE LINE 84
+ # SOURCE LINE 92
context.write(unicode( h.text_field('metaname') ))
context.write(u'</td>\n <td>')
- # SOURCE LINE 85
+ # SOURCE LINE 93
context.write(unicode( h.text_field('metacontent') ))
- context.write(u'</td>\n <td>')
- # SOURCE LINE 86
+ context.write(u'</td>\n</tr>\n</table>\n')
+ # SOURCE LINE 96
context.write(unicode( h.hidden_field('metascheme') ))
- context.write(u'</td>\n</tr>\n</table>\n')
- # SOURCE LINE 89
+ context.write(u'\n')
+ # SOURCE LINE 97
context.write(unicode( h.hidden_field('headindex', value = c.headdict['ixh']) ))
context.write(u'\n')
- # SOURCE LINE 90
+ # SOURCE LINE 98
context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
context.write(u'\n\n')
- # SOURCE LINE 92
+ # SOURCE LINE 100
context.write(unicode( h.submit('Add') ))
context.write(u' \n')
- # SOURCE LINE 93
+ # SOURCE LINE 101
context.write(unicode( h.end_form() ))
context.write(u' \n\n<hr>\n\n\n<!--div class="sourceinfo"-->\n<table style="font-size:small">\n<tr>\n<td>Duration:</td><td> ')
- # SOURCE LINE 101
+ # SOURCE LINE 109
context.write(unicode(c.sourcedict['duration']))
context.write(u'</td>\n</tr>\n<tr>\n<td>Bitrate: </td><td>')
- # SOURCE LINE 104
+ # SOURCE LINE 112
context.write(unicode(c.sourcedict['bitrate']))
context.write(u'</td>\n</tr>\n<tr>\n<td>Resolution: </td><td>')
- # SOURCE LINE 107
+ # SOURCE LINE 115
context.write(unicode(c.sourcedict['resolution']))
context.write(u'</td>\n</tr>\n<tr>\n<td>Framerate: </td><td>')
- # SOURCE LINE 110
+ # SOURCE LINE 118
context.write(unicode(c.sourcedict['framerate']))
context.write(u'</td>\n</tr>\n<tr>\n<td>Audio: </td><td>')
- # SOURCE LINE 113
+ # SOURCE LINE 121
context.write(unicode(c.sourcedict['audio']))
context.write(u'</td>\n</tr>\n<tr>\n<td>Has video: </td><td>')
- # SOURCE LINE 116
+ # SOURCE LINE 124
context.write(unicode(c.sourcedict['has_video']))
context.write(u'</td>\n</tr>\n<tr>\n<td>Has audio: </td><td>')
- # SOURCE LINE 119
+ # SOURCE LINE 127
context.write(unicode(c.sourcedict['has_audio']))
context.write(u'</td>\n</tr>\n</table>\n\n<!--/div!-->\n</div>\n\n<div id="clips">\nClips:\n<br />\n<table style="font-size:small">\n<tr>\n <td></td>\n <td>Start time</td>\n <td>Id</td>\n <td>Description</td>\n <td>a_href</td> \n</tr>\n')
- # SOURCE LINE 137
+ # SOURCE LINE 145
for clipinfo in c.cliplist:
- # SOURCE LINE 138
+ # SOURCE LINE 146
context.write(u'<tr>\n <td><a onclick="javascript:SetLocation(\'')
- # SOURCE LINE 139
+ # SOURCE LINE 147
context.write(unicode(c.sourcedict['urlpath']))
context.write(u'?id=')
context.write(unicode(clipinfo['id']))
context.write(u'\')"><img width=60 height=40 src="/images/blank.png"></a></td>\n <td>')
- # SOURCE LINE 140
+ # SOURCE LINE 148
context.write(unicode(clipinfo['start_time']))
context.write(u'</td>\n <td>')
- # SOURCE LINE 141
+ # SOURCE LINE 149
context.write(unicode(clipinfo['id']))
context.write(u'</td>\n <td>')
- # SOURCE LINE 142
+ # SOURCE LINE 150
context.write(unicode(clipinfo['desc']))
context.write(u'</td>\n <td>')
- # SOURCE LINE 143
+ # SOURCE LINE 151
context.write(unicode(clipinfo['a_href']))
context.write(u'</td>\n\n\n')
- # SOURCE LINE 146
+ # SOURCE LINE 154
context.write(unicode( h.form(h.url(action='deleteclip'), multipart=True) ))
context.write(u'\n<td>')
- # SOURCE LINE 147
+ # SOURCE LINE 155
context.write(unicode( h.submit('Delete') ))
context.write(u' </td>\n')
- # SOURCE LINE 148
+ # SOURCE LINE 156
context.write(unicode( h.hidden_field('clipid', value=clipinfo['ixc']) ))
context.write(u'\n')
- # SOURCE LINE 149
+ # SOURCE LINE 157
context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
context.write(u'\n')
- # SOURCE LINE 150
+ # SOURCE LINE 158
context.write(unicode( h.end_form() ))
context.write(u' \n\n\n</tr> \n')
- # SOURCE LINE 155
+ # SOURCE LINE 163
context.write(u'</table>\n\nAdd new clip:\n')
- # SOURCE LINE 158
+ # SOURCE LINE 166
context.write(unicode( h.form(h.url(action='addclip'), multipart=True) ))
- context.write(u'\n<table>\n<tr>\n <td>Start time</td>\n <td>')
- # SOURCE LINE 162
+ context.write(u'\n<table style="font-size:small">\n<tr>\n <td>Start time</td>\n <td>')
+ # SOURCE LINE 170
context.write(unicode( h.text_field('starttime', size=5) ))
context.write(u'</td>\n <td>a_text</td>\n <td>')
- # SOURCE LINE 164
+ # SOURCE LINE 172
context.write(unicode( h.text_field('a_text') ))
context.write(u'</td>\n</tr>\n<tr>\n <td>Id</td>\n <td>')
- # SOURCE LINE 168
+ # SOURCE LINE 176
context.write(unicode( h.text_field('id', size=5) ))
context.write(u'</td>\n <td>a_href</td>\n <td>')
- # SOURCE LINE 170
+ # SOURCE LINE 178
context.write(unicode( h.text_field('a_href') ))
context.write(u'</td>\n</tr>\n<tr>\n <td>img_src</td>\n <td>')
- # SOURCE LINE 174
+ # SOURCE LINE 182
context.write(unicode( h.text_field('img_src', size=5) ))
context.write(u'</td>\n <td>desc</td>\n <td>')
- # SOURCE LINE 176
+ # SOURCE LINE 184
context.write(unicode( h.text_field('desc') ))
context.write(u'</td>\n</tr>\n</table>\n')
- # SOURCE LINE 179
+ # SOURCE LINE 187
context.write(unicode( h.hidden_field('headindex', value = c.headdict['ixh']) ))
context.write(u'\n')
- # SOURCE LINE 180
+ # SOURCE LINE 188
context.write(unicode( h.hidden_field('itemid', value=c.itemid) ))
context.write(u'\n\n')
- # SOURCE LINE 182
+ # SOURCE LINE 190
context.write(unicode( h.submit('Add') ))
context.write(u' \n')
- # SOURCE LINE 183
+ # SOURCE LINE 191
context.write(unicode( h.end_form() ))
- context.write(u' \n</div>\n<script>\nvar plugin = document.embeds[0];\nvar input = document.api.ifield;\nvar goto = document.api.gotofield;\nvar output = document.api.ofield;\n\nfunction Play() {\n plugin.play();\n addOutput("Play!");\n}\n\nfunction Pause() {\n plugin.pause();\n addOutput("Pause!");\n}\n\nfunction SetLocation(location) {\n// plugin.setPlayPosition(location);\n plugin.setCurrentMovie(location);\n addOutput("Current movie: " + plugin.getCurrentMovie());\n addOutput("setting a location: " + location + " ms");\n}\n\nfunction GetPlayPosition() {\n addOutput("Play position: " + plugin.getPlayPosition() + " ms");\n}\n\nfunction skip(dir) {\n// addOutput("we get here")\n i = getInput();\n addOutput("i is " + i);\n if (i <= 0) i = 1000;\n addOutput("dir is " + dir);\n t = plugin.getPlayPosition() + (i * dir);\n addOutput("t is " + t);\n addOutput("Skipping by " + i + " to " + t + " ms - " +\n (plugin.setPlayPositi
on(t) ? "succeeded" : "failed"));\n}\n\nfunction getInput() {\n i = parseInt(input.value);\n return isNaN(i) ? 0 : i;\n}\n\nfunction getGoto() {\n i = parseInt(goto.value);\n return isNaN(i) ? 0 : i;\n}\n\n\nfunction GotoPosition() {\n i = getGoto();\n plugin.setPlayPosition(i);\n}\n\nvar outLines = 0;\n\nfunction addOutput(str) {\n if (outLines == 0) {\n output.value = str;\n } else {\n output.value = str + "\\n" + output.value;\n }\n outLines++;\n if (outLines == 11) {\n i = output.value.lastIndexOf("\\n");\n output.value = output.value.substr(0, i);\n outLines--;\n }\n}\n</script>\n\n')
+ context.write(u' \n</div>\n<script>\nvar plugin = document.embeds[0];\nvar input = document.api.ifield;\nvar goto = document.api.gotofield;\nvar output = document.api.ofield;\n\nfunction Play() {\n plugin.play();\n addOutput("Play!");\n}\n\nfunction Pause() {\n plugin.pause();\n addOutput("Pause!");\n}\n\nfunction SetLocation(location) {\n// plugin.setPlayPosition(location);\n plugin.setCurrentMovie(location);\n addOutput("Current movie: " + plugin.getCurrentMovie());\n addOutput("setting a location: " + location + " ms");\n}\n\nfunction GetPlayPosition() {\n addOutput("Play position: " + plugin.getPlayPosition() + " ms");\n}\n\nfunction skip(dir) {\n// addOutput("we get here")\n i = getInput();\n addOutput("i is " + i);\n if (i <= 0) i = 1000;\n addOutput("dir is " + dir);\n t = plugin.getPlayPosition() + (i * dir);\n addOutput("t is " + t);\n addOutput("Skipping by " + i + " to " + t + " ms - " +\n (plugin.setPlayPositi
on(t) ? "succeeded" : "failed"));\n}\n\nfunction getInput() {\n i = parseInt(input.value);\n return isNaN(i) ? 0 : i;\n}\n\nfunction getGoto() {\n i = parseInt(goto.value);\n return isNaN(i) ? 0 : i;\n}\n\n\nfunction GotoPosition() {\n i = getGoto();\n i = i * 1000;\n plugin.setPlayPosition(i);\n}\n\nvar outLines = 0;\n\nfunction addOutput(str) {\n if (outLines == 0) {\n output.value = str;\n } else {\n output.value = str + "\\n" + output.value;\n }\n outLines++;\n if (outLines == 11) {\n i = output.value.lastIndexOf("\\n");\n output.value = output.value.substr(0, i);\n outLines--;\n }\n}\n</script>\n\n')
return ''
finally:
context.caller_stack.pop_frame()
Modified: arkaiv/trunk/data/templates/displayitem.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/mainpage.mak.py
===================================================================
--- arkaiv/trunk/data/templates/mainpage.mak.py 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/data/templates/mainpage.mak.py 2007-08-29 05:26:52 UTC (rev 3208)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1187580976.972198
-_template_filename='/home/dcrowdy/src/working/svn/arkaiv/templates/mainpage.mak'
+_modified_time = 1188363937.3493609
+_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/mainpage.mak'
_template_uri='/mainpage.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
@@ -31,10 +31,10 @@
# SOURCE LINE 6
for item in c.items:
# SOURCE LINE 7
- context.write(u'<li>\n ')
+ context.write(u'<li>\n <!--')
# SOURCE LINE 8
context.write(unicode(item.ixi))
- context.write(u' \n ')
+ context.write(u'-->\n ')
# SOURCE LINE 9
context.write(unicode( h.link_to(item.name, h.url(action="displayitem", edit="no", id=item[0])) ))
context.write(u'\n</li>\n')
Modified: arkaiv/trunk/data/templates/mainpage.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/production.ini
===================================================================
--- arkaiv/trunk/production.ini 2007-08-29 03:00:50 UTC (rev 3207)
+++ arkaiv/trunk/production.ini 2007-08-29 05:26:52 UTC (rev 3208)
@@ -9,7 +9,7 @@
smtp_server = localhost
error_email_from = paste at localhost
media_path_base = /var/www/
-archive_loc = /var/www/arkaiv/
+archive_loc = /var/www/test/
[server:main]
use = egg:Paste#http
@@ -26,7 +26,7 @@
sqlalchemy.echo = true
authkit.enable = true
authkit.method = digest
-authkit.users.setup = user:pylons
+authkit.users.setup = dcrowdy:hoohaa
# If you'd like to fine-tune the individual locations of the cache data dirs
More information about the commits
mailing list