From 565e9f2fcc990a127c19ea370b03e90a50e467df Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Thu, 4 Oct 2012 01:03:06 +0200
Subject: [PATCH] html: simplify

---
 SparkleShare/Common/HTML/day-entry.html   |   8 +-
 SparkleShare/Common/HTML/event-entry.html |   6 --
 SparkleShare/Common/HTML/event-log.html   | 126 ++++++++++------------
 SparkleShare/Mac/SparkleStatusIcon.cs     |   2 +-
 4 files changed, 60 insertions(+), 82 deletions(-)
diff --git a/SparkleShare/Common/HTML/day-entry.html b/SparkleShare/Common/HTML/day-entry.html
index 9b023327..43b2d523 100755
--- a/SparkleShare/Common/HTML/day-entry.html
+++ b/SparkleShare/Common/HTML/day-entry.html
@@ -1,8 +1,4 @@
 <div class='day-entry'>
-    <div class='day-entry-header'>
-        <!-- $day-entry-header -->
-    </div>
-    <div class='day-entry-content'>
-        <!-- $day-entry-content -->
-    </div>
+    <div class='day-entry-header'><!-- $day-entry-header --></div>
+    <div class='day-entry-content'><!-- $day-entry-content --></div>
 </div>
diff --git a/SparkleShare/Common/HTML/event-entry.html b/SparkleShare/Common/HTML/event-entry.html
index 942f91a7..255d9ba4 100755
--- a/SparkleShare/Common/HTML/event-entry.html
+++ b/SparkleShare/Common/HTML/event-entry.html
@@ -1,12 +1,6 @@
 <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 -->
-
-    <div class="clearer"></div>
-    <div class="event-timestamp"><!-- $event-time --></div>
     <a class="show">Show all</a>
-
-    <div class="clearer"></div>
 </div>
diff --git a/SparkleShare/Common/HTML/event-log.html b/SparkleShare/Common/HTML/event-log.html
index 7bb67a6d..f3a5e4b1 100755
--- a/SparkleShare/Common/HTML/event-log.html
+++ b/SparkleShare/Common/HTML/event-log.html
@@ -3,10 +3,8 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <title>SparkleShare Event Log</title>
-        <script type="text/javascript">
-          <!-- $jquery -->
-        </script>
-
+        
+        <script type="text/javascript"><!-- $jquery --></script>
         <script type="text/javascript">
           $(document).ready(function () {
               $('dl dd:nth-child(-n+10)').css('display', 'block');
@@ -63,63 +61,28 @@
                 -webkit-user-select: none;
             }
 
-            small {
-                font-size: <!-- $small-font-size -->;
-                color: <!-- $secondary-font-color -->;
-            }
-
-            .day-entry-header {
-                color: #aaa;
-                margin-left: 32px;
-                padding-top: 22px;
-                font-weight: bold;
-            }
-                        
             a {
                 color: <!-- $a-color -->;
                 text-decoration: none;
                 outline: 0;
             }
+            
+            a.show {
+                font-size: 80%;
+                margin-bottom: 9px;
+            }
 
             a:hover {
                 color: <!-- $a-hover-color -->;
                 text-decoration: underline;
                 cursor: pointer;
             }
-
-            .event-timestamp {
-                font-size: 80%;
+            
+            small {
+                font-size: <!-- $small-font-size -->;
                 color: <!-- $secondary-font-color -->;
             }
-
-            .event-user-name {
-                font-weight: bold;
-            }
-
-            .event-folder {
-                color: <!-- $secondary-font-color -->;
-                font-size: 80%;
-            }
-
-            .event-entry {
-                padding: 24px 14px 14px 64px;
-                margin: 0 32px 0 32px;
-                border-bottom: 1px #ddd solid;
-                background-repeat: no-repeat;
-                background-position: 36px 24px;
-                min-height: 100px;
-            }
-
-            a.show {
-                font-size: 80%;
-                margin-bottom: 9px;
-            }
-
-            .separator {
-                border-bottom: 1px #ccc solid;
-                margin: 24px 0 24px 0;
-            }
-
+            
             dl {
                 padding : 6px 0 0 0;
                 margin:  0 0 12px 0;
@@ -139,6 +102,51 @@
                 white-space: nowrap;
             }
 
+            .day-entry-header {
+                color: #aaa;
+                margin-left: 32px;
+                padding-top: 22px;
+                font-weight: bold;
+            }
+            
+            .event-entry {
+                padding: 24px 14px 14px 64px;
+                margin: 0 32px 0 32px;
+                border-bottom: 1px #ddd solid;
+                background-repeat: no-repeat;
+                background-position: 36px 24px;
+                min-height: 100px;
+            }
+            
+            .no-buddy-icon {
+                width: 48px;
+                background-image: url('<!-- $no-buddy-icon-background-image -->');
+                background-repeat: no-repeat;
+                background-position: top center; 
+            }
+            
+            .event-user-name {
+                font-weight: bold;
+            }
+            
+            .event-avatar {
+                width: 48px;
+                height: 48px;
+                border-radius: 4px;
+                position: absolute;
+                left: 32px;
+            }
+
+            .event-folder {
+                color: <!-- $secondary-font-color -->;
+                font-size: 80%;
+            }
+
+            .separator {
+                border-bottom: 1px #ccc solid;
+                margin: 24px 0 24px 0;
+            }
+
             .added {
                 background-image: url('<!-- $document-added-background-image -->');
             }
@@ -153,27 +161,7 @@
 
             .moved {
                 background-image: url('<!-- $document-moved-background-image -->');
-            }
-
-            .no-buddy-icon {
-                position: relative;
-                top: 0;
-                left: 0;
-                float: left;
-                margin-right: 12px;
-                width: 48px;
-                background-image: url('<!-- $no-buddy-icon-background-image -->');
-                background-repeat: no-repeat;
-                background-position: top center; 
-            }
-
-            .event-avatar {
-                width: 48px;
-                height: 48px;
-                border-radius: 4px;
-                position: absolute;
-                left: 32px;
-            }
+            }            
         </style>
     </head>
     <body oncontextmenu="return false;">
diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs
index cf135140..126e8df2 100755
--- a/SparkleShare/Mac/SparkleStatusIcon.cs
+++ b/SparkleShare/Mac/SparkleStatusIcon.cs
@@ -390,7 +390,7 @@ namespace SparkleShare {
     
         public override void MenuWillOpen (NSMenu menu)
         {
-            InvokeOnMainThread (delegate {
+            InvokeOnMainThread (() => {
                 NSApplication.SharedApplication.DockTile.BadgeLabel = null;
             });
         }
