Index: lams_bb_integration/web/admin/config.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/admin/config.jsp,v
diff -u -r1.2 -r1.3
--- lams_bb_integration/web/admin/config.jsp	22 Aug 2007 06:17:32 -0000	1.2
+++ lams_bb_integration/web/admin/config.jsp	21 Sep 2011 17:42:25 -0000	1.3
@@ -1,63 +1,78 @@
-<%@page import="java.util.Properties,
-                blackboard.platform.BbServiceManager,
-                blackboard.platform.plugin.PlugInUtil,
-                blackboard.platform.security.AccessManagerService,
-                org.lamsfoundation.ld.integration.blackboard.LamsPluginUtil" 
-		errorPage="/error.jsp"
-%>
-
-<%@ taglib uri="/bbUI" prefix="bbUI"%>
-<%@ taglib uri="/bbData" prefix="bbData"%>
-<bbData:context id="ctx">
-
+<%--
+    Original Version: 2007 LAMS Foundation
+    Updated for Blackboard 9.1 SP6 (including new bbNG tag library) 2011
+    Richard Stals (www.stals.com.au)
+    Edith Cowan University, Western Australia
+--%>
+<%--
+    Configuration Form for the Building Block System Administration
+    View and set the configuration items
+--%>
+<%@ page import="java.util.Properties"%>
+<%@ page import="blackboard.platform.BbServiceManager"%>
+<%@ page import="blackboard.platform.plugin.PlugInUtil"%>
+<%@ page import="blackboard.platform.plugin.PlugInException"%>
+<%@ page import="org.lamsfoundation.ld.integration.blackboard.LamsPluginUtil"%>
+<%@ page errorPage="/error.jsp"%>
+<%@ taglib uri="/bbNG" prefix="bbNG"%>
+<bbNG:genericPage title="LAMS Configuration" ctxId="ctx">
 <%
     // SECURITY!
-    AccessManagerService accessManager = (AccessManagerService) BbServiceManager.lookupService(AccessManagerService.class);
-    if (!PlugInUtil.authorizeForSystemAdmin(request,response)){
-        accessManager.sendAccessDeniedRedirect(request,response);
-        return;
+    // Authorise current user for System Admin (automatic redirect)
+    try{
+        if (!PlugInUtil.authorizeForSystemAdmin(request, response))
+            return;
+    } catch(PlugInException e) {
+        throw new RuntimeException(e);
     }
-
+    
+    // Get the LAMS2 Building Block properties from Blackboard (if set)
     Properties p = LamsPluginUtil.getProperties();
-	String lamsServerUrl = p.getProperty("LAMS_SERVER_URL", "http://");
-	String lamsServerId = p.getProperty("LAMS_SERVER_ID", "");
-	String SecretKey = p.getProperty("LAMS_SERVER_SKEY", "");
-	String ReqSrc = p.getProperty("BB_REQ_SRC");
+    String lamsServerUrl = p.getProperty("LAMS_SERVER_URL", "http://");
+    String lamsServerId = p.getProperty("LAMS_SERVER_ID", "");
+    String SecretKey = p.getProperty("LAMS_SERVER_SKEY", "");
+    String ReqSrc = p.getProperty("BB_REQ_SRC");
 
-	//	 add port to the url if the port is in the blackboard url.
-	int bbport = request.getServerPort();
-	String bbportstr = bbport != 0 ? ":" + bbport : "";
+    //Add port to the url if the port is in the blackboard url
+    int bbport = request.getServerPort();
+    String bbportstr = bbport != 0 ? ":" + bbport : "";
 %>
 
-<bbUI:docTemplate title="Configure LAMS">
-<bbUI:breadcrumbBar handle="admin_plugin_manage">
-    <bbUI:breadcrumb>LAMS Configuration</bbUI:breadcrumb>
-</bbUI:breadcrumbBar>
-<bbUI:titleBar iconUrl="/images/ci/icons/tools_u.gif">Configure Sample Plugin.</bbUI:titleBar>
-<form action="config_proc.jsp">
-  <bbUI:step title="Select Plug-in" number="1">
-    <bbUI:dataElement label="LAMS SERVER URL">
-      <input type="text" name="lams_server_url" size="70" value="<%=lamsServerUrl%>">
-	</bbUI:dataElement>
-    <bbUI:dataElement label="LAMS SERVER ID">
-      <input type="text" name="lams_server_id" size="70" value="<%=lamsServerId%>">
-	</bbUI:dataElement>
-    <bbUI:dataElement label="LAMS SERVER SECRET KEY">
-      <input type="text" name="lams_server_skey" size="70" value="<%=SecretKey%>">
-	</bbUI:dataElement>
-	<bbUI:dataElement label="BLACKBOARD REQUEST SRC">
-      <input type="text" name="bb_req_src" size="70" value="<%=ReqSrc%>">
-	</bbUI:dataElement>
-  </bbUI:step>
-  <bbUI:step title="Callback URL" number="2">
-  	<bbUI:instructions>
-		Copy and paste the user data callback URL into LAMS <BR>
-		<B>USER DATA CALLBACK URL</B>: http://<%=request.getServerName()%><%=bbportstr%><%=request.getContextPath()%>/UserData?uid=%username%&ts=%timestamp%&hash=%hash%
-	</bbUI:instructions>
-  </bbUI:step>
-  <bbUI:stepSubmit title="Submit" number="3" />
-  
-</form>
-
-</bbUI:docTemplate>
-</bbData:context>
\ No newline at end of file
+    <%-- Breadcrumbs  It seems we need to build the full trail manually --%>
+    <bbNG:breadcrumbBar environment="SYS_ADMIN">
+        <bbNG:breadcrumb href="/webapps/portal/execute/tabs/tabAction?tabType=admin" title="Administrator Panel" />
+        <bbNG:breadcrumb href="/webapps/portal/admin/pa_ext_caret.jsp" title="Building Blocks" />
+        <bbNG:breadcrumb href="/webapps/blackboard/admin/manage_plugins.jsp" title="Installed Tools" />
+        <bbNG:breadcrumb title="LAMS Configuration" />
+    </bbNG:breadcrumbBar>
+    
+    <%-- Page Header --%>
+    <bbNG:pageHeader>    	
+        <bbNG:pageTitleBar title="LAMS Configuration"/>
+    </bbNG:pageHeader>
+    
+    <%-- Properties Form --%>
+    <form action="config_proc.jsp">
+    	<bbNG:dataCollection>
+            <bbNG:step title="Select Plug-in">
+                <bbNG:dataElement label="LAMS SERVER URL" isRequired="true" labelFor="lams_server_url">
+                    <input type="text" name="lams_server_url" size="70" value="<%=lamsServerUrl%>">
+                </bbNG:dataElement>
+                <bbNG:dataElement label="LAMS SERVER ID" isRequired="true" labelFor="lams_server_id">
+                    <input type="text" name="lams_server_id" size="70" value="<%=lamsServerId%>">
+                </bbNG:dataElement>
+                <bbNG:dataElement label="LAMS SERVER SECRET KEY" isRequired="true" labelFor="lams_server_skey">
+                    <input type="text" name="lams_server_skey" size="70" value="<%=SecretKey%>">
+                </bbNG:dataElement>
+                <bbNG:dataElement label="BLACKBOARD REQUEST SRC" isRequired="true" labelFor="bb_req_src">
+                    <input type="text" name="bb_req_src" size="70" value="<%=ReqSrc%>">
+                </bbNG:dataElement>
+            </bbNG:step>  
+            <bbNG:step title="Callback URL" instructions="Copy and paste the user data callback URL into LAMS">
+            	 <b>USER DATA CALLBACK URL</b>: http://<%=request.getServerName()%><%=bbportstr%><%=request.getContextPath()%>/UserData?uid=%username%&ts=%timestamp%&hash=%hash%
+            </bbNG:step> 
+            <bbNG:stepSubmit title="Submit" />
+        </bbNG:dataCollection>    
+    </form>
+            
+</bbNG:genericPage>
\ No newline at end of file