more toying with parallelism

Handler/AlbumSettings.hs

@@ -2,6 +2,7 @@ module Handler.AlbumSettings where
 
 import Import
 import qualified Data.Text as T
+import Data.Maybe
 import System.Directory
 import System.FilePath
 import qualified Data.List as L
@@ -84,7 +85,7 @@ postAlbumSettingsR albumId = do
                     False -> do
                       return [()]
                       -- nothing to do here
-                  width <- getThumbWidth $ albumSamplePic temp
+                  width <- getThumbWidth $ Just $ L.tail $ fromMaybe ['a'] $ albumSamplePic temp
                   _ <- runDB $ update albumId 
                     [ AlbumTitle =. albumTitle temp
                     , AlbumShares =. newShares

Handler/ProfileDelete.hs

@@ -12,7 +12,7 @@ getProfileDeleteR userId = do
   checkRes <- profileCheck userId
   case checkRes of
     Right user -> do
-      defaultLayout $ do
+      formLayout $ do
         setTitle "Eidolon :: Delete user profile"
         $(widgetFile "profileDelete")
     Left (errorMsg, route) -> do

Handler/ProfileSettings.hs

@@ -9,7 +9,7 @@ getProfileSettingsR userId = do
   case checkRes of
     Right user -> do
       (profileSettingsWidget, enctype) <- generateFormPost $ profileSettingsForm user
-      defaultLayout $ do
+      formLayout $ do
         setTitle "Eidolon :: Profile settings"
         $(widgetFile "profileSettings")
     Left (errorMsg, route) -> do

templates/home.hamlet

@@ -10,8 +10,3 @@ $forall (Entity mediumId medium) <- recentMedia
       <figure>
         <img src=#{mediumThumb medium}>
         <figcaption>#{mediumTitle medium}
-<div id="header" class="item" data-width="400">
-  <div class="inner">
-    <h1>Test
-    <p>
-      foo bar baz

templates/profile.hamlet

@@ -2,6 +2,8 @@ $newline always
 <div id="header" class="item" data-width="400">
   <div class="inner">
     <h1>Profile of #{ownerSlug}
+    $if presence == True
+      <a href=@{ProfileSettingsR ownerId}>Change your profile settings
 
 <div id="header" class="item" data-width="400">
   <div class="inner">
@@ -55,5 +57,3 @@ $else
     get a feed from this:
       <a href=@{UserFeedAtomR ownerId}>Atom
       <a href=@{UserFeedRssR ownerId}>RSS
-    $if presence == True
-      <a href=@{ProfileSettingsR ownerId}>Change your profile settings

templates/profileDelete.hamlet

@@ -1,10 +1,12 @@
 $newline always
-<h3>Delete User #{userSlug user}
+<div id="header" class="item" data-width="300">
+  <div class="inner">
+    <h1>Delete User #{userSlug user}
 
-<p>
+    <p>
-  Do you wish to delete this user and all his albums in images?
+      Do you wish to delete this user and all his albums and images?
 
-<form method="POST" action=@{ProfileDeleteR userId}>
+    <form method="POST" action=@{ProfileDeleteR userId}>
       <label for="confirm">Really delete this user
       <input type="checkbox" id="confirm" name="confirm" value="confirm" required>
       <input id="delete" type="submit" value="Delete user">

templates/profileSettings.hamlet

@@ -1,9 +1,9 @@
 $newline always
-<h3>Profile settings
+<div id="header" class="item" data-width="300">
-
+  <form class="inner" method="post" enctype=#{enctype}>
-<form method="post" enctype=#{enctype}>
+    <h1>Profile settings
     ^{profileSettingsWidget}
     <div>
       <input type=submit value="Change settings">
 
-<a href=@{ProfileDeleteR userId}>Delete user
+  <a href=@{ProfileDeleteR userId}>Delete user