[xiph-commits] r3215 - in arkaiv/trunk: arkaiv/controllers
arkaiv/public arkaiv/templates data/templates
dcrowdy at svn.annodex.net
dcrowdy at svn.annodex.net
Fri Aug 31 23:49:31 PDT 2007
Author: dcrowdy
Date: 2007-08-31 23:49:31 -0700 (Fri, 31 Aug 2007)
New Revision: 3215
Modified:
arkaiv/trunk/arkaiv/controllers/page.py
arkaiv/trunk/arkaiv/controllers/page.pyc
arkaiv/trunk/arkaiv/public/quick.css
arkaiv/trunk/arkaiv/templates/autohandler
arkaiv/trunk/arkaiv/templates/displayitem.mak
arkaiv/trunk/data/templates/autohandler.py
arkaiv/trunk/data/templates/autohandler.pyc
arkaiv/trunk/data/templates/displayitem.mak.py
arkaiv/trunk/data/templates/displayitem.mak.pyc
Log:
Fixed bug preventing correct jumping to clip locations if following a search link.
Modified: arkaiv/trunk/arkaiv/controllers/page.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/page.py 2007-09-01 04:06:58 UTC (rev 3214)
+++ arkaiv/trunk/arkaiv/controllers/page.py 2007-09-01 06:49:31 UTC (rev 3215)
@@ -136,9 +136,12 @@
# print "urlpath: " + urlpath
url = media_url_base + urlpath + ".anx"
if c.playclip=="":
- sourcedict['urlpath'] = url
+# sourcedict['urlpath'] = url
+ sourcedict['clipdetail'] = ""
else:
- sourcedict['urlpath'] = url + "?id=" + c.playclip
+ sourcedict['clipdetail'] = "?id=" + c.playclip
+
+ sourcedict['urlpath'] = url # + "?id=" + c.playclip
sourcedict['clipimageurl'] = clipimageurl
# now get some source info:
o = OggzInfo(oggsource)
Modified: arkaiv/trunk/arkaiv/controllers/page.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/public/quick.css
===================================================================
--- arkaiv/trunk/arkaiv/public/quick.css 2007-09-01 04:06:58 UTC (rev 3214)
+++ arkaiv/trunk/arkaiv/public/quick.css 2007-09-01 06:49:31 UTC (rev 3215)
@@ -86,8 +86,8 @@
}
#navcontainer ul li .searchpadding {
- /* padding: 0.6em 1em;*/
- padding: 10px 15px 11px 15px;
+ padding: 0.6em 1em 0em 1em;
+/* padding: 10px 15px 11px 15px;*/
background-color: #036;
color: #fff;
text-decoration: none;
Modified: arkaiv/trunk/arkaiv/templates/autohandler
===================================================================
--- arkaiv/trunk/arkaiv/templates/autohandler 2007-09-01 04:06:58 UTC (rev 3214)
+++ arkaiv/trunk/arkaiv/templates/autohandler 2007-09-01 06:49:31 UTC (rev 3215)
@@ -16,7 +16,6 @@
<li><span class="searchpadding">
${ h.form(h.url(action='search'), multipart=True) }
${ h.text_field('searchterms', value="Search") }
-<!--${ h.submit('Submit') }-->
${ h.end_form() }
</span>
</li>
Modified: arkaiv/trunk/arkaiv/templates/displayitem.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/displayitem.mak 2007-09-01 04:06:58 UTC (rev 3214)
+++ arkaiv/trunk/arkaiv/templates/displayitem.mak 2007-09-01 06:49:31 UTC (rev 3215)
@@ -12,7 +12,7 @@
${ h.end_form() }
<embed type="application/liboggplay"
- src="${c.sourcedict['urlpath']}"
+ src="${c.sourcedict['urlpath']}${c.sourcedict['clipdetail']}"
width="320" height="240"/>
<form name="api">
<table style="font-size:small">
Modified: arkaiv/trunk/data/templates/autohandler.py
===================================================================
--- arkaiv/trunk/data/templates/autohandler.py 2007-09-01 04:06:58 UTC (rev 3214)
+++ arkaiv/trunk/data/templates/autohandler.py 2007-09-01 06:49:31 UTC (rev 3215)
@@ -1,7 +1,7 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1188463289.27105
+_modified_time = 1188622693.3342869
_template_filename=u'/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/autohandler'
_template_uri=u'/autohandler'
_template_cache=cache.Cache(__name__, _modified_time)
@@ -34,14 +34,11 @@
context.write(u'\n')
# SOURCE LINE 18
context.write(unicode( h.text_field('searchterms', value="Search") ))
- context.write(u' \n<!--')
+ context.write(u' \n')
# SOURCE LINE 19
- context.write(unicode( h.submit('Submit') ))
- context.write(u'-->\n')
- # SOURCE LINE 20
context.write(unicode( h.end_form() ))
context.write(u' \n </span>\n </li>\n</ul>\n</div>\n</p>\n\n <!--div class="content"-->\n')
- # SOURCE LINE 28
+ # SOURCE LINE 27
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/displayitem.mak.py
===================================================================
--- arkaiv/trunk/data/templates/displayitem.mak.py 2007-09-01 04:06:58 UTC (rev 3214)
+++ arkaiv/trunk/data/templates/displayitem.mak.py 2007-09-01 06:49:31 UTC (rev 3215)
@@ -1,7 +1,7 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1188439839.8722601
+_modified_time = 1188629045.8835859
_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/displayitem.mak'
_template_uri='/displayitem.mak'
_template_cache=cache.Cache(__name__, _modified_time)
@@ -48,6 +48,7 @@
context.write(u' \n \n <embed type="application/liboggplay"\n src="')
# SOURCE LINE 15
context.write(unicode(c.sourcedict['urlpath']))
+ context.write(unicode(c.sourcedict['clipdetail']))
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) ))
Modified: arkaiv/trunk/data/templates/displayitem.mak.pyc
===================================================================
(Binary files differ)
More information about the commits
mailing list