cleanup and a gs tab for the default wayf

2 files changed, 26 insertions, 141 deletions

diff --git a/src/main/webapp/wayf-sunet.jsp b/src/main/webapp/wayf-sunet.jsp
index 3eedea9..b28de5f 100644
--- a/src/main/webapp/wayf-sunet.jsp
+++ b/src/main/webapp/wayf-sunet.jsp
@@ -10,40 +10,7 @@
 <%request.setCharacterEncoding("UTF-8");%>
 <%response.setCharacterEncoding("UTF-8");%>
 
-<logic:present name="showComments" scope="Request">
-
-<!-- TO CONFIGURE THIS FOR A SPECIFIC SITE
-     =====================================
-
-     Before you deploy this jsp you need to look for CONFIG below.
-     These mark places where you should make changes. 
-
-     If you want to make more profound changes but only to the jsp,
-     you should read the sections marked PROGRAMMING NOTE below.-->
-
-<!-- PROGRAMMING NOTE
-
-     "requestURL" contains the URL that was specified to get the
-     WAYF going.  The jsp uses it mostly for submitting result back to
-     the WAYF and error reporting -->
-
-</logic:present>
-
-    <jsp:useBean id="requestURL" scope="request" class="java.lang.String"/>
-
-<logic:present name="showComments" scope="Request">
-
-<!-- PROGRAMMING NOTE
-
-     shire, target, provider and time are all part of the Shibboleth
-     1.3 discovery protocol and need to be specified as parameters to the WAYF
-
-     entityID, return, returnIDParam are all part of the
-     SAML Discovery protocol.
-
-
--->
-</logic:present>
+<jsp:useBean id="requestURL" scope="request" class="java.lang.String"/>
 
 <logic:notPresent name="entityID" scope="request">
 <logic:notPresent name="shire" scope="request">
@@ -52,93 +19,6 @@
 </logic:notPresent>
 </logic:notPresent>
 
-
-<logic:present name="showComments" scope="Request">
-
-<!-- PROGRAMMING NOTE
-     In addition to the above.  The WAYF may also supply the following to
-     the jsp.
-
-     "cookieList" If this exists it represents the contents of the
-         _saml_idp cookie (possibly filtered to remove IdPs which
-         cannot serve the SP).  It is a Collection of IdPSite objects,
-         which themselves have the following properties:
-
-       "name" The uri for the IdP, which needs to be returned to the
-              WAYF in the "origin" parameter.
-
-       "displayName" User friendly name (taken from its alias)
-
-       "addressFor" The (ungarnished) URL for the IdP. This could be
-              used to create a direct hyperlink to the IdP
-
-     "sites" If this exists it contains all the possible IdPs for for
-         the SP (possibly filtered).  It is a Collection of IdPSite
-         Objects which are described above.  This is only present if
-         provideList was defined true in the configuration.
-
-     "siteLists" If this exists it contains all the possible metadata
-         files which can service for the SP (possibly filtered).  It
-         is a collection of IdPSiteSetEntry Objects which have two
-         properties:
-
-         "name" This is the displayName from the Metadata element in
-            the WAYF configuration file
-
-         "sites" This represents the IdPs.  Again it is a collection
-            of IdPSite Objects
-
-         It is only present if provideListOfList was defined true in
-         the configuration.
-
-     "singleSiteList" if this is present, then there is only one
-         IdPSiteSetEntry Object in "siteLists".
-
-     "searchresultempty" If this is present then it means that a
-         search was performed, but no suitable IdPs were returned.
-
-     "searchresults" If this is present it represents the list of IdPs
-         which matched a previous search.  It is a Collection of
-         IdPSite Objects. -->
-
-<!-- PROGRAMMING NOTE
-
-     The jsp communicates back to the WAYF via the parameters listed
-     above, and:
-
-        "action" what the WAYF has to do.  Possible contents are:
-
-            "lookup" - refresh the screen.
-            "search" - perform a search on the contents parameter "string"
-            "selection" - redirect to the IdP with the uri "origin"
-
-        "cache" preserve any selection in the _saml_idp cookie. A
-            value of "session" makes the cookie last for the browser
-            session, "perm" gives it the lifetime specified in the
-            configuration file.  
-
-      The tabindex is hard wired.  Fortunately the standard allows us to
-      have duplicate numbers and says the order is the order things
-      get emitted.  We use these numbers
-
-      10 - Recently used sites hyperlinks 
-      20 - <clear button for above> 
-      25 - AutoSuggestion
-      30 Federation selection 
-      40 IdP within Selection 
-      50 Select button 
-      60 How long to remember selector 
-      70 Search entry 
-      80 Search Button 
-      90 List of search results
-      100 Select search result
-      110 How long to remember search results
-      120 Hyperlink to admin user. 
-
--->
-
-</logic:present>
-
 <head>
     <title>Identity Provider Selection</title>
     <link href="css/reset.css" rel="stylesheet" type="text/css" />
diff --git a/src/main/webapp/wayf-swamid.jsp b/src/main/webapp/wayf-swamid.jsp
index 9a7b989..a1d5abe 100644
--- a/src/main/webapp/wayf-swamid.jsp
+++ b/src/main/webapp/wayf-swamid.jsp
@@ -10,26 +10,7 @@
 <%request.setCharacterEncoding("UTF-8");%>
 <%response.setCharacterEncoding("UTF-8");%>
 
-<logic:present name="showComments" scope="Request">
-
-<!-- TO CONFIGURE THIS FOR A SPECIFIC SITE
-     =====================================
-
-     Before you deploy this jsp you need to look for CONFIG below.
-     These mark places where you should make changes. 
-
-     If you want to make more profound changes but only to the jsp,
-     you should read the sections marked PROGRAMMING NOTE below.-->
-
-<!-- PROGRAMMING NOTE
-
-     "requestURL" contains the URL that was specified to get the
-     WAYF going.  The jsp uses it mostly for submitting result back to
-     the WAYF and error reporting -->
-
-</logic:present>
-
-    <jsp:useBean id="requestURL" scope="request" class="java.lang.String"/>
+<jsp:useBean id="requestURL" scope="request" class="java.lang.String"/>
 
 <logic:notPresent name="entityID" scope="request">
 <logic:notPresent name="shire" scope="request">
@@ -42,6 +23,30 @@
 <head>
     <title>Identity Provider Selection</title>
     <link rel="stylesheet" title="normal" type="text/css" href="wayf-swamid.css"/>
+    <script type="text/javascript" charset="utf-8">
+  var is_ssl = ("https:" == document.location.protocol);
+  var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
+  document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript" charset="utf-8">
+  var feedback_widget_options = {};
+
+  feedback_widget_options.display = "overlay";
+  feedback_widget_options.company = "sunet";
+  feedback_widget_options.placement = "right";
+  feedback_widget_options.color = "#222";
+  feedback_widget_options.style = "idea";
+  feedback_widget_options.product = "sunet_swamid";
+
+
+
+  feedback_widget_options.limit = "3";
+
+  GSFN.feedback_widget.prototype.local_base_url = "http://community.sunet.se";
+  GSFN.feedback_widget.prototype.local_ssl_base_url = "http://community.sunet.se";
+
+
+  var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
+</script>
 </head>
 
 <body>