[xiph-commits] r3909 - in arkaiv/trunk: . arkaiv/controllers arkaiv/templates data/templates

[dcrowdy at svn.annodex.net]

Author: dcrowdy
Date: 2009-04-19 20:52:46 -0700 (Sun, 19 Apr 2009)
New Revision: 3909

Modified:
   arkaiv/trunk/arkaiv/controllers/page.py
   arkaiv/trunk/arkaiv/controllers/page.pyc
   arkaiv/trunk/arkaiv/templates/displayitem.mak
   arkaiv/trunk/data/templates/displayitem.mak.py
   arkaiv/trunk/data/templates/displayitem.mak.pyc
   arkaiv/trunk/development.ini
Log:
Obtain media url base info from config file rather than have it in the controller...


Modified: arkaiv/trunk/arkaiv/controllers/page.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/page.py	2009-04-20 02:52:58 UTC (rev 3908)
+++ arkaiv/trunk/arkaiv/controllers/page.py	2009-04-20 03:52:46 UTC (rev 3909)
@@ -37,7 +37,8 @@
 myhostname = gethostname()
 url_base = "http://" + myhostname + ":5000/"
 #media_url_base = "http://" + myhostname + "/"
-media_url_base = "http://127.0.0.1/"
+#media_url_base = "http://127.0.0.1/"
+media_url_base = config['media_url_base']
 
 class PageController(BaseController):
 

Modified: arkaiv/trunk/arkaiv/controllers/page.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/templates/displayitem.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/displayitem.mak	2009-04-20 02:52:58 UTC (rev 3908)
+++ arkaiv/trunk/arkaiv/templates/displayitem.mak	2009-04-20 03:52:46 UTC (rev 3909)
@@ -16,7 +16,7 @@
  
 
 %     if c.sourcedict['has_video'] == "Yes":
-<video src='${c.sourcedict['urlpath']}${c.sourcedict['clipdetail']}' controls='controls'></video>
+<video src='${c.sourcedict['urlpath']}${c.sourcedict['clipdetail']}' controls='controls' width=320 height=240></video>
 %     endif
 
 %     if c.sourcedict['has_video'] == "No":

Modified: arkaiv/trunk/data/templates/displayitem.mak.py
===================================================================
--- arkaiv/trunk/data/templates/displayitem.mak.py	2009-04-20 02:52:58 UTC (rev 3908)
+++ arkaiv/trunk/data/templates/displayitem.mak.py	2009-04-20 03:52:46 UTC (rev 3909)
@@ -3,7 +3,7 @@
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 5
-_modified_time = 1240195564.2088721
+_modified_time = 1240199467.157346
 _template_filename='/home/dcrowdy/src/arkaiv/working/trunk/arkaiv/templates/displayitem.mak'
 _template_uri='/displayitem.mak'
 _template_cache=cache.Cache(__name__, _modified_time)
@@ -56,7 +56,7 @@
             __M_writer(u"<video src='")
             __M_writer(unicode(c.sourcedict['urlpath']))
             __M_writer(unicode(c.sourcedict['clipdetail']))
-            __M_writer(u"' controls='controls'></video>\n")
+            __M_writer(u"' controls='controls' width=320 height=240></video>\n")
         # SOURCE LINE 21
         __M_writer(u'\n')
         # SOURCE LINE 22

Modified: arkaiv/trunk/data/templates/displayitem.mak.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/development.ini
===================================================================
--- arkaiv/trunk/development.ini	2009-04-20 02:52:58 UTC (rev 3908)
+++ arkaiv/trunk/development.ini	2009-04-20 03:52:46 UTC (rev 3909)
@@ -10,6 +10,7 @@
 error_email_from = paste at localhost
 media_path_base = /var/www/
 archive_loc = /var/www/arkaiv/
+media_url_base = http://127.0.0.1/
 
 [server:main]
 use = egg:Paste#http