updated security bingo

2 files changed, 35 insertions, 35 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a9a7dc9..a7e962f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -12,7 +12,7 @@ module ApplicationHelper
   # two forms:
   #
   #  (1) link('page-name')
-  #  (2) link('label' => 'page-name')
+  #  (2) link('label' => 'page-name-or-url')
   #
   # both accept optional options hash:
   #
@@ -29,7 +29,7 @@ module ApplicationHelper
     else
       klass = options[:class] if options
     end
-    if name.starts_with?('#')
+    if name.starts_with?('#') || name.starts_with?('http')
       path = name
     else
       page = StaticPage.find(name)
diff --git a/app/views/pages/about-us/news/2012/security-bingo/en.haml b/app/views/pages/about-us/news/2012/security-bingo/en.haml
index 344ee35..64eff77 100644
--- a/app/views/pages/about-us/news/2012/security-bingo/en.haml
+++ b/app/views/pages/about-us/news/2012/security-bingo/en.haml
@@ -9,8 +9,8 @@
   :sass
     table.table
       border: 1px solid #ccc
-      background: white
       td
+        background: white
         width: 12.5%
         font-size: 0.9em
         border-right: 1px solid #ccc
@@ -39,15 +39,15 @@
     %tr
       %td.section{:rowspan => 3} Messages
       %td Short Message
-      %td{:colspan => 3} Pidgin, Gajim, OTR
-      %td SecureChat
-      %td Gibberbot, Beem, TextSecure
-      %td Cryptocat
+      %td{:colspan => 3} #{link 'Pidgin' => 'http://pidgin.im'}, #{link 'Gajim' => 'http://gajim.org'}, #{link 'OTR' => 'http://www.cypherpunks.ca/otr/'}
+      %td #{link 'ChatSecure' => 'https://chatsecure.org/'}
+      %td #{link 'Gibberbot' => 'https://guardianproject.info/apps/gibber/'}, #{link 'Beem' => 'http://beem-project.com'}, #{link 'TextSecure' => 'https://github.com/WhisperSystems/TextSecure'}
+      %td #{link 'Cryptocat' => 'https://crypto.cat'}
     %tr
       %td Long Message
-      %td{:colspan => 3} (Thunderbird + Enigmail)
+      %td{:colspan => 3} (#{link 'Thunderbird' => 'https://www.mozilla.org/en-US/thunderbird'} + #{link 'Enigmail' => 'http://enigmail.mozdev.org/'})
       %td
-      %td (K-9 + AGP)
+      %td (#{link 'K-9' => 'https://code.google.com/p/k9mail/'} + #{link 'AGP' => 'http://www.thialfihar.org/projects/apg/'})
       %td
     -# %tr
       %td Social Networking
@@ -61,33 +61,33 @@
     %tr
       %td.section{:rowspan => 5} Files
       %td Storage
-      %td DiskCryptor
+      %td #{link 'DiskCryptor' => 'http://diskcryptor.net'}
       %td
       %td EncFS, DMCrypt
       %td
-      %td (AOSP, LUKS Manager, Cryptonite)
-      %td SafeWith.me
+      %td (#{link 'AOSP' => 'http://source.android.com/'}, #{link 'Cryptonite' => 'https://code.google.com/p/cryptonite/'})
+      %td #{link 'SafeWith.me' => 'https://SafeWith.me'}
     %tr
       %td Backup
-      %td Duplicati
+      %td #{link 'Duplicati' => 'http://duplicati.com/'}
       %td
-      %td Déjà Dup
+      %td #{link 'Déjà Dup' => 'https://launchpad.net/deja-dup'}
       %td
-      %td FlashBack
+      %td #{link 'FlashBack' => 'http://www.whispersys.com/flashback.html'}
       %td
     %tr
       %td Synchronization
-      %td{:colspan => 3} (Syncany, git-annex)
+      %td{:colspan => 3} (#{link 'Syncany' => 'http://www.syncany.org/'}, #{link 'git-annex' => 'http://git-annex.branchable.com/assistant/'})
       %td
       %td
       %td
     %tr
       %td Data Wipe
+      %td #{link 'Eraser' => 'http://eraser.heidi.ie/'}, #{link 'BleachBit' => 'http://bleachbit.sourceforge.net/'}, #{link 'DBAN' => 'http://www.dban.org/'}
+      %td #{link 'DBAN' => 'http://www.dban.org/'}
+      %td #{link 'BleachBit' => 'http://bleachbit.sourceforge.net/'}, #{link 'DBAN' => 'http://www.dban.org/'}, wipe
       %td
-      %td
-      %td wipe
-      %td
-      %td InTheClear
+      %td #{link 'InTheClear' => 'https://github.com/SaferMobile/InTheClear'}
       %td N/A
     -# %tr
       %td Collaboration
@@ -101,15 +101,15 @@
     %tr
       %td.section{:rowspan => 3} Audio/Video
       %td Direct Calling
-      %td{:colspan => 3} (Jitsi)
+      %td{:colspan => 3} (#{link 'Jitsi' => 'https://jitsi.org/'})
       %td
-      %td RedPhone, CSimpleSip
+      %td #{link 'RedPhone' => 'https://github.com/WhisperSystems/RedPhone'}, #{link 'CSimpleSip' => 'https://code.google.com/p/csipsimple/'}
       %td
     %tr
       %td Conference
-      %td{:colspan => 3} (Mumble)
+      %td{:colspan => 3} (#{link 'Mumble' => 'http://mumble.sourceforge.net/'})
       %td
-      %td (Mumble)
+      %td (#{link 'Mumble' => 'http://mumble.sourceforge.net/'})
       %td
     %tr
       %td Capture & Reporting
@@ -117,32 +117,32 @@
       %td
       %td
       %td
-      %td ObscuraCam
+      %td #{link 'ObscuraCam' => 'https://guardianproject.info/apps/obscuracam/'}
       %td
   %tbody
     %tr
       %td.section{:rowspan => 2} Network
       %td Availability
-      %td{:colspan => 5} Commotion
+      %td{:colspan => 5} #{link 'Commotion' => 'http://commotionwireless.net/'}
       %td N/A
     %tr
       %td Confidentiality & Anonymity
-      %td{:colspan => 5} Tor, (OpenVPN)
+      %td{:colspan => 5} #{link 'Tor' => 'https://torproject.org'}, (#{link 'OpenVPN' => 'http://openvpn.net'})
       %td N/A
   %tbody
     %tr
       %td.section{:rowspan => 3} Identity
       %td Passwords
-      %td{:colspan => 3} KeePassX
+      %td{:colspan => 3} #{link 'KeePassX' => 'http://www.keepassx.org/'}
       %td
-      %td KeePassDroid
+      %td #{link 'KeePassDroid' => 'http://www.keepassdroid.com/'}
       %td
     %tr
       %td Validation
-      %td{:colspan => 6} (OpenPGP, OTR)
+      %td{:colspan => 6} (OpenPGP, #{link 'OTR' => 'http://www.cypherpunks.ca/otr/'})
     %tr
       %td Authentication
-      %td{:colspan => 6} Mozilla Persona, WebID
+      %td{:colspan => 6} #{link 'Mozilla Persona' => 'https://login.persona.org/'}, #{link 'WebID' => 'http://www.w3.org/2005/Incubator/webid/spec/'}
   -# %tbody
     %tr
       %td.section{:rowspan => 2} Anti-intrusion
@@ -185,14 +185,14 @@
 
   I put cells in parenthesis whenever I felt that the cell contents were egregiously doubtful. This could be for any number of reasons:
 
-  * *Not ready*: Some software shows promise, but there is not really any code that is ready to be used. For example, Syncany and git-annex.
-  * *Security problems*: Some software has notable security problems. Mumble, for example, only supports variable bit-rate encoding and is thus not suited to prevent eavesdropping by a skilled adversary.
-  * *Hostile to users*: Much of the available software exemplifies a painful user experience. For example, Jitsi, OpenVPN, or OpenPGP.
+  # *Not ready*: Some software shows promise, but there is not really any code that is ready to be used. For example, Syncany and git-annex.
+  # *Security problems*: Some software has notable security problems. Mumble, for example, only supports variable bit-rate encoding and is thus not suited to prevent eavesdropping by a skilled adversary.
+  # *Hostile to users*: Much of the available software exemplifies a painful user experience. For example, Jitsi, OpenVPN, or OpenPGP.
 
   What is missing might be more revealing than what is listed. These toolsets are entirely absent from my 'security bingo' game card:
 
   * *Social Networking:* When I excluded software that I think is unfeasible (SecureShare) or has no security (Diaspora, etc), then you end up with zero projects.
-  * *Document Collaboration:* I have high hopes an encrypted etherpad, but so far no one has started work on it.
+  * *Document Collaboration:* I have high hopes for an encrypted etherpad, but so far no one has started work on it.
   * *Photos/Vidoes & Galleries:* Nothing I have heard of.
   * *Events & Scheduling:* Nothing I have heard of.
   * *Tasks & Planning:* Nothing I have heard of.