bootstrap3 glyphicons

Assistant/WebApp/Gpg.hs

@@ -27,7 +27,7 @@ import qualified Data.Map as M
 gpgKeyDisplay :: KeyId -> Maybe UserId -> Widget
 gpgKeyDisplay keyid userid = [whamlet|
   <span title="key id #{keyid}">
-    <i .icon-user></i> #
+    <span .glyphicon .glyphicon-user></span> #
       $maybe name <- userid
         #{name}
       $nothing

Assistant/WebApp/SideBar.hs

@@ -106,4 +106,4 @@ htmlIcon UpgradeIcon = bootstrapIcon "arrow-up"
 htmlIcon ConnectionIcon = bootstrapIcon "signal"
 
 bootstrapIcon :: Text -> Widget
-bootstrapIcon name = [whamlet|<i .icon-#{name}></i>|]
+bootstrapIcon name = [whamlet|<span .glyphicon .glyphicon-#{name}></span>|]

templates/actionbutton.hamlet

@@ -1,2 +1,2 @@
 <a title="#{fromMaybe "" tooltip}" class="#{buttonclass}" href="@{route}" onclick="(function( $ ) { $.post('@{route}'); })( jQuery ); return false;">
-  <i class="#{iconclass}"></i> #{fromMaybe "" label}
+  <span class="glyphicon #{iconclass}"></span> #{fromMaybe "" label}

templates/configurators/adddrive/combine.hamlet

@@ -8,12 +8,12 @@
     Do you want to combine these files into your repository?
   <p>
     <a .btn .btn-default onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR drive NoRepoKey}">
-      <i .icon-resize-small></i> Combine the repositories #
+      <span .glyphicon .glyphicon-resize-small></span> Combine the repositories #
     The combined repositories will sync and share their files.
   <p>
   <p>
     <a .btn .btn-default href="@{AddDriveR}">
-      <i .icon-resize-full></i> Go back #
+      <span .glyphicon .glyphicon-resize-full></span> Go back #
     Use a different directory than <tt>#{driveRepoPath drive}</tt> to #
     avoid combining the repositories.
 ^{setupDriveModal}

templates/configurators/adddrive/encrypt.hamlet

@@ -10,16 +10,16 @@
     easily accessing its contents on another computer.
   <p>
     <a .btn .btn-default onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR drive NoRepoKey}">
-      <i .icon-minus-sign></i> Do not encrypt repository #
+      <span .glyphicon .glyphicon-minus-sign></span> Do not encrypt repository #
     Anyone who has the drive can see the files stored on it.
     $forall (keyid, name) <- secretkeys
       <p>
         <a .btn .btn-default onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR drive (RepoKey keyid)}">
-          <i .icon-ok-sign></i> Encrypt repository #
+          <span .glyphicon .glyphicon-ok-sign></span> Encrypt repository #
         to ^{gpgKeyDisplay keyid (Just name)}
   <p>
     <a .btn .btn-default onclick="$('#genkeymodal').modal('show');" href="@{GenKeyForDriveR drive}">
-      <i .icon-plus-sign></i> Encrypt repository #
+      <span .glyphicon .glyphicon-plus-sign></span> Encrypt repository #
     with a new encryption key
 ^{setupDriveModal}
 ^{genKeyModal}

templates/configurators/addglacier.hamlet

@@ -7,10 +7,10 @@
     files to be retrieved from Glacier, making it mostly suitable for #
     backups and long-term data archival. #
   <p>
-    <i .icon-warning-sign></i> By default, only files you place in #
+    <span .glyphicon .glyphicon-warning-sign></span> By default, only files you place in #
     "archive" directories will be archived in Amazon Glacier.
   <p>
-    <i .icon-warning-sign></i> You will be charged by Amazon for data #
+    <span .glyphicon .glyphicon-warning-sign></span> You will be charged by Amazon for data #
     uploaded to Glacier, as well as data downloaded from Glacier, and a #
     monthly fee for data storage. #
     <a href="http://aws.amazon.com/glacier/pricing/">

templates/configurators/addrepository/archive.hamlet

@@ -1,11 +1,11 @@
 <h3>
   <a href="@{AddGlacierR}">
-    <i .icon-plus-sign></i> Amazon Glacier
+    <span .glyphicon .glyphicon-plus-sign></span> Amazon Glacier
 <p>
   Low cost offline data archival.
 
 <h3>
   <a href="@{AddIAR}">
-    <i .icon-plus-sign></i> Internet Archive
+    <span .glyphicon .glyphicon-plus-sign></span> Internet Archive
 <p>
   Free archival of public data.

templates/configurators/addrepository/cloud.hamlet

@@ -1,12 +1,12 @@
 <h3>
   <a href="@{AddBoxComR}">
-    <i .icon-plus-sign></i> Box.com
+    <span .glyphicon .glyphicon-plus-sign></span> Box.com
 <p>
   Provides free cloud storage for small amounts of data.
 
 <h3>
   <a href="@{AddRsyncNetR}">
-    <i .icon-plus-sign></i> Rsync.net
+    <span .glyphicon .glyphicon-plus-sign></span> Rsync.net
 <p>
   Works very well with git-annex.
   <br>
@@ -14,7 +14,7 @@
 
 <h3>
   <a href="@{AddS3R}">
-    <i .icon-plus-sign></i> Amazon S3
+    <span .glyphicon .glyphicon-plus-sign></span> Amazon S3
 <p>
   Good choice for professional quality storage.
 

templates/configurators/addrepository/misc.hamlet

@@ -1,6 +1,6 @@
 <h3>
   <a href="@{AddDriveR}">
-    <i .icon-plus-sign></i> Removable drive
+    <span .glyphicon .glyphicon-plus-sign></span> Removable drive
 <p>
   Add a USB drive, memory stick, or other removable media. #
   For offline archiving, backups, or to #
@@ -11,14 +11,14 @@
 
 <h3>
   <a href="@{StartLocalPairR}">
-    <i .icon-plus-sign></i> Local computer
+    <span .glyphicon .glyphicon-plus-sign></span> Local computer
 <p>
   Pair with a computer to keep files in sync quickly, #
   over your local network.
 
 <h3>
   <a href="@{NewRepositoryR}">
-    <i .icon-plus-sign></i> Add another repository
+    <span .glyphicon .glyphicon-plus-sign></span> Add another repository
 <p>
   Make another repository on your computer.
 

templates/configurators/addrepository/ssh.hamlet

@@ -1,6 +1,6 @@
 <h3>
   <a href="@{AddSshR}">
-    <i .icon-plus-sign></i> Remote server
+    <span .glyphicon .glyphicon-plus-sign></span> Remote server
 <p>
   Set up a repository on a remote server using #
   <tt>ssh</tt>.

templates/configurators/addrepository/xmppconnection.hamlet

@@ -1,11 +1,11 @@
 <h3>
   <a href="@{StartXMPPPairSelfR}">
-    <i .icon-plus-sign></i> Share with your other devices
+    <span .glyphicon .glyphicon-plus-sign></span> Share with your other devices
 <p>
   Keep files in sync between your devices running git-annex.
 
 <h3>
   <a href="@{StartXMPPPairFriendR}">
-    <i .icon-plus-sign></i> Share with a friend
+    <span .glyphicon .glyphicon-plus-sign></span> Share with a friend
 <p>
   Combine your repository with a friend's repository, and share your files.

templates/configurators/adds3.hamlet

@@ -6,7 +6,7 @@
     provider. If you need a professional level of storage for your data, #
     this is a good choice.
   <p>
-    <i .icon-warning-sign></i> You will be charged by Amazon for data #
+    <span .glyphicon .glyphicon-warning-sign></span> You will be charged by Amazon for data #
     uploaded to S3, as well as data downloaded from S3, and a monthly fee #
     for data storage. #
     <a href="http://aws.amazon.com/s3/pricing/">

templates/configurators/delete/currentrepository.hamlet

@@ -29,6 +29,6 @@
         ^{webAppFormAuthToken}
         <div .form-actions>
           <button .btn .btn-danger type=submit>
-            <i .icon-warning-sign></i> Delete this repository #
+            <span .glyphicon .glyphicon-warning-sign></span> Delete this repository #
           <a .btn .btn-default href="@{DashboardR}">
             Cancel

templates/configurators/delete/start.hamlet

@@ -8,4 +8,4 @@
     off it, to other repositories.
   <p>
    <a .btn .btn-primary href="@{StartDeleteRepositoryR uuid}">
-     <i .icon-minus></i> Start deletion process
+     <span .glyphicon .glyphicon-minus></span> Start deletion process

templates/configurators/fsck.hamlet

@@ -21,7 +21,7 @@
       Add a check:
       ^{showFsckForm True (defaultFsck Nothing)}
     $else
-      <i .icon-warning-sign></i> #
+      <span .glyphicon .glyphicon-warning-sign></span> #
       Some repositories are not yet checked. #
       Please consider adding these checks:
       $forall c <- recommendedchecks

templates/configurators/needconnection.hamlet

@@ -1,6 +1,6 @@
 <div .col-sm-9 .jumbotron>
   <h2>
-    <i .icon-signal></i> Connection needed
+    <span .glyphicon .glyphicon-signal></span> Connection needed
     <p>
       In order to quickly sync with other repositories, #
       a direct connection is needed to another git-annex. #

templates/configurators/newrepository.hamlet

@@ -2,7 +2,7 @@
   <h2>
     Add another local repository
   <p>
-    <i .icon-asterisk></i> Do you want to back your repository up to a #
+    <span .glyphicon .glyphicon-asterisk></span> Do you want to back your repository up to a #
     removable drive?
     <a .btn .btn-primary href="@{AddDriveR}">
       Make a repository on a Removable Drive

templates/configurators/newrepository/combine.hamlet

@@ -7,11 +7,11 @@
     Do you want to combine it with your existing repository at #{mainrepo}?
   <p>
     <a .btn .btn-default href="@{CombineRepositoryR newrepopath newrepouuid}">
-      <i .icon-resize-small></i> Combine the repositories #
+      <span .glyphicon .glyphicon-resize-small></span> Combine the repositories #
     The combined repositories will sync and share their files.
   <p>
     -or-
   <p>
     <a .btn .btn-default href="@{SwitchToRepositoryR newrepopath}">
-      <i .icon-resize-full></i> Keep the repositories separate #
+      <span .glyphicon .glyphicon-resize-full></span> Keep the repositories separate #
     Files placed in one will not be synced to the other.

templates/configurators/newrepository/first.hamlet

@@ -8,7 +8,7 @@
       Do you only want to share photos and videos you take?
     <p>
       <a .btn .btn-primary .btn-lg href="@{AndroidCameraRepositoryR}">
-        <i .icon-camera></i> Make Camera Repository
+        <span .glyphicon .glyphicon-camera></span> Make Camera Repository
   <p>
     $if androidspecial
       Want to share more files? #

templates/configurators/newrepository/form.hamlet

@@ -2,7 +2,7 @@
 <p>
   <div .input-group>
     <span .input-group-addon>
-      <i .icon-folder-open></i>
+      <span .glyphicon .glyphicon-folder-open></span>
     ^{fvInput pathView}
     <button type=submit .btn .btn-primary>
       Make Repository

templates/configurators/pairing/local/prompt.hamlet

@@ -24,7 +24,7 @@
         phrase, go ask #{username} ...
   $if badphrase
     <div .alert .alert-danger>
-      <i .icon-warning-sign></i> #{problem}
+      <span .glyphicon .glyphicon-warning-sign></span> #{problem}
   <p>
     <form method="post" .form-horizontal enctype=#{enctype}>
       <fieldset>

templates/configurators/rsync.net/add.hamlet

@@ -17,7 +17,7 @@
     $case status
       $of UnusableServer msg
         <div .alert .alert-danger>
-          <i .icon-warning-sign></i> #{msg}
+          <span .glyphicon .glyphicon-warning-sign></span> #{msg}
       $of _
         <div>
           Your data will be encrypted before it is sent to Rsync.net.

templates/configurators/rsync.net/encrypt.hamlet

@@ -12,7 +12,7 @@
     And it's easy to set up and use.
   <p>
     <a .btn .btn-default href="@{MakeRsyncNetSharedR sshdata}" onclick="$('#setupmodal').modal('show');">
-      <i .icon-lock></i> Use shared encryption
+      <span .glyphicon .glyphicon-lock></span> Use shared encryption
   <p style="text-align: center">
     -or-
   <h3>
@@ -27,11 +27,11 @@
     $forall (keyid, name) <- secretkeys
       <p>
         <a .btn .btn-default href="@{MakeRsyncNetGCryptR sshdata (RepoKey keyid)}" onclick="$('#setupmodal').modal('show');">
-          <i .icon-lock></i> Encrypt repository #
+          <span .glyphicon .glyphicon-lock></span> Encrypt repository #
         to ^{gpgKeyDisplay keyid (Just name)}
   <p>
     <a .btn .btn-default href="@{MakeRsyncNetGCryptR sshdata NoRepoKey}" onclick="$('#genkeymodal').modal('show');">
-      <i .icon-plus-sign></i> Encrypt repository #
+      <span .glyphicon .glyphicon-plus-sign></span> Encrypt repository #
     with a new encryption key
 ^{genKeyModal}
 <div .modal .fade #setupmodal>

templates/configurators/ssh/add.hamlet

@@ -10,7 +10,7 @@
     $case status
       $of UnusableServer msg
         <div .alert .alert-danger>
-          <i .icon-warning-sign></i> #{msg}
+          <span .glyphicon .glyphicon-warning-sign></span> #{msg}
       $of _
   <p>
     <form method="post" .form-horizontal enctype=#{enctype}>

templates/configurators/ssh/combine.hamlet

@@ -8,12 +8,12 @@
     Do you want to merge this repository's contents into your repository?
   <p>
     <a .btn .btn-default onclick="$('#setupmodal').modal('show');" href="@{CombineSshR sshdata}">
-      <i .icon-resize-small></i> Combine the repositories #
+      <span .glyphicon .glyphicon-resize-small></span> Combine the repositories #
     The combined repositories will sync and share their files.
   <p>
   <p>
     <a .btn .btn-default href="@{AddSshR}">
-      <i .icon-resize-full></i> Go back #
+      <span .glyphicon .glyphicon-resize-full></span> Go back #
     Use a different directory than <tt>#{sshDirectory sshdata}</tt> to #
     avoid combining the repositories.
 ^{sshSetupModal sshdata}

templates/configurators/ssh/confirm.hamlet

@@ -5,7 +5,7 @@
     <div .col-sm-9>
       $if not (hasCapability sshdata GitAnnexShellCapable)
         <p>
-          <i .icon-warning-sign></i> #
+          <span .glyphicon .glyphicon-warning-sign></span> #
           The server #{sshHostName sshdata} can be used as is, but #
           installing #
           $if not (hasCapability sshdata GitCapable)
@@ -42,7 +42,7 @@
         it good for sharing. And it's easy to set up and use.
       <p>
         <a .btn .btn-default href="@{MakeSshRsyncR sshdata}" onclick="$('#setupmodal').modal('show');">
-          <i .icon-lock></i> Use shared encryption
+          <span .glyphicon .glyphicon-lock></span> Use shared encryption
       $if hasCapability sshdata GitCapable
         <p style="text-align: center">
           -or-
@@ -58,11 +58,11 @@
           $forall (keyid, name) <- secretkeys
             <p>
               <a .btn .btn-default href="@{MakeSshGCryptR sshdata (RepoKey keyid)}" onclick="$('#setupmodal').modal('show');" >
-                <i .icon-lock></i> Encrypt repository #
+                <span .glyphicon .glyphicon-lock></span> Encrypt repository #
               to ^{gpgKeyDisplay keyid (Just name)}
         <p>
           <a .btn href="@{MakeSshGCryptR sshdata NoRepoKey}" onclick="$('#genkeymodal').modal('show');">
-            <i .icon-plus-sign></i> Encrypt repository #
+            <span .glyphicon .glyphicon-plus-sign></span> Encrypt repository #
           with a new encryption key
 ^{sshTestModal}
 ^{sshSetupModal sshdata}

templates/configurators/ssh/enable.hamlet

@@ -14,7 +14,7 @@
         $case status
           $of UnusableServer msg
             <div .alert .alert-danger>
-              <i .icon-warning-sign></i> #{msg}
+              <span .glyphicon .glyphicon-warning-sign></span> #{msg}
           $of _
         ^{form}
         ^{webAppFormAuthToken}

templates/configurators/ssh/error.hamlet

@@ -1,6 +1,6 @@
 <div .col-sm-9 .jumbotron>
   <h2>
-    <i .icon-warning-sign></i> Failed to make repository
+    <span .glyphicon .glyphicon-warning-sign></span> Failed to make repository
   <p>
     Something went wrong setting up the repository on the remote server.
   <p>

templates/configurators/unused.hamlet

@@ -6,7 +6,7 @@
       Some old versions of files and deleted files have been preserved #
       inside this repository.
       <div .alert .alert-info>
-        <i .icon-info-sign></i> #{renderTense Past desc} #
+        <span .glyphicon .glyphicon-info-sign></span> #{renderTense Past desc} #
         $maybe lastchecked <- mlastchecked
           (last checked #{fromDuration lastchecked} ago)
     $nothing
@@ -24,7 +24,7 @@
         up space.
         <br>
         <a .btn .btn-default href="@{AddRepositoryR}">
-          <i .icon-plus></i> Add a new repository
+          <span .glyphicon .glyphicon-plus></span> Add a new repository
     <li>
       <p>
         Or, you can let unused files expire after a period of time.
@@ -35,4 +35,4 @@
         Finally, you can clean up all unused files manually at any time.
         <br>
         <a .btn .btn-default href="@{CleanupUnusedR}">
-          <i .icon-trash></i> Clean up unused files now
+          <span .glyphicon .glyphicon-trash></span> Clean up unused files now

templates/configurators/xmpp.hamlet

@@ -10,10 +10,10 @@
     post any messages to it.
   <p>
     $maybe msg <- problem
-      <i .icon-warning-sign></i> Unable to connect to the Jabber server. #
+      <span .glyphicon .glyphicon-warning-sign></span> Unable to connect to the Jabber server. #
       Maybe you entered the wrong password? (Error message: #{msg})
     $nothing
-      <i .icon-user></I> If you have a Gmail account, you can use #
+      <span .glyphicon .glyphicon-user></span> If you have a Gmail account, you can use #
       Google Talk. Just enter your full Gmail address #
       <small>(<tt>you@gmail.com</tt>)</small> #
       and password below.

templates/configurators/xmpp/buddylist.hamlet

@@ -13,11 +13,11 @@
         <tr>
           <td>
             $if isself buddyid
-              <i .icon-star></i> #
+              <span .glyphicon .glyphicon-star></span> #
               <span :away:.text-muted>
                 your other devices
             $else
-              <i .icon-user></i> #
+              <span .glyphicon .glyphicon-user></span> #
               <span :away:.text-muted>
                   #{name}
           <td>

templates/control/shutdown.hamlet

@@ -3,6 +3,6 @@
     Shutdown daemon?
   <p>
     <a .btn .btn-danger href="@{ShutdownConfirmedR}">
-      <i .icon-off></i> Confirm shutdown
+      <span .glyphicon .glyphicon-off></span> Confirm shutdown
     <a .btn .btn-default href="@{DashboardR}">
       Keep running

templates/controlmenu.hamlet

@@ -1,16 +1,16 @@
 <ul .dropdown-menu>
   <li>
     <a href="@{NewRepositoryR}">
-      <i .icon-plus-sign></i> Add another local repository
+      <span .glyphicon .glyphicon-plus-sign></span> Add another local repository
   <li>
     <a href="@{RepositorySwitcherR}">
-      <i .icon-folder-close></i> Switch repository
+      <span .glyphicon .glyphicon-folder-close></span> Switch repository
   <li>
     <a href="@{RestartR}">
-      <i .icon-repeat></i> Restart daemon
+      <span .glyphicon .glyphicon-repeat></span> Restart daemon
   <li>
     <a href="@{ShutdownR}">
-      <i .icon-off></i> Shutdown daemon
+      <span .glyphicon .glyphicon-off></span> Shutdown daemon
   <li>
     <a href="@{LogR}">
-      <i .icon-list></i> View log
+      <span .glyphicon .glyphicon-list></span> View log

templates/repolist.hamlet

@@ -15,24 +15,24 @@
         <tr .repoline ##{show repoid}>
           <td .handle>
             <a .btn .btn-default .btn-xs .disabled>
-              <i .icon-resize-vertical></i>
+              <span .glyphicon .glyphicon-resize-vertical></span>
             &nbsp; #{name}
           <td .draghide>
             $if needsEnabled actions
               <a href="@{setupRepoLink actions}">
-                <i .icon-warning-sign></i> not enabled
+                <span .glyphicon .glyphicon-warning-sign></span> not enabled
             $else
               $if notWanted actions
-                <i .icon-trash></i> cleaning out..
+                <span .glyphicon .glyphicon-trash></span> cleaning out..
               $else
                 <a href="@{syncToggleLink actions}">
                   $if currentlyconnected
-                    <i .icon-signal></i> #
+                    <span .glyphicon .glyphicon-signal></span> #
                   $else
                     $if notSyncing actions
-                      <i .icon-ban-circle></i> #
+                      <span .glyphicon .glyphicon-ban-circle></span> #
                     $else
-                      <i .icon-refresh></i> #
+                      <span .glyphicon .glyphicon-refresh></span> #
                   $if notSyncing actions
                     syncing disabled
                   $else
@@ -46,28 +46,28 @@
             $else
               <div .dropdown #menu-#{show repoid}>
                 <a data-toggle="dropdown" data-target="#" href="#menu-#{show repoid}">
-                  <i .icon-cog></i> actions
+                  <span .glyphicon .glyphicon-cog></span> actions
                   <span .caret>
                 <ul .dropdown-menu>
                   <li>
                     <a href="@{setupRepoLink actions}">
-                      <i .icon-pencil></i> Edit
+                      <span .glyphicon .glyphicon-pencil></span> Edit
                     $if not (lacksUUID repoid)
                       <a href="@{SyncNowRepositoryR $ asUUID repoid}">
-                        <i .icon-refresh></i> Sync now
+                        <span .glyphicon .glyphicon-refresh></span> Sync now
                       <a href="@{DisableRepositoryR $ asUUID repoid}">
-                        <i .icon-minus></i> Disable
+                        <span .glyphicon .glyphicon-minus></span> Disable
                       <a href="@{DeleteRepositoryR $ asUUID repoid}">
-                        <i .icon-trash></i> Delete
+                        <span .glyphicon .glyphicon-trash></span> Delete
       $if addmore
         <tr>
           <td colspan="3">
             $if nootherrepos
               <a .btn .btn-primary .btn-lg href="@{AddRepositoryR}">
-                <i .icon-plus-sign></i> Add another repository
+                <span .glyphicon .glyphicon-plus-sign></span> Add another repository
             $else
               <a .btn .btn-default .btn-sm href="@{AddRepositoryR}">
-                <i .icon-plus-sign></i> Add another repository
+                <span .glyphicon .glyphicon-plus-sign></span> Add another repository
             <span>
               &nbsp; Sync your files with another device, or #
               share with a friend.