don't close tags that are closed by hamlet

This commit is contained in:
Sören Brunk 2014-04-21 13:05:52 +02:00
parent ce0ecbeefc
commit ccc8afb59d
36 changed files with 144 additions and 82 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -29,6 +29,7 @@
^{webAppFormAuthToken} ^{webAppFormAuthToken}
<div .col-md-2> <div .col-md-2>
<button .btn .btn-danger type=submit> <button .btn .btn-danger type=submit>
<span .glyphicon .glyphicon-warning-sign></span> Delete this repository # <span .glyphicon .glyphicon-warning-sign>
\ Delete this repository #
<a .btn .btn-default href="@{DashboardR}"> <a .btn .btn-default href="@{DashboardR}">
Cancel Cancel

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -3,7 +3,7 @@
<div .form-group> <div .form-group>
<div .input-group> <div .input-group>
<span .input-group-addon> <span .input-group-addon>
<span .glyphicon .glyphicon-folder-open></span> <span .glyphicon .glyphicon-folder-open>
^{fvInput pathView} ^{fvInput pathView}
<span .input-group-btn> <span .input-group-btn>
<button type=submit .btn .btn-primary> <button type=submit .btn .btn-primary>

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -2,7 +2,7 @@
<div .container> <div .container>
<div .navbar-header> <div .navbar-header>
<button type="button" .navbar-toggle data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" .navbar-toggle data-toggle="collapse" data-target=".navbar-collapse">
<span .sr-only">Toggle navigation <span .sr-only>Toggle navigation
<span .icon-bar> <span .icon-bar>
<span .icon-bar> <span .icon-bar>
<span .icon-bar> <span .icon-bar>
@ -22,7 +22,7 @@
<li .dropdown #menu1> <li .dropdown #menu1>
<a .dropdown-toggle data-toggle="dropdown" href="#menu1"> <a .dropdown-toggle data-toggle="dropdown" href="#menu1">
Repository: #{reldir} Repository: #{reldir}
<b .caret></b> <b .caret>
^{controlMenu} ^{controlMenu}
$nothing $nothing
<div .container-fluid> <div .container-fluid>

View file

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

View file

@ -10,7 +10,8 @@
$else $else
$maybe i <- alertIcon alert $maybe i <- alertIcon alert
^{htmlIcon i} # ^{htmlIcon i} #
<strong>#{h}</strong> # <strong>#{h}
\
$nothing $nothing
$maybe i <- alertIcon alert $maybe i <- alertIcon alert
^{htmlIcon i} # ^{htmlIcon i} #