summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-08 14:14:19 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-08 14:14:19 -0400
commit96950a3b40e462abf607377d509ebf14c7d4a1a1 (patch)
tree983a58d0be0b3e37233216d5c007f90a3c51a7c0 /templates
parentfb4b19deedca3f7bebfc415b1c9bc44f0e125567 (diff)
add pause/start and cancel buttons to transfer display
Diffstat (limited to 'templates')
-rw-r--r--templates/dashboard/transfers.hamlet48
-rw-r--r--templates/documentation/about.hamlet2
-rw-r--r--templates/sidebar/alert.hamlet4
3 files changed, 33 insertions, 21 deletions
diff --git a/templates/dashboard/transfers.hamlet b/templates/dashboard/transfers.hamlet
index b48ae6f6d..20d1b5e8a 100644
--- a/templates/dashboard/transfers.hamlet
+++ b/templates/dashboard/transfers.hamlet
@@ -5,21 +5,33 @@
$forall (transfer, info) <- transfers
$with percent <- maybe "unknown" (showPercentage 0) $ percentComplete transfer info
<div .row-fluid>
- <h3>
- $maybe file <- associatedFile info
- #{file}
- $nothing
- #{show $ transferKey transfer}
- $case transferDirection transfer
- $of Upload
- &rarr;
- $of Download
- &larr;
- <small>#{maybe "unknown" Remote.name $ transferRemote info}</small>
- $with size <- maybe "unknown" (roughSize dataUnits True) $ keySize $ transferKey transfer
- $if isJust $ startedTime info
- <small .pull-right><b>#{percent} of #{size}</b></small>
- $else
- <small .pull-right>queued (#{size})</small>
- <div .progress .progress-striped>
- <div .bar style="width: #{percent};">
+ <div .span10>
+ <div .row-fluid>
+ <h3>
+ $maybe file <- associatedFile info
+ #{file}
+ $nothing
+ #{show $ transferKey transfer}
+ $case transferDirection transfer
+ $of Upload
+ &rarr;
+ $of Download
+ &larr;
+ <small>#{maybe "unknown" Remote.name $ transferRemote info}</small>
+ $with size <- maybe "unknown" (roughSize dataUnits True) $ keySize $ transferKey transfer
+ $if isJust $ startedTime info
+ <small .pull-right><b>#{percent} of #{size}</b></small>
+ $else
+ <small .pull-right>queued (#{size})</small>
+ <div .row-fluid>
+ <div .progress .progress-striped>
+ <div .bar style="width: #{percent};">
+ <div .btn-group .span2>
+ $if isNothing (startedTime info)
+ <button .btn>
+ <i .icon-play title="start"></i>
+ $else
+ <button .btn>
+ <i .icon-pause title="pause"></i>
+ <button .btn>
+ <i .icon-remove title="cancel"></i>
diff --git a/templates/documentation/about.hamlet b/templates/documentation/about.hamlet
index e9a233471..992e1a11d 100644
--- a/templates/documentation/about.hamlet
+++ b/templates/documentation/about.hamlet
@@ -14,4 +14,4 @@
Its development was made possible by #
<a href="http://git-annex.branchable.com/design/assistant/thanks/">
many excellent people
- . <i class="icon-heart"></i>
+ . <i .icon-heart></i>
diff --git a/templates/sidebar/alert.hamlet b/templates/sidebar/alert.hamlet
index a339874a2..4275931a9 100644
--- a/templates/sidebar/alert.hamlet
+++ b/templates/sidebar/alert.hamlet
@@ -7,12 +7,12 @@
$case icon
$of Nothing
$of Just name
- <i class="icon-#{name}"></i> #
+ <i .icon-#{name}></i> #
#{h}
$else
$case icon
$of Nothing
$of Just name
- <i class="icon-#{name}"></i> #
+ <i .icon-#{name}></i> #
<strong>#{h}</strong> #
#{message}