moved around some pages.

12 files changed, 10 insertions, 82 deletions

diff --git a/pages/about-us/jobs/en.haml b/pages/about-us/jobs/en.haml
index d0e7fd1..80a33ed 100644
--- a/pages/about-us/jobs/en.haml
+++ b/pages/about-us/jobs/en.haml
@@ -15,6 +15,9 @@
 
   Contact: mcnair@leap.se
 
+  Currently, we have no open positions, but we would love to hear from you anyway.
+
+-#
   h1. Open Positions
 
   h2. Lead Python Developer
diff --git a/pages/development/en.haml b/pages/development/en.haml
deleted file mode 100644
index bfbf8c5..0000000
--- a/pages/development/en.haml
+++ /dev/null
@@ -1,67 +0,0 @@
-%h1.first IRC
-
-Join us on freenode at #leap-dev.
-
-%h1.topgap Source Code
-
-%h3 Client
-
-%table.table.table-bordered
-  %tr
-    %td leap_client
-    %td Easy-to-use client for Linux, Mac, and Windows.
-    %td git://leap.se/leap_client
-    %td= link 'github' => 'https://github.com/leapcode/leap_client'
-
-%h3 Service provider platform
-
-%table.table.table-bordered
-  %tr
-    %td leap_platform
-    %td Turn-key automation for communication service providers
-    %td git://leap.se/leap_platform
-    %td= link 'github' => 'https://github.com/leapcode/leap_platform'
-
-  %tr
-    %td leap_ca
-    %td Client certificate generation daemon
-    %td git://leap.se/leap_ca
-    %td= link 'github' => 'https://github.com/leapcode/leap_ca'
-
-  %tr
-    %td leap_cli
-    %td Command line interface to setup and manage servers running the LEAP platform
-    %td git://leap.se/leap_cli
-    %td
-
-%h3 Web applications and libraries
-
-%table.table.table-bordered
-  %tr
-    %td leap_web
-    %td Web application for the LEAP platform, providing user management, tickets, billing, and REST API
-    %td git://leap.se/leap_web
-    %td= link 'github' => 'https://github.com/leapcode/leap_web'
-  %tr
-    %td leap_website
-    %td This website
-    %td git://leap.se/leap_website
-    %td
-  %tr
-    %td srp_js
-    %td Secure Remote Password (SRP) library for javascript
-    %td git://leap.se/srp_js
-    %td= link 'github' => 'https://github.com/leapcode/srp_js'
-  %tr
-    %td ruby_srp
-    %td Secure Remote Password (SRP) library for ruby
-    %td git://github.com/leapcode/ruby_srp
-    %td= link 'github' => 'https://github.com/leapcode/ruby_srp'
-
-%h1 Mailing List
-
-%p Coming soon.
-
-%h1 Wiki
-
-%p Coming soon.
diff --git a/pages/menu.txt b/pages/menu.txt
index 5576e2b..931efd7 100644
--- a/pages/menu.txt
+++ b/pages/menu.txt
@@ -3,19 +3,11 @@ services
   eip
   email
   chat
-  #files
-  #voice
-technology
-  infosec
-  platform
-  client
-  #cloud
-  identity
-  routing
-  critiques
-  #sync
-  #authentication
-development
+  technology
+    infosec
+    identity
+    routing
+    critiques
 about-us
   vision
   jobs
diff --git a/pages/technology/client/en.haml b/pages/services/technology/client/en.haml
index c4f82b5..c4f82b5 100644
--- a/pages/technology/client/en.haml
+++ b/pages/services/technology/client/en.haml
diff --git a/pages/technology/critiques/en.haml b/pages/services/technology/critiques/en.haml
index 06fccdd..06fccdd 100644
--- a/pages/technology/critiques/en.haml
+++ b/pages/services/technology/critiques/en.haml
diff --git a/pages/technology/en.haml b/pages/services/technology/en.haml
index bc60a94..bc60a94 100644
--- a/pages/technology/en.haml
+++ b/pages/services/technology/en.haml
diff --git a/pages/technology/identity/en.haml b/pages/services/technology/identity/en.haml
index 27c8b8b..27c8b8b 100644
--- a/pages/technology/identity/en.haml
+++ b/pages/services/technology/identity/en.haml
diff --git a/pages/technology/infosec/en.haml b/pages/services/technology/infosec/en.haml
index 386ce10..386ce10 100644
--- a/pages/technology/infosec/en.haml
+++ b/pages/services/technology/infosec/en.haml
diff --git a/pages/technology/infosec/table-style.haml b/pages/services/technology/infosec/table-style.haml
index c9a3495..c9a3495 100644
--- a/pages/technology/infosec/table-style.haml
+++ b/pages/services/technology/infosec/table-style.haml
diff --git a/pages/technology/infosec/table.haml b/pages/services/technology/infosec/table.haml
index 0f6a92f..f2de6bf 100644
--- a/pages/technology/infosec/table.haml
+++ b/pages/services/technology/infosec/table.haml
@@ -217,14 +217,14 @@
               %td{:rowspan=>3}= I18n.t(row_group, :scope => 'infosec').sub(' ', '<br/>').html_safe
             %td= I18n.t row, :scope => 'infosec'
             - columns.each do |column|
-              %td.cell{:class => cells[column][row]}= I18n.t cells[column][row], :scope => 'infosec'
+              %td.cell{:class => cells[column][row]}= I18n.t cells[column][row].first, :scope => 'infosec'
   - else
     - rows.each do |row|
       %tbody
         %tr
           %td= I18n.t row, :scope => 'infosec'
           - columns.each do |column|
-            %td.cell{:class => cells[column][row]}= I18n.t cells[column][row], :scope => 'infosec'
+            %td.cell{:class => cells[column][row]}= I18n.t(cells[column][row].first, :scope => 'infosec')
   - if footer
     %tr.footer
       %td{:colspan=>2}= I18n.t :for_example, :scope => 'infosec'
diff --git a/pages/technology/platform/en.haml b/pages/services/technology/platform/en.haml
index 44bbce9..44bbce9 100644
--- a/pages/technology/platform/en.haml
+++ b/pages/services/technology/platform/en.haml
diff --git a/pages/technology/routing/en.haml b/pages/services/technology/routing/en.haml
index 35d52ed..35d52ed 100644
--- a/pages/technology/routing/en.haml
+++ b/pages/services/technology/routing/en.haml