rebuilt pages

author: elijah <elijah@riseup.net> 2014-04-24 01:10:21 -0700
committer: elijah <elijah@riseup.net> 2014-04-24 01:10:21 -0700
commit: e53b2d02de7228f563a7187723477dd4dac20b99 (patch)
tree: 82f17d7c193b2882a3147177e7a45e0a302b842f
parent: f456ab77716ba5327f7f12d800123fbf3f857c7f (diff)
6 files changed, 288 insertions, 199 deletions
diff --git a/public/.htaccess b/public/.htaccess
new file mode 100644
index 0000000..68a245d
--- /dev/null
+++ b/public/.htaccess
@@ -0,0 +1,85 @@
+##
+## AUTO NEGOTIATED LOCALE
+##
+
+LanguagePriority en
+ForceLanguagePriority Prefer Fallback
+DirectoryIndex index
+DirectorySlash Off
+Options +MultiViews
+
+##
+## REWRITES
+##
+
+Options +FollowSymLinks
+RewriteEngine On
+
+RewriteBase /
+
+##
+## remove trailing slashes (except for paths where we added the slash)
+##
+
+# /en/ => /en
+RewriteCond %{QUERY_STRING} !end
+RewriteRule ^([a-z]{2})/$ /$1 [R=307,L]
+
+# /en/aaa/ => /en/aaa
+RewriteCond %{QUERY_STRING} !end
+RewriteCond %{REQUEST_URI} ^/([a-z]{2})/
+RewriteCond %{REQUEST_URI} !\.html$
+RewriteRule ^(.+)/$ /$1 [R=307,L]
+
+# /foo/bar.en.html/ => /foo/bar
+RewriteCond %{QUERY_STRING} !end
+RewriteCond %{REQUEST_URI} \.html/$
+RewriteRule ^(.+)\.[a-z]{2}\.html/$ $1 [R=307,L]
+
+# /foo/bar/ => /foo/blah
+RewriteCond %{QUERY_STRING} !end
+RewriteRule ^(.+)/$ $1 [R=307,L]
+
+##
+## rewrite all paths with a local prefix to use
+## the appropriate index.{local}.html file or
+## filename.{local}.html file.
+##
+
+# /en => /index.en.html
+RewriteCond %{QUERY_STRING} !end
+RewriteCond %{DOCUMENT_ROOT}/index.$1.html -f
+RewriteCond %{REQUEST_URI} ^/([a-z]{2})$
+RewriteRule ^(.*) /index.%1.html?end [L]
+
+# /en/aaa => /aaa/index.en.html
+RewriteCond %{QUERY_STRING} !end
+RewriteCond %{DOCUMENT_ROOT}/$2/index.$1.html -f
+RewriteRule ^([a-z]{2})/(.*) /$2/index.$1.html?end [L]
+
+# /de/foo/bar => /foo/bar.de.html
+RewriteCond %{QUERY_STRING} !end
+RewriteCond %{DOCUMENT_ROOT}/$2.$1.html -f
+RewriteRule ^([a-z]{2})/(.*) /$2.$1.html?end [L]
+
+##
+## internally simulate a trailing slashes for directories in order
+## to trigger DirectoryIndex and autonegotiated locale.
+##
+
+# /foo/bar => /foo/bar/
+RewriteCond %{QUERY_STRING} !end
+RewriteCond %{DOCUMENT_ROOT}/$1 -d
+RewriteRule ^(.*[^/])$ /$1/?end [PT]
+
+##
+## redirect assets that are locale prefixed
+## (in order to allow relative paths)
+##
+
+# e.g. /de/foo/assets/style.css => /foo/assets/style.css
+RewriteCond %{QUERY_STRING} !end
+RewriteCond %{DOCUMENT_ROOT}/$2 -f
+RewriteRule ^([a-z]{2})/(.*) /$2 [R=307,L]
+
+
diff --git a/public/android/index.en.html b/public/android/index.en.html
index ef27df7..ce704a7 100644
--- a/public/android/index.en.html
+++ b/public/android/index.en.html
@@ -1,55 +1,56 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>
-      Bitmask for Android - dl.bitmask.net
-    </title>
-    <meta content='width=device-width, initial-scale=1.0' name='viewport'>
-    <link href='/assets/bootstrap.min.css' rel='stylesheet'>
-    <link href='/assets/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
-    <link href='/assets/style.css' rel='stylesheet'>
-  </head>
-  <body>
-    <a class='bm-masthead' href='/'></a>
-    <div class='bm-bar'>
-      Bitmask
-      Downloads
+<head>
+<title>
+Bitmask for Android - dl.bitmask.net
+</title>
+<meta content='width=device-width, initial-scale=1.0' name='viewport'>
+<link href='/assets/bootstrap.min.css' rel='stylesheet'>
+<link href='/assets/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
+<link href='/assets/style.css' rel='stylesheet'>
+</head>
+<body>
+<a class='bm-masthead' href='/'></a>
+<div class='bm-bar'>
+Bitmask
+Downloads
+</div>
+<div class='bm-main container'>
+<div id="TOC"><ol>
+  <li>
+    <a href="#download-latest-version">Download latest version</a>
+  </li>
+  <li>
+    <a href="#download-other-versions">Download other versions</a>
+  </li>
+</ol></div>
+
+<div class='row'>
+  <div class='col-sm-8 col-sm-offset-2'>
+    <div class='p alert alert-info'>
+      <i class='fa fa-envelope'></i>
+      <b>NOTE:</b> Bitmask for Android does not yet support encrypted email.
     </div>
-    <div class='bm-main container'>
-      <div id="TOC"><ol>
-        <li>
-          <a href="#download-latest-version">Download latest version</a>
-        </li>
-        <li>
-          <a href="#download-other-versions">Download other versions</a>
-        </li>
-      </ol></div>
-      
-      <div class='row'>
-        <div class='col-sm-8 col-sm-offset-2'>
-          <div class='p alert alert-info'>
-            <i class='fa fa-envelope'></i>
-            <b>NOTE:</b> Bitmask for Android does not yet support encrypted email.
-          </div>
-        </div>
-      </div>
-      <h2><a name="download-latest-version"></a>Download latest version</h2>
-      <a class='btn btn-primary btn-large' href='/client/android/Bitmask-Android-latest.apk'>
-        <i class='fa fa-cloud-download fa-lg'></i>
-        Download for Android
-      </a>
-      <h2><a name="download-other-versions"></a>Download other versions</h2>
-      <p>
-        If you want to install an old version of Bitmask, you can <a href="/client/android/">browse all releases</a>.
-      </p>
-    </div>
-    <footer>
-      <div>
-        (c) 2014 LEAP Encryption Access Project
-      </div>
-      <div>
-        Everything available for download on this site is free and open source software.
-      </div>
-    </footer>
-  </body>
+  </div>
+</div>
+<h2><a name="download-latest-version"></a>Download latest version</h2>
+<a class='btn btn-primary btn-large' href='/client/android/Bitmask-Android-latest.apk'>
+  <i class='fa fa-cloud-download fa-lg'></i>
+  Download for Android
+</a>
+<h2><a name="download-other-versions"></a>Download other versions</h2>
+<p>
+  If you want to install an old version of Bitmask, you can <a href="/client/android/">browse all releases</a>.
+</p>
+
+</div>
+<footer>
+<div>
+(c) 2014 LEAP Encryption Access Project
+</div>
+<div>
+Everything available for download on this site is free and open source software.
+</div>
+</footer>
+</body>
 </html>
diff --git a/public/index.en.html b/public/index.en.html
index a61e186..b52f56f 100644
--- a/public/index.en.html
+++ b/public/index.en.html
@@ -1,70 +1,71 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>
-      home - dl.bitmask.net
-    </title>
-    <meta content='width=device-width, initial-scale=1.0' name='viewport'>
-    <link href='/assets/bootstrap.min.css' rel='stylesheet'>
-    <link href='/assets/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
-    <link href='/assets/style.css' rel='stylesheet'>
-  </head>
-  <body>
-    <a class='bm-masthead' href='/'></a>
-    <div class='bm-bar'>
-      Bitmask
-      Downloads
+<head>
+<title>
+home - dl.bitmask.net
+</title>
+<meta content='width=device-width, initial-scale=1.0' name='viewport'>
+<link href='/assets/bootstrap.min.css' rel='stylesheet'>
+<link href='/assets/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
+<link href='/assets/style.css' rel='stylesheet'>
+</head>
+<body>
+<a class='bm-masthead' href='/'></a>
+<div class='bm-bar'>
+Bitmask
+Downloads
+</div>
+<div class='bm-main container'>
+<div id="TOC"><ol>
+</ol></div>
+
+<div class='row'>
+  <div class='col-sm-8 col-sm-offset-2'>
+    <div class='p alert alert-danger'>
+      <i class='fa fa-warning'></i>
+      <b>WARNING:</b> Bitmask is very experimental. It should not yet be used for sensitive data and you might lose your data at any time.
     </div>
-    <div class='bm-main container'>
-      <div id="TOC"><ol>
-      </ol></div>
-      
-      <div class='row'>
-        <div class='col-sm-8 col-sm-offset-2'>
-          <div class='p alert alert-danger'>
-            <i class='fa fa-warning'></i>
-            <b>WARNING:</b> Bitmask is very experimental. It should not yet be used for sensitive data and you might lose your data at any time.
-          </div>
-        </div>
-      </div>
-      <div class='row bm-front-buttons'>
-        <div class='col-sm-3 col-xs-6'>
-          <a class='btn btn-lg btn-default' href='/linux'>
-            <i class='fa fa-linux fa-5x'></i>
-            <br>
-            GNU/Linux
-          </a>
-        </div>
-        <div class='col-sm-3 col-xs-6'>
-          <a class='btn btn-lg btn-default' href='/mac'>
-            <i class='fa fa-apple fa-5x'></i>
-            <br>
-            Mac OS
-          </a>
-        </div>
-        <div class='col-sm-3 col-xs-6'>
-          <a class='btn btn-lg btn-default' href='/windows'>
-            <i class='fa fa-windows fa-5x'></i>
-            <br>
-            Windows
-          </a>
-        </div>
-        <div class='col-sm-3 col-xs-6'>
-          <a class='btn btn-lg btn-default' href='/android'>
-            <i class='fa fa-android fa-5x'></i>
-            <br>
-            Android
-          </a>
-        </div>
-      </div>
-    </div>
-    <footer>
-      <div>
-        (c) 2014 LEAP Encryption Access Project
-      </div>
-      <div>
-        Everything available for download on this site is free and open source software.
-      </div>
-    </footer>
-  </body>
+  </div>
+</div>
+<div class='row bm-front-buttons'>
+  <div class='col-sm-3 col-xs-6'>
+    <a class='btn btn-lg btn-default' href='/linux'>
+      <i class='fa fa-linux fa-5x'></i>
+      <br>
+      GNU/Linux
+    </a>
+  </div>
+  <div class='col-sm-3 col-xs-6'>
+    <a class='btn btn-lg btn-default' href='/mac'>
+      <i class='fa fa-apple fa-5x'></i>
+      <br>
+      Mac OS
+    </a>
+  </div>
+  <div class='col-sm-3 col-xs-6'>
+    <a class='btn btn-lg btn-default' href='/windows'>
+      <i class='fa fa-windows fa-5x'></i>
+      <br>
+      Windows
+    </a>
+  </div>
+  <div class='col-sm-3 col-xs-6'>
+    <a class='btn btn-lg btn-default' href='/android'>
+      <i class='fa fa-android fa-5x'></i>
+      <br>
+      Android
+    </a>
+  </div>
+</div>
+
+</div>
+<footer>
+<div>
+(c) 2014 LEAP Encryption Access Project
+</div>
+<div>
+Everything available for download on this site is free and open source software.
+</div>
+</footer>
+</body>
 </html>
diff --git a/public/linux/index.en.html b/public/linux/index.en.html
index 74f985e..37b4126 100644
--- a/public/linux/index.en.html
+++ b/public/linux/index.en.html
@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>
-      Install Bitmask on Linux - dl.bitmask.net
-    </title>
-    <meta content='width=device-width, initial-scale=1.0' name='viewport'>
-    <link href='/assets/bootstrap.min.css' rel='stylesheet'>
-    <link href='/assets/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
-    <link href='/assets/style.css' rel='stylesheet'>
-  </head>
-  <body>
-    <a class='bm-masthead' href='/'></a>
-    <div class='bm-bar'>
-      Bitmask
-      Downloads
-    </div>
-    <div class='bm-main container'>
-      <div id="TOC"><ol>
+<head>
+<title>
+Install Bitmask on Linux - dl.bitmask.net
+</title>
+<meta content='width=device-width, initial-scale=1.0' name='viewport'>
+<link href='/assets/bootstrap.min.css' rel='stylesheet'>
+<link href='/assets/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
+<link href='/assets/style.css' rel='stylesheet'>
+</head>
+<body>
+<a class='bm-masthead' href='/'></a>
+<div class='bm-bar'>
+Bitmask
+Downloads
+</div>
+<div class='bm-main container'>
+<div id="TOC"><ol>
   <li>
     <a href="#install-as-packages">Install as packages</a>
     <ol>
@@ -136,7 +136,6 @@
 
 <ul>
 <li><code>x86_64</code>, you have <strong>64 bit</strong></li>
-<li><code>ia64</code>, you have <strong>64 bit</strong></li>
 <li><code>i686</code>, you have <strong>32 bit</strong></li>
 <li><code>i386</code>, you have <strong>32 bit</strong></li>
 </ul>
@@ -204,14 +203,15 @@
 
 <p>You should also disable any local caching in your email client, if applicable. All the data stored by Bitmask is kept on disk in an encrypted format, but your mail client might cache your email in clear text, so it is good to disable caching if you can. Also, all your Bitmask email is sync'ed locally anyway, so there is no benefit to local caching.</p>
 </p>
-    </div>
-    <footer>
-      <div>
-        (c) 2014 LEAP Encryption Access Project
-      </div>
-      <div>
-        Everything available for download on this site is free and open source software.
-      </div>
-    </footer>
-  </body>
+
+</div>
+<footer>
+<div>
+(c) 2014 LEAP Encryption Access Project
+</div>
+<div>
+Everything available for download on this site is free and open source software.
+</div>
+</footer>
+</body>
 </html>
diff --git a/public/mac/index.en.html b/public/mac/index.en.html
index 4a4afa5..4d52a68 100644
--- a/public/mac/index.en.html
+++ b/public/mac/index.en.html
@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>
-      Bitmask for Mac OS - dl.bitmask.net
-    </title>
-    <meta content='width=device-width, initial-scale=1.0' name='viewport'>
-    <link href='/assets/bootstrap.min.css' rel='stylesheet'>
-    <link href='/assets/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
-    <link href='/assets/style.css' rel='stylesheet'>
-  </head>
-  <body>
-    <a class='bm-masthead' href='/'></a>
-    <div class='bm-bar'>
-      Bitmask
-      Downloads
-    </div>
-    <div class='bm-main container'>
-      <div id="TOC"><ol>
+<head>
+<title>
+Bitmask for Mac OS - dl.bitmask.net
+</title>
+<meta content='width=device-width, initial-scale=1.0' name='viewport'>
+<link href='/assets/bootstrap.min.css' rel='stylesheet'>
+<link href='/assets/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
+<link href='/assets/style.css' rel='stylesheet'>
+</head>
+<body>
+<a class='bm-masthead' href='/'></a>
+<div class='bm-bar'>
+Bitmask
+Downloads
+</div>
+<div class='bm-main container'>
+<div id="TOC"><ol>
   <li>
     <a href="#download-latest-version">Download latest version</a>
   </li>
@@ -94,14 +94,15 @@
 
 <p>You should also disable any local caching in your email client, if applicable. All the data stored by Bitmask is kept on disk in an encrypted format, but your mail client might cache your email in clear text, so it is good to disable caching if you can. Also, all your Bitmask email is sync'ed locally anyway, so there is no benefit to local caching.</p>
 </p>
-    </div>
-    <footer>
-      <div>
-        (c) 2014 LEAP Encryption Access Project
-      </div>
-      <div>
-        Everything available for download on this site is free and open source software.
-      </div>
-    </footer>
-  </body>
+
+</div>
+<footer>
+<div>
+(c) 2014 LEAP Encryption Access Project
+</div>
+<div>
+Everything available for download on this site is free and open source software.
+</div>
+</footer>
+</body>
 </html>
diff --git a/public/windows/index.en.html b/public/windows/index.en.html
index 1492e08..547720b 100644
--- a/public/windows/index.en.html
+++ b/public/windows/index.en.html
@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>
-      Bitmask for Windows - dl.bitmask.net
-    </title>
-    <meta content='width=device-width, initial-scale=1.0' name='viewport'>
-    <link href='/assets/bootstrap.min.css' rel='stylesheet'>
-    <link href='/assets/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
-    <link href='/assets/style.css' rel='stylesheet'>
-  </head>
-  <body>
-    <a class='bm-masthead' href='/'></a>
-    <div class='bm-bar'>
-      Bitmask
-      Downloads
-    </div>
-    <div class='bm-main container'>
-      <div id="TOC"><ol>
+<head>
+<title>
+Bitmask for Windows - dl.bitmask.net
+</title>
+<meta content='width=device-width, initial-scale=1.0' name='viewport'>
+<link href='/assets/bootstrap.min.css' rel='stylesheet'>
+<link href='/assets/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
+<link href='/assets/style.css' rel='stylesheet'>
+</head>
+<body>
+<a class='bm-masthead' href='/'></a>
+<div class='bm-bar'>
+Bitmask
+Downloads
+</div>
+<div class='bm-main container'>
+<div id="TOC"><ol>
   <li>
     <a href="#bitmask-for-windows">Bitmask for Windows</a>
     <ol>
@@ -98,14 +98,15 @@
 
 
 <p>You should also disable any local caching in your email client, if applicable. All the data stored by Bitmask is kept on disk in an encrypted format, but your mail client might cache your email in clear text, so it is good to disable caching if you can. Also, all your Bitmask email is sync'ed locally anyway, so there is no benefit to local caching.</p>
-    </div>
-    <footer>
-      <div>
-        (c) 2014 LEAP Encryption Access Project
-      </div>
-      <div>
-        Everything available for download on this site is free and open source software.
-      </div>
-    </footer>
-  </body>
+
+</div>
+<footer>
+<div>
+(c) 2014 LEAP Encryption Access Project
+</div>
+<div>
+Everything available for download on this site is free and open source software.
+</div>
+</footer>
+</body>
 </html>
author	elijah <elijah@riseup.net>	2014-04-24 01:10:21 -0700
committer	elijah <elijah@riseup.net>	2014-04-24 01:10:21 -0700
commit	e53b2d02de7228f563a7187723477dd4dac20b99 (patch)
tree	82f17d7c193b2882a3147177e7a45e0a302b842f
parent	f456ab77716ba5327f7f12d800123fbf3f857c7f (diff)