From e53b2d02de7228f563a7187723477dd4dac20b99 Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 24 Apr 2014 01:10:21 -0700 Subject: rebuilt pages --- public/.htaccess | 85 +++++++++++++++++++++++++++ public/android/index.en.html | 103 ++++++++++++++++----------------- public/index.en.html | 133 ++++++++++++++++++++++--------------------- public/linux/index.en.html | 56 +++++++++--------- public/mac/index.en.html | 55 +++++++++--------- public/windows/index.en.html | 55 +++++++++--------- 6 files changed, 288 insertions(+), 199 deletions(-) create mode 100644 public/.htaccess (limited to 'public') 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 @@ - - - Bitmask for Android - dl.bitmask.net - - - - - - - - -
- Bitmask - Downloads + + +Bitmask for Android - dl.bitmask.net + + + + + + + + +
+Bitmask +Downloads +
+
+ + +
+
+
+ + NOTE: Bitmask for Android does not yet support encrypted email.
-
- - -
-
-
- - NOTE: Bitmask for Android does not yet support encrypted email. -
-
-
-

Download latest version

- - - Download for Android - -

Download other versions

-

- If you want to install an old version of Bitmask, you can browse all releases. -

-
-
-
- (c) 2014 LEAP Encryption Access Project -
-
- Everything available for download on this site is free and open source software. -
-
- +
+
+

Download latest version

+ + + Download for Android + +

Download other versions

+

+ If you want to install an old version of Bitmask, you can browse all releases. +

+ +
+
+
+(c) 2014 LEAP Encryption Access Project +
+
+Everything available for download on this site is free and open source software. +
+
+ 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 @@ - - - home - dl.bitmask.net - - - - - - - - -
- Bitmask - Downloads + + +home - dl.bitmask.net + + + + + + + + +
+Bitmask +Downloads +
+
+
    +
+ +
+
+
+ + WARNING: Bitmask is very experimental. It should not yet be used for sensitive data and you might lose your data at any time.
-
-
    -
- -
-
-
- - WARNING: Bitmask is very experimental. It should not yet be used for sensitive data and you might lose your data at any time. -
-
-
-
-
- - -
- GNU/Linux - -
-
- - -
- Mac OS - -
-
- - -
- Windows - -
-
- - -
- Android - -
-
-
-
-
- (c) 2014 LEAP Encryption Access Project -
-
- Everything available for download on this site is free and open source software. -
-
- +
+
+
+
+ + +
+ GNU/Linux + +
+
+ + +
+ Mac OS + +
+
+ + +
+ Windows + +
+
+ + +
+ Android + +
+
+ +
+
+
+(c) 2014 LEAP Encryption Access Project +
+
+Everything available for download on this site is free and open source software. +
+
+ 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 @@ - - - Install Bitmask on Linux - dl.bitmask.net - - - - - - - - -
- Bitmask - Downloads -
-
-
    + + +Install Bitmask on Linux - dl.bitmask.net + + + + + + + + +
    +Bitmask +Downloads +
    +
    +
    1. Install as packages
        @@ -136,7 +136,6 @@
        • x86_64, you have 64 bit
          • -
        • ia64, you have 64 bit
        • i686, you have 32 bit
        • i386, you have 32 bit
        @@ -204,14 +203,15 @@

        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.

        -
    -
    -
    - (c) 2014 LEAP Encryption Access Project -
    -
    - Everything available for download on this site is free and open source software. -
    -
    - + +
    +
    +
    +(c) 2014 LEAP Encryption Access Project +
    +
    +Everything available for download on this site is free and open source software. +
    +
    + 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 @@ - - - Bitmask for Mac OS - dl.bitmask.net - - - - - - - - -
    - Bitmask - Downloads -
    -
    -
      + + +Bitmask for Mac OS - dl.bitmask.net + + + + + + + + +
      +Bitmask +Downloads +
      +
      +
      1. Download latest version
        2. @@ -94,14 +94,15 @@

        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.

        -
      -
      -
      - (c) 2014 LEAP Encryption Access Project -
      -
      - Everything available for download on this site is free and open source software. -
      -
      - + +
      +
      +
      +(c) 2014 LEAP Encryption Access Project +
      +
      +Everything available for download on this site is free and open source software. +
      +
      + 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 @@ - - - Bitmask for Windows - dl.bitmask.net - - - - - - - - -
      - Bitmask - Downloads -
      -
      -
        + + +Bitmask for Windows - dl.bitmask.net + + + + + + + + +
        +Bitmask +Downloads +
        +
        +
        1. Bitmask for Windows
            @@ -98,14 +98,15 @@

            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.

            -
        -
        -
        - (c) 2014 LEAP Encryption Access Project -
        -
        - Everything available for download on this site is free and open source software. -
        -
        - + +
        + + -- cgit v1.2.3