diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index 3460b3c7..65d7d9ca 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -595,7 +595,12 @@ namespace SparkleLib {
git_notes.WaitForExit ();
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Added note to " + revision);
+ SyncUpNotes ();
+ }
+
+ public override void SyncUpNotes ()
+ {
while (Status != SyncStatus.Idle) {
System.Threading.Thread.Sleep (5 * 20);
}
@@ -604,9 +609,15 @@ namespace SparkleLib {
git_push.Start ();
git_push.WaitForExit ();
- SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Notes pushed");
+ if (git_push.ExitCode == 0) {
+ SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Notes pushed");
- SparkleAnnouncement announcement = new SparkleAnnouncement (Identifier, note_namespace);
+ } else {
+ HasUnsyncedChanges = true;
+ SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Pushing notes failed, trying again later");
+ }
+
+ SparkleAnnouncement announcement = new SparkleAnnouncement (Identifier, SHA1 (DateTime.Now.ToString ()));
base.listener.Announce (announcement);
}
diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
index 9aff8aff..dde4c277 100644
--- a/SparkleLib/SparkleRepoBase.cs
+++ b/SparkleLib/SparkleRepoBase.cs
@@ -111,8 +111,10 @@ namespace SparkleLib {
// In the unlikely case that we haven't synced up our
// changes or the server was down, sync up again
- if (HasUnsyncedChanges)
+ if (HasUnsyncedChanges) {
SyncUpBase ();
+ SyncUpNotes ();
+ }
};
this.remote_timer.Start ();
@@ -233,8 +235,10 @@ namespace SparkleLib {
SyncDownBase ();
// Push changes that were made since the last disconnect
- if (HasUnsyncedChanges)
+ if (HasUnsyncedChanges) {
SyncUpBase ();
+ SyncUpNotes ();
+ }
};
// Start polling when the connection to the irc channel is lost
@@ -449,6 +453,12 @@ namespace SparkleLib {
}
+ public virtual void SyncUpNotes ()
+ {
+
+ }
+
+
// Recursively gets a folder's size in bytes
private double CalculateFolderSize (DirectoryInfo parent)
{
diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index 4581c1d5..4f970a45 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -397,11 +397,10 @@ namespace SparkleShare {
foreach (SparkleNote note in change_set.Notes) {
comments += "
" +
" " +
- " " +
+ " " +
"
" +
"" +
- " " +
- " | " +
+ " " +
"
";
}
@@ -451,7 +450,8 @@ namespace SparkleShare {
event_log += day_entry.Replace ("", event_entries);
}
- return event_log_html.Replace ("", event_log);
+ return event_log_html.Replace ("", event_log)
+ .Replace ("", UserName);
}
diff --git a/data/html/event-entry.html b/data/html/event-entry.html
index 84af42d6..ae3cd403 100644
--- a/data/html/event-entry.html
+++ b/data/html/event-entry.html
@@ -8,24 +8,16 @@
-
+
-
diff --git a/data/html/event-log.html b/data/html/event-log.html
index 2d08eb4b..c707b758 100644
--- a/data/html/event-log.html
+++ b/data/html/event-log.html
@@ -16,9 +16,13 @@
table = $(this).parent ().find ("table");
comments = table.html ();
- comments += '
';
- comments += ' |
'
-
+ comments += '' +
+ ' ' +
+ ' ' +
+ '
' +
+ '' +
+ ' ' +
+ '
';
table.html (comments);
location = this.id + '~' + text;
@@ -48,11 +52,9 @@
td {
vertical-align: top;
-font-size: 12px;
+ font-size: 12px;
}
-
-
.day-entry-header {
font-size: ;
color: #444;
@@ -61,7 +63,6 @@ font-size: 12px;
margin-left: auto;
margin-right: auto;
}
-
a {
color: ;
@@ -72,8 +73,8 @@ font-size: 12px;
color: ;
}
- .event-time {
- margin: 15px;
+ .event-folder {
+ margin: 6px;
opacity: 0.8;
font-size: 80%;
color: #fff;
@@ -81,15 +82,16 @@ font-size: 12px;
padding: 3px 15px;
font-weight: bold;
-webkit-border-radius: 100px;
+ cursor: pointer;
}
.event-entry-content {
- display: block;
- background-color: #f0f0f0;
- margin-bottom: 12px;
- padding: 0px;
- padding-bottom: 6px;
- border: #ccc 1px solid;
+ display: block;
+ background-color: #f0f0f0;
+ margin-bottom: 12px;
+ padding: 0px;
+ padding-bottom: 6px;
+ border: #ccc 1px solid;
}
.wrapper {
@@ -153,11 +155,14 @@ font-size: 12px;
}
.event-info {
+ padding: 6px;
float: left;
margin-bottom: 8px;
width: 100%;
background-color: #fff;
border-bottom: 1px #ccc solid;
+ box-sizing: border-box;
+ -webkit-box-sizing: border-box;
}
.comments {
@@ -166,12 +171,42 @@ font-size: 12px;
.comment-author {
font-weight: bold;
- width: 25%;
+ width: 75%;
}
.comment-timestamp {
color: ;
- padding-bottom: 12px;
+ text-align: right;
+ }
+
+ .comment-button {
+ float:right;
+ margin-top: 6px;
+ margin-bottom: 6px;"
+ }
+
+ .comment-textarea {
+ margin-top: 12px;
+ box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ width: 100%;
+ height: 40px;
+ }
+
+ .comments-wrapper {
+ margin-top: 9px;
+ border-top: 1px #ccc solid;
+ box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ margin-top: 3px;
+ width: 100%;
+ padding: 12px;
+ }
+
+ .comment-text {
+ padding-bottom: 6px;
}