From ab344dc92c6c96f50295b600c312a2fb455709b9 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Mon, 24 Sep 2012 18:14:42 +0200
Subject: [PATCH] eventlog: css and layout style tweaks

---
 SparkleShare/Common/HTML/event-entry.html |  6 ++--
 SparkleShare/Common/HTML/event-log.html   | 37 ++++++-----------------
 SparkleShare/SparkleEventLogController.cs |  6 ++--
 3 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/SparkleShare/Common/HTML/event-entry.html b/SparkleShare/Common/HTML/event-entry.html
index 287cd2db..dd987364 100755
--- a/SparkleShare/Common/HTML/event-entry.html
+++ b/SparkleShare/Common/HTML/event-entry.html
@@ -1,6 +1,6 @@
-<div class='event-entry' style='background-image: url("<!-- $event-avatar-url -->");'>
-    <div class='event-user-name'><!-- $event-user-name --></div>
-    <div class='event-folder'><!-- $event-folder --><span><!-- $event-url --></span></div>
+<div class='event-entry'>
+    <div class='event-avatar' style='background-image: url("<!-- $event-avatar-url -->");'></div>
+    <div class='event-user-name'><!-- $event-user-name --><span class='event-folder'><!-- $event-folder --></span></div>
 
     <!-- $event-entry-content -->
 
diff --git a/SparkleShare/Common/HTML/event-log.html b/SparkleShare/Common/HTML/event-log.html
index d5b4e5ba..5115395a 100755
--- a/SparkleShare/Common/HTML/event-log.html
+++ b/SparkleShare/Common/HTML/event-log.html
@@ -80,10 +80,8 @@
 
             .day-entry-header {
                 color: #aaa;
-                margin-left: auto;
-                margin-right: auto;
+                margin-left: 32px;
                 display: block;
-                text-align: center;
                 padding-top: 24px;
                 font-weight: bold;
             }
@@ -110,38 +108,18 @@
                 font-weight: bold;
             }
 
-
             .event-folder {
-                float: right;
                 color: <!-- $secondary-font-color -->;
-                position: relative;
-                cursor: pointer;
-            }
-
-            .event-folder span {
-              display: none
-            }
-
-            .event-folder:hover span {
-                display: block;
-                position: absolute;
-                top: 20px;
-                right: 0;
-                background-color: rgba(20, 20, 20, 0.8);
-                color: #fafafa;
-                padding: 7px 12px;
-                border-radius: 5px;
-                font-family: sans-serif;
-                font-size: <!-- $small-font-size -->;
-                float: right;
+                font-size: 80%;
             }
 
             .event-entry {
                 padding-top: 24px;
                 padding-bottom: 14px;
                 border-bottom: 1px #ddd solid;
-                padding-left: 96px;
-                padding-right: 32px;
+                padding-left: 64px;
+                margin-left: 32px;
+                margin-right: 32px;
                 background-repeat: no-repeat;
                 background-position: 36px 24px;
                 display: block;
@@ -232,9 +210,12 @@
                 background-position: top center; 
             }
 
-            .buddy-icon {
+            .event-avatar {
                 width: 48px;
                 height: 48px;
+                border-radius: 4px;
+                position: absolute;
+                left: 32px;
             }
         </style>
     </head>
diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
index 2dfd1b11..af4a5bc7 100755
--- a/SparkleShare/SparkleEventLogController.cs
+++ b/SparkleShare/SparkleEventLogController.cs
@@ -311,14 +311,14 @@ namespace SparkleShare {
                         timestamp = change_set.FirstTimestamp.ToString ("H:mm") + " – " + timestamp;
                     }
 
-                    if (this.selected_folder == null)
-                        event_entry_html = event_entry_html.Replace ("<!-- $event-folder -->", change_set.Folder.Name);
-
                     event_entries += event_entry_html.Replace ("<!-- $event-entry-content -->", event_entry)
                         .Replace ("<!-- $event-user-name -->", change_set.User.Name)
                         .Replace ("<!-- $event-avatar-url -->", change_set_avatar)
                         .Replace ("<!-- $event-url -->", change_set.RemoteUrl.ToString ())
                         .Replace ("<!-- $event-revision -->", change_set.Revision);
+
+                    if (this.selected_folder == null) 
+                        event_entries = event_entries.Replace ("<!-- $event-folder -->", " @ " + change_set.Folder.Name);
                 }
 
                 string day_entry   = "";