Index: lams_central/web/main.jsp
===================================================================
diff -u -r54a14306d3b36e6da9aedbaa6700c91048ebc53a -reb0982fcbbcac3092ad52a1b7d81b6fc08237826
--- lams_central/web/main.jsp	(.../main.jsp)	(revision 54a14306d3b36e6da9aedbaa6700c91048ebc53a)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision eb0982fcbbcac3092ad52a1b7d81b6fc08237826)
@@ -1,11 +1,9 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
-<%@ page import="org.lamsfoundation.lams.util.Configuration"%>
-<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-function" prefix="fn"%>
-<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
 
 <!DOCTYPE html>
 <lams:html>
@@ -20,22 +18,22 @@
 	<link rel="stylesheet" href="/lams/css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="/lams/css/bootstrap-tour.min.css" type="text/css" media="screen">
 
-	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
-	<script type="text/javascript" src="loadVars.jsp"></script>
-	<script type="text/javascript" src="includes/javascript/openUrls.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.tablesorter.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.tablesorter-pager.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.tablesorter-widgets.js"></script> 	
-	<script type="text/javascript" src="includes/javascript/jquery.dialogextend.js"></script>	
-	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap-tour.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.ui.touch-punch.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.slimscroll.js"></script>
-	<script type="text/javascript" src="includes/javascript/main.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/getSysInfo.js"></script>
+	<script type="text/javascript" src="${lams}loadVars.jsp"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/openUrls.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script> 	
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.dialogextend.js"></script>	
+	<script type="text/javascript" src="${lams}includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap-tour.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.ui.touch-punch.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.slimscroll.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/main.js"></script>
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',	
 			decoderDiv = $('<div />'),
@@ -230,14 +228,14 @@
 		               	</c:choose>
 									
 						<li>
-							<a href="javascript:;" id="<c:out value="${adminlink.id}"/>" onclick="<c:out value="${adminlink.url}"/>">
+							<a href="javascript:;" onclick="<c:out value="${adminlink.url}"/>">
 								<span><i class="fa ${iconClass}"></i> <fmt:message key="${adminlink.name}"/></span>
 							</a>
 						</li>
 					</c:forEach>
 							                  
 					<li>
-						<a href="#nogo" id="logoutButton" onclick="javascript:closeAllChildren(); document.location.href='home.do?method=logout'">
+						<a href="#nogo" id="logoutButton" onclick="javascript:closeAllChildren(); document.location.href='home/logout.do?'">
 							<i class="fa fa-sign-out"></i> <fmt:message key="index.logout" />
 						</a>
 					</li>
@@ -314,10 +312,6 @@
 	<footer>
 		<div class="">
 			<p class="text-muted text-center">
-				<fmt:message key="msg.LAMS.version" />&nbsp;<%=Configuration.get(ConfigurationKeys.VERSION)%>
-				<a href="<lams:LAMSURL/>/www/copyright.jsp" target='copyright' onClick="openCopyRight()">
-					&copy; <fmt:message key="msg.LAMS.copyright.short" /> 
-				</a>
 				<span class="text-danger text-center" id="timezoneWarning"></span>
 			</p>
 		</div>
