Adding logo!

IHaskell/Display.hs

@@ -7,6 +7,8 @@ module IHaskell.Display (
   ) where
 
 import ClassyPrelude
+import Data.String.Utils (rstrip) 
+
 import IHaskell.Types
 
 -- | A class for displayable Haskell types.
@@ -15,7 +17,7 @@ class IHaskellDisplay a where
 
 -- | Generate a plain text display.
 plain :: String -> DisplayData
-plain = Display PlainText
+plain = Display PlainText . rstrip
 
 -- | Generate an HTML display.
 html :: String -> DisplayData

IHaskell/Eval/Evaluate.hs

@@ -190,7 +190,7 @@ evalCommand (Directive GetType expr) = wrapExecution $ do
   result <- exprType expr
   flags <- getSessionDynFlags
   let typeStr = showSDocUnqual flags $ ppr result
-  return [Display PlainText typeStr, Display MimeHtml $ formatGetType typeStr]
+  return [plain typeStr, html $ formatGetType typeStr]
 
 evalCommand (Statement stmt) = do
   write $ "Statement: " ++ stmt
@@ -200,7 +200,7 @@ evalCommand (Statement stmt) = do
       RunOk names -> do
         dflags <- getSessionDynFlags
         write $ "Names: " ++ show (map (showPpr dflags) names)  
-        let output = [Display PlainText printed | not . null $ strip printed]
+        let output = [plain printed | not . null $ strip printed]
         return (Success, output)
       RunException exception -> do
         write $ "RunException: " ++ show exception
@@ -300,6 +300,7 @@ formatError :: ErrMsg -> String
 formatError = printf "<span style='color: red; font-style: italic;'>%s</span>" .
             replace "\n" "<br/>" . 
             replace useDashV "" .
+            rstrip . 
             typeCleaner
   where 
         useDashV = "\nUse -v to see a list of the files searched for."
@@ -312,4 +313,4 @@ formatGetType :: String -> String
 formatGetType = printf "<span style='font-weight: bold; color: green;'>%s</span>"
 
 displayError :: ErrMsg -> [DisplayData]
-displayError msg = [Display PlainText msg, Display MimeHtml $ formatError msg] 
+displayError msg = [plain msg, html $ formatError msg] 

IHaskell/IPython.hs

@@ -97,6 +97,9 @@ writeConfigFilesTo profileDir ihaskellPath = do
     mkdir_p (conf "static/custom/")
     writeFile (conf "static/custom/custom.js")      Config.customjs
 
+    -- Make directory for images.
+    mkdir_p (conf "static/base/images")
+
     -- The notebook/js directory many not exist, in which case we'll create it.
     mkdir_p (conf "static/notebook/")
     mkdir_p (conf "static/notebook/js")

Main.hs

@@ -144,7 +144,6 @@ replyTo interface ExecuteRequest{ getCode = code } replyHeader state = do
   -- Construct a function for publishing output as this is going.
   let publish :: [DisplayData] -> Interpreter ()
       publish outputs = do
-        liftIO $ print outputs
         header <- dupHeader replyHeader DisplayDataMessage
         send $ PublishDisplayData header "haskell" outputs
 

Setup.hs

@@ -6,7 +6,12 @@ main :: IO ()
 main = defaultMainWithHooks simpleUserHooks{
     preConf = \args confFlags -> do
       buildParser
-      preConf simpleUserHooks args confFlags
+      preConf simpleUserHooks args confFlags,
+    postInst = \args flags descr buildInfo -> do
+      postInst simpleUserHooks args flags descr buildInfo
+      system "IHaskell setup"
+      system "cp ./images/ihaskell-logo.png `ipython locate profile haskell`/static/base/images/ipynblogo.png"
+      return ()
 }
 
 buildParser = system "./build-parser.sh"