diff --git a/SparkleShare/Common/HTML/event-log.html b/SparkleShare/Common/HTML/event-log.html
index 077a4a75..b6988503 100755
--- a/SparkleShare/Common/HTML/event-log.html
+++ b/SparkleShare/Common/HTML/event-log.html
@@ -32,7 +32,7 @@
var entry_count = $(this).parent ().find ('dl').children ().length;
if (entry_count > 10)
- $(this).html ('Show all ' + entry_count + '…');
+ $(this).html ('Show all ' + entry_count);
else
$(this).hide ();
});
diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
index 3c9adb60..9acfd212 100755
--- a/SparkleShare/SparkleEventLogController.cs
+++ b/SparkleShare/SparkleEventLogController.cs
@@ -361,23 +361,13 @@ namespace SparkleShare {
html += Path.GetFileName (file_path) + "”";
html += "
";
-
- int count = 0;
+
+ if (change_sets.Count > 0)
+ change_sets.RemoveAt (0);
+
foreach (SparkleChangeSet change_set in change_sets) {
- count++;
-
- if (count == 1)
- continue;
-
- string change_set_avatar = "file:///user-icon-default.png";
-
- if (Program.Controller.AvatarsEnabled) {
- change_set_avatar = SparkleAvatars.GetAvatar (change_set.User.Email, 24, Program.Controller.Config.FullPath);
- change_set_avatar = "file://" + change_set_avatar.Replace ("\\", "/");
- }
-
html += "" +
- " | " +
+ " | " +
"" + change_set.User.Name + " | " +
"" +
change_set.Timestamp.ToString ("d MMM yyyy", CultureInfo.InvariantCulture) +
@@ -390,8 +380,6 @@ namespace SparkleShare {
file_path + "'>Restore…" +
" | " +
"
";
-
- count++;
}
html += "
";
@@ -472,13 +460,6 @@ namespace SparkleShare {
}
}
- string change_set_avatar = "file:///user-icon-default.png";
-
- if (Program.Controller.AvatarsEnabled) {
- change_set_avatar = SparkleAvatars.GetAvatar (change_set.User.Email, 48, Program.Controller.Config.FullPath);
- change_set_avatar = "file://" + change_set_avatar.Replace ("\\", "/");
- }
-
event_entry += "";
string timestamp = change_set.Timestamp.ToString ("H:mm");
@@ -492,7 +473,7 @@ namespace SparkleShare {
event_entries += event_entry_html.Replace ("", event_entry)
.Replace ("", change_set.User.Name)
.Replace ("", change_set.User.Email)
- .Replace ("", change_set_avatar)
+ .Replace ("", GetAvatarFilePath (change_set.User))
.Replace ("", change_set.RemoteUrl.ToString ())
.Replace ("", change_set.Revision);
@@ -606,6 +587,20 @@ namespace SparkleShare {
}
+ private string GetAvatarFilePath (SparkleUser user)
+ {
+ if (!Program.Controller.AvatarsEnabled)
+ return "/user-icon-default.png";
+
+ string fetched_avatar = SparkleAvatars.GetAvatar (user.Email, 48, Program.Controller.Config.FullPath);
+
+ if (!string.IsNullOrEmpty (fetched_avatar))
+ return "file://" + fetched_avatar.Replace ("\\", "/");
+ else
+ return "/user-icon-default.png";
+ }
+
+
// All change sets that happened on a day
private class ActivityDay : List
{