commit bf2beea69dc8cbfb338c0968fa1e9f0f7913857b Author: dsorber Date: Thu Jul 31 17:57:22 2014 -0400 Whoops, I forgot that I have to manually add files that I modified to commits with git. Guess I'm a bit of a git... diff --git a/software/bookmark_library/bmklib/web/base_controller.py b/software/bookmark_library/bmklib/web/base_controller.py index cff142a..02c537b 100644 --- a/software/bookmark_library/bmklib/web/base_controller.py +++ b/software/bookmark_library/bmklib/web/base_controller.py @@ -8,7 +8,7 @@ TEMPLATE_PATH = os.path.join(BASE_PATH, 'bmklib', 'web', 'templates') class BaseHTMLController(object): - def __init__(self, template_name, environ): + def __init__(self, environ, template_name=None): self.environ = environ diff --git a/software/bookmark_library/bmklib/web/bmklib.wsgi b/software/bookmark_library/bmklib/web/bmklib.wsgi index 0704c3e..cf101bd 100644 --- a/software/bookmark_library/bmklib/web/bmklib.wsgi +++ b/software/bookmark_library/bmklib/web/bmklib.wsgi @@ -1,3 +1,4 @@ +from bmklib.web.controllers.bookmark import BookmarkPageController from bmklib.web.controllers.main import MainPageController # It accepts two arguments: @@ -9,9 +10,13 @@ def application(environ, start_response): if not environ['PATH_INFO'] or environ['PATH_INFO'] == '/': - controller = MainPageController('main.html', environ) + controller = MainPageController(environ) response_headers, response_body = controller.generate_response() + elif environ['PATH_INFO'].startswith('/bookmark'): + + controller = BookmarkPageController(environ) + response_headers, response_body = controller.generate_response() else: # User supplied an invalid URL response_body = 'Invalid URL "%s"' % environ['PATH_INFO'] diff --git a/software/bookmark_library/bmklib/web/controllers/main.py b/software/bookmark_library/bmklib/web/controllers/main.py index eda0a69..f7c9bbc 100644 --- a/software/bookmark_library/bmklib/web/controllers/main.py +++ b/software/bookmark_library/bmklib/web/controllers/main.py @@ -4,6 +4,9 @@ from bmklib.web.base_controller import BaseHTMLController, DB_PATH class MainPageController(BaseHTMLController): + def __init__(self, environ, template_name='main.html'): + super(MainPageController, self).__init__(environ, template_name) + def build_content(self): conn = sqlite3.connect(DB_PATH) diff --git a/software/bookmark_library/bmklib/web/templates/main.html b/software/bookmark_library/bmklib/web/templates/main.html index 7013253..b40f3e9 100644 --- a/software/bookmark_library/bmklib/web/templates/main.html +++ b/software/bookmark_library/bmklib/web/templates/main.html @@ -2,64 +2,16 @@ xmlns:py="http://genshi.edgewall.org/"> Bookmark Library - +

Bookmark Library

There are currently ${total_num_bmks} bookmarks in the library. - +