[Ils-source] r1368 - branches/1.6/webapp

Thu Dec 17 14:30:47 MST 2015

Author: scribe
Date: 2015-12-17 14:30:47 -0700 (Thu, 17 Dec 2015)
New Revision: 1368

Modified:
   branches/1.6/webapp/aicc.jsp
   branches/1.6/webapp/crosswire.js
   branches/1.6/webapp/employee.jsp
Log:
updated to size popup to screen resolution
possible fix commented for redirect update


Modified: branches/1.6/webapp/aicc.jsp
===================================================================

--- branches/1.6/webapp/aicc.jsp	2015-12-17 21:17:18 UTC (rev 1367)
+++ branches/1.6/webapp/aicc.jsp	2015-12-17 21:30:47 UTC (rev 1368)
@@ -153,6 +153,10 @@
     logger.debug(url);
     String redir = "<html><head><META HTTP-EQUIV=\"Refresh\" CONTENT=\"0;URL=" + url + "\"></head></html>";
     out.print(redir);
+//	response.setStatus(301);
+//	response.setHeader("Location", url);
+//	response.setHeader("Connection", "close");
+//	return;
   }
   else if (asid != null) {
     ca = CourseAttempt.getCourseAttempt(ilsSession, Integer.parseInt(asid));

Modified: branches/1.6/webapp/crosswire.js
===================================================================
--- branches/1.6/webapp/crosswire.js	2015-12-17 21:17:18 UTC (rev 1367)
+++ branches/1.6/webapp/crosswire.js	2015-12-17 21:30:47 UTC (rev 1368)
@@ -409,7 +409,10 @@
     lastLaunch = false;
     var launchURL = 'aicc.jsp?courseid='+courseID;
     if (!refreshMain) launchURL += '&preview=true';
-    w = window.open(launchURL,'Course',clsize);
+    //w = window.open(launchURL,'Course',clsize);
+	ScreenWidth = screen.width - 15;
+	ScreenHeight = screen.height - 100;
+	w = window.open(launchURL,'Course','width='+ScreenWidth+', height='+ScreenHeight+', toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no, fullscreen=yes, top=0, left=0');
     if (refreshMain) {
         lastLaunch = w;
         refreshOnClose();

Modified: branches/1.6/webapp/employee.jsp
===================================================================
--- branches/1.6/webapp/employee.jsp	2015-12-17 21:17:18 UTC (rev 1367)
+++ branches/1.6/webapp/employee.jsp	2015-12-17 21:30:47 UTC (rev 1368)
@@ -64,7 +64,9 @@
 <!--
 
 function showWindow(link) {
-  window.open(link,'Resource','width=800,height=600');
+  ScreenWidth = screen.width - 15;
+  ScreenHeight = screen.height - 100;
+  window.open(link,'Resource','width='+ScreenWidth+', height='+ScreenHeight+', toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=no, copyhistory=no, fullscreen=yes, top=0, left=0');
 }
 
 -->


