From 3977513b5d7b741663e806566d72fb81916f4775 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Tue, 6 Aug 2013 02:04:38 -0700 Subject: [PATCH] Made non-app portions of site friendlier. --- .../newsrdr/NewsReaderServlet.scala | 10 ++--- .../WEB-INF/templates/layouts/default.ssp | 33 +-------------- .../webapp/WEB-INF/templates/views/app.ssp | 42 ++++++++++++++++++- .../webapp/WEB-INF/templates/views/index.ssp | 21 ++++++++++ src/main/webapp/static/css/layout.css | 11 +++++ .../js/controllers/NewsFeedController.js | 2 + 6 files changed, 78 insertions(+), 41 deletions(-) create mode 100644 src/main/webapp/WEB-INF/templates/views/index.ssp diff --git a/src/main/scala/com/thoughtbug/newsrdr/NewsReaderServlet.scala b/src/main/scala/com/thoughtbug/newsrdr/NewsReaderServlet.scala index 9318407..36df171 100644 --- a/src/main/scala/com/thoughtbug/newsrdr/NewsReaderServlet.scala +++ b/src/main/scala/com/thoughtbug/newsrdr/NewsReaderServlet.scala @@ -13,13 +13,9 @@ import org.openid4java.message._ class NewsReaderServlet(dao: DataTables, db: Database) extends NewsrdrStack with AuthOpenId { val manager = new ConsumerManager - get("/") { - - -

test server

- Real website coming soon. For now, click here to get to the main app. - - + get("/") { + contentType = "text/html" + ssp("/index") } get("/auth/login") { diff --git a/src/main/webapp/WEB-INF/templates/layouts/default.ssp b/src/main/webapp/WEB-INF/templates/layouts/default.ssp index d260246..27d12f9 100644 --- a/src/main/webapp/WEB-INF/templates/layouts/default.ssp +++ b/src/main/webapp/WEB-INF/templates/layouts/default.ssp @@ -1,7 +1,7 @@ <%@ val body: String %> - newsrdr + newsrdr beta @@ -22,36 +22,5 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/templates/views/app.ssp b/src/main/webapp/WEB-INF/templates/views/app.ssp index 41b8d0b..269e6e2 100644 --- a/src/main/webapp/WEB-INF/templates/views/app.ssp +++ b/src/main/webapp/WEB-INF/templates/views/app.ssp @@ -17,10 +17,16 @@
  • add new feed
  • logout
    • -
  • about newsrdr
    • -
  • help
    • +
  • about newsrdr
    • +
  • help
    • +
    +

    welcome

    +

    + To get started, select a feed from the left. Or, if you don't have any feeds yet, add one. +

    +