Index: lams_learning/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/main.jsp,v
diff -u -r1.31.2.5 -r1.31.2.6
--- lams_learning/web/main.jsp 2 Jul 2015 12:32:54 -0000 1.31.2.5
+++ lams_learning/web/main.jsp 14 Aug 2015 07:41:54 -0000 1.31.2.6
@@ -1,36 +1,6 @@
-<%--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA
-
- http://www.gnu.org/licenses/gpl.txt
---%>
-
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="tags-core" prefix="c"%>
<%@ taglib uri="tags-fmt" prefix="fmt"%>
<%@ taglib uri="tags-lams" prefix="lams"%>
-<%
-String userAgent = request.getHeader("User-Agent").toLowerCase();
-boolean isTouchInterface = (userAgent.matches("(?i).*(iphone|ipod|ipad).*"));
-%>
-<%=isTouchInterface%>
-
-
@@ -73,7 +43,6 @@
isHorizontalBar = false,
hasContentFrame = true,
hasDialog = false,
- isTouchInterface = ${isTouchInterface},
bars = {
'learnerMainBar' : {
@@ -105,19 +74,7 @@
togglerTip_open : '',
togglerTip_closed : '',
- onopen_start : function() {$('#controlFrame').css('visibility','visible');},
- onopen_end : function() {
- //expand contentFrame width altogether with content-frame-container
- if (isTouchInterface) {
- $("#contentFrame").width($("#content-frame-container").width());
- };
- },
- onclose_end : function() {
- //shrink contentFrame width altogether with content-frame-container
- if (isTouchInterface) {
- $("#contentFrame").width($("#content-frame-container").width());
- };
- },
+ onopen_start : function() {$('#controlFrame').css('visibility','visible');}
}
});
@@ -140,7 +97,7 @@
-
+
@@ -204,22 +161,9 @@
<%@ include file="presenceChat.jsp"%>
-
-
-
