[xiph-commits] r13152 - in trunk/icebreaker: . Icebreaker
Icebreaker/icebreaker Icebreaker/icebreaker/templates
nickmudd at svn.xiph.org
nickmudd at svn.xiph.org
Wed Jun 20 17:47:55 PDT 2007
Author: nickmudd
Date: 2007-06-20 17:47:55 -0700 (Wed, 20 Jun 2007)
New Revision: 13152
Added:
trunk/icebreaker/Icebreaker/icebreaker/templates/list.kid
Modified:
trunk/icebreaker/Icebreaker/devdata.sqlite
trunk/icebreaker/Icebreaker/icebreaker/__init__.pyc
trunk/icebreaker/Icebreaker/icebreaker/controllers.py
trunk/icebreaker/Icebreaker/icebreaker/controllers.pyc
trunk/icebreaker/Icebreaker/icebreaker/model.pyc
trunk/icebreaker/Icebreaker/icebreaker/templates/__init__.pyc
trunk/icebreaker/Icebreaker/icebreaker/templates/icebreaker.pyc
trunk/icebreaker/Icebreaker/icebreaker/templates/master.pyc
trunk/icebreaker/config.py
Log:
Added new list view, shows contents of data table.
Modified: trunk/icebreaker/Icebreaker/devdata.sqlite
===================================================================
(Binary files differ)
Modified: trunk/icebreaker/Icebreaker/icebreaker/__init__.pyc
===================================================================
(Binary files differ)
Modified: trunk/icebreaker/Icebreaker/icebreaker/controllers.py
===================================================================
--- trunk/icebreaker/Icebreaker/icebreaker/controllers.py 2007-06-21 00:42:23 UTC (rev 13151)
+++ trunk/icebreaker/Icebreaker/icebreaker/controllers.py 2007-06-21 00:47:55 UTC (rev 13152)
@@ -2,9 +2,9 @@
# from model import *
from turbogears import identity, redirect
from cherrypy import request, response
-# from icebreaker import json
-# import logging
-# log = logging.getLogger("icebreaker.controllers")
+from icebreaker import json
+import logging
+log = logging.getLogger("icebreaker.controllers")
class Root(controllers.RootController):
@expose(template="icebreaker.templates.icebreaker")
@@ -43,3 +43,8 @@
def logout(self):
identity.current.logout()
raise redirect("/")
+
+ @expose(template="icebreaker.templates.list")
+ def list(self):
+ from model import data
+ return dict(data=data.select())
Modified: trunk/icebreaker/Icebreaker/icebreaker/controllers.pyc
===================================================================
(Binary files differ)
Modified: trunk/icebreaker/Icebreaker/icebreaker/model.pyc
===================================================================
(Binary files differ)
Modified: trunk/icebreaker/Icebreaker/icebreaker/templates/__init__.pyc
===================================================================
(Binary files differ)
Modified: trunk/icebreaker/Icebreaker/icebreaker/templates/icebreaker.pyc
===================================================================
(Binary files differ)
Added: trunk/icebreaker/Icebreaker/icebreaker/templates/list.kid
===================================================================
--- trunk/icebreaker/Icebreaker/icebreaker/templates/list.kid (rev 0)
+++ trunk/icebreaker/Icebreaker/icebreaker/templates/list.kid 2007-06-21 00:47:55 UTC (rev 13152)
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="'master.kid'">
+<head>
+ <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''" />
+ <title>List</title>
+</head>
+<body>
+<table border="1">
+ <tr>
+ <td>Artist</td>
+ <td>Album</td>
+ <td>Title</td>
+ <td>Genre</td>
+ <td>Path</td>
+ </tr>
+ <tr py:for="list in data">
+ <td py:content="list.artist1">artist</td>
+ <td py:content="list.album1">album</td>
+ <td py:content="list.title1">title</td>
+ <td py:content="list.genre1">genre</td>
+ <td py:content="list.path1">path</td>
+ </tr>
+</table>
+</body>
+</html>
Modified: trunk/icebreaker/Icebreaker/icebreaker/templates/master.pyc
===================================================================
(Binary files differ)
Modified: trunk/icebreaker/config.py
===================================================================
--- trunk/icebreaker/config.py 2007-06-21 00:42:23 UTC (rev 13151)
+++ trunk/icebreaker/config.py 2007-06-21 00:47:55 UTC (rev 13152)
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# Config file for Icebreaker
-file_dir=''
+file_dir='../samplemusic/'
# conn = 'mysql://test:pwd@localhost/testdb'
# conn = 'mysql://test:pwd@localhost/testdb?debug=1'
@@ -12,4 +12,4 @@
# conn = DBMConnection('database/')
# conn = 'dbm://path/to/database/'
-conn = ''
+conn = 'sqlite:///mnt/icebreaker/icebreaker/Icebreaker/devdata.sqlite'
More information about the commits
mailing list