beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

event log: update Today an Yesterday timestamps to the full dates after midnight. Closes #517

Browse source
This commit is contained in:
Hylke Bons 2012-01-10 01:14:44 +00:00
parent 10fd77a9b8
commit 65215426c9
3 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SparkleShare/Mac/SparkleUI.cs
View file

@ -94,13 +94,13 @@ namespace SparkleShare {
public void UpdateDockIconVisibility ()
{
if (true) { // TODO: check for open windows
// if (true) { // TODO: check for open windows
ShowDockIcon ();
} else {
HideDockIcon ();
}
// } else {
// HideDockIcon ();
// }
}

16
SparkleShare/SparkleControllerBase.cs
View file

@ -467,13 +467,17 @@ namespace SparkleShare {
today.Month == activity_day.DateTime.Month &&
today.Year == activity_day.DateTime.Year) {
day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->", "Today");
day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->",
"<span id='today' name='" + activity_day.DateTime.ToString (_("dddd, MMMM d")) + "'>"
+ _("Today") + "</span>");
} else if (yesterday.Day == activity_day.DateTime.Day &&
yesterday.Month == activity_day.DateTime.Month &&
yesterday.Year == activity_day.DateTime.Year) {
day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->", "Yesterday");
day_entry = day_entry_html.Replace ("<!-- $day-entry-header -->",
"<span id='yesterday' name='" + activity_day.DateTime.ToString (_("dddd, MMMM d")) + "'>"
+ _("Yesterday") + "</span>");
} else {
if (activity_day.DateTime.Year != DateTime.Now.Year) {
@ -493,9 +497,13 @@ namespace SparkleShare {
event_log += day_entry.Replace ("<!-- $day-entry-content -->", event_entries);
}
string html = event_log_html.Replace ("<!-- $event-log-content -->", event_log)
int midnight = (int) (DateTime.Today.AddDays (1) - new DateTime (1970, 1, 1)).TotalSeconds;
Console.WriteLine (midnight);
string html = event_log_html.Replace ("<!-- $event-log-content -->", event_log)
.Replace ("<!-- $username -->", UserName)
.Replace ("<!-- $user-avatar-url -->", "file://" + GetAvatar (UserEmail, 48));
.Replace ("<!-- $user-avatar-url -->", "file://" + GetAvatar (UserEmail, 48))
.Replace ("<!-- $midnight -->", midnight.ToString ());
return html;
}

12
data/html/event-log.html
View file

@ -5,6 +5,18 @@
<script type="text/javascript" src="<!-- $jquery-url -->"></script>
<script type="text/javascript">
$(document).ready(function () {
// Update the Today and Yesterday labels after midnight
setInterval (function(){
var date = new Date();
if ((date.getTime() / 1000) >= <!-- $midnight -->) {
$("#today").html($("#today").attr("name"));
$("#yesterday").html($("#yesterday").attr("name"));
}
}, 60 * 1000);
$('.comments-section').each (function () {
if ($(this).find ('.comments').children ().size () < 1) {
$(this).hide ();