summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-06 17:15:27 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-06 17:15:27 -0400
commit77cd32717080428d830fdaf543cd29edf8bfabbc (patch)
tree37c52157422a35708de6c2e4ca2cc502aaf8fbfe
parent8f1a9ef8b5e914bbe447733650a5848fc553c708 (diff)
fix display of icon in block alert heading
-rw-r--r--Assistant/Alert.hs1
-rw-r--r--templates/sidebar/alert.hamlet15
2 files changed, 10 insertions, 6 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs
index 9ebc89aab..51743964b 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 9ffb44999..a339874a2 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}