vrfs-360: changed j2ee into j2se; consolidated jnlp links to just using the icon

app/controllers/users_controller.rb

@@ -196,7 +196,7 @@ class UsersController < ApplicationController
         xml.vendor 'JamKazam'
       end
       xml.resources do
-        xml.j2ee(:version => "1.6+", :href => "http://java.sun.com/products/autodl/j2se")
+        xml.j2se(:version => "1.6+", :href => "http://java.sun.com/products/autodl/j2se")
         xml.jar(:href => 'ping.jar', :main => 'true')
       end
       xml.tag!('application-desc', 

app/views/users/isp.html.erb

@@ -3,18 +3,11 @@
 <h1 style="text-align:center">JamKazam Internet Latency Test:  Select your Internet Service Provider</h1>
 <h2 style="text-align:center">Java must be installed to run this tool.  Please select logo corresponding to your ISP, or if you're not sure, choose "Other".  OSX not currently supported.</h2>
 <div style="overflow:scroll; margin-left: 20px; margin-top: 20px; ">
-<% @isps.each do |isp_id, isp_data| %>
-  <% url_jnlp = isp_ping_url(:isp => isp_id, :format => :jnlp, :host => 'www.jamkazam.com', :port => '80') %>
-  <div style='margin-bottom: 30px; '>
-    <div>
-      <%= content_tag(:div, "My ISP is #{isp_data[0]}:") %>
-      <%= image_tag("isps/#{isp_data[1]}") %>
+  <% @isps.each do |isp_id, isp_data| %>
+    <% url_jnlp = isp_ping_url(:isp => isp_id, :format => :jnlp, :host => 'www.jamkazam.com', :port => '80') %>
+    <div style='margin-bottom: 30px; '>
+        <%= content_tag(:div, "My ISP is #{isp_data[0]}:") %>
+        <%= link_to(image_tag("isps/#{isp_data[1]}", :alt => isp_data[0]), url_jnlp) %>
     </div>
-    <script>
-        var url = "<%= url_jnlp %>";
-        deployJava.createWebStartLaunchButton(url, '1.6.0');
-    </script>
-    <p>Or click <%= link_to('here',url_jnlp) %></p>
-  </div>
-<% end %>
+  <% end %>
 </div>