Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rc29258b9eeb1ed3109649bedc379f876aadea91a -r186f3f31c5716f7805f67125e2cb7620c68f6e6a
Binary files differ
Index: lams_central/conf/language/ApplicationResources.properties
===================================================================
diff -u -r6abd54cf76538f142efa6274c50290e352327568 -r186f3f31c5716f7805f67125e2cb7620c68f6e6a
--- lams_central/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6abd54cf76538f142efa6274c50290e352327568)
+++ lams_central/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 186f3f31c5716f7805f67125e2cb7620c68f6e6a)
@@ -83,6 +83,7 @@
 index.refresh  =Refresh
 index.refresh.hint  =You may need click me after you add/remove groups/subgroups/lessons
 index.myprofile  =My Profile
+index.community =Community
 index.sysadmin  =Sys Admin
 index.courseman  =Group Mgt
 index.author  =Author
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -r278667240e36ecbb68a28aaf4d3069cd177cc77f -r186f3f31c5716f7805f67125e2cb7620c68f6e6a
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 278667240e36ecbb68a28aaf4d3069cd177cc77f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 186f3f31c5716f7805f67125e2cb7620c68f6e6a)
@@ -46,6 +46,8 @@
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -66,6 +68,7 @@
  * @struts.action path="/index" validate="false"
  * 
  * @struts.action-forward name="main" path="/main.jsp"
+ * @struts.action-forward name="community" path=".community"
  * @struts.action-forward name="profile" path="/profile.do?method=view"
  * @struts.action-forward name="editprofile" path="/profile.do?method=edit"
  * @struts.action-forward name="password" path="/password.do"
@@ -102,6 +105,9 @@
 			return mapping.findForward("password");
 		} else if (StringUtils.equals(tab, "portrait")) {
 			return mapping.findForward("portrait");
+		} else if (StringUtils.equals(tab, "community")) {
+			request.setAttribute("tab", tab);
+			return mapping.findForward("community");
 		}
 		
 		List<IndexOrgBean> orgBeans = new ArrayList<IndexOrgBean>();
@@ -142,6 +148,10 @@
 			headerLinks.add(new IndexLinkBean("index.author", "javascript:openAuthor()"));
 		}
 		headerLinks.add(new IndexLinkBean("index.myprofile", "index.do?state=active&tab=profile"));
+		
+		if(Configuration.getAsBoolean(ConfigurationKeys.LAMS_COMMUNITY_ENABLE))
+			headerLinks.add(new IndexLinkBean("index.community", "index.do?state=active&tab=community"));
+		
 		log.debug("set headerLinks in request");
 		request.setAttribute("headerLinks", headerLinks);
 	}
Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r1a6d963f79aec92577a15b6993708637abb03a19 -r186f3f31c5716f7805f67125e2cb7620c68f6e6a
--- lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 1a6d963f79aec92577a15b6993708637abb03a19)
+++ lams_central/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 186f3f31c5716f7805f67125e2cb7620c68f6e6a)
@@ -86,9 +86,14 @@
       />
       <forward
         name="cancelled"
-        path="/profile.do?method=view"
+        path="/index.do?state=active&amp;tab=profile"
         redirect="false"
       />
+      <forward
+        name="errors"
+        path="/index.do?state=active&amp;tab=password"
+        redirect="false"
+      />
     </action>
     <action
       path="/authoring/importToolContent"
@@ -154,6 +159,31 @@
         redirect="false"
       />
       <forward
+        name="community"
+        path=".community"
+        redirect="false"
+      />
+      <forward
+        name="profile"
+        path="/profile.do?method=view"
+        redirect="false"
+      />
+      <forward
+        name="editprofile"
+        path="/profile.do?method=edit"
+        redirect="false"
+      />
+      <forward
+        name="password"
+        path="/password.do"
+        redirect="false"
+      />
+      <forward
+        name="portrait"
+        path="/portrait.do"
+        redirect="false"
+      />
+      <forward
         name="content"
         path="/indexContent.jsp"
         redirect="false"
@@ -170,9 +200,14 @@
     >
       <forward
         name="profile"
-        path="/profile.do?method=view"
+        path="/index.do?state=active&amp;tab=profile"
         redirect="false"
       />
+      <forward
+        name="editprofile"
+        path="/index.do?state=active&amp;tab=editprofile"
+        redirect="false"
+      />
     </action>
     <action
       path="/password"
@@ -199,9 +234,14 @@
     >
       <forward
         name="profile"
-        path="/profile.do?method=view"
+        path="/index.do?state=active&amp;tab=profile"
         redirect="false"
       />
+      <forward
+        name="errors"
+        path="/index.do?state=active&amp;tab=portrait"
+        redirect="false"
+      />
     </action>
     <action
       path="/home"
Index: lams_central/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4 -r186f3f31c5716f7805f67125e2cb7620c68f6e6a
--- lams_central/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
+++ lams_central/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 186f3f31c5716f7805f67125e2cb7620c68f6e6a)
@@ -30,6 +30,10 @@
 		<put name="profile" value="profile.jsp"/>	
 	</definition>
 	
+	<definition name=".community" path="/main.jsp">
+		<put name="community" value="community.jsp"/>	
+	</definition>
+	
 	<definition name=".editprofile" path="/main.jsp">
 		<put name="profile" value="editprofile.jsp"/>	
 	</definition>
Index: lams_central/web/community.jsp
===================================================================
diff -u
--- lams_central/web/community.jsp	(revision 0)
+++ lams_central/web/community.jsp	(revision 186f3f31c5716f7805f67125e2cb7620c68f6e6a)
@@ -0,0 +1,27 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+
+<script type="text/javascript">
+<!-- Common Javascript functions for LAMS -->
+	/**
+	 * Launches the frame for the LAMS Community
+	 */
+	function showCommunity(url) {
+		var area=document.getElementById("communityArea");
+		if(area != null){
+			area.style.width="640px";
+			area.style.height="500px";
+			area.src=url;
+			area.style.display="block";
+		}
+	}
+</script>
+<iframe
+	onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'; showCommunity('http://lamscommunity.org/lams/welcome');"
+	id="communityArea" name="communityArea"
+	style="width:0px;height:0px;border:0px;display:none" frameborder="no"
+	scrolling="yes">
+</iframe>
Index: lams_central/web/main.jsp
===================================================================
diff -u -re5a87cc7e2ba68af1c13981640b593efb1146d86 -r186f3f31c5716f7805f67125e2cb7620c68f6e6a
--- lams_central/web/main.jsp	(.../main.jsp)	(revision e5a87cc7e2ba68af1c13981640b593efb1146d86)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 186f3f31c5716f7805f67125e2cb7620c68f6e6a)
@@ -65,6 +65,14 @@
 						<c:set var="highlight" value="false" />
 					</c:if>
 				</c:if>
+				<c:if test="${tab eq 'community'}">
+					<c:if test="${headerlink.name eq 'index.community'}">
+						<c:set var="tabLeft" value="tab-left-selected"/>
+						<c:set var="tabMiddle" value="tab-middle-selected"/>
+						<c:set var="tabRight" value="tab-right-selected"/>	
+						<c:set var="highlight" value="false" />
+					</c:if>
+				</c:if>
 				<c:if test="${headerlink.name eq 'index.author'}">
 					<c:set var="tabLeft" value="tab-left-highlight"/>
 					<c:set var="tabMiddle" value="tab-middle-highlight"/>
@@ -113,6 +121,9 @@
 							<c:if test="${tab eq 'profile'}">
 								<tiles:insert attribute="profile" />
 							</c:if>
+							<c:if test="${tab eq 'community'}">
+								<tiles:insert attribute="community" />
+							</c:if>
 						</td>
 					</tr>
 				</tbody>
Index: lams_common/db/sql/insert_unix_config_data.sql
===================================================================
diff -u -rc84a691e5cd108829681c9fa2c4129905eaf2da7 -r186f3f31c5716f7805f67125e2cb7620c68f6e6a
--- lams_common/db/sql/insert_unix_config_data.sql	(.../insert_unix_config_data.sql)	(revision c84a691e5cd108829681c9fa2c4129905eaf2da7)
+++ lams_common/db/sql/insert_unix_config_data.sql	(.../insert_unix_config_data.sql)	(revision 186f3f31c5716f7805f67125e2cb7620c68f6e6a)
@@ -29,3 +29,4 @@
 insert into lams_configuration (config_key, config_value) values ('DefaultFlashTheme','default');
 insert into lams_configuration (config_key, config_value) values ('DefaultHTMLTheme','defaultHTML');
 insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false');
+insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false');
Index: lams_common/db/sql/insert_windows_config_data.sql
===================================================================
diff -u -r40529cd9dba723f60bb5b2ae6143638371651625 -r186f3f31c5716f7805f67125e2cb7620c68f6e6a
--- lams_common/db/sql/insert_windows_config_data.sql	(.../insert_windows_config_data.sql)	(revision 40529cd9dba723f60bb5b2ae6143638371651625)
+++ lams_common/db/sql/insert_windows_config_data.sql	(.../insert_windows_config_data.sql)	(revision 186f3f31c5716f7805f67125e2cb7620c68f6e6a)
@@ -28,4 +28,5 @@
 insert into lams_configuration (config_key, config_value) values ('XmppPassword','wildfire');
 insert into lams_configuration (config_key, config_value) values ('DefaultFlashTheme','default');
 insert into lams_configuration (config_key, config_value) values ('DefaultHTMLTheme','defaultHTML');
-insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false');
\ No newline at end of file
+insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false'); 
+insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false');
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -r76efc7353a101ac0ed787376fab5b9684da814c9 -r186f3f31c5716f7805f67125e2cb7620c68f6e6a
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 76efc7353a101ac0ed787376fab5b9684da814c9)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 186f3f31c5716f7805f67125e2cb7620c68f6e6a)
@@ -129,4 +129,6 @@
 	public static String DEFAULT_HTML_THEME = "DefaultHTMLTheme";
 	
 	public static String ALLOW_DIRECT_LESSON_LAUNCH = "AllowDirectLessonLaunch";
+	
+	public static String LAMS_COMMUNITY_ENABLE = "LAMS_Community_enable";
 }
\ No newline at end of file