diff --git a/NEWS b/NEWS index b6ee585..638fac1 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,7 @@ -1.5.0: +1.5.0 beta 2: + * + +1.5.0 beta 1: August 27, 2008 * Completed the Luminotes Desktop Windows installer. * Improved logging, so tracebacks in production and desktop mode actually go to a file. Also removed logs on startup to prevent endless log growth. diff --git a/config/Common.py b/config/Common.py index c0c4d67..0191edd 100644 --- a/config/Common.py +++ b/config/Common.py @@ -110,6 +110,15 @@ settings = { "luminotes.unsubscribe_button": """ """, + "luminotes.download_button": + """ +
+ + + + +
+ """, }, "/files/download": { "stream_response": True, diff --git a/controller/Root.py b/controller/Root.py index 189a798..2235e19 100644 --- a/controller/Root.py +++ b/controller/Root.py @@ -17,6 +17,7 @@ from view.Main_page import Main_page from view.Front_page import Front_page from view.Tour_page import Tour_page from view.Upgrade_page import Upgrade_page +from view.Download_page import Download_page from view.Forums_page import Forums_page from view.Notebook_rss import Notebook_rss from view.Json import Json @@ -344,6 +345,28 @@ class Root( object ): redirect = u"/pricing", ) + @expose( view = Download_page ) + @strongly_expire + @end_transaction + @grab_user_id + @validate( + user_id = Valid_id( none_okay = True ), + ) + def download( self, user_id = None ): + """ + Provide the information necessary to display the Luminotes download page. + """ + result = self.__users.current( user_id ) + parents = [ notebook for notebook in result[ u"notebooks" ] if notebook.trash_id and not notebook.deleted ] + if len( parents ) > 0: + result[ "first_notebook" ] = parents[ 0 ] + else: + result[ "first_notebook" ] = None + + result[ "download_button" ] = self.__settings[ u"global" ].get( u"luminotes.download_button" ) + + return result + # TODO: move this method to controller.Notebooks, and maybe give it a more sensible name @expose( view = Json ) @end_transaction diff --git a/static/css/product.css b/static/css/product.css index abc66fd..290b760 100644 --- a/static/css/product.css +++ b/static/css/product.css @@ -113,6 +113,12 @@ border: 1px solid #999999; } +.desktop_screenshot { + float: right; + text-align: center; + margin-left: 20px; +} + .heading { padding: 0.5em; margin-top: 1em; @@ -364,6 +370,10 @@ font-size: 82%; } +.download_button_area { + padding-top: 0.5em; +} + .yearly_link { font-size: 82%; } diff --git a/static/html/download.html b/static/html/source code.html similarity index 67% rename from static/html/download.html rename to static/html/source code.html index a419087..8d20970 100644 --- a/static/html/download.html +++ b/static/html/source code.html @@ -1,15 +1,16 @@ -

download

+

source code

-First of all: You don't need to download any software if you just want to +First of all: You don't need to download any source code if you just want to make a wiki! For that, simply -try the demo, or -sign up for a free account. +try the demo, +download Luminotes Desktop, or +sign up for a free account online.

-But if you do want to run Luminotes on your own server, here is the -necessary software: +But if you do want to run Luminotes on your own server or run Luminotes +Desktop on Linux, here is the necessary software: