summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortchou <tchou@riseup.net>2015-06-12 14:23:40 +0200
committerintrigeri <intrigeri@boum.org>2015-06-12 12:29:38 +0000
commit4f99f0fe007b0838975d742667bca6e7de394f09 (patch)
treeae584f524d0595cc177cbdd3999ff538cdf650bc
parentd3010378450564795e656fb89f81fa7c94458fc1 (diff)
router & overview import (+ clock img)
-rw-r--r--wiki/src/install.mdwn14
-rw-r--r--wiki/src/install/debian.mdwn65
-rw-r--r--wiki/src/install/debian/clone.mdwn7
-rw-r--r--wiki/src/install/debian/dvd.mdwn7
-rw-r--r--wiki/src/install/debian/dvd/scenario.mdwn7
-rw-r--r--wiki/src/install/debian/usb.mdwn7
-rw-r--r--wiki/src/install/debian/usb/scenario.mdwn7
-rw-r--r--wiki/src/install/debian/vm.mdwn7
-rw-r--r--wiki/src/install/expert/dvd.mdwn7
-rw-r--r--wiki/src/install/expert/usb.mdwn7
-rw-r--r--wiki/src/install/inc/router/clone.mdwn32
-rw-r--r--wiki/src/install/linux.mdwn66
-rw-r--r--wiki/src/install/linux/clone.mdwn7
-rw-r--r--wiki/src/install/linux/dvd.mdwn7
-rw-r--r--wiki/src/install/linux/usb.mdwn7
-rw-r--r--wiki/src/install/linux/vm.mdwn7
-rw-r--r--wiki/src/install/mac.mdwn7
-rw-r--r--wiki/src/install/mac/clone.mdwn7
-rw-r--r--wiki/src/install/mac/dvd-usb.mdwn3
-rw-r--r--wiki/src/install/mac/laptop.mdwn7
-rw-r--r--wiki/src/install/mac/macbook.mdwn9
-rw-r--r--wiki/src/install/mac/scenario/1.mdwn3
-rw-r--r--wiki/src/install/mac/usb.mdwn7
-rw-r--r--wiki/src/install/mac/vm.mdwn7
-rw-r--r--wiki/src/install/os.mdwn83
-rw-r--r--wiki/src/install/win.mdwn66
-rw-r--r--wiki/src/install/win/clone.mdwn7
-rw-r--r--wiki/src/install/win/dvd.mdwn7
-rw-r--r--wiki/src/install/win/usb.mdwn174
-rw-r--r--wiki/src/install/win/vm.mdwn7
-rw-r--r--wiki/src/lib/clock.svg71
31 files changed, 611 insertions, 115 deletions
diff --git a/wiki/src/install.mdwn b/wiki/src/install.mdwn
index b6f5d7e..c164f97 100644
--- a/wiki/src/install.mdwn
+++ b/wiki/src/install.mdwn
@@ -1,11 +1,17 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
-
-Welcome to the Tails Installation Assistant
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
+<h1>Welcome to the Tails Installation Assistant</h1>
Thank you for your interest in Tails.
Installing Tails can be quite long but we hope you will still have good time :)
We will first ask you a few questions to choose your installation scenario and then guide you step by step.
-[[Let's start the journey!|install/os]]
+[[
+<div class="panel panel-primary start text-center" >
+ <div class="panel-heading">
+ <h3 class="panel-title">Let's start the journey!</h3>
+ </div>
+</div>
+|install/os]]
diff --git a/wiki/src/install/debian.mdwn b/wiki/src/install/debian.mdwn
index abd1942..ce3bf20 100644
--- a/wiki/src/install/debian.mdwn
+++ b/wiki/src/install/debian.mdwn
@@ -1,24 +1,59 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/os]]
+<div class="back">
+ [[Back|install/os]]
+</div>
-Debian user
+<h1 class="text-center">Debian user <small>you can :</small></h1>
-You can:
-[[[[!inline pages="install/inc/router/clone" raw="yes"]]|install/debian/clone]]
+<div class="row">
+
+ <div class="col-md-6">
-[[
-Download and install
+ [[[[!inline pages="install/inc/router/clone" raw="yes"]]|install/debian/clone]]
-You need:
+ </div>
- - 1 flash memory (USB stick or SD card of at least 4 GB)
- - 30&ndash;60 minutes to download Tails ([[!inline pages="inc/stable_i386_iso_size" raw="yes"]]).
- - 25 minutes to install
-|debian/usb/scenario]]
-You can also
+ <div class="col-md-6">
- - [[Burn Tails on a DVD|debian/dvd/scenario]]
- - [[Run Tails in a virtual machine|debian/vm]]
+ [[
+ <div class="panel panel-primary">
+
+ <div class="panel-heading">
+ <h3 class="panel-title">Download and install</h3>
+ </div>
+
+ <div class="panel-footer">
+ You need:
+ <ul>
+ <li> 1 flash memory (USB stick or SD card of at least 4 GB)</li>
+ <li> 1&ndash;2 hours to download Tails ([[!inline pages="inc/stable_i386_iso_size" raw="yes"]]).</li>
+ <li> 25 minutes to install</li
+ </ul>
+ </div>
+ </div>
+
+ |debian/usb/scenario]]
+
+ </div>
+
+
+
+
+
+</div>
+
+<div class="row">
+ <div class="col-md-3 col-md-offset-6">
+ <small>
+ You can also
+ <ul>
+ <li> [[Burn Tails on a DVD|debian/dvd/scenario]]</li>
+ <li> [[Run Tails in a virtual machine|debian/vm]]</li>
+ </ul>
+ </small>
+ </div>
+</div> \ No newline at end of file
diff --git a/wiki/src/install/debian/clone.mdwn b/wiki/src/install/debian/clone.mdwn
index 92b051b..6a88bec 100644
--- a/wiki/src/install/debian/clone.mdwn
+++ b/wiki/src/install/debian/clone.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/debian]]
+<div class="back">
+ [[Back|install/debian]]
+</div>
[[!inline pages="install/inc/overview/clone" raw="yes"]]
diff --git a/wiki/src/install/debian/dvd.mdwn b/wiki/src/install/debian/dvd.mdwn
index 846f84c..53664a4 100644
--- a/wiki/src/install/debian/dvd.mdwn
+++ b/wiki/src/install/debian/dvd.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/debian/dvd/scenario]]
+<div class="back">
+ [[Back|install/debian/dvd/scenario]]
+</div>
Debian to DVD
diff --git a/wiki/src/install/debian/dvd/scenario.mdwn b/wiki/src/install/debian/dvd/scenario.mdwn
index 4e65d4d..1e6396b 100644
--- a/wiki/src/install/debian/dvd/scenario.mdwn
+++ b/wiki/src/install/debian/dvd/scenario.mdwn
@@ -1,6 +1,9 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/debian]]
+<div class="back">
+ [[Back|install/debian]]
+</div>
Do you know the command line?
diff --git a/wiki/src/install/debian/usb.mdwn b/wiki/src/install/debian/usb.mdwn
index 48d8ed8..c5aa211 100644
--- a/wiki/src/install/debian/usb.mdwn
+++ b/wiki/src/install/debian/usb.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/debian/usb/scenario]]
+<div class="back">
+ [[Back|install/debian/usb/scenario]]
+</div>
Debian to USB
diff --git a/wiki/src/install/debian/usb/scenario.mdwn b/wiki/src/install/debian/usb/scenario.mdwn
index 8ec2574..fda45e9 100644
--- a/wiki/src/install/debian/usb/scenario.mdwn
+++ b/wiki/src/install/debian/usb/scenario.mdwn
@@ -1,6 +1,9 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/debian]]
+<div class="back">
+ [[Back|install/debian]]
+</div>
Do you know the command line?
diff --git a/wiki/src/install/debian/vm.mdwn b/wiki/src/install/debian/vm.mdwn
index 1545554..d18cc98 100644
--- a/wiki/src/install/debian/vm.mdwn
+++ b/wiki/src/install/debian/vm.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/debian]]
+<div class="back">
+ [[Back|install/debian]]
+</div>
[[!inline pages="install/inc/overview/vm" raw="yes"]]
diff --git a/wiki/src/install/expert/dvd.mdwn b/wiki/src/install/expert/dvd.mdwn
index 628dcd2..f67ad24 100644
--- a/wiki/src/install/expert/dvd.mdwn
+++ b/wiki/src/install/expert/dvd.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/debian/dvd/scenario]]
+<div class="back">
+ [[Back|install/debian/dvd/scenario]]
+</div>
Expert to DVD
diff --git a/wiki/src/install/expert/usb.mdwn b/wiki/src/install/expert/usb.mdwn
index f236d76..5336625 100644
--- a/wiki/src/install/expert/usb.mdwn
+++ b/wiki/src/install/expert/usb.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/debian/usb/scenario]]
+<div class="back">
+ [[Back|install/debian/usb/scenario]]
+</div>
Expert to USB
diff --git a/wiki/src/install/inc/router/clone.mdwn b/wiki/src/install/inc/router/clone.mdwn
index bd78ef5..8f9ba28 100644
--- a/wiki/src/install/inc/router/clone.mdwn
+++ b/wiki/src/install/inc/router/clone.mdwn
@@ -1,11 +1,21 @@
-Clone from another Tails
-
-If you know someone of trust who uses Tails already, then the easiest
-is to install your Tails by copying from it. Make sure that this
-Tails is up-to-date.
-
-You need:
-
- - 1 friend with Tails
- - 1 flash memory (USB stick or SD card of at least 4 GB)
- - 15 minutes to clone
+<div class="panel panel-primary">
+
+ <div class="panel-heading">
+ <h3 class="panel-title">Clone from another Tails</h3>
+ </div>
+
+ <div class="panel-body">
+ If you know someone of trust who uses Tails already, then the easiest
+ is to install your Tails by copying from it. Make sure that this
+ Tails is up-to-date.
+ </div>
+
+ <div class="panel-footer">
+ You need:
+ <ul>
+ <li> 1 friend with Tails</li>
+ <li> 1 flash memory <small>(USB stick or SD card of at least 4 GB)</small></li>
+ <li> 15 minutes to clone</lI>
+ </ul>
+ </div>
+</div>
diff --git a/wiki/src/install/linux.mdwn b/wiki/src/install/linux.mdwn
index 064a428..a23625c 100644
--- a/wiki/src/install/linux.mdwn
+++ b/wiki/src/install/linux.mdwn
@@ -1,24 +1,60 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/os]]
-Linux user
+<div class="back">
+ [[Back|install/os]]
+</div>
-You can:
+<h1 class="text-center">Linux user <small>you can :</small></h1>
-[[[[!inline pages="install/inc/router/clone" raw="yes"]]|install/linux/clone]]
-[[
-Download and install
+<div class="row">
+
+ <div class="col-md-6">
-You need:
+ [[[[!inline pages="install/inc/router/clone" raw="yes"]]|install/linux/clone]]
- - 2 flash memories (USB sticks or SD cards of at least 4 GB)
- - 30&ndash;60 minutes to download Tails ([[!inline pages="inc/stable_i386_iso_size" raw="yes"]]).
- - 45 minutes to install
-|linux/usb]]
+ </div>
-You can also
- - [[Burn Tails on a DVD|linux/dvd]]
- - [[Run Tails in a virtual machine|linux/vm]]
+ <div class="col-md-6">
+
+ [[
+ <div class="panel panel-primary">
+
+ <div class="panel-heading">
+ <h3 class="panel-title">Download and install</h3>
+ </div>
+
+ <div class="panel-footer">
+ You need:
+ <ul>
+ <li> 2 flash memories <small>(USB sticks or SD cards of at least 4 GB)</small></li>
+ <li> 1&ndash;2 hours to download Tails <small>([[!inline pages="inc/stable_i386_iso_size" raw="yes"]])</small>.</li>
+ <li> 45 minutes to install</li>
+ </ul>
+ </div>
+ </div>
+
+ |linux/usb]]
+
+ </div>
+
+
+
+
+
+</div>
+
+<div class="row">
+ <div class="col-md-3 col-md-offset-6">
+ <small>
+ You can also
+ <ul>
+ <li> [[Burn Tails on a DVD|linux/dvd]]</li>
+ <li> [[Run Tails in a virtual machine|linux/vm]]</li>
+ </ul>
+ </small>
+ </div>
+</div> \ No newline at end of file
diff --git a/wiki/src/install/linux/clone.mdwn b/wiki/src/install/linux/clone.mdwn
index fe38b9d..5211369 100644
--- a/wiki/src/install/linux/clone.mdwn
+++ b/wiki/src/install/linux/clone.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/linux]]
+<div class="back">
+ [[Back|install/linux]]
+</div>
[[!inline pages="install/inc/overview/clone" raw="yes"]]
diff --git a/wiki/src/install/linux/dvd.mdwn b/wiki/src/install/linux/dvd.mdwn
index 303398e..525ab1a 100644
--- a/wiki/src/install/linux/dvd.mdwn
+++ b/wiki/src/install/linux/dvd.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/linux]]
+<div class="back">
+ [[Back|install/linux]]
+</div>
Linux to DVD
diff --git a/wiki/src/install/linux/usb.mdwn b/wiki/src/install/linux/usb.mdwn
index 2006e9f..385f98e 100644
--- a/wiki/src/install/linux/usb.mdwn
+++ b/wiki/src/install/linux/usb.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/linux]]
+<div class="back">
+ [[Back|install/linux]]
+</div>
Linux to USB
diff --git a/wiki/src/install/linux/vm.mdwn b/wiki/src/install/linux/vm.mdwn
index 1545554..d18cc98 100644
--- a/wiki/src/install/linux/vm.mdwn
+++ b/wiki/src/install/linux/vm.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/debian]]
+<div class="back">
+ [[Back|install/debian]]
+</div>
[[!inline pages="install/inc/overview/vm" raw="yes"]]
diff --git a/wiki/src/install/mac.mdwn b/wiki/src/install/mac.mdwn
index 0b11ab6..ff1e4d7 100644
--- a/wiki/src/install/mac.mdwn
+++ b/wiki/src/install/mac.mdwn
@@ -1,6 +1,9 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/os]]
+<div class="back">
+ [[Back|install/os]]
+</div>
Mac user
diff --git a/wiki/src/install/mac/clone.mdwn b/wiki/src/install/mac/clone.mdwn
index 05ad2ab..f9b9821 100644
--- a/wiki/src/install/mac/clone.mdwn
+++ b/wiki/src/install/mac/clone.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/mac]]
+<div class="back">
+ [[Back|install/mac]]
+</div>
[[!inline pages="install/inc/overview/clone" raw="yes"]]
diff --git a/wiki/src/install/mac/dvd-usb.mdwn b/wiki/src/install/mac/dvd-usb.mdwn
index 1d93a7f..3f1a6f6 100644
--- a/wiki/src/install/mac/dvd-usb.mdwn
+++ b/wiki/src/install/mac/dvd-usb.mdwn
@@ -1,3 +1,4 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
Mac to USB via DVD
diff --git a/wiki/src/install/mac/laptop.mdwn b/wiki/src/install/mac/laptop.mdwn
index 2154df0..576a09a 100644
--- a/wiki/src/install/mac/laptop.mdwn
+++ b/wiki/src/install/mac/laptop.mdwn
@@ -1,6 +1,9 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/mac]]
+<div class="back">
+ [[Back|install/mac]]
+</div>
Mac user
diff --git a/wiki/src/install/mac/macbook.mdwn b/wiki/src/install/mac/macbook.mdwn
index 003405d..b4c5fc8 100644
--- a/wiki/src/install/mac/macbook.mdwn
+++ b/wiki/src/install/mac/macbook.mdwn
@@ -1,6 +1,9 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/mac/laptop]]
+<div class="back">
+ [[Back|install/mac/laptop]]
+</div>
Mac user
@@ -17,7 +20,7 @@ You need:
- 1 DVD + 1 flash memory (USB stick or SD card of at least 4 GB)
- or 2 flash memories (USB sticks or SD cards of at least 4 GB)
- - 30&ndash;60 minutes to download Tails ([[!inline pages="inc/stable_i386_iso_size" raw="yes"]]).
+ - 1&ndash;2 hours to download Tails ([[!inline pages="inc/stable_i386_iso_size" raw="yes"]]).
- 45 minutes to install
|install/mac/scenario/1]]
diff --git a/wiki/src/install/mac/scenario/1.mdwn b/wiki/src/install/mac/scenario/1.mdwn
index d8a54f5..762c844 100644
--- a/wiki/src/install/mac/scenario/1.mdwn
+++ b/wiki/src/install/mac/scenario/1.mdwn
@@ -1,4 +1,5 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
[[
Use my DVD drive (recommended)
diff --git a/wiki/src/install/mac/usb.mdwn b/wiki/src/install/mac/usb.mdwn
index 1e82c25..e251f62 100644
--- a/wiki/src/install/mac/usb.mdwn
+++ b/wiki/src/install/mac/usb.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/mac]]
+<div class="back">
+ [[Back|install/mac]]
+</div>
Mac to USB via USB
diff --git a/wiki/src/install/mac/vm.mdwn b/wiki/src/install/mac/vm.mdwn
index c2374c3..f2a6adf 100644
--- a/wiki/src/install/mac/vm.mdwn
+++ b/wiki/src/install/mac/vm.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/mac]]
+<div class="back">
+ [[Back|install/mac]]
+</div>
[[!inline pages="install/inc/overview/vm" raw="yes"]]
diff --git a/wiki/src/install/os.mdwn b/wiki/src/install/os.mdwn
index 54c502d..4b6d4e3 100644
--- a/wiki/src/install/os.mdwn
+++ b/wiki/src/install/os.mdwn
@@ -1,13 +1,82 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install]]
+<div class="back">
+ [[Back|install]]
+</div>
-Which operating system are you installing Tails from?
-[[Windows|install/win]]
+<h1>Which operating system are you installing Tails from?</h1>
-[[Mac OS X|install/mac]]
+<div class="row">
-[[Debian & Ubuntu (Linux Mint)|install/debian]]
+
+ <div class="col-md-6">
+ [[
+ <div class="panel panel-primary">
+ <div class="panel-heading">
+ <h3 class="panel-title">Windows</h3>
+ </div>
+ <div class="panel-footer">
+ From windows XP to Windows 8
+ </div>
+ </div>
+ |install/win]]
+ </div>
-[[Other Linux (Red Hat, Fedora, etc.)|install/linux]]
+
+ <div class="col-md-6">
+ [[
+ <div class="panel panel-primary">
+
+ <div class="panel-heading">
+ <h3 class="panel-title">Mac OS X</h3>
+ </div>
+ <div class="panel-footer">
+ From Leopard to Yosemite (but no IOS)
+ </div>
+
+ </div>
+
+ |install/mac]]
+
+ </div>
+
+ <div class="col-md-6">
+ [[
+ <div class="panel panel-primary">
+
+ <div class="panel-heading">
+ <h3 class="panel-title">Debian & Ubuntu</h3>
+ </div>
+
+ <div class="panel-footer">
+ and Linux Mint
+ </div>
+
+ </div>
+
+ |install/debian]]
+
+ </div>
+
+
+ <div class="col-md-6">
+ [[
+ <div class="panel panel-primary">
+
+ <div class="panel-heading">
+ <h3 class="panel-title">Other Linux</h3>
+ </div>
+
+ <div class="panel-footer">
+ Red Hat, Fedora, etc.
+ </div>
+
+ </div>
+
+ |install/linux]]
+
+ </div>
+
+</div>
diff --git a/wiki/src/install/win.mdwn b/wiki/src/install/win.mdwn
index 43ba4c4..98d4151 100644
--- a/wiki/src/install/win.mdwn
+++ b/wiki/src/install/win.mdwn
@@ -1,24 +1,60 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/os]]
+<div class="back">
+ [[Back|install/os]]
+</div>
-Windows user
+<h1 class="text-center">Windows user <small>you can :</small></h1>
-You can:
-[[[[!inline pages="install/inc/router/clone" raw="yes"]]|install/win/clone]]
+<div class="row">
+
+ <div class="col-md-6">
-[[
-Download and install
+ [[[[!inline pages="install/inc/router/clone" raw="yes"]]|install/win/clone]]
-You need:
- - 2 flash memories (USB sticks or SD cards of at least 4 GB)
- - 30&ndash;60 minutes to download Tails ([[!inline pages="inc/stable_i386_iso_size" raw="yes"]]).
- - 45 minutes to install
-|install/win/usb]]
+ </div>
-You can also
- - [[Burn Tails on a DVD|win/dvd]]
- - [[Run Tails in a virtual machine|win/vm]]
+ <div class="col-md-6">
+
+ [[
+ <div class="panel panel-primary">
+
+ <div class="panel-heading">
+ <h3 class="panel-title">Download and install</h3>
+ </div>
+
+ <div class="panel-footer">
+ You need:
+ <ul>
+ <li> 2 flash memories <small>(USB sticks or SD cards of at least 4 GB)</small> </li>
+ <li> 1&ndash;2 hours to download Tails <small>([[!inline pages="inc/stable_i386_iso_size" raw="yes"]])</small>.</li>
+ <li> 45 minutes to install</li>
+ </ul>
+ </div>
+ </div>
+
+ |install/win/usb]]
+
+ </div>
+
+
+
+
+
+</div>
+
+<div class="row">
+ <div class="col-md-3 col-md-offset-6">
+ <small>
+ You can also
+ <ul>
+ <li> [[Burn Tails on a DVD|win/dvd]]</li>
+ <li> [[Run Tails in a virtual machine|win/vm]]</li>
+ </ul>
+ </small>
+ </div>
+</div>
diff --git a/wiki/src/install/win/clone.mdwn b/wiki/src/install/win/clone.mdwn
index a41e971..40da577 100644
--- a/wiki/src/install/win/clone.mdwn
+++ b/wiki/src/install/win/clone.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/win]]
+<div class="back">
+ [[Back|install/win]]
+</div>
[[!inline pages="install/inc/overview/clone" raw="yes"]]
diff --git a/wiki/src/install/win/dvd.mdwn b/wiki/src/install/win/dvd.mdwn
index e6f8ed2..e5009ee 100644
--- a/wiki/src/install/win/dvd.mdwn
+++ b/wiki/src/install/win/dvd.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/win]]
+<div class="back">
+ [[Back|install/win]]
+</div>
Windows to DVD
diff --git a/wiki/src/install/win/usb.mdwn b/wiki/src/install/win/usb.mdwn
index 3d5bce4..d6e34f8 100644
--- a/wiki/src/install/win/usb.mdwn
+++ b/wiki/src/install/win/usb.mdwn
@@ -1,5 +1,173 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
+
+<div class="back">
+ [[Back|install/win]]
+</div>
+
+<h1>Installation for <b>Windows</b></h1>
+
+
+<div class="row">
+
+ <div class="col-md-6 col-md-offset-6">
+ <div class="panel-body explain">
+
+
+ <p>Due to technical limitations, you first need to install a temporary Tails on a <b>first USB stick</b>.</p>
+
+ <p>After restarting in this temporary Tails, you will install Tails on a <b>second USB stick</b>.</p>
+
+ <p>You will need <b>another screen</b> or a printer to follow this guide throught the multiple restarts.</p>
+
+ </div>
+ </div>
+
+</div>
+
+
+<div id="needs">
+<h2> You <b>need</b>: </h2>
+
+<div class="row you_need">
+
+ <div class="col-sm-6 col-md-2 col-md-offset-1">
+ <div class="thumbnail">
+ [[!img lib/clock.svg link="no" height="50"]]
+ <div class="caption">
+ <h3>1 hour</h3>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-6 col-md-3">
+ <div class="thumbnail">
+ [[!img lib/2_usb.svg link="no"]]
+ <div class="caption">
+ <h3>2 USB Sticks <small>4Go minimum</small></h3>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="col-sm-6 col-md-2">
+ <div class="thumbnail">
+ [[!img lib/pc.svg link="no"]]
+ <div class="caption">
+ <h3>Your computer</h3>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-6 col-md-3">
+ <div class="thumbnail">
+ [[!img lib/screens.svg link="no"]]
+ <div class="caption">
+ <h3>Another screen or a printer</h3>
+ </div>
+ </div>
+ </div>
+
+
+</div>
+</div>
+
+<div id="steps">
+
+<h2> Your <b>steps</b>: </h2>
+
+<h3>1 - Install a temporary Tails on the first UBS stick</h3>
+
+<div class="row">
+
+ <div class="col-md-3 col-md-offset-1 ">
+ <div class="thumbnail step">
+ [[!img lib/dl_and_verify.svg link="no"]]
+
+ <div class="caption">
+ <h4><span class="step-number"></span>Download</h4>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-md-3 ">
+ <div class="thumbnail step">
+
+ [[!img lib/install_temp_tails.svg link="no"]]
+ <div class="caption">
+ <h4><span class="step-number"></span>Install</h4>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-md-1 ">
+ <div class="thumbnail step restart">
+ [[!img lib/reboot.svg link="no"]]
+ <div class="caption">
+ <h4>restart</h4>
+ </div>
+ </div>
+ </div>
+
+</div>
+
+<h3>2 - Install the final Tails on the second UBS stick</h3>
+
+
+<div class="row">
+
+
+ <div class="col-md-3 col-md-offset-1">
+ <div class="thumbnail step">
+ [[!img lib/install_tails.svg link="no"]]
+
+ <div class="caption">
+ <h4><span class="step-number"></span>Install </h4>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-md-1 ">
+ <div class="thumbnail step restart">
+ [[!img lib/reboot.svg link="no"]]
+ <div class="caption">
+ <h4>restart</h4>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="col-md-3">
+ <div class="thumbnail step">
+ [[!img lib/persistence.svg link="no"]]
+
+ <div class="caption">
+ <h4><span class="step-number"></span>Configure</h4>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-md-1 ">
+ <div class="thumbnail step restart">
+ [[!img lib/reboot.svg link="no"]]
+ <div class="caption">
+ <h4>restart</h4>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="col-md-3 ">
+ <div class="thumbnail step final">
+
+ [[!img lib/tails.svg link="no"]]
+ <div class="caption">
+ <h4><span class="step-number"></span>Enjoy!</h4>
+ </div>
+ </div>
+ </div>
+
+</div>
+</div>
-[[Back|install/win]]
-Windows to USB
diff --git a/wiki/src/install/win/vm.mdwn b/wiki/src/install/win/vm.mdwn
index 88ffaec..87fec32 100644
--- a/wiki/src/install/win/vm.mdwn
+++ b/wiki/src/install/win/vm.mdwn
@@ -1,5 +1,8 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta stylesheet="bootstrap" rel="stylesheet" title="bootstrap"]]
+[[!meta stylesheet="router" rel="stylesheet" title="bootstrap"]]
-[[Back|install/linux]]
+<div class="back">
+ [[Back|install/linux]]
+</div>
[[!inline pages="install/inc/overview/vm" raw="yes"]]
diff --git a/wiki/src/lib/clock.svg b/wiki/src/lib/clock.svg
new file mode 100644
index 0000000..f5d977c
--- /dev/null
+++ b/wiki/src/lib/clock.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ x="0px"
+ y="0px"
+ viewBox="0 0 99.999997 92.309998"
+ enable-background="new 0 0 100 92.31"
+ xml:space="preserve"
+ id="svg3276"
+ inkscape:version="0.48.3.1 r9886"
+ width="100%"
+ height="100%"
+ sodipodi:docname="noun_6732_cc.svg"><metadata
+ id="metadata3298"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs3296" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="640"
+ inkscape:window-height="480"
+ id="namedview3294"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="2.0452822"
+ inkscape:cx="49.999999"
+ inkscape:cy="34.616248"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg3276" /><path
+ d="m 54.841999,0.02 c -0.1,-0.01 -0.2,-0.02 -0.3,-0.02 -2.66,0 -4.5,2.155 -4.5,4.814 0,2.62 1.02,4.75 5.02,4.805 v 0.015 c 18.999,0.26 35.618,16.489 35.618,36.408 0,20.079 -16.489,36.648 -36.568,36.648 -19.164,0 -35.073,-14.46 -36.474,-33.458 h 8.455 L 13.043999,27.539 -1.3223954e-6,49.233 H 7.9999987 c 1.414,23.998 21.4830003,43.077 45.9520003,43.077 25.389,0 46.048,-20.759 46.048,-46.152 0,-25.089 -20.18,-45.663 -45.158,-46.138 z"
+ id="path3278"
+ inkscape:connector-curvature="0"
+ style="fill:#010101" /><path
+ d="m 54.111999,69.421 c 1.59,0 2.89,1.29 2.89,2.89 0,1.601 -1.3,2.89 -2.89,2.89 -1.595,0 -2.89,-1.289 -2.89,-2.89 0.001,-1.6 1.296,-2.89 2.89,-2.89 z"
+ id="path3280"
+ inkscape:connector-curvature="0"
+ style="fill:#010101" /><path
+ d="m 73.200999,25.764 c 1.6,0 2.89,1.295 2.89,2.89 0,1.595 -1.29,2.885 -2.89,2.885 -1.59,0 -2.88,-1.29 -2.88,-2.885 0,-1.595 1.29,-2.89 2.88,-2.89 z"
+ id="path3282"
+ inkscape:connector-curvature="0"
+ style="fill:#010101" /><path
+ d="m 73.200999,60.412 c 1.6,0 2.89,1.3 2.89,2.89 0,1.59 -1.29,2.891 -2.89,2.891 -1.59,0 -2.88,-1.301 -2.88,-2.891 0,-1.59 1.29,-2.89 2.88,-2.89 z"
+ id="path3284"
+ inkscape:connector-curvature="0"
+ style="fill:#010101" /><path
+ d="m 79.620999,43.413 c 1.6,0 2.89,1.29 2.89,2.885 0,1.595 -1.29,2.89 -2.89,2.89 -1.601,0 -2.88,-1.295 -2.88,-2.89 0,-1.595 1.28,-2.885 2.88,-2.885 z"
+ id="path3286"
+ inkscape:connector-curvature="0"
+ style="fill:#010101" /><path
+ d="m 59.061999,22.444 c 0,-2.265 -1.819,-4.21 -4.079,-4.21 h -0.881 c -2.26,0 -4.039,1.945 -4.039,4.21 v 24.204 l -11.855,11.834 c -1.75,1.75 -1.66,4.59 -0.005,6.33 1.66,1.76 4.569,1.76 6.319,0 l 13.1,-13.1 c 0.1,-0.11 0.18,-0.22 0.28,-0.32 0.72,-0.745 1.159,-1.755 1.159,-2.87 V 22.444 z"
+ id="path3288"
+ inkscape:connector-curvature="0"
+ style="fill:#010101" /></svg> \ No newline at end of file