Permalink
Browse files

update templates

  • Loading branch information...
1 parent f393685 commit eb3d9970aac6a940e6061d4db20b7d2bcbdeb4f6 @fafhrd91 fafhrd91 committed Mar 1, 2012
View
@@ -17,11 +17,10 @@ db.sqlite
source
src/docs
src/ptah
-src/biga
src/ptah_crowd
+src/ptah_nextui
src/pyramid
src/pyramid_sockjs
-src/gevent
-src/gevent-websocket
+src/pyramid_jca
src/velruse
downloads/dist
View
@@ -9,14 +9,16 @@ download-cache = downloads
parts =
dirs
+ test
+ coverage
+ coverage-html
scripts
-#test
-#coverage
-#coverage-html
-
index = http://pypi.python.org/simple
+find-links +=
+ http://code.google.com/p/gevent/downloads/list
+
eggs =
ptah
devapp
@@ -35,10 +37,12 @@ eggs = ${buildout:eggs}
ptah
pyramid
sphinx
+ pyhogan
+ ptah_nextui
[versions]
coverage = 3.4
-zope.interface = 3.8.0
+ws4py = 0.1.4
[test]
recipe = zc.recipe.egg
View
@@ -8,13 +8,20 @@ auto-checkout = *
parts +=
omelette
+ test
+ coverage
+ coverage-html
eggs +=
pyramid_debugtoolbar
[sources]
ptah = git git@github.com:ptahproject/ptah.git
ptah_crowd = git git@github.com:ptahproject/ptah_crowd.git
+ptah_nextui = git git@github.com:ptahproject/ptah_nextui.git
+
+pyramid_jca = git git@github.com:fafhrd91/pyramid_jca.git
+pyramid_sockjs = git git@github.com:fafhrd91/pyramid_sockjs.git
devapp = fs devapp
View
@@ -1,8 +1,7 @@
[app:ptah]
use = egg:devapp
reload_templates = true
-#pyramid.includes = pyramid_debugtoolbar ptah ptah_crowd devapp pyramid_beaker
-pyramid.includes = ptah ptah_crowd devapp pyramid_beaker
+pyramid.includes = ptah ptah_crowd devapp pyramid_beaker pyramid_sockjs pyramid_jca ptah_nextui
# auth
ptah.auth = true
@@ -52,7 +51,7 @@ pipeline =
[server:main]
#use = egg:pyramid#wsgiref
use = egg:pyramid_sockjs#server
-host = 0.0.0.0
+host = 127.0.0.1
port = 8080
threadpool_workers = 1
threadpool_spawn_if_under = 1
View
@@ -1,41 +0,0 @@
-[buildout]
-include-site-packages = false
-
-extends = base.cfg
-extensions +=
- mr.developer
-auto-checkout = *
-
-parts +=
- py
- omelette
-
-eggs +=
- devsocket
- pyramid_debugtoolbar
- gunicorn
-
-[sources]
-pyramid_sockjs = git git@github.com:fafhrd91/pyramid_sockjs.git
-
-ptah = git git@github.com:ptahproject/ptah.git
-ptah_crowd = git git@github.com:ptahproject/ptah_crowd.git
-
-gevent = hg https://bitbucket.org/denis/gevent
-gevent-websocket = hg https://bitbucket.org/Jeffrey/gevent-websocket branch=stable
-
-devapp = fs devapp
-devsocket = fs devsocket
-
-[omelette]
-recipe = collective.recipe.omelette
-eggs = ${buildout:eggs}
-packages = ${buildout:directory} ./
-location = ${buildout:directory}/source
-
-[py]
-recipe = zc.recipe.egg
-eggs = ${buildout:eggs}
-extra-paths = .
-interpreter = py
-scripts = py
View
@@ -1,61 +0,0 @@
-[app:ptah]
-use = egg:devsocket
-reload_templates = true
-#pyramid.includes = pyramid_debugtoolbar pyramid_beaker
-#pyramid.includes = ptah ptah_crowd devapp
-pyramid.includes = pyramid_beaker
-
-# session settings
-session.type = file
-session.data_dir = %(here)s/var/sessions/data
-session.lock_dir = %(here)s/var/sessions/lock
-session.key = ptahsession
-session.secret = ptahsecret
-
-# mailer settings
-mail.host = localhost
-mail.port = 25
-mail.queue_path = None
-mail.default_sender = Ptah <info@ptahproject.org>
-mail.debug = true
-
-# sqlalchemy
-sqlalchemy.url = sqlite:///%(here)s/var/db.sqlite
-#sqlalchemy.url = postgresql+psycopg2://fafhrd@localhost:5433/forum
-
-[pipeline:main]
-pipeline =
- ptah
-
-[server:main]
-use = egg:pyramid_sockjs#server
-#use = egg:gunicorn
-host = 127.0.0.1
-port = 9090
-threadpool_workers = 1
-threadpool_spawn_if_under = 1
-workers = 1
-worker_class = gevent
-
-# Begin logging configuration
-[loggers]
-keys = root
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
@@ -6,7 +6,7 @@
<ul>
<li tal:repeat="info view.types">
<a href="${view.url}${info.addview if info.addview else '+/%s'%info.name}">
- ${info.title}
+ ${info.title}
</a>
<p>${info.description}</p>
</li>
@@ -5,16 +5,16 @@
<fieldset>
<div class="clearfix" tal:repeat="widget view.widgets.values()">
<label tal:attributes="for widget.id;
- title widget.description">
- ${widget.title}
- <tal:block condition="widget.required">*</tal:block>
+ title widget.description">
+ ${widget.title}
+ <tal:block condition="widget.required">*</tal:block>
</label>
<div class="input">
- <span tal:content="structure widget.value" />
- <span class="help-block"
- tal:condition="widget.description"
- tal:content="structure widget.description"></span>
+ <span tal:content="structure widget.value" />
+ <span class="help-block"
+ tal:condition="widget.description"
+ tal:content="structure widget.description"></span>
</div>
</div>
</fieldset>
@@ -3,8 +3,8 @@
</div>
<p>${context.description}</p>
-<div class="content" tal:define="blob view.resolve(context.blobref)">
- Size: ${view.format.size(blob.size)}<br />
+<div class="content" tal:define="blob resolve(context.blobref)">
+ Size: ${format.size(blob.size)}<br />
Mimetype: ${blob.mimetype}<br />
Original filename: ${blob.filename}<br />
<a href="${request.resource_url(context)[:-1]}">Download</a>
@@ -3,21 +3,21 @@
</div>
<tal:block tal:define="contents context.__children__;
- url request.resource_url(context)">
+ url request.resource_url(context)">
<form action="${request.url}" method="post">
<table class="zebra-striped">
<tr tal:repeat="item contents">
- <td><input type="checkbox" name="item" value="${item.__uri__}" />
- <td><a href="${url}${item.__name__}">${item.name or 'unknown'}</a></td>
- <td><a href="${url}${item.__name__}">${item.title}</a></td>
+ <td><input type="checkbox" name="item" value="${item.__uri__}" />
+ <td><a href="${url}${item.__name__}">${item.name or 'unknown'}</a></td>
+ <td><a href="${url}${item.__name__}">${item.title}</a></td>
</tr>
</table>
<div class="actions" tal:condition="contents">
<input type="submit" class="btn primary"
- name="form.buttons.rename" value="Rename" />
+ name="form.buttons.rename" value="Rename" />
<input type="submit" class="btn"
- name="form.buttons.cancel" value="Cancel" />
+ name="form.buttons.cancel" value="Cancel" />
</div>
</form>
</tal:block>
@@ -1,7 +1,8 @@
-<div class="row">
+<div class="container">
+ <div class="row">
<div class="span10 offset3 columns">
- <tal:block content="structure view.render_messages()" />
-
- <tal:block content="structure wrapped_content" />
+ ${structure: view.render_messages()}
+ ${structure: wrapped_content}
</div>
-</div>
+ </div>
+</div>
@@ -1,13 +1,15 @@
-<div class="row">
- <div class="span3 columns">
- <ul>
- <li tal:repeat="action view.actions">
- <a href="${action['url']}">${action['title']}</a>
- </li>
- </ul>
- </div>
+<div class="container">
+ <div class="row">
+ <div class="span2">
+ <ul>
+ <li tal:repeat="action view.actions">
+ <a href="${action['url']}">${action['title']}</a>
+ </li>
+ </ul>
+ </div>
- <div class="span13 columns">
- ${structure: wrapped_content}
+ <div class="span10">
+ ${structure: wrapped_content}
+ </div>
</div>
</div>
@@ -1,7 +1,9 @@
-<div class="row">
- <div class="span16 columns">
- <tal:block content="structure view.render_messages()" />
-
- ${structure: wrapped_content}
+<div class="container">
+ <div class="row">
+ <div class="span12">
+ <tal:block content="structure view.render_messages()" />
+
+ ${structure: wrapped_content}
+ </div>
</div>
</div>
@@ -1,14 +1,15 @@
<!DOCTYPE html>
<html lang="en">
- <head tal:define="root getattr(request, 'root', None)">
- <title>${getattr(root, 'title', '')}</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+ <head tal:define="root getattr(request, 'root', None)">
+ <title>${getattr(root, 'title', '')}</title>
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
- ${view.include('bootstrap')}
- <tal:block content="structure view.render_includes()" />
- </head>
+ ${view.include('bootstrap')}
+ ${structure: view.render_includes()}
+ </head>
- <body>
- <tal:block tal:content="structure wrapped_content" />
- </body>
+ <body>
+ <!-- Rendered content that is beeing passed to layout.render method -->
+ ${structure: wrapped_content}
+ </body>
</html>
Oops, something went wrong.

0 comments on commit eb3d997

Please sign in to comment.