witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Rearranged many of the navigation links and expanded the product page footer.

This commit is contained in:
Dan Helfman 2008-11-15 13:15:51 -08:00
parent 4775d6df98
commit aa4d3585bd
10 changed files with 123 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controller/Root.py
View File

@ -368,6 +368,12 @@ class Root( object ):
redirect = u"/pricing",
)
@expose()
def support( self ):
return dict(
redirect = u"/community",
)
@expose( view = Download_page )
@strongly_expire
@end_transaction

4
static/css/header.css
View File

@ -34,3 +34,7 @@
height: 100%;
margin: 0 auto;
}
.nav_image {
vertical-align: middle;
}

34
static/css/product.css
View File

@ -195,16 +195,42 @@
.footer {
clear: both;
background-color: #b0d0ff;
height: 2em;
background-image: url(/static/images/footer.png);
background-repeat: repeat-x;
margin-left: 0;
margin-right: 0;
margin-top: 1em;
border-top: 1px solid #999999;
}
.footer_links {
font-size: 85%;
padding-top: 0.5em;
font-size: 72%;
}
.footer_links br {
clear: both;
}
.footer_category {
font-weight: bold;
}
.footer_column {
text-align: left;
}
.footer_list {
float: left;
list-style: none;
margin-left: 0;
margin-right: 0;
padding-left: 1em;
padding-right: 1em;
padding-bottom: 0.5em;
width: 125px;
}
.wide_footer_list {
width: 200px;
}
.tour_area {

30
static/html/support.html → static/html/community.html
View File

@ -1,4 +1,4 @@
<h3>support</h3>
<h3>community</h3>
<h4><a href="/contact_info" target="_top">contact support</a></h4>
@ -6,13 +6,6 @@
Have a question? I'll be happy to answer it.
</p>
<h4><a href="/faq" target="_top">frequently asked questions</a></h4>
<p>
The Luminotes faq covers some of the most common questions about the software,
so it's a good place to start.
</p>
<h4><a href="/forums/" target="_top">discussion forums</a></h4>
<p>
@ -20,13 +13,6 @@ In the Luminotes discussion forums, you can ask about Luminotes features and
chat with your fellow Luminoters.
</p>
<h4><a href="/guide" target="_top">user guide</a></h4>
<p>
The Luminotes user guide explains every feature of Luminotes in full detail,
and it even includes tips for organizing your wiki.
</p>
<h4><a href="/blog" target="_top">blog</a></h4>
<p>
@ -34,6 +20,20 @@ With the Luminotes blog, you can stay up to date on all the latest features
and announcements.
</p>
<h4><a href="/faq" target="_top">frequently asked questions</a></h4>
<p>
The Luminotes faq covers some of the most common questions about the software,
so it's a good place to start.
</p>
<h4><a href="/guide" target="_top">user guide</a></h4>
<p>
The Luminotes user guide explains every feature of Luminotes in full detail,
and it even includes tips for organizing your wiki.
</p>
<h4><a href="http://www.facebook.com/pages/Luminotes-personal-wiki-notebook/17143857741" target="_top">Facebook group</a></h4>
<p>

BIN
static/images/footer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 174 B

2
tools/initdb.py
View File

@ -23,7 +23,7 @@ class Initializer( object ):
( u"password reset.html", False ),
( u"advanced browser features.html", False ),
( u"supported browsers.html", False ),
( u"support.html", False ),
( u"community.html", False ),
( u"enable JavaScript.html", False ),
]

2
tools/updatedb.py
View File

@ -22,7 +22,7 @@ class Updater( object ):
( u"password reset.html", False ),
( u"advanced browser features.html", False ),
( u"supported browsers.html", False ),
( u"support.html", False ),
( u"community.html", False ),
( u"enable JavaScript.html", False ),
]

6
view/Front_page.py
View File

@ -47,17 +47,12 @@ class Front_page( Product_page ):
),
P(
A( u"Take a tour", href = u"/tour", class_ = u"hook_action" ), u", ",
A( u"Try the demo", href = u"/users/demo", class_ = u"hook_action" ), u", ", Br(),
A( u"Download", href = u"/download", class_ = u"hook_action" ), u", ",
Span( u" or ", class_ = u"hook_action_or" ),
A( u"Sign up", href = u"/pricing", class_ = u"hook_action" ),
class_ = u"hook_action_area",
separator = u"",
),
Div(
A( u"New discussion forums!", href = u"/forums/" ),
class_ = u"small_text",
),
class_ = u"explanation",
),
class_ = u"wide_center_area",
@ -352,7 +347,6 @@ class Front_page( Product_page ):
P(
Span( u"Sound interesting?", class_ = u"hook_action_question" ), Br(),
A( u"Take a tour", href = u"/tour", class_ = u"hook_action" ), u", ",
A( u"Try the demo", href = u"/users/demo", class_ = u"hook_action" ), u", ", Br(),
A( u"Download", href = u"/download", class_ = u"hook_action" ), u", ",
Span( u" or ", class_ = u"hook_action_or" ),
A( u"Sign up", href = u"/pricing", class_ = u"hook_action" ),

64
view/Header.py
View File

@ -34,10 +34,6 @@ class Header( Div ):
Div(
( note_title == u"home" ) and title_image or A( title_image, href = u"/" ),
( login_url and user.username == u"anonymous" ) and Div(
( note_title == u"download" ) and Span( u"download", class_ = u"bold_link" ) or \
A( u"download", href = u"/download", class_ = u"bold_link" ), u" | ",
( note_title == u"pricing" ) and Span( u"sign up", class_ = u"bold_link" ) or \
A( u"sign up", href = u"/pricing", class_ = u"bold_link" ), u" | ",
A(
u"login",
href = login_url,
@ -64,32 +60,6 @@ class Header( Div ):
),
" | ",
) or None,
( note_title == u"download" ) and Span( u"download", class_ = u"bold_link" ) or \
A(
u"download",
href = u"/download",
title = u"Download Luminotes to run on your own computer.",
class_ = u"bold_link",
),
" | ",
user.username and Span(
A(
u"upgrade",
href = u"/pricing",
title = u"Upgrade your Luminotes account.",
class_ = u"bold_link",
),
" | ",
) or Span(
( note_title == u"pricing" ) and Span( u"sign up", class_ = u"bold_link" ) or \
A(
u"sign up",
href = u"/pricing",
title = u"Sign up for an online Luminotes account.",
class_ = u"bold_link",
),
" | ",
) or None,
A(
u"logout",
href = logout_url,
@ -102,10 +72,36 @@ class Header( Div ):
( note_title == u"home" ) and Span( u"home", class_ = u"bold_link" ) or A( u"home", href = u"/" ), u" | ",
( note_title == u"tour" ) and Span( u"tour", class_ = u"bold_link" ) or A( u"tour", href = u"/tour" ), u" | ",
( user.username in ( None, u"anonymous" ) ) and Span( ( note_title == u"wiki" ) and Span( u"demo", class_ = u"bold_link" ) or A( u"demo", href = u"/users/demo" ), u" | " ) or None,
( note_title == u"support" ) and Span( u"support", class_ = u"bold_link" ) or A( u"support", href = u"/support" ), u" | ",
( note_title == u"team" ) and Span( u"team", class_ = u"bold_link" ) or A( u"team", href = u"/meet_the_team" ), u" | ",
( note_title == u"blog" ) and Span( u"blog", class_ = u"bold_link" ) or A( u"blog", href = u"/blog" ), u" | ",
( note_title == u"privacy" ) and Span( u"privacy", class_ = u"bold_link" ) or A( u"privacy", href = u"/privacy" ),
( note_title == u"community" ) and Span( u"community", class_ = u"bold_link" ) or A( u"community", href = u"/community" ), u" | ",
( note_title == u"download" ) and Span( u"download", class_ = u"bold_link" ) or \
A(
u"download",
href = u"/download",
title = u"Download Luminotes to run on your own computer.",
class_ = u"bold_link",
),
" | ",
( user.username and user.username != u"anonymous" ) and Span(
A(
u"upgrade",
href = u"/pricing",
title = u"Upgrade your Luminotes account.",
class_ = u"bold_link",
),
) or Span(
( note_title == u"pricing" ) and Span( u"sign up", class_ = u"bold_link" ) or \
A(
u"sign up",
href = u"/pricing",
title = u"Sign up for an online Luminotes account.",
class_ = u"bold_link",
),
) or None,
#( note_title == u"support" ) and Span( u"support", class_ = u"bold_link" ) or A( u"support", href = u"/support" ), u" | ",
#( note_title == u"team" ) and Span( u"team", class_ = u"bold_link" ) or A( u"team", href = u"/meet_the_team" ), u" | ",
#( note_title == u"blog" ) and Span( u"blog", class_ = u"bold_link" ) or A( u"blog", href = u"/blog" ), u" | ",
#( note_title == u"privacy" ) and Span( u"privacy", class_ = u"bold_link" ) or A( u"privacy", href = u"/privacy" ),
class_ = u"header_links",
),
class_ = u"wide_center_area",

44
view/Product_page.py
View File

@ -1,6 +1,6 @@
from Page import Page
from Header import Header
from Tags import Link, Meta, Div, A, Span
from Tags import Link, Meta, Div, A, Span, Ul, Li, Br
class Product_page( Page ):
@ -21,14 +21,42 @@ class Product_page( Page ):
Div(
Div(
# TODO make into a table kinda like on the footer of change.gov?
Div(
u"Copyright &copy;2008 Luminotes", u" | ",
A( u"contact", href = u"/contact_info" ), u" | ",
A( u"support", href = u"/support" ), u" | ",
A( u"source code", href = u"/source_code" ), u" | ",
A( u"team", href = u"/meet_the_team" ), u" | ",
A( u"blog", href = u"/blog" ), u" | ",
A( u"privacy", href = u"/privacy" ),
Div(
Ul(
Li( u"About", class_ = u"footer_category" ),
Li( A( u"tour", href = u"/tour" ) ),
Li( A( u"demo", href = u"/demo" ) ),
Li( A( u"faq", href = u"/faq" ) ),
Li( A( u"team", href = u"/meet_the_team" ) ),
Li( A( u"user guide", href = u"/guide" ) ),
Li( A( u"privacy", href = u"/privacy" ) ),
class_ = u"footer_list",
),
Ul(
Li( u"Get Started", class_ = u"footer_category" ),
Li( A( u"download", href = u"/download" ) ),
Li( A( u"sign up", href = u"/pricing" ) ),
Li( A( u"source code", href = u"/source_code" ) ),
class_ = u"footer_list",
),
Ul(
Li( u"Community", class_ = u"footer_category" ),
Li( A( u"contact support", href = u"/contact_info" ) ),
Li( A( u"discussion forums", href = u"/forums/" ) ),
Li( A( u"blog", href = u"/blog" ) ),
Li( A( u"Facebook group", href = u"http://www.facebook.com/pages/Luminotes-personal-wiki-notebook/17143857741" ) ),
Li( A( u"Twitter stream", href = u"http://twitter.com/Luminotes" ) ),
class_ = u"footer_list",
),
Ul(
Li( u"Copyright &copy;2008 Luminotes" ),
class_ = u"footer_list wide_footer_list",
),
Br(),
class_ = u"footer_column",
),
class_ = u"footer_links",
),
class_ = u"wide_center_area",