more parallelism

Handler/AdminAlbumSettings.hs

@@ -4,6 +4,7 @@ import Import
 import Handler.Commons
 import qualified Data.Text as T
 import qualified Data.List as L
+import Data.Maybe
 import System.FilePath
 import System.Directory
 
@@ -50,7 +51,7 @@ getAdminAlbumSettingsR albumId = do
           entities <- runDB $ selectList [UserId !=. (albumOwner album)] [Desc UserName]
           users <- return $ map (\u -> (userName $ entityVal u, entityKey u)) entities
           (adminAlbumSettingsWidget, enctype) <- generateFormPost $ adminAlbumSettingsForm album albumId users
-          defaultLayout $ do
+          formLayout $ do
             setTitle "Administration: Album settings"
             $(widgetFile "adminAlbumSet")
         Nothing -> do
@@ -73,7 +74,7 @@ postAdminAlbumSettingsR albumId = do
           ((res, _), _) <- runFormPost $ adminAlbumSettingsForm album albumId users
           case res of
             FormSuccess temp -> do
-              width <- getThumbWidth $ albumSamplePic temp
+              width <- getThumbWidth $ Just $ L.tail $ fromMaybe ['a'] $ albumSamplePic temp
               _ <- runDB $ update albumId
                 [ AlbumTitle =. albumTitle temp
                 , AlbumShares =. albumShares temp

templates/adminAlbumMedia.hamlet

@@ -1,10 +1,13 @@
 $newline always
-<h3>Media from #{albumTitle album}
+<div id="header" class="item" data-width="400">
-
+  <div class="inner">
+    <h1>Media from #{albumTitle album}
     $if null media
-  #{albumTitle album} has no media yet
+      <p>#{albumTitle album} has no media yet
-$else
+
-  <ul>
 $forall (Entity mId m) <- media
-    <li>
+  <article class="item" data-width="200">
     <a href=@{AdminMediumSettingsR mId}>#{mediumTitle m}
+      <figure class="thumbnail">
+        <img src=#{mediumThumb m}>
+        <figcaption>#{mediumTitle m}

templates/adminAlbumSet.hamlet

@@ -1,15 +1,14 @@
 $newline always
-<h3>Album settings
+<div id="header" class="item" data-width="400">
-
+  <form class="inner" method="post" enctype=#{enctype}>
-<div class="left">
+    <h1>Album settings
-  <form method="post" enctype=#{enctype}>
     ^{adminAlbumSettingsWidget}
     <div>
       <input type=submit value="Change settings">
 
   <a href=@{AdminAlbumDeleteR albumId}>Delete this album
 
-<div class="right">
+<div id="header" class="item" data-width="200">
-  <ul>
+  <div class="inner">
-    <li>
+    <p>
       <a href=@{AdminAlbumMediaR albumId}>Media in this album

templates/adminAlbums.hamlet

@@ -1,10 +1,16 @@
 $newline always
-<h3>Albums
+<div id="header" class="item" data-width="400">
-
+  <div class="inner">
+    <h1>Albums
     $if null albums
-  There are no albums yet
+      <p>There are no albums yet
-$else
+
 $forall (Entity aId a) <- albums
-    <ul>
+  <article class="item" data-width=#{albumSampleWidth a}>
-      <li>
     <a href=@{AdminAlbumSettingsR aId}>#{albumTitle a}
+      <figure class="thumbnail">
+        $if (albumSamplePic a) == Nothing
+          <img src="/static/img/album.jpg">
+        $else
+          <img src=#{T.pack $ fromJust $ albumSamplePic a}>
+        <figcaption>#{albumTitle a}

templates/adminMedia.hamlet

@@ -1,10 +1,13 @@
 $newline always
-<h3>Media
+<div id="header" class="item" data-width="400">
-
+  <div class="inner">
+    <h1>Media
     $if null media
-  There are no media yet
+       <p>There are no media yet
-$else
+
-  <ul>
 $forall (Entity mId m) <- media
-    <li>
+  <article class="item" data-width=#{mediumThumbWidth m}>
     <a href=@{AdminMediumSettingsR mId}>#{mediumTitle m}
+      <figure class="thumbnail">
+        <img src=#{mediumThumb m}>
+        <figcaption>#{mediumTitle m}

templates/adminUserAlbums.hamlet

@@ -7,7 +7,11 @@ $newline always
           #{userSlug owner} has no albums yet
 
 $forall (Entity aId a) <- albums
-  <div id="header" class="item" data-width="200">
+  <article class="item" data-width=#{albumSampleWidth a}>
-    <div class="inner">
-      <p>
     <a href=@{AdminAlbumSettingsR aId}>#{albumTitle a}
+      <figure class="thumbnail">
+        $if (albumSamplePic a) == Nothing
+          <img src="/static/img/album.jpg">
+        $else
+          <img src=#{T.pack $ fromJust $ albumSamplePic a}>
+        <figcaption>#{albumTitle a}

templates/adminUserMedia.hamlet

@@ -7,7 +7,8 @@ $newline always
         #{userSlug owner} has no media yet
 
 $forall (Entity mId m) <- media
-  <div id="header" class="item" data-width="200">
+  <article class="item" data-width=#{mediumThumbWidth m}>
-    <div class="inner">
-      <p>
     <a href=@{AdminMediumSettingsR mId}>#{mediumTitle m}
+      <figure class="thumbnail">
+        <img src=#{mediumThumb m}>
+        <figcaption>#{mediumTitle m}

templates/profile.hamlet

@@ -18,7 +18,7 @@ $forall (Entity albumId album) <- userAlbs
     <a href=@{AlbumR albumId}>
       <figure class="thumbnail">
         $if (albumSamplePic album) == Nothing
-          <img src="/static/img/album.jpg"><br>
+          <img src="/static/img/album.jpg">
         $else
           <img src=#{T.pack $ fromJust $ albumSamplePic album}>
         <figcaption>#{albumTitle album}
@@ -34,7 +34,7 @@ $else
       <a href=@{AlbumR albumId}>
         <figure class="thumbnail">
           $if (albumSamplePic album) == Nothing
-            <img src="/static/img/album.jpg"><br>
+            <img src="/static/img/album.jpg">
           $else
             <img src=#{T.pack $ fromJust $ albumSamplePic album}>
           <figcaption>#{albumTitle album}