still learning git... updates...

alsonkemp · Nov 17, 2008 · a8f9a12 · a8f9a12
1 parent a11b885
commit a8f9a12
Show file tree

Hide file tree

Showing 42 changed files with 196 additions and 50,543 deletions.
diff --git a/App/Controllers/About.hs b/App/Controllers/About.hs
diff --git a/App/Controllers/Develop.hs b/App/Controllers/Develop.hs
@@ -1,4 +1,3 @@
-module Develop (index) where
 
 index :: Controller ()
 index = return () 

diff --git a/App/Controllers/Download.hs b/App/Controllers/Download.hs
diff --git a/App/Controllers/Home.hs b/App/Controllers/Home.hs
@@ -1,6 +1,16 @@
-module Home (index) where
 
 index :: Controller ()
-index = return () :: Controller ()
+index = return ()
+
+about :: Controller ()
+about = return ()
+
+performance :: Controller ()
+performance = return ()
+
+hello :: Controller ()
+hello = do e  <- getEnvironment
+           e' <- doIO $ clearLayout e
+           put e'
 
 
diff --git a/App/Layouts/Default.hs b/App/Layouts/Default.hs
@@ -1,6 +1,53 @@
-module Default (page) where
-
--- This is for XML, so doesn't do anything but insert the page
 page :: View XML
-page = insertView
+page = <html>
-
+         <head>
+           <% styleSheet "normalize" "screen" %>
+           <% styleSheet "jsddm" "screen" %>
+           <% styleSheet "turbinado" "screen" %>
+           <% javaScript "jquery" %>
+           <% javaScript "jsddm" %>
+           <script type="text/javascript">
+             var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");   
+             document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); 
+           </script>
+           <script type="text/javascript">
+             var pageTracker = _gat._getTracker("UA-6158816-1");   
+             pageTracker._trackViewview(); 
+           </script>
+         </head>
+         <body>
+           <table class="wrapper">
+             <tr>
+               <td class="title">
+                 <h1>Turbinado</h1>
+                 <img class="title-image" src="/images/turbinado.jpg" />
+                 <h2>Sugar For</h2>
+                 <h2>The Web</h2>
+               </td>
+               <td class="container">
+                 <ul id="jsddm">
+                   <li><a href="/Home/Index">Home</a>
+                     <ul>
+                       <li><a href="/Home/About">About</a></li>
+                       <li><a href="/Home/Performance">Performance</a></li>
+                     </ul>
+                   </li>
+                   <li><a href="/Tutorial/Index">Tutorial</a>
+                   </li>
+                   <li><a href="/Develop/Index">Develop</a></li>
+                 </ul>
+                 <div class="clear"></div>
+                 <% breadCrumbs %>
+                 <div id="content-block" class="content-block">
+                   <% insertView %>
+                 </div>
+               </td>
+             </tr>
+             <tr>
+               <td colspan="2">
+                 <div class="footer">Turbinado - www.turbinado.org</div>
+               </td>
+             </tr>
+           </table>
+         </body>
+       </html>
diff --git a/App/Layouts/oldDefault.hs b/App/Layouts/oldDefault.hs
diff --git a/App/Views/About/Index.hs b/App/Views/About/Index.hs
diff --git a/App/Views/Develop/Index.hs b/App/Views/Develop/Index.hs
@@ -3,8 +3,8 @@ page     =  <div>
               <h2>! Windows</h2>
               <p>This software doesn't work on Windows.  Linux/Unix only at this point.</p>
 
-              <h2>Darcs</h2>
+              <h2>Git Repo</h2>
-              <p> The <em>darcs</em> repo is at <% anchorTag "http://darcs.turbinado.org" "darcs.turbinado.org" %>.  Send commits to maintainer@turbinado.org</p>
+              <p> The <em>git</em> repo is at <% anchorTag "http://github.com/alsonkemp/turbinado/tree/master" "http://github.com/alsonkemp/turbinado/tree/master" %>.  Push patches into the repo.</p>
 
               <h2>Dependencies</h2>
               <p>You'll need the following:</p>

diff --git a/App/Views/Download/Index.hs b/App/Views/Download/Index.hs
diff --git a/App/Views/Home/About.hs b/App/Views/Home/About.hs
@@ -3,7 +3,7 @@ page =      <div>
               <p>Turbinado gives you all of the benefits of coding in Haskell and adds:</p>
               <ul class="standard-list">
                 <li> A fast HTTP server with static- and dynamic-content serving capabilities; </li>
-                <li> Views built using a simple HTML-like templating syntax; </li>
+                <li> Views built using a simple HTML-like templating syntax combined with tag-matching to guard against invalid HTML; </li>
                 <li> Automagic recompilation of Controllers, Layouts and Views; </li>
                 <li> <span style="font-size:10px; font-style:italic">coming soon</span> A database <% anchorTag "http://en.wikipedia.org/wiki/Object-relational_mapping" "ORM" %> to make database interaction (especially with PostgreSQL) joyful; </li>
                 <li> A rich set of tags to make designing pages simpler;. </li>

diff --git a/App/Views/Home/Index.hs b/App/Views/Home/Index.hs
@@ -5,9 +5,10 @@ page =  <div>
             <img src="http://upload.wikimedia.org/wikipedia/en/thumb/0/0e/TurbinadoSugar.jpg/757px-TurbinadoSugar.jpg" width="300" /> 
           </div>
           <p><a href="http://en.wikipedia.org/wiki/Turbinado">Turbinado</a> is that yummy, not-so-refined sugar.
-            Sounds like Haskell... Sounds like this framework...</p>
+            Sounds like Haskell... 
-          <p>Turbinado is also an easy-to-use web application framework for Haskell.</p>
+          </p>
+          <p>Turbinado is also an easy-to-use web application framework for Haskell which is fricking <% anchorTag "/Home/Performance" "fast" %>.  Naturally, this website is written in Turbinado, so head over to the <% anchorTag "http://github.com/alsonkemp/turbinado/tree/master" "Git repo" %> to see how easy it is to code websites in Turbinado.</p>
 
           <h1>Why?</h1>
-          <p>Haskell has no easy-to-use web framework.  Turbinado is an effort to build one by lazily stealing the best ideas from <% anchorTag "www.rubyonrails.org" "Ruby On Rails" %>, <% anchorTag "www.asp.net" "ASP.NET" %>, etc.</p>
+          <p>Haskell has no easy-to-use web framework.  Turbinado is an effort to build one by lazily stealing the best ideas from <% anchorTag "http://www.rubyonrails.org" "Ruby On Rails" %>, <% anchorTag "http://www.asp.net" "ASP.NET" %>, etc.</p>
         </div>
diff --git a/App/Views/Source.hs b/App/Views/Source.hs
diff --git a/Config/Master.hs b/Config/Master.hs
@@ -17,6 +17,8 @@ compileArgs =
         , "-fallow-undecidable-instances"
         , "-F", "-pgmFtrhsx"
         , "-fno-warn-overlapping-patterns" 
+        , "-odir " ++ compiledDir
+        , "-hidir " ++ compiledDir
         ] ++ (map ("-i"++) searchDirs)
 
 mUserPkgConf = [""]

diff --git a/Turbinado/Controller.hs b/Turbinado/Controller.hs
@@ -4,13 +4,15 @@ module Turbinado.Controller (
         -- limited export from Turbinado.Controller.Monad
         Controller,
         runController,
+        get, put,
         -- * Functions
         doIO, catch,
 
         module Turbinado.Environment,
         module Turbinado.Environment.CodeStore,
         module Turbinado.Environment.Request,
         module Turbinado.Environment.Response,
+        module Turbinado.Environment.Settings
         ) where
 
 import Control.Exception (catchDyn)
@@ -23,6 +25,7 @@ import Prelude hiding (catch)
 import Turbinado.Environment
 import Turbinado.Environment.Request
 import Turbinado.Environment.Response
+import Turbinado.Environment.Settings
 import Turbinado.Controller.Monad
 import Turbinado.Environment.CodeStore
 import Turbinado.Utility.General