adapt templates to bootstrap3 layout and class changes

This commit is contained in:
Sören Brunk 2014-04-20 12:42:31 +02:00
parent c8dccf9582
commit 23091cc318
67 changed files with 191 additions and 185 deletions

View file

@ -67,7 +67,7 @@ withExpandableNote :: (Monad m, ToWidget (HandlerSite m) w) => Field m v -> (Str
withExpandableNote :: Field sub master v -> (String, GWidget sub master ()) -> Field sub master v withExpandableNote :: Field sub master v -> (String, GWidget sub master ()) -> Field sub master v
#endif #endif
withExpandableNote field (toggle, note) = withNote field $ [whamlet| withExpandableNote field (toggle, note) = withNote field $ [whamlet|
<a .btn data-toggle="collapse" data-target="##{ident}">#{toggle}</a> <a .btn .btn-default data-toggle="collapse" data-target="##{ident}">#{toggle}</a>
<div ##{ident} .collapse> <div ##{ident} .collapse>
^{note} ^{note}
|] |]

View file

@ -38,7 +38,7 @@ sideBarDisplay = do
bootstrapclass :: AlertClass -> Text bootstrapclass :: AlertClass -> Text
bootstrapclass Activity = "alert-info" bootstrapclass Activity = "alert-info"
bootstrapclass Warning = "alert" bootstrapclass Warning = "alert"
bootstrapclass Error = "alert-error" bootstrapclass Error = "alert-danger"
bootstrapclass Success = "alert-success" bootstrapclass Success = "alert-success"
bootstrapclass Message = "alert-info" bootstrapclass Message = "alert-info"

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Adding a Box.com repository Adding a Box.com repository
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Adding a removable drive Adding a removable drive
<p> <p>
@ -7,7 +7,7 @@
content will be synced with the content of this repository. content will be synced with the content of this repository.
<p> <p>
$if (null writabledrives) $if (null writabledrives)
<div .span6 .alert .alert-error .alert-block> <div .col-sm-6 .alert .alert-danger .alert-block>
$if (null removabledrives) $if (null removabledrives)
<h4 .alert-heading> <h4 .alert-heading>
No removable drives found No removable drives found
@ -27,5 +27,5 @@
^{form} ^{form}
^{webAppFormAuthToken} ^{webAppFormAuthToken}
<button .btn .btn-primary type=submit>Use this drive</button> # <button .btn .btn-primary type=submit>Use this drive</button> #
<a .btn href="@{AddDriveR}"> <a .btn .btn-default href="@{AddDriveR}">
Rescan for removable drives Rescan for removable drives

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Combine repositories? Combine repositories?
<p> <p>
@ -7,12 +7,12 @@
<p> <p>
Do you want to combine these files into your repository? Do you want to combine these files into your repository?
<p> <p>
<a .btn onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR drive NoRepoKey}"> <a .btn .btn-default onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR drive NoRepoKey}">
<i .icon-resize-small></i> Combine the repositories # <i .icon-resize-small></i> 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 href="@{AddDriveR}"> <a .btn .btn-default href="@{AddDriveR}">
<i .icon-resize-full></i> Go back # <i .icon-resize-full></i> 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.

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Encrypt this drive? Encrypt this drive?
<p> <p>
@ -9,16 +9,16 @@
will also prevent you from sharing the repository with friends, or # will also prevent you from sharing the repository with friends, or #
easily accessing its contents on another computer. easily accessing its contents on another computer.
<p> <p>
<a .btn onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR drive NoRepoKey}"> <a .btn .btn-default onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR drive NoRepoKey}">
<i .icon-minus-sign></i> Do not encrypt repository # <i .icon-minus-sign></i> 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 onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR drive (RepoKey keyid)}"> <a .btn .btn-default onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR drive (RepoKey keyid)}">
<i .icon-ok-sign></i> Encrypt repository # <i .icon-ok-sign></i> Encrypt repository #
to ^{gpgKeyDisplay keyid (Just name)} to ^{gpgKeyDisplay keyid (Just name)}
<p> <p>
<a .btn onclick="$('#genkeymodal').modal('show');" href="@{GenKeyForDriveR drive}"> <a .btn .btn-default onclick="$('#genkeymodal').modal('show');" href="@{GenKeyForDriveR drive}">
<i .icon-plus-sign></i> Encrypt repository # <i .icon-plus-sign></i> Encrypt repository #
with a new encryption key with a new encryption key
^{setupDriveModal} ^{setupDriveModal}

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Adding an Amazon Glacier repository Adding an Amazon Glacier repository
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Adding an Internet Archive item Adding an Internet Archive item
<p> <p>

View file

@ -1,13 +1,13 @@
<div .span9> <div .col-sm-9>
^{repolist} ^{repolist}
<div .row-fluid> <div .row>
<div .span6> <div .col-sm-6>
<h2> <h2>
Add more repositories Add more repositories
^{makeMiscRepositories} ^{makeMiscRepositories}
<div .span6> <div .col-sm-6>
<h2> <h2>
Store your data in the cloud Store your data in the cloud

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Adding an Amazon S3 repository Adding an Amazon S3 repository
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Deleting #{reldir} Deleting #{reldir}
<p> <p>
@ -12,11 +12,11 @@
losing any data, if all files have been synced to them. # losing any data, if all files have been synced to them. #
No guarantees -- It's up to you to make sure before you continue. No guarantees -- It's up to you to make sure before you continue.
$else $else
<div .alert .alert-error> <div .alert .alert-danger>
This repository is not uploading its files to other repositories, This repository is not uploading its files to other repositories,
so you will lose data if you delete it! so you will lose data if you delete it!
$else $else
<div .alert .alert-error> <div .alert .alert-danger>
This repository is not syncing to other git repositories, # This repository is not syncing to other git repositories, #
so you will lose data if you delete it! so you will lose data if you delete it!
<p> <p>
@ -30,5 +30,5 @@
<div .form-actions> <div .form-actions>
<button .btn .btn-danger type=submit> <button .btn .btn-danger type=submit>
<i .icon-warning-sign></i> Delete this repository # <i .icon-warning-sign></i> Delete this repository #
<a .btn href="@{DashboardR}"> <a .btn .btn-default href="@{DashboardR}">
Cancel Cancel

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Repository deleted Repository deleted
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Delete repository # Delete repository #
<small> <small>

View file

@ -1,10 +1,12 @@
<div .span9 .hero-unit> <div .col-sm-9>
<h2> <div .jumbotron>
Disconnecting from Jabber <h2>
<p> Disconnecting from Jabber
This won't delete the repository or repositories at the other end <p>
of the Jabber connection, but it will disconnect from them, and stop This won't delete the repository or repositories at the other end
using Jabber. of the Jabber connection, but it will disconnect from them, and stop
<p> using Jabber.
<a .btn .btn-primary href="@{DisconnectXMPPR}"> <p>
<i .icon-minus></i> Disconnect <a .btn .btn-primary href="@{DisconnectXMPPR}">
<span .glyphicon .glyphicon-minus>
\ Disconnect

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Just a git repository Just a git repository
<p> <p>
@ -10,7 +10,7 @@
upgrade this repository to a full git annex, which will store the upgrade this repository to a full git annex, which will store the
contents of your files, not only their metadata. contents of your files, not only their metadata.
<p> <p>
<a .btn href="@{UpgradeRepositoryR r}"> <a .btn .btn-default href="@{UpgradeRepositoryR r}">
Upgrade Repository Upgrade Repository
<h2> <h2>
Repository information Repository information

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
$if new $if new
Setup complete Setup complete
@ -23,7 +23,7 @@
<div .form-actions> <div .form-actions>
<button .btn .btn-primary type=submit> <button .btn .btn-primary type=submit>
Save Changes # Save Changes #
<a .btn href="@{DashboardR}"> <a .btn .btn-default href="@{DashboardR}">
Cancel # Cancel #
$if new $if new
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Enabling #{description} Enabling #{description}
<p> <p>

View file

@ -1,10 +1,10 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Enabling #{description} Enabling #{description}
<p> <p>
Where is this repository located? Where is this repository located?
<p> <p>
<a .btn href="@{AddDriveR}"> <a .btn .btn-default href="@{AddDriveR}">
On a removable drive On a removable drive
<a .btn href="@{DashboardR}"> <a .btn href="@{DashboardR}">
Cancel Cancel

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Enabling #{description} Enabling #{description}
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Enabling #{description} Enabling #{description}
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Consistency checks Consistency checks
<p> <p>

View file

@ -1,6 +1,6 @@
#{msg} #{msg}
<p> <p>
<div .input-prepend .input-append> <div .input-group>
Check ^{fvInput reposView} for # Check ^{fvInput reposView} for #
^{fvInput durationView} minutes # ^{fvInput durationView} minutes #
^{fvInput recurranceView} # ^{fvInput recurranceView} #
@ -9,7 +9,7 @@
<button type=submit .btn .btn-primary> <button type=submit .btn .btn-primary>
Add Add
$else $else
<button type=submit .btn> <button type=submit .btn .btn-default>
Save Save
<a .btn href="@{RemoveActivityR u activity}"> <a .btn .btn-default href="@{RemoveActivityR u activity}">
Remove Remove

View file

@ -1,34 +1,34 @@
<div .span9> <div .col-sm-9>
<div .row-fluid> <div .row>
<div .span4> <div .col-sm-4>
<h3> <h3>
<a href="@{AddRepositoryR}"> <a href="@{AddRepositoryR}">
Repositories Repositories
<p> <p>
Configure the repositories that git-annex syncs with. Configure the repositories that git-annex syncs with.
<div .span4> <div .col-sm-4>
<h3> <h3>
<a href="@{PreferencesR}"> <a href="@{PreferencesR}">
Preferences Preferences
<p> <p>
Tune the behavior of git-annex, including how many copies # Tune the behavior of git-annex, including how many copies #
to retain of each file, and how much disk space it can use. to retain of each file, and how much disk space it can use.
<div .row-fluid> <div .row>
<div .span4> <div .col-sm-4>
<h3> <h3>
<a href="@{ConfigFsckR}"> <a href="@{ConfigFsckR}">
Consistency checks Consistency checks
<p> <p>
Set up periodic checks of your data to detect and recover from # Set up periodic checks of your data to detect and recover from #
disk problems. disk problems.
<div .span4> <div .col-sm-4>
<h3> <h3>
<a href="@{ConfigUnusedR}"> <a href="@{ConfigUnusedR}">
Unused files Unused files
<p> <p>
Configure what to do with old and deleted files. Configure what to do with old and deleted files.
<div .row-fluid> <div .row>
<div .span4> <div .col-sm-4>
<h3> <h3>
<a href="@{XMPPConfigR}"> <a href="@{XMPPConfigR}">
Jabber account Jabber account

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
<i .icon-signal></i> Connection needed <i .icon-signal></i> Connection needed
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Need git-remote-gcrypt Need git-remote-gcrypt
<p> <p>
@ -6,5 +6,5 @@
<a href="https://github.com/joeyh/git-remote-gcrypt"> <a href="https://github.com/joeyh/git-remote-gcrypt">
git-remote-gcrypt git-remote-gcrypt
<p> <p>
<a .btn .btn-primary .btn-large href=""> <a .btn .btn-primary .btn-lg href="">
Retry Retry

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Need glacier-cli Need glacier-cli
<p> <p>
@ -6,5 +6,5 @@
<a href="https://github.com/basak/glacier-cli"> <a href="https://github.com/basak/glacier-cli">
glacier-cli glacier-cli
<p> <p>
<a .btn .btn-primary .btn-large href=""> <a .btn .btn-primary .btn-lg href="">
Retry Retry

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Add another local repository Add another local repository
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Combine repositories? Combine repositories?
<p> <p>
@ -6,12 +6,12 @@
<br> <br>
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 href="@{CombineRepositoryR newrepopath newrepouuid}"> <a .btn .btn-default href="@{CombineRepositoryR newrepopath newrepouuid}">
<i .icon-resize-small></i> Combine the repositories # <i .icon-resize-small></i> 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 href="@{SwitchToRepositoryR newrepopath}"> <a .btn .btn-default href="@{SwitchToRepositoryR newrepopath}">
<i .icon-resize-full></i> Keep the repositories separate # <i .icon-resize-full></i> 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

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Welcome to git-annex! Welcome to git-annex!
<p> <p>
@ -7,7 +7,7 @@
<p> <p>
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-large href="@{AndroidCameraRepositoryR}"> <a .btn .btn-primary .btn-lg href="@{AndroidCameraRepositoryR}">
<i .icon-camera></i> Make Camera Repository <i .icon-camera></i> Make Camera Repository
<p> <p>
$if androidspecial $if androidspecial

View file

@ -1,11 +1,11 @@
#{msg} #{msg}
<p> <p>
<div .input-prepend .input-append> <div .input-group>
<span .add-on> <span .input-group-addon>
<i .icon-folder-open></i> <i .icon-folder-open></i>
^{fvInput pathView} ^{fvInput pathView}
<button type=submit .btn .btn-primary> <button type=submit .btn .btn-primary>
Make Repository Make Repository
$if err $if err
<div .alert .alert-error> <div .alert .alert-danger>
#{errmsg} #{errmsg}

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
not supported not supported
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Pairing in progress .. Pairing in progress ..
$if T.null secret $if T.null secret

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Pairing with a local computer Pairing with a local computer
<p> <p>
@ -23,7 +23,7 @@
to enter here to finish the pairing. If you don't know the # to enter here to finish the pairing. If you don't know the #
phrase, go ask #{username} ... phrase, go ask #{username} ...
$if badphrase $if badphrase
<div .alert .alert-error> <div .alert .alert-danger>
<i .icon-warning-sign></i> #{problem} <i .icon-warning-sign></i> #{problem}
<p> <p>
<form method="post" .form-horizontal enctype=#{enctype}> <form method="post" .form-horizontal enctype=#{enctype}>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
$if inprogress $if inprogress
<h2> <h2>
Pair request sent ... Pair request sent ...

View file

@ -1,11 +1,11 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Pair request received from #{name} Pair request received from #{name}
<p> <p>
Pairing with #{name} will combine your two git annex # Pairing with #{name} will combine your two git annex #
repositories into one, allowing you to share files. repositories into one, allowing you to share files.
<p> <p>
<a .btn .btn-primary .btn-large href="@{FinishXMPPPairFriendR pairkey}"> <a .btn .btn-primary .btn-lg href="@{FinishXMPPPairFriendR pairkey}">
Accept pair request Accept pair request
<a .btn .btn-large href="@{DashboardR}"> <a .btn .btn-default .btn-lg href="@{DashboardR}">
No thanks No thanks

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Share with a friend Share with a friend
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Sharing with your other devices Sharing with your other devices
<p> <p>
@ -14,7 +14,7 @@
repositories configured to use the same Jabber account will be # repositories configured to use the same Jabber account will be #
combined together when you do this. combined together when you do this.
<p> <p>
<a .btn .btn-primary .btn-large href="@{RunningXMPPPairSelfR}"> <a .btn .btn-primary .btn-lg href="@{RunningXMPPPairSelfR}">
Start sharing with my other devices # Start sharing with my other devices #
<a .btn .btn-large href="@{DashboardR}"> <a .btn .btn-default .btn-lg href="@{DashboardR}">
Cancel Cancel

View file

@ -1,11 +1,11 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Unable to get in touch with any other devices. Unable to get in touch with any other devices.
<p> <p>
Make sure your other devices are online and configured to use # Make sure your other devices are online and configured to use #
your Jabber account before continuing. your Jabber account before continuing.
<p> <p>
<a .btn .btn-primary .btn-large href="@{RunningXMPPPairSelfR}"> <a .btn .btn-primary .btn-lg href="@{RunningXMPPPairSelfR}">
Start sharing with my other devices # Start sharing with my other devices #
<a .btn .btn-large href="@{DashboardR}"> <a .btn .btn-default .btn-lg href="@{DashboardR}">
Cancel Cancel

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Preferences Preferences
<p> <p>
@ -9,5 +9,5 @@
<div .form-actions> <div .form-actions>
<button .btn .btn-primary type=submit> <button .btn .btn-primary type=submit>
Save Preferences Save Preferences
<a .btn href="@{ConfigurationR}"> <a .btn .btn-default href="@{ConfigurationR}">
Cancel Cancel

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Adding a Rsync.net repository Adding a Rsync.net repository
<p> <p>
@ -16,7 +16,7 @@
<p> <p>
$case status $case status
$of UnusableServer msg $of UnusableServer msg
<div .alert .alert-error> <div .alert .alert-danger>
<i .icon-warning-sign></i> #{msg} <i .icon-warning-sign></i> #{msg}
$of _ $of _
<div> <div>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Ready to use rsync.net Ready to use rsync.net
<p> <p>
@ -11,7 +11,7 @@
files stored on rsync.net. That makes it good for sharing. # files stored on rsync.net. That makes it good for sharing. #
And it's easy to set up and use. And it's easy to set up and use.
<p> <p>
<a .btn href="@{MakeRsyncNetSharedR sshdata}" onclick="$('#setupmodal').modal('show');"> <a .btn .btn-default href="@{MakeRsyncNetSharedR sshdata}" onclick="$('#setupmodal').modal('show');">
<i .icon-lock></i> Use shared encryption <i .icon-lock></i> Use shared encryption
<p style="text-align: center"> <p style="text-align: center">
-or- -or-
@ -26,11 +26,11 @@
<p> <p>
$forall (keyid, name) <- secretkeys $forall (keyid, name) <- secretkeys
<p> <p>
<a .btn href="@{MakeRsyncNetGCryptR sshdata (RepoKey keyid)}" onclick="$('#setupmodal').modal('show');"> <a .btn .btn-default href="@{MakeRsyncNetGCryptR sshdata (RepoKey keyid)}" onclick="$('#setupmodal').modal('show');">
<i .icon-lock></i> Encrypt repository # <i .icon-lock></i> Encrypt repository #
to ^{gpgKeyDisplay keyid (Just name)} to ^{gpgKeyDisplay keyid (Just name)}
<p> <p>
<a .btn href="@{MakeRsyncNetGCryptR sshdata NoRepoKey}" onclick="$('#genkeymodal').modal('show');"> <a .btn .btn-default href="@{MakeRsyncNetGCryptR sshdata NoRepoKey}" onclick="$('#genkeymodal').modal('show');">
<i .icon-plus-sign></i> Encrypt repository # <i .icon-plus-sign></i> Encrypt repository #
with a new encryption key with a new encryption key
^{genKeyModal} ^{genKeyModal}

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Adding a remote server using ssh Adding a remote server using ssh
<p> <p>
@ -9,7 +9,7 @@
<p> <p>
$case status $case status
$of UnusableServer msg $of UnusableServer msg
<div .alert .alert-error> <div .alert .alert-danger>
<i .icon-warning-sign></i> #{msg} <i .icon-warning-sign></i> #{msg}
$of _ $of _
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Combine repositories? Combine repositories?
<p> <p>
@ -7,12 +7,12 @@
<p> <p>
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 onclick="$('#setupmodal').modal('show');" href="@{CombineSshR sshdata}"> <a .btn .btn-default onclick="$('#setupmodal').modal('show');" href="@{CombineSshR sshdata}">
<i .icon-resize-small></i> Combine the repositories # <i .icon-resize-small></i> 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 href="@{AddSshR}"> <a .btn .btn-default href="@{AddSshR}">
<i .icon-resize-full></i> Go back # <i .icon-resize-full></i> 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.

View file

@ -1,8 +1,8 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Ready to add remote server Ready to add remote server
<div .row-fluid> <div .row>
<div .span9> <div .col-sm-9>
$if not (hasCapability sshdata GitAnnexShellCapable) $if not (hasCapability sshdata GitAnnexShellCapable)
<p> <p>
<i .icon-warning-sign></i> # <i .icon-warning-sign></i> #
@ -15,7 +15,7 @@
on it would make it work better, and provide more options below. # on it would make it work better, and provide more options below. #
<p> <p>
If you're able to install software on the server, do so and click If you're able to install software on the server, do so and click
<a .btn href="@{RetrySshR sshdata}" onclick="$('#testmodal').modal('show');"> <a .btn .btn-default href="@{RetrySshR sshdata}" onclick="$('#testmodal').modal('show');">
Retry Retry
$else $else
<p> <p>
@ -30,7 +30,7 @@
other devices to use the same server, or share the repository with # other devices to use the same server, or share the repository with #
others. others.
<p> <p>
<a .btn href="@{MakeSshGitR sshdata}" onclick="$('#setupmodal').modal('show');"> <a .btn .btn-default href="@{MakeSshGitR sshdata}" onclick="$('#setupmodal').modal('show');">
Make an unencrypted git repository on the server Make an unencrypted git repository on the server
<p style="text-align: center"> <p style="text-align: center">
-or- -or-
@ -41,7 +41,7 @@
decrypt the files stored on #{sshHostName sshdata}. That makes # decrypt the files stored on #{sshHostName sshdata}. That makes #
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 href="@{MakeSshRsyncR sshdata}" onclick="$('#setupmodal').modal('show');"> <a .btn .btn-default href="@{MakeSshRsyncR sshdata}" onclick="$('#setupmodal').modal('show');">
<i .icon-lock></i> Use shared encryption <i .icon-lock></i> Use shared encryption
$if hasCapability sshdata GitCapable $if hasCapability sshdata GitCapable
<p style="text-align: center"> <p style="text-align: center">
@ -57,7 +57,7 @@
<p> <p>
$forall (keyid, name) <- secretkeys $forall (keyid, name) <- secretkeys
<p> <p>
<a .btn href="@{MakeSshGCryptR sshdata (RepoKey keyid)}" onclick="$('#setupmodal').modal('show');" > <a .btn .btn-default href="@{MakeSshGCryptR sshdata (RepoKey keyid)}" onclick="$('#setupmodal').modal('show');" >
<i .icon-lock></i> Encrypt repository # <i .icon-lock></i> Encrypt repository #
to ^{gpgKeyDisplay keyid (Just name)} to ^{gpgKeyDisplay keyid (Just name)}
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Enabling #{description} Enabling #{description}
<p> <p>
@ -13,7 +13,7 @@
Check this server Check this server
$case status $case status
$of UnusableServer msg $of UnusableServer msg
<div .alert .alert-error> <div .alert .alert-danger>
<i .icon-warning-sign></i> #{msg} <i .icon-warning-sign></i> #{msg}
$of _ $of _
^{form} ^{form}

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
<i .icon-warning-sign></i> Failed to make repository <i .icon-warning-sign></i> Failed to make repository
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Managing unused files Managing unused files
<p> <p>
@ -23,7 +23,7 @@
or in the cloud, and the unused files will be moved to it, freeing # or in the cloud, and the unused files will be moved to it, freeing #
up space. up space.
<br> <br>
<a .btn href="@{AddRepositoryR}"> <a .btn .btn-default href="@{AddRepositoryR}">
<i .icon-plus></i> Add a new repository <i .icon-plus></i> Add a new repository
<li> <li>
<p> <p>
@ -34,5 +34,5 @@
<p> <p>
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 href="@{CleanupUnusedR}"> <a .btn .btn-default href="@{CleanupUnusedR}">
<i .icon-trash></i> Clean up unused files now <i .icon-trash></i> Clean up unused files now

View file

@ -1,6 +1,6 @@
#{msg} #{msg}
<p> <p>
<div .input-prepend .input-append> <div .input-group>
^{fvInput enableView} after ^{fvInput whenView} days.&nbsp; ^{fvInput enableView} after ^{fvInput whenView} days.&nbsp;
<button type=submit .btn> <button type=submit .btn .btn-default >
Save Changes Save Changes

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Upgrading git-annex Upgrading git-annex
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Configuring jabber account Configuring jabber account
<p> <p>
@ -25,7 +25,7 @@
<div .form-actions> <div .form-actions>
<button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');"> <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
Use this account Use this account
<a .btn href="@{DisconnectXMPPR}"> <a .btn .btn-default href="@{DisconnectXMPPR}">
Stop using this account Stop using this account
<div .modal .fade #workingmodal> <div .modal .fade #workingmodal>
<div .modal-header> <div .modal-header>

View file

@ -1,4 +1,4 @@
<div .span9 ##{ident}> <div .col-sm-9 ##{ident}>
<table .table> <table .table>
<tbody> <tbody>
$if null buddies $if null buddies
@ -14,15 +14,15 @@
<td> <td>
$if isself buddyid $if isself buddyid
<i .icon-star></i> # <i .icon-star></i> #
<span :away:.muted> <span :away:.text-muted>
your other devices your other devices
$else $else
<i .icon-user></i> # <i .icon-user></i> #
<span :away:.muted> <span :away:.text-muted>
#{name} #{name}
<td> <td>
$if away $if away
<span .muted> <span .text-muted>
away away
$else $else
$if paired $if paired
@ -31,10 +31,10 @@
$else $else
$if canpair $if canpair
$if isself buddyid $if isself buddyid
<a .btn .btn-primary .btn-small href="@{RunningXMPPPairSelfR}"> <a .btn .btn-primary .btn-sm href="@{RunningXMPPPairSelfR}">
Start pairing Start pairing
$else $else
<a .btn .btn-primary .btn-small href="@{RunningXMPPPairFriendR buddyid}"> <a .btn .btn-primary .btn-sm href="@{RunningXMPPPairFriendR buddyid}">
Start pairing Start pairing
$else $else
not using git-annex not using git-annex

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Jabber not supported Jabber not supported
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
&#9730; Configure a shared cloud repository &#9730; Configure a shared cloud repository
$maybe name <- buddyname $maybe name <- buddyname

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<p> <p>
Here's everything that has been logged by the git-annex assistant, # Here's everything that has been logged by the git-annex assistant, #
as well as by programs it has run. as well as by programs it has run.

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<p> <p>
Bye bye! Bye bye!
<div .modal .fade #shutdownmodal> <div .modal .fade #shutdownmodal>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<p> <p>
A # A #
<a href="@{ConfigFsckR}"> <a href="@{ConfigFsckR}">

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<p> <p>
Good news: Your repository has successfully been repaired! Good news: Your repository has successfully been repaired!
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Switch repository Switch repository
<p> <p>

View file

@ -1,8 +1,8 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Shutdown daemon? Shutdown daemon?
<p> <p>
<a .btn .btn-danger href="@{ShutdownConfirmedR}"> <a .btn .btn-danger href="@{ShutdownConfirmedR}">
<i .icon-off></i> Confirm shutdown <i .icon-off></i> Confirm shutdown
<a .btn href="@{DashboardR}"> <a .btn .btn-default href="@{DashboardR}">
Keep running Keep running

View file

@ -1,12 +1,11 @@
<div .span9> <div .col-sm-9>
^{repolist} ^{repolist}
^{transferlist} ^{transferlist}
$if warnNoScript $if warnNoScript
<noscript> <noscript>
<div .navbar .navbar-fixed-bottom> <div .navbar .navbar-inverse .navbar-fixed-bottom>
<div .navbar-inner> <div .container>
<div .container> Javascript is disabled; cannot update in real-time.
Javascript is disabled; cannot update in real-time. <div .btn-group>
<div .btn-group> <a .btn .btn-primary href="@{NoScriptAutoR}">Auto-refresh every 3 seconds #
<a .btn .btn-primary href="@{NoScriptAutoR}">Auto-refresh every 3 seconds # <a .btn .btn-primary href="@{NoScriptR}">Manually refresh
<a .btn .btn-primary href="@{NoScriptR}">Manually refresh

View file

@ -3,9 +3,9 @@
$if transfersrunning $if transfersrunning
$forall (transfer, info) <- transfers $forall (transfer, info) <- transfers
$with percent <- maybe "unknown" (showPercentage 0) $ percentComplete transfer info $with percent <- maybe "unknown" (showPercentage 0) $ percentComplete transfer info
<div .row-fluid> <div .row>
<div .span10> <div .col-sm-10>
<div .row-fluid> <div .row>
<h3 .forcewrap> <h3 .forcewrap>
$maybe file <- associatedFile info $maybe file <- associatedFile info
#{file} #{file}
@ -27,10 +27,10 @@
<small .pull-right>paused at #{percent} of #{size}</small> <small .pull-right>paused at #{percent} of #{size}</small>
$else $else
<small .pull-right>queued (#{size})</small> <small .pull-right>queued (#{size})</small>
<div .row-fluid> <div .row>
<div .progress .progress-striped> <div .progress .progress-striped>
<div .bar style="width: #{percent};"> <div .progress-bar style="width: #{percent};">
<div .btn-group .span2> <div .btn-group .col-sm-2>
$if isrunning info $if isrunning info
^{actionButton (PauseTransferR transfer) Nothing (Just "pause") "btn" "icon-pause"} ^{actionButton (PauseTransferR transfer) Nothing (Just "pause") "btn" "icon-pause"}
$else $else

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
git-annex watches over your files git-annex watches over your files
<p> <p>

View file

@ -1,4 +1,4 @@
<div .span9 .hero-unit> <div .col-sm-9 .jumbotron>
<h2> <h2>
Repository groups Repository groups
<p> <p>

View file

@ -1,26 +1,25 @@
<div .navbar .navbar-fixed-top> <div .navbar .navbar-inverse .navbar-fixed-top>
<div .navbar-inner> <div .container>
<div .container> <a .navbar-brand>
<a .brand> git-annex
git-annex <ul .nav>
<ul .nav> <li .active>
<li .active> <a href="">
<a href=""> Error
Error <li>
<li> <a href="" onclick="history.back(-1);return false">
<a href="" onclick="history.back(-1);return false"> Go Back
Go Back <li>
<li> <a href="@{LogR}">
<a href="@{LogR}"> View logs
View logs <li>
<li> <a href="http://git-annex.branchable.com/bugs/">
<a href="http://git-annex.branchable.com/bugs/"> File a Bug
File a Bug
<div .container-fluid> <div .container-fluid>
<div .row-fluid> <div .row>
<div .span3> <div .col-sm-3>
<div .span6> <div .col-sm-6>
<div .alert .alert-error .alert-block> <div .alert .alert-danger .alert-block>
^{content} ^{content}
<hr> <hr>
git-annex version #{packageversion} git-annex version #{packageversion}

View file

@ -1,15 +1,21 @@
<div .navbar .navbar-fixed-top> <div .navbar .navbar-inverse .navbar-fixed-top role="navigation">
<div .navbar-inner> <div .container>
<div .container> <div .navbar-header>
<a .brand> <button type="button" .navbar-toggle data-toggle="collapse" data-target=".navbar-collapse">
<span .sr-only">Toggle navigation
<span .icon-bar>
<span .icon-bar>
<span .icon-bar>
<a .navbar-brand>
git-annex git-annex
<ul .nav> <div .navbar-collapse .collapse>
<ul .nav .navbar-nav>
$forall (name, route, isactive) <- navbar $forall (name, route, isactive) <- navbar
<li :isactive:.active> <li :isactive:.active>
<a href="@{route}"> <a href="@{route}">
#{name} #{name}
$maybe reldir <- relDir webapp $maybe reldir <- relDir webapp
<ul .nav .pull-right> <ul .nav .navbar-nav .navbar-right>
$if hasFileBrowser $if hasFileBrowser
<li> <li>
^{actionButton FileBrowserR (Just "Files") (Just "Click to open a file browser") "" "icon-folder-open icon-white"} ^{actionButton FileBrowserR (Just "Files") (Just "Click to open a file browser") "" "icon-folder-open icon-white"}
@ -20,5 +26,5 @@
^{controlMenu} ^{controlMenu}
$nothing $nothing
<div .container-fluid> <div .container-fluid>
<div .row-fluid> <div .row>
^{content} ^{content}

View file

@ -14,7 +14,7 @@
$forall (name, repoid, currentlyconnected, actions) <- repolist $forall (name, repoid, currentlyconnected, actions) <- repolist
<tr .repoline ##{show repoid}> <tr .repoline ##{show repoid}>
<td .handle> <td .handle>
<a .btn .btn-mini .disabled> <a .btn .btn-default .btn-xs .disabled>
<i .icon-resize-vertical></i> <i .icon-resize-vertical></i>
&nbsp; #{name} &nbsp; #{name}
<td .draghide> <td .draghide>
@ -44,10 +44,10 @@
<a href="@{setupRepoLink actions}"> <a href="@{setupRepoLink actions}">
enable enable
$else $else
<span .dropdown #menu-#{show repoid}> <div .dropdown #menu-#{show repoid}>
<a .dropdown-toggle data-toggle="dropdown" href="#menu-#{show repoid}"> <a data-toggle="dropdown" data-target="#" href="#menu-#{show repoid}">
<i .icon-cog></i> actions <i .icon-cog></i> actions
<b .caret></b> <span .caret>
<ul .dropdown-menu> <ul .dropdown-menu>
<li> <li>
<a href="@{setupRepoLink actions}"> <a href="@{setupRepoLink actions}">
@ -63,10 +63,10 @@
<tr> <tr>
<td colspan="3"> <td colspan="3">
$if nootherrepos $if nootherrepos
<a .btn .btn-primary .btn-large href="@{AddRepositoryR}"> <a .btn .btn-primary .btn-lg href="@{AddRepositoryR}">
<i .icon-plus-sign></i> Add another repository <i .icon-plus-sign></i> Add another repository
$else $else
<a .btn .btn-small href="@{AddRepositoryR}"> <a .btn .btn-default .btn-sm href="@{AddRepositoryR}">
<i .icon-plus-sign></i> Add another repository <i .icon-plus-sign></i> Add another repository
<span> <span>
&nbsp; Sync your files with another device, or # &nbsp; Sync your files with another device, or #

View file

@ -1,3 +1,3 @@
<div .span3 ##{ident}> <div .col-sm-3 ##{ident}>
<div .sidebar-nav> <div .sidebar-nav>
^{content} ^{content}