witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Upgrade page now tells you what rate plan you're at.

This commit is contained in:
Dan Helfman 2008-01-10 21:11:45 +00:00
parent 1f3b3dcd4c
commit d0362a3ad1
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controller/Root.py
View File

@ -252,6 +252,11 @@ class Root( object ):
else: else:
main_notebook = None main_notebook = None
if user_id:
user = self.__database.load( User, user_id )
else:
user = None
https_url = self.__settings[ u"global" ].get( u"luminotes.https_url" ) https_url = self.__settings[ u"global" ].get( u"luminotes.https_url" )
result = self.__users.current( user_id ) result = self.__users.current( user_id )
result[ "notebook" ] = main_notebook result[ "notebook" ] = main_notebook
@ -263,7 +268,7 @@ class Root( object ):
contents = unicode( Upgrade_note( contents = unicode( Upgrade_note(
self.__settings[ u"global" ].get( u"luminotes.rate_plans", [] ), self.__settings[ u"global" ].get( u"luminotes.rate_plans", [] ),
https_url, https_url,
user_id, user,
) ), ) ),
notebook_id = main_notebook.object_id, notebook_id = main_notebook.object_id,
) ] ) ]

21
view/Upgrade_note.py
View File

@ -2,7 +2,7 @@ from Tags import Div, Span, H3, P, A, Table, Tr, Th, Td, Br, Img
class Upgrade_note( Span ): class Upgrade_note( Span ):
def __init__( self, rate_plans, https_url, user_id ): def __init__( self, rate_plans, https_url, user ):
MEGABYTE = 1024 * 1024 MEGABYTE = 1024 * 1024
Span.__init__( Span.__init__(
@ -17,7 +17,7 @@ class Upgrade_note( Span ):
), ),
P( P(
Table( Table(
self.fee_row( rate_plans, user_id ), self.fee_row( rate_plans, user ),
Tr( Tr(
Td( u"included storage space", class_ = u"feature_name" ), Td( u"included storage space", class_ = u"feature_name" ),
[ Td( [ Td(
@ -53,7 +53,7 @@ class Upgrade_note( Span ):
border = u"1", border = u"1",
id = u"upgrade_table", id = u"upgrade_table",
), ),
( not user_id ) and P( ( not user ) and P(
u"To upgrade your Luminotes account, please", u"To upgrade your Luminotes account, please",
A( u"login", href = https_url + u"/login?after_login=/upgrade", target = u"_top" ), A( u"login", href = https_url + u"/login?after_login=/upgrade", target = u"_top" ),
u"first!", u"first!",
@ -62,6 +62,11 @@ class Upgrade_note( Span ):
id = u"upgrade_table_area", id = u"upgrade_table_area",
), ),
user and user.rate_plan > 0 and P(
u"You're currently subscribed to Luminotes %s." %
rate_plans[ user.rate_plan ][ u"name" ].capitalize(),
) or None,
H3( u"share your notebook" ), H3( u"share your notebook" ),
P( P(
A( A(
@ -143,7 +148,7 @@ class Upgrade_note( Span ):
), ),
P( P(
Table( Table(
self.fee_row( rate_plans, user_id, include_blank = False ), self.fee_row( rate_plans, user, include_blank = False ),
Tr( Tr(
[ Td( [ Td(
plan[ u"storage_quota_bytes" ] // MEGABYTE, " MB", plan[ u"storage_quota_bytes" ] // MEGABYTE, " MB",
@ -152,7 +157,7 @@ class Upgrade_note( Span ):
border = u"1", border = u"1",
id = u"upgrade_table_small", id = u"upgrade_table_small",
), ),
( not user_id ) and P( ( not user ) and P(
u"Please", u"Please",
A( u"login", href = https_url + u"/login?after_login=/upgrade", target = u"_top" ), A( u"login", href = https_url + u"/login?after_login=/upgrade", target = u"_top" ),
u"to upgrade your wiki!", u"to upgrade your wiki!",
@ -162,7 +167,7 @@ class Upgrade_note( Span ):
), ),
) )
def fee_row( self, rate_plans, user_id, include_blank = True ): def fee_row( self, rate_plans, user, include_blank = True ):
return Tr( return Tr(
include_blank and Th( u" " ) or None, include_blank and Th( u" " ) or None,
[ Th( [ Th(
@ -174,8 +179,8 @@ class Upgrade_note( Span ):
class_ = u"price_text", class_ = u"price_text",
separator = u"", separator = u"",
), ),
user_id and plan.get( u"button" ) % user_id or None, user and user.rate_plan != index and plan.get( u"button" ) % user.object_id or None,
) or None, ) or None,
class_ = u"plan_name", class_ = u"plan_name",
) for plan in rate_plans ], ) for ( index, plan ) in enumerate( rate_plans ) ],
) )