add some padding by nesting layout elements
This commit is contained in:
parent
ccc8afb59d
commit
70ea7fbcdb
52 changed files with 1145 additions and 1092 deletions
|
@ -1,18 +1,19 @@
|
|||
<div .col-sm-9 .jumbotron>
|
||||
<h2>
|
||||
Pairing in progress ..
|
||||
$if T.null secret
|
||||
<p>
|
||||
You do not need to leave this page open; pairing will finish #
|
||||
automatically.
|
||||
$else
|
||||
<p>
|
||||
Now you should either go tell the owner of the computer you want to pair #
|
||||
with the secret phrase you selected ("#{secret}"), or go enter it into #
|
||||
the computer you want to pair with.
|
||||
<p>
|
||||
You do not need to leave this page open; pairing will finish automatically #
|
||||
as soon as the secret phrase is entered into the other computer.
|
||||
<p>
|
||||
If you're not seeing a pair request on the other computer, try moving #
|
||||
it to the same switch or wireless network as this one.
|
||||
<div .col-sm-9>
|
||||
<div .jumbotron>
|
||||
<h2>
|
||||
Pairing in progress ..
|
||||
$if T.null secret
|
||||
<p>
|
||||
You do not need to leave this page open; pairing will finish #
|
||||
automatically.
|
||||
$else
|
||||
<p>
|
||||
Now you should either go tell the owner of the computer you want to pair #
|
||||
with the secret phrase you selected ("#{secret}"), or go enter it into #
|
||||
the computer you want to pair with.
|
||||
<p>
|
||||
You do not need to leave this page open; pairing will finish automatically #
|
||||
as soon as the secret phrase is entered into the other computer.
|
||||
<p>
|
||||
If you're not seeing a pair request on the other computer, try moving #
|
||||
it to the same switch or wireless network as this one.
|
||||
|
|
|
@ -1,52 +1,53 @@
|
|||
<div .col-sm-9 .jumbotron>
|
||||
<h2>
|
||||
Pairing with a local computer
|
||||
<p>
|
||||
$if start
|
||||
Pair with a computer on your local network (or VPN), and the #
|
||||
two git annex repositories will be combined into one, with changes #
|
||||
kept in sync between them.
|
||||
$else
|
||||
Pairing with #{username}@#{hostname} will combine your two git annex #
|
||||
repositories into one, allowing you to share files.
|
||||
<p>
|
||||
$if start
|
||||
For security, enter a secret phrase. To verify that you're pairing #
|
||||
with the right computer, its git-annex webapp will then prompt for the #
|
||||
same secret phrase. That's all this secret phrase will be used for.
|
||||
$else
|
||||
$if sameusername
|
||||
For security, you need to enter the same secret phrase that was #
|
||||
entered on #{hostname} when the pairing was started.
|
||||
$else
|
||||
For security, a secret phrase has been selected, which you need #
|
||||
to enter here to finish the pairing. If you don't know the #
|
||||
phrase, go ask #{username} ...
|
||||
$if badphrase
|
||||
<div .alert .alert-danger>
|
||||
<span .glyphicon .glyphicon-warning-sign>
|
||||
\ #{problem}
|
||||
<p>
|
||||
<form method="post" .form-horizontal enctype=#{enctype}>
|
||||
<fieldset>
|
||||
^{form}
|
||||
^{webAppFormAuthToken}
|
||||
<div .form-group>
|
||||
<div .col-sm-offset-2>
|
||||
<button .btn .btn-primary type=submit>
|
||||
$if start
|
||||
Start pairing
|
||||
$else
|
||||
Finish pairing
|
||||
<div .alert .alert-info>
|
||||
<div .col-sm-9>
|
||||
<div .jumbotron>
|
||||
<h2>
|
||||
Pairing with a local computer
|
||||
<p>
|
||||
$if start
|
||||
<p>
|
||||
A good secret phrase is reasonably long. You'll only #
|
||||
type it a few times. Only letters and numbers matter; #
|
||||
punctuation and white space is ignored.
|
||||
<p>
|
||||
A quotation is one good choice, something like: #
|
||||
"#{sampleQuote}"
|
||||
Pair with a computer on your local network (or VPN), and the #
|
||||
two git annex repositories will be combined into one, with changes #
|
||||
kept in sync between them.
|
||||
$else
|
||||
Only letters and numbers matter; punctuation and spaces are #
|
||||
ignored.
|
||||
Pairing with #{username}@#{hostname} will combine your two git annex #
|
||||
repositories into one, allowing you to share files.
|
||||
<p>
|
||||
$if start
|
||||
For security, enter a secret phrase. To verify that you're pairing #
|
||||
with the right computer, its git-annex webapp will then prompt for the #
|
||||
same secret phrase. That's all this secret phrase will be used for.
|
||||
$else
|
||||
$if sameusername
|
||||
For security, you need to enter the same secret phrase that was #
|
||||
entered on #{hostname} when the pairing was started.
|
||||
$else
|
||||
For security, a secret phrase has been selected, which you need #
|
||||
to enter here to finish the pairing. If you don't know the #
|
||||
phrase, go ask #{username} ...
|
||||
$if badphrase
|
||||
<div .alert .alert-danger>
|
||||
<span .glyphicon .glyphicon-warning-sign>
|
||||
\ #{problem}
|
||||
<p>
|
||||
<form method="post" .form-horizontal enctype=#{enctype}>
|
||||
<fieldset>
|
||||
^{form}
|
||||
^{webAppFormAuthToken}
|
||||
<div .form-group>
|
||||
<div .col-sm-offset-2>
|
||||
<button .btn .btn-primary type=submit>
|
||||
$if start
|
||||
Start pairing
|
||||
$else
|
||||
Finish pairing
|
||||
<div .alert .alert-info>
|
||||
$if start
|
||||
<p>
|
||||
A good secret phrase is reasonably long. You'll only #
|
||||
type it a few times. Only letters and numbers matter; #
|
||||
punctuation and white space is ignored.
|
||||
<p>
|
||||
A quotation is one good choice, something like: #
|
||||
"#{sampleQuote}"
|
||||
$else
|
||||
Only letters and numbers matter; punctuation and spaces are #
|
||||
ignored.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue