From c11de8424160978cb3fc2cd74e25bfaa6a949afd Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 2 Mar 2010 16:00:05 +0200 Subject: [PATCH] Added timezones --- scribeengine/controllers/account.py | 2 ++ scribeengine/public/styles/style.css | 29 ++++++++++++++--------- scribeengine/templates/account/index.mako | 19 ++++++++++++--- setup.py | 4 +++- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/scribeengine/controllers/account.py b/scribeengine/controllers/account.py index 3661fcf..74ac213 100644 --- a/scribeengine/controllers/account.py +++ b/scribeengine/controllers/account.py @@ -27,6 +27,7 @@ from urlparse import urlsplit from datetime import datetime from formencode.validators import Int +from pytz import all_timezones from scribeengine.lib.base import * from scribeengine.lib.validation.client import JSString, JSEmail @@ -42,6 +43,7 @@ class AccountController(BaseController): @authenticate() def index(self): c.page_title = u'My Account' + c.timezones = all_timezones return render(u'/account/index.mako') def register(self): diff --git a/scribeengine/public/styles/style.css b/scribeengine/public/styles/style.css index 1e0ed89..8902fde 100644 --- a/scribeengine/public/styles/style.css +++ b/scribeengine/public/styles/style.css @@ -384,17 +384,6 @@ fieldset { padding: 0; } -fieldset.form-details { - background: url(../images/img05.gif) no-repeat left 1.5em; - padding: 13px 20px 0 20px; -} - -fieldset.form-details legend { - font-size: 1.2em; - margin-left: 0; - padding-left: 0; -} - .form-text, .form-password, .form-textarea { @@ -434,6 +423,24 @@ fieldset.form-details legend { margin-top: 0.2em; } +fieldset.form-details { + padding: 10px; +} + +fieldset.form-details legend { + background: url(../images/img05.gif) no-repeat left top; + color: #fff; + font-size: 1.5em; + line-height: 50px; + margin: 0 -10px; + padding-left: 1em; + width: 593px; +} + +fieldset.form-details .form-text { + width: 573px; +} + #register-now { margin-left: 1em; } diff --git a/scribeengine/templates/account/index.mako b/scribeengine/templates/account/index.mako index dca3fe6..aca5b6a 100644 --- a/scribeengine/templates/account/index.mako +++ b/scribeengine/templates/account/index.mako @@ -2,24 +2,37 @@ <%include file="/flash.mako"/>

My Account

+

This is your account page. Update your details by changing them below and clicking the Save button.

<%include file="/errors.mako"/>
Required Details
- +
- +
Personal Details
- + +
+
+ + +
+
+ +
diff --git a/setup.py b/setup.py index 4342c9f..a0c69cc 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- try: from setuptools import setup, find_packages except ImportError: @@ -28,7 +29,8 @@ setup( "Pylons==0.9.7", "SQLAlchemy>=0.5,<0.6", "TurboMail>=3.0,<3.1", - "MonthDelta>=0.9,<0.10" + "MonthDelta>=0.9,<0.10", + "pytz" ], setup_requires=["PasteScript>=1.6.3"], packages=find_packages(exclude=['ez_setup']),