[xiph-commits] r3938 - in arkaiv/trunk: . arkaiv/config arkaiv/controllers arkaiv/lib arkaiv/model arkaiv/templates arkaiv/tests/functional data/templates
dcrowdy at svn.annodex.net
dcrowdy at svn.annodex.net
Fri May 29 17:42:47 PDT 2009
Author: dcrowdy
Date: 2009-05-29 17:42:47 -0700 (Fri, 29 May 2009)
New Revision: 3938
Added:
arkaiv/trunk/arkaiv/controllers/admin.py
arkaiv/trunk/arkaiv/tests/functional/test_admin.py
Modified:
arkaiv/trunk/arkaiv/config/__init__.pyc
arkaiv/trunk/arkaiv/config/environment.pyc
arkaiv/trunk/arkaiv/config/middleware.py
arkaiv/trunk/arkaiv/config/middleware.pyc
arkaiv/trunk/arkaiv/config/routing.pyc
arkaiv/trunk/arkaiv/controllers/__init__.pyc
arkaiv/trunk/arkaiv/controllers/addmedia.py
arkaiv/trunk/arkaiv/controllers/collection.py
arkaiv/trunk/arkaiv/controllers/error.pyc
arkaiv/trunk/arkaiv/controllers/item.py
arkaiv/trunk/arkaiv/controllers/list.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/templates/autohandler
arkaiv/trunk/arkaiv/templates/collections.mak
arkaiv/trunk/arkaiv/templates/displayitem.mak
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.pyc
arkaiv/trunk/data/templates/displayitem.mak.py
arkaiv/trunk/data/templates/displayitem.mak.pyc
arkaiv/trunk/data/templates/mainpage.mak.pyc
arkaiv/trunk/development.ini
Log:
Implemented basic authentication with users and roles
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.py
===================================================================
--- arkaiv/trunk/arkaiv/config/middleware.py 2009-05-29 21:58:55 UTC (rev 3937)
+++ arkaiv/trunk/arkaiv/config/middleware.py 2009-05-30 00:42:47 UTC (rev 3938)
@@ -1,4 +1,8 @@
"""Pylons middleware initialization"""
+import authkit.authenticate
+import authkit.authorize
+from authkit.permissions import ValidAuthKitUser
+
from paste.cascade import Cascade
from paste.registry import RegistryManager
from paste.urlparser import StaticURLParser
@@ -50,8 +54,11 @@
if asbool(full_stack):
# Handle Python exceptions
- app = ErrorHandler(app, global_conf, **config['pylons.errorware'])
-
+# app = ErrorHandler(app, global_conf, **config['pylons.errorware'])
+ #permission = ValidAuthKitUser()
+# app = authkit.authorize.middleware(app, permission)
+ app = authkit.authenticate.middleware(app, app_conf)
+
# Display error documents for 401, 403, 404 status codes (and
# 500 when debug is disabled)
if asbool(config['debug']):
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/addmedia.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/addmedia.py 2009-05-29 21:58:55 UTC (rev 3937)
+++ arkaiv/trunk/arkaiv/controllers/addmedia.py 2009-05-30 00:42:47 UTC (rev 3938)
@@ -8,6 +8,8 @@
from pylons import request, response, session, tmpl_context as c
from pylons.controllers.util import abort, redirect_to
from pylons import config
+from authkit.authorize.pylons_adaptors import authorize
+from authkit.permissions import RemoteUser, ValidAuthKitUser, UserIn
from arkaiv.lib.base import BaseController, render, model
from arkaiv.model.cmmlparser import cmmlParser
@@ -20,6 +22,10 @@
class AddmediaController(BaseController):
+ @authorize(ValidAuthKitUser())
+ def __before__(self):
+ pass
+
def index(self):
# Return a rendered template
#return render('/addmedia.mako')
Added: arkaiv/trunk/arkaiv/controllers/admin.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/admin.py (rev 0)
+++ arkaiv/trunk/arkaiv/controllers/admin.py 2009-05-30 00:42:47 UTC (rev 3938)
@@ -0,0 +1,26 @@
+import logging
+
+from pylons import request, response, session, tmpl_context as c
+from pylons.controllers.util import abort, redirect_to
+from authkit.authorize.pylons_adaptors import authorize
+from authkit.permissions import RemoteUser, ValidAuthKitUser, UserIn
+
+from arkaiv.lib.base import BaseController
+
+log = logging.getLogger(__name__)
+
+class AdminController(BaseController):
+
+ def index(self):
+ # Return a rendered template
+ #return render('/admin.mako')
+ # or, return a response
+ return 'Hello World'
+
+ @authorize(ValidAuthKitUser())
+ def login(self):
+ return redirect_to(controller='list', action='index')
+
+ def logout(self):
+ return "Successfully signed out!"
+
Modified: arkaiv/trunk/arkaiv/controllers/collection.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/collection.py 2009-05-29 21:58:55 UTC (rev 3937)
+++ arkaiv/trunk/arkaiv/controllers/collection.py 2009-05-30 00:42:47 UTC (rev 3938)
@@ -2,6 +2,8 @@
from pylons import request, response, session, tmpl_context as c
from pylons.controllers.util import abort, redirect_to
+from authkit.authorize.pylons_adaptors import authorized
+from authkit.permissions import HasAuthKitRole, ValidAuthKitUser, And
from arkaiv.lib.base import BaseController, render, model
@@ -13,9 +15,14 @@
# Not really used
return render('/collections.mak')
+ #@authorize(ValidAuthKitUser())
+# @authorize(HasAuthKitRole('admin'))
def list(self):
c.collections = model.getcollections()
- return render('/collections.mak')
+ if authorized(HasAuthKitRole('admin')):
+ return render('/collectionsadmin.mak')
+ else:
+ return render('/collections.mak')
def displaycollection(self):
collid = request.params['id']
Modified: arkaiv/trunk/arkaiv/controllers/error.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/controllers/item.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/item.py 2009-05-29 21:58:55 UTC (rev 3937)
+++ arkaiv/trunk/arkaiv/controllers/item.py 2009-05-30 00:42:47 UTC (rev 3938)
@@ -6,6 +6,8 @@
from pylons import request, response, session, tmpl_context as c
from pylons.controllers.util import abort, redirect_to
+from authkit.authorize.pylons_adaptors import authorized
+from authkit.permissions import HasAuthKitRole, ValidAuthKitUser, And
from arkaiv.lib.base import BaseController, render, model
from arkaiv.model.oggzinfo import OggzInfo
@@ -85,7 +87,10 @@
sourcedict['has_audio'] = "No"
c.sourcedict = sourcedict
- return render('/displayitem.mak')
+ if authorized(HasAuthKitRole('admin')):
+ return render('/displayitemadmin.mak')
+ else:
+ return render('/displayitem.mak')
def addmetainfo(self):
metadict = {}
Modified: arkaiv/trunk/arkaiv/controllers/list.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/list.py 2009-05-29 21:58:55 UTC (rev 3937)
+++ arkaiv/trunk/arkaiv/controllers/list.py 2009-05-30 00:42:47 UTC (rev 3938)
@@ -1,5 +1,7 @@
import logging
+from authkit.authorize.pylons_adaptors import authorize
+from authkit.permissions import RemoteUser, ValidAuthKitUser, UserIn
from pylons import request, response, session, tmpl_context as c
from pylons.controllers.util import abort, redirect_to
@@ -8,8 +10,15 @@
log = logging.getLogger(__name__)
class ListController(BaseController):
-
+# @authorize(ValidAuthKitUser())
def index(self):
- c.items = model.getallitems()
- return render('/mainpage.mak')
+# if request.environ.get("REMOTE_USER"):
+ c.items = model.getallitems()
+ return render('/mainpage.mak')
+# else:
+# response.status = "401 Not authenticated"
+# return "You are not authenticated"
+ def signout(self):
+ return "Successfully signed out!"
+
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/templates/autohandler
===================================================================
--- arkaiv/trunk/arkaiv/templates/autohandler 2009-05-29 21:58:55 UTC (rev 3937)
+++ arkaiv/trunk/arkaiv/templates/autohandler 2009-05-30 00:42:47 UTC (rev 3938)
@@ -20,6 +20,8 @@
${ h.text_field('searchterms', value="Search") }
${ h.end_form() }
</span>
+ <li>${ h.link_to("Login", h.url_for(controller='admin', action='login')) }</li>
+ <li>${ h.link_to("Logout", h.url_for(controller='admin', action='logout')) }</li>
</li>
</ul>
</div>
Modified: arkaiv/trunk/arkaiv/templates/collections.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/collections.mak 2009-05-29 21:58:55 UTC (rev 3937)
+++ arkaiv/trunk/arkaiv/templates/collections.mak 2009-05-30 00:42:47 UTC (rev 3938)
@@ -7,9 +7,6 @@
<li>
${ h.link_to(coll['name'], h.url_for(action="displaycollection", edit="no", id=coll['index'], name=coll['name'])) }
${ h.form(h.url_for(action='deletecollection', id=coll['index']), multipart=True) }
-Delete collection:
-${ h.submit('Delete') }
-${ h.end_form() }
</li>
% endfor
Modified: arkaiv/trunk/arkaiv/templates/displayitem.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/displayitem.mak 2009-05-29 21:58:55 UTC (rev 3937)
+++ arkaiv/trunk/arkaiv/templates/displayitem.mak 2009-05-30 00:42:47 UTC (rev 3938)
@@ -3,16 +3,16 @@
<div id="video">
## Title of item and script to change name
-<p id="edititemname">${c.itemname}</p>
-<script type="text/javascript">
- new Ajax.InPlaceEditor('edititemname', '/item/edititemname', { callback: function(form, value) { return 'itemid=${c.itemid}&myparam=' + escape(value) }});
-</script>
-
+##<p id="edititemname">${c.itemname}</p>
+##<script type="text/javascript">
+## new Ajax.InPlaceEditor('edititemname', '/item/edititemname', { callback: function(form, value) { return 'itemid=${c.itemid}&myparam=' + escape(value) }});
+##</script>
+<p>${c.itemname}</p>
## Or delete it...
-${ h.form(h.url_for(action='deleteitem'), multipart=True) }
-${ h.submit('Delete') }
-${ h.hidden_field('itemid', value=c.itemid) }
-${ h.end_form() }
+##${ h.form(h.url_for(action='deleteitem'), multipart=True) }
+##${ h.submit('Delete') }
+##${ h.hidden_field('itemid', value=c.itemid) }
+##${ h.end_form() }
% if c.sourcedict['has_video'] == "Yes":
@@ -41,20 +41,20 @@
</form>
##Header info - should really only be editable by priveleged users
-<hr>
-Head:
-${ h.form(h.url_for(controller='item', action='editheadinfo'), multipart=True) }
-id:
-${ h.text_field('headid', value=c.headdict['id']) }
-Title:
-${ h.text_field('headtitle', value=c.headdict['title']) }
-${ h.hidden_field('itemid', value=c.itemid) }
+##<hr>
+##Head:
+##${ h.form(h.url_for(controller='item', action='editheadinfo'), multipart=True) }
+##id:
+##{ h.text_field('headid', value=c.headdict['id']) }
+##Title:
+##${ h.text_field('headtitle', value=c.headdict['title']) }
+##${ h.hidden_field('itemid', value=c.itemid) }
+##
+##${ h.submit('Edit') }
+##${ h.end_form() }
+##<br />
+##<hr>
-${ h.submit('Edit') }
-${ h.end_form() }
-<br />
-<hr>
-
Meta information:<br />
<table style="font-size:small">
<tr>
@@ -76,12 +76,12 @@
</script>
</td>
<td>
-${ h.form(h.url_for(action='deletemeta'), multipart=True) }
-${ h.submit('Delete') }
-${ h.hidden_field('metaid', value=metainfo['index']) }
-${ h.hidden_field('itemid', value=c.itemid) }
-${ h.hidden_field('headid', value=c.headdict['index']) }
-${ h.end_form() }
+##${ h.form(h.url_for(action='deletemeta'), multipart=True) }
+##${ h.submit('Delete') }
+##${ h.hidden_field('metaid', value=metainfo['index']) }
+##${ h.hidden_field('itemid', value=c.itemid) }
+##${ h.hidden_field('headid', value=c.headdict['index']) }
+##${ h.end_form() }
</td>
</tr>
@@ -172,11 +172,11 @@
<td>${clipinfo['desc']}</td>
<td>${clipinfo['a_href']}</td>
-${ h.form(h.url_for(action='deleteclip'), multipart=True) }
-<td>${ h.submit('Delete') } </td>
-${ h.hidden_field('clipid', value=clipinfo['ixc']) }
-${ h.hidden_field('itemid', value=c.itemid) }
-${ h.end_form() }
+##${ h.form(h.url_for(action='deleteclip'), multipart=True) }
+##<td>${ h.submit('Delete') } </td>
+##${ h.hidden_field('clipid', value=clipinfo['ixc']) }
+##${ h.hidden_field('itemid', value=c.itemid) }
+##${ h.end_form() }
</tr>
% endfor
Added: arkaiv/trunk/arkaiv/tests/functional/test_admin.py
===================================================================
--- arkaiv/trunk/arkaiv/tests/functional/test_admin.py (rev 0)
+++ arkaiv/trunk/arkaiv/tests/functional/test_admin.py 2009-05-30 00:42:47 UTC (rev 3938)
@@ -0,0 +1,7 @@
+from arkaiv.tests import *
+
+class TestAdminController(TestController):
+
+ def test_index(self):
+ response = self.app.get(url(controller='admin', action='index'))
+ # Test response...
Modified: arkaiv/trunk/data/templates/addannodexform.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/autohandler.py
===================================================================
--- arkaiv/trunk/data/templates/autohandler.py 2009-05-29 21:58:55 UTC (rev 3937)
+++ arkaiv/trunk/data/templates/autohandler.py 2009-05-30 00:42:47 UTC (rev 3938)
@@ -3,8 +3,8 @@
__M_dict_builtin = dict
__M_locals_builtin = locals
_magic_number = 5
-_modified_time = 1243485005.7403729
-_template_filename=u'/home/dcrowdy/src/arkaiv/working/trunk/arkaiv/templates/autohandler'
+_modified_time = 1243642435.9865539
+_template_filename=u'/home/dcrowdy/src/arkaiv/trunk/arkaiv/templates/autohandler'
_template_uri=u'/autohandler'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
@@ -46,8 +46,14 @@
__M_writer(u' \n')
# SOURCE LINE 21
__M_writer(unicode( h.end_form() ))
- __M_writer(u' \n </span>\n </li>\n</ul>\n</div>\n</p>\n\n <!--div class="content"-->\n')
- # SOURCE LINE 29
+ __M_writer(u' \n </span>\n <li>')
+ # SOURCE LINE 23
+ __M_writer(unicode( h.link_to("Login", h.url_for(controller='admin', action='login')) ))
+ __M_writer(u'</li>\n <li>')
+ # SOURCE LINE 24
+ __M_writer(unicode( h.link_to("Logout", h.url_for(controller='admin', action='logout')) ))
+ __M_writer(u'</li>\n </li>\n</ul>\n</div>\n</p>\n\n <!--div class="content"-->\n')
+ # SOURCE LINE 31
__M_writer(unicode(next.body()))
__M_writer(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.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/displayitem.mak.py
===================================================================
--- arkaiv/trunk/data/templates/displayitem.mak.py 2009-05-29 21:58:55 UTC (rev 3937)
+++ arkaiv/trunk/data/templates/displayitem.mak.py 2009-05-30 00:42:47 UTC (rev 3938)
@@ -3,8 +3,8 @@
__M_dict_builtin = dict
__M_locals_builtin = locals
_magic_number = 5
-_modified_time = 1243488511.693424
-_template_filename='/home/dcrowdy/src/arkaiv/working/trunk/arkaiv/templates/displayitem.mak'
+_modified_time = 1243643993.12429
+_template_filename='/home/dcrowdy/src/arkaiv/trunk/arkaiv/templates/displayitem.mak'
_template_uri='/displayitem.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
@@ -31,25 +31,12 @@
__M_writer = context.writer()
# SOURCE LINE 1
__M_writer(u' \n\n<div id="video">\n\n')
- # SOURCE LINE 6
- __M_writer(u'<p id="edititemname">')
+ # SOURCE LINE 10
+ __M_writer(u'<p>')
__M_writer(unicode(c.itemname))
- __M_writer(u'</p>\n<script type="text/javascript">\n new Ajax.InPlaceEditor(\'edititemname\', \'/item/edititemname\', { callback: function(form, value) { return \'itemid=')
- # SOURCE LINE 8
- __M_writer(unicode(c.itemid))
- __M_writer(u"&myparam=' + escape(value) }});\n</script>\n\n")
- # SOURCE LINE 12
- __M_writer(unicode( h.form(h.url_for(action='deleteitem'), multipart=True) ))
- __M_writer(u'\n')
- # SOURCE LINE 13
- __M_writer(unicode( h.submit('Delete') ))
- __M_writer(u' \n')
- # SOURCE LINE 14
- __M_writer(unicode( h.hidden_field('itemid', value=c.itemid) ))
- __M_writer(u'\n')
- # SOURCE LINE 15
- __M_writer(unicode( h.end_form() ))
- __M_writer(u' \n \n\n')
+ __M_writer(u'</p>\n')
+ # SOURCE LINE 16
+ __M_writer(u' \n\n')
# SOURCE LINE 18
if c.sourcedict['has_video'] == "Yes":
# SOURCE LINE 19
@@ -73,26 +60,8 @@
__M_writer(u'?t=")\'></textarea></td>\n</tr>\n')
# SOURCE LINE 40
__M_writer(u'</table>\n</form>\n\n')
- # SOURCE LINE 44
- __M_writer(u'<hr>\nHead:\n')
- # SOURCE LINE 46
- __M_writer(unicode( h.form(h.url_for(controller='item', action='editheadinfo'), multipart=True) ))
- __M_writer(u'\nid:\n')
- # SOURCE LINE 48
- __M_writer(unicode( h.text_field('headid', value=c.headdict['id']) ))
- __M_writer(u'\nTitle:\n')
- # SOURCE LINE 50
- __M_writer(unicode( h.text_field('headtitle', value=c.headdict['title']) ))
- __M_writer(u'\n')
- # SOURCE LINE 51
- __M_writer(unicode( h.hidden_field('itemid', value=c.itemid) ))
- __M_writer(u'\n\n')
- # SOURCE LINE 53
- __M_writer(unicode( h.submit('Edit') ))
- __M_writer(u' \n')
- # SOURCE LINE 54
- __M_writer(unicode( h.end_form() ))
- __M_writer(u' \n<br />\n<hr>\n\nMeta information:<br />\n<table style="font-size:small">\n<tr>\n <td>Name</td>\n <td>Content</td>\n</tr>\n')
+ # SOURCE LINE 57
+ __M_writer(u'\nMeta information:<br />\n<table style="font-size:small">\n<tr>\n <td>Name</td>\n <td>Content</td>\n</tr>\n')
# SOURCE LINE 64
for metainfo in c.metalist:
# SOURCE LINE 65
@@ -113,24 +82,8 @@
__M_writer(u'&field=content&itemid=')
__M_writer(unicode(c.itemid))
__M_writer(u"&myparam=' + escape(value) }});\n</script>\n</td>\n<td>\n")
- # SOURCE LINE 79
- __M_writer(unicode( h.form(h.url_for(action='deletemeta'), multipart=True) ))
- __M_writer(u'\n')
- # SOURCE LINE 80
- __M_writer(unicode( h.submit('Delete') ))
- __M_writer(u'\n')
- # SOURCE LINE 81
- __M_writer(unicode( h.hidden_field('metaid', value=metainfo['index']) ))
- __M_writer(u'\n')
- # SOURCE LINE 82
- __M_writer(unicode( h.hidden_field('itemid', value=c.itemid) ))
- __M_writer(u'\n')
- # SOURCE LINE 83
- __M_writer(unicode( h.hidden_field('headid', value=c.headdict['index']) ))
- __M_writer(u'\n')
- # SOURCE LINE 84
- __M_writer(unicode( h.end_form() ))
- __M_writer(u' \n\n</td>\n</tr> \n')
+ # SOURCE LINE 85
+ __M_writer(u'\n</td>\n</tr> \n')
# SOURCE LINE 89
__M_writer(u'</table>\n<hr>\nAdd new meta tag:\n')
# SOURCE LINE 92
@@ -244,21 +197,8 @@
# SOURCE LINE 173
__M_writer(unicode(clipinfo['a_href']))
__M_writer(u'</td>\n\n')
- # SOURCE LINE 175
- __M_writer(unicode( h.form(h.url_for(action='deleteclip'), multipart=True) ))
- __M_writer(u'\n<td>')
- # SOURCE LINE 176
- __M_writer(unicode( h.submit('Delete') ))
- __M_writer(u' </td>\n')
- # SOURCE LINE 177
- __M_writer(unicode( h.hidden_field('clipid', value=clipinfo['ixc']) ))
- __M_writer(u'\n')
- # SOURCE LINE 178
- __M_writer(unicode( h.hidden_field('itemid', value=c.itemid) ))
- __M_writer(u'\n')
- # SOURCE LINE 179
- __M_writer(unicode( h.end_form() ))
- __M_writer(u' \n\n</tr> \n')
+ # SOURCE LINE 180
+ __M_writer(u'\n</tr> \n')
# SOURCE LINE 183
__M_writer(u'</table>\n\nAdd new clip:\n<!--')
# SOURCE LINE 186
Modified: arkaiv/trunk/data/templates/displayitem.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/mainpage.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/development.ini
===================================================================
--- arkaiv/trunk/development.ini 2009-05-29 21:58:55 UTC (rev 3937)
+++ arkaiv/trunk/development.ini 2009-05-30 00:42:47 UTC (rev 3938)
@@ -25,14 +25,12 @@
beaker.session.secret = somesecret
sqlalchemy.url = sqlite:///arkaiv.db
sqlalchemy.echo = true
-#authkit.enable = true
-#authkit.setup.method = digest
-#authkit.method = digest
-#authkit.users.setup = user:pylons
-#authkit.setup.method = form, cookie
-#authkit.form.authenticate.user.data = visitor:open_sesame
-#authkit.cookie.secret = secret string
+authkit.setup.method = form, cookie
+authkit.cookie.secret = secret string
+authkit.cookie.signoutpath = /admin/logout
+authkit.form.authenticate.user.data = user:pylons user
+ admin:pword admin
# If you'd like to fine-tune the individual locations of the cache data dirs
# for the Cache data, or the Session saves, un-comment the desired settings
More information about the commits
mailing list