From 4ff66317fa93fab10f3a096ea120854b415d756d Mon Sep 17 00:00:00 2001
From: nek0 <neko.rloove@rocketmail.com>
Date: Fri, 5 Sep 2014 21:00:03 +0200
Subject: [PATCH] some beautyfication

---
 Handler/Medium.hs        |  2 ++
 templates/album.hamlet   | 12 +++++++-----
 templates/medium.hamlet  |  2 +-
 templates/profile.hamlet | 30 ++++++++++++++++++------------
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Handler/Medium.hs b/Handler/Medium.hs
index e2b0b54..70a9585 100644
--- a/Handler/Medium.hs
+++ b/Handler/Medium.hs
@@ -12,6 +12,8 @@ getMediumR mediumId = do
       ownerId <- return $ mediumOwner medium
       owner <- runDB $ getJust ownerId
       ownerName <- return $ userName owner
+      albumId <- return $ mediumAlbum medium
+      album <- runDB $ getJust albumId
       msu <- lookupSession "userId"
       presence <- case msu of
         Just tempUserId -> do
diff --git a/templates/album.hamlet b/templates/album.hamlet
index 91987d8..d048c30 100644
--- a/templates/album.hamlet
+++ b/templates/album.hamlet
@@ -11,8 +11,10 @@ by <a href=@{UserR ownerName}>#{ownerName}</a>
     This album is empty
   $else
     Images in this album:
-    $forall (Entity mediumId medium) <- media
-      <div class="thumbnails">
-        <a href=@{MediumR mediumId}>
-          <img src=#{mediumPath medium}><br>
-            #{mediumTitle medium}
+    <ul class="media">
+      <li>
+        $forall (Entity mediumId medium) <- media
+          <div class="thumbnails">
+            <a href=@{MediumR mediumId}>
+              <img src=#{mediumPath medium}><br>
+                #{mediumTitle medium}
diff --git a/templates/medium.hamlet b/templates/medium.hamlet
index dd939f5..5549dd5 100644
--- a/templates/medium.hamlet
+++ b/templates/medium.hamlet
@@ -1,6 +1,6 @@
 <h3>#{mediumTitle medium}
 
-by <a href=@{UserR ownerName}>#{ownerName}</a>
+by <a href=@{UserR ownerName}>#{ownerName}</a> from album <a href=@{AlbumR albumId}>#{albumTitle album}</a>
 
 
 
diff --git a/templates/profile.hamlet b/templates/profile.hamlet
index d6b471e..9d302ba 100644
--- a/templates/profile.hamlet
+++ b/templates/profile.hamlet
@@ -4,23 +4,29 @@ $if presence == True
   <a href=@{ProfileSettingsR ownerId}>Change your profile settings
 
 $if null userAlbs
-  This user has no albums yet
+  <ul class="noalbum">
+    <li>
+      This user has no albums yet
 $else
   Albums of this user:
   $forall (Entity albumId album) <- userAlbs
-    <div class="thumbnails">
-      <a href=@{AlbumR albumId}>
-        $if (albumSamplePic album) == Nothing
-          <img width="200px" src="/static/img/album.jpg"><br>
-        $else
-          <img width="200px" src=#{T.pack $ fromJust $ albumSamplePic album}><br>
-        #{albumTitle album}
+    <ul class="albums">
+      <li>
+        <div class="thumbnails">
+          <a href=@{AlbumR albumId}>
+            $if (albumSamplePic album) == Nothing
+              <img width="200px" src="/static/img/album.jpg"><br>
+            $else
+              <img width="200px" src=#{T.pack $ fromJust $ albumSamplePic album}><br>
+            #{albumTitle album}
 
 $if null recentMedia
   This user has not uploaded any images
 $else
   Newest images:
-  $forall (Entity mediumId medium) <- take 10 recentMedia
-    <div class="thumbnails">
-      <a href=@{MediumR mediumId}>
-        <img src=#{mediumPath medium}>
+  <ul class="media">
+    <li>
+      $forall (Entity mediumId medium) <- take 10 recentMedia
+        <div class="thumbnails">
+          <a href=@{MediumR mediumId}>
+            <img src=#{mediumPath medium}>