From 77cd32717080428d830fdaf543cd29edf8bfabbc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 6 Aug 2012 17:15:27 -0400
Subject: [PATCH] fix display of icon in block alert heading

---
 Assistant/Alert.hs             |  1 -
 templates/sidebar/alert.hamlet | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs
index 9ebc89aabc..51743964bd 100644
--- a/Assistant/Alert.hs
+++ b/Assistant/Alert.hs
@@ -211,7 +211,6 @@ syncAlert rs = baseActivityAlert
 	{ alertHeader = Just $ tenseWords
 		[Tensed "Syncing" "Synced", "with", showRemotes rs]
 	, alertData = []
-	, alertBlockDisplay = True
 	, alertPriority = Low
         }
 
diff --git a/templates/sidebar/alert.hamlet b/templates/sidebar/alert.hamlet
index 9ffb449999..a339874a2b 100644
--- a/templates/sidebar/alert.hamlet
+++ b/templates/sidebar/alert.hamlet
@@ -1,13 +1,18 @@
 <div .alert .fade .in .#{divclass} :block:.alert-block ##{alertid} :closable:onclick="(function( $ ) { $.get('@{closealert}') })( jQuery );">
   $if closable
     <a .close data-dismiss="alert">&times;</a>
-  $case icon
-    $of Nothing
-    $of Just name
-      <i class="icon-#{name}"></i> #
   $maybe h <- heading
     $if block
-      <h4 .alert-heading>#{h}</h4> #
+      <h4 .alert-heading>
+        $case icon
+          $of Nothing
+          $of Just name
+            <i class="icon-#{name}"></i> #
+        #{h}
     $else
+      $case icon
+        $of Nothing
+        $of Just name
+          <i class="icon-#{name}"></i> #
       <strong>#{h}</strong> #
   #{message}