[virtualcommons-svn] SF.net SVN: virtualcommons:[434] mentalmodels/trunk
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] SF.net SVN: virtualcommons:[434] mentalmodels/trunk
|
From: <kj...@us...> - 2010-01-15 21:23:13
|
Revision: 434
http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=434&view=rev
Author: kjonas
Date: 2010-01-15 21:23:07 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
updated swf files
Modified Paths:
--------------
mentalmodels/trunk/pom.xml
mentalmodels/trunk/src/main/webapp/FisheryExperimentShell.html
mentalmodels/trunk/src/main/webapp/FisheryExperimentShell.swf
mentalmodels/trunk/src/main/webapp/InitialiseDatabase.html
mentalmodels/trunk/src/main/webapp/InitialiseDatabase.swf
mentalmodels/trunk/src/main/webapp/StartGame.html
mentalmodels/trunk/src/main/webapp/StartGame.swf
Modified: mentalmodels/trunk/pom.xml
===================================================================
--- mentalmodels/trunk/pom.xml 2010-01-15 21:20:31 UTC (rev 433)
+++ mentalmodels/trunk/pom.xml 2010-01-15 21:23:07 UTC (rev 434)
@@ -56,6 +56,11 @@
<version>2.5.6</version>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>2.5.6.SEC01</version>
+</dependency>
+ <dependency>
<groupId>org.springframework.flex</groupId>
<artifactId>spring-flex</artifactId>
<version>1.0.0.RC2</version>
Modified: mentalmodels/trunk/src/main/webapp/FisheryExperimentShell.html
===================================================================
--- mentalmodels/trunk/src/main/webapp/FisheryExperimentShell.html 2010-01-15 21:20:31 UTC (rev 433)
+++ mentalmodels/trunk/src/main/webapp/FisheryExperimentShell.html 2010-01-15 21:23:07 UTC (rev 434)
@@ -28,15 +28,6 @@
<style>
body { margin: 0px; overflow:hidden }
</style>
-
-<script language="JavaScript">
- window.onbeforeunload = confirmExit;
- function confirmExit()
- {
- return "If you are connected to the server, you will be disconnected if the page closes. Students in the experiment will be removed if the window closes.";
- }
-</script>
-
<script language="JavaScript" type="text/javascript">
<!--
// -----------------------------------------------------------------------------
@@ -53,12 +44,8 @@
</head>
<body scroll="no">
-
<script language="JavaScript" type="text/javascript">
<!--
-
-var clientIP = '<!--#echo var="REMOTE_ADDR"-->';
-
// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
var hasProductInstall = DetectFlashVer(6, 0, 65);
@@ -70,12 +57,12 @@
// Location visited after installation is complete if installation is required
var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
var MMredirectURL = window.location;
- document.title = document.title.slice(0, 47) + " - Flash Player Installation";
- var MMdoctitle = document.title;
+ document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+ var MMdoctitle = document.title;
AC_FL_RunContent(
"src", "playerProductInstall",
- "FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&ip=test'+clientIP+"",
+ "FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
"width", "100%",
"height", "100%",
"align", "middle",
@@ -95,30 +82,27 @@
"width", "100%",
"height", "100%",
"align", "middle",
- "valign", "middle",
"id", "FisheryExperimentShell",
"quality", "high",
"bgcolor", "#869ca7",
"name", "FisheryExperimentShell",
"allowScriptAccess","sameDomain",
"type", "application/x-shockwave-flash",
- "pluginspage", "http://www.adobe.com/go/getflashplayer",
- "FlashVars", "ip=test"+clientIP+""
+ "pluginspage", "http://www.adobe.com/go/getflashplayer"
);
-} else { // flash is too old or we can't detect the plugin
- var alternateContent = 'Alternate HTML content should be placed here. '
- + 'This content requires the Adobe Flash Player. '
- + '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
- document.write(alternateContent); // insert non-flash content
+ } else { // flash is too old or we can't detect the plugin
+ var alternateContent = 'Alternate HTML content should be placed here. '
+ + 'This content requires the Adobe Flash Player. '
+ + '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+ document.write(alternateContent); // insert non-flash content
}
// -->
</script>
<noscript>
- <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+ <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
id="FisheryExperimentShell" width="100%" height="100%"
codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
<param name="movie" value="FisheryExperimentShell.swf" />
- <PARAM NAME=FlashVars VALUE="ip=test${clientIP}">
<param name="quality" value="high" />
<param name="bgcolor" value="#869ca7" />
<param name="allowScriptAccess" value="sameDomain" />
Modified: mentalmodels/trunk/src/main/webapp/FisheryExperimentShell.swf
===================================================================
(Binary files differ)
Modified: mentalmodels/trunk/src/main/webapp/InitialiseDatabase.html
===================================================================
--- mentalmodels/trunk/src/main/webapp/InitialiseDatabase.html 2010-01-15 21:20:31 UTC (rev 433)
+++ mentalmodels/trunk/src/main/webapp/InitialiseDatabase.html 2010-01-15 21:23:07 UTC (rev 434)
@@ -28,15 +28,6 @@
<style>
body { margin: 0px; overflow:hidden }
</style>
-
-<script language="JavaScript">
- window.onbeforeunload = confirmExit;
- function confirmExit()
- {
- return "If you are connected to the server, you will be disconnected if the page closes. Students in the experiment will be removed if the window closes.";
- }
-</script>
-
<script language="JavaScript" type="text/javascript">
<!--
// -----------------------------------------------------------------------------
@@ -53,12 +44,8 @@
</head>
<body scroll="no">
-
<script language="JavaScript" type="text/javascript">
<!--
-
-var clientIP = '<!--#echo var="REMOTE_ADDR"-->';
-
// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
var hasProductInstall = DetectFlashVer(6, 0, 65);
@@ -70,12 +57,12 @@
// Location visited after installation is complete if installation is required
var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
var MMredirectURL = window.location;
- document.title = document.title.slice(0, 47) + " - Flash Player Installation";
- var MMdoctitle = document.title;
+ document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+ var MMdoctitle = document.title;
AC_FL_RunContent(
"src", "playerProductInstall",
- "FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&ip=test'+clientIP+"",
+ "FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
"width", "100%",
"height", "100%",
"align", "middle",
@@ -95,30 +82,27 @@
"width", "100%",
"height", "100%",
"align", "middle",
- "valign", "middle",
"id", "InitialiseDatabase",
"quality", "high",
"bgcolor", "#869ca7",
"name", "InitialiseDatabase",
"allowScriptAccess","sameDomain",
"type", "application/x-shockwave-flash",
- "pluginspage", "http://www.adobe.com/go/getflashplayer",
- "FlashVars", "ip=test"+clientIP+""
+ "pluginspage", "http://www.adobe.com/go/getflashplayer"
);
-} else { // flash is too old or we can't detect the plugin
- var alternateContent = 'Alternate HTML content should be placed here. '
- + 'This content requires the Adobe Flash Player. '
- + '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
- document.write(alternateContent); // insert non-flash content
+ } else { // flash is too old or we can't detect the plugin
+ var alternateContent = 'Alternate HTML content should be placed here. '
+ + 'This content requires the Adobe Flash Player. '
+ + '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+ document.write(alternateContent); // insert non-flash content
}
// -->
</script>
<noscript>
- <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+ <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
id="InitialiseDatabase" width="100%" height="100%"
codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
<param name="movie" value="InitialiseDatabase.swf" />
- <PARAM NAME=FlashVars VALUE="ip=test${clientIP}">
<param name="quality" value="high" />
<param name="bgcolor" value="#869ca7" />
<param name="allowScriptAccess" value="sameDomain" />
Modified: mentalmodels/trunk/src/main/webapp/InitialiseDatabase.swf
===================================================================
(Binary files differ)
Modified: mentalmodels/trunk/src/main/webapp/StartGame.html
===================================================================
--- mentalmodels/trunk/src/main/webapp/StartGame.html 2010-01-15 21:20:31 UTC (rev 433)
+++ mentalmodels/trunk/src/main/webapp/StartGame.html 2010-01-15 21:23:07 UTC (rev 434)
@@ -28,15 +28,6 @@
<style>
body { margin: 0px; overflow:hidden }
</style>
-
-<script language="JavaScript">
- window.onbeforeunload = confirmExit;
- function confirmExit()
- {
- return "If you are connected to the server, you will be disconnected if the page closes. Students in the experiment will be removed if the window closes.";
- }
-</script>
-
<script language="JavaScript" type="text/javascript">
<!--
// -----------------------------------------------------------------------------
@@ -53,12 +44,8 @@
</head>
<body scroll="no">
-
<script language="JavaScript" type="text/javascript">
<!--
-
-var clientIP = '<!--#echo var="REMOTE_ADDR"-->';
-
// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
var hasProductInstall = DetectFlashVer(6, 0, 65);
@@ -70,12 +57,12 @@
// Location visited after installation is complete if installation is required
var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
var MMredirectURL = window.location;
- document.title = document.title.slice(0, 47) + " - Flash Player Installation";
- var MMdoctitle = document.title;
+ document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+ var MMdoctitle = document.title;
AC_FL_RunContent(
"src", "playerProductInstall",
- "FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&ip=test'+clientIP+"",
+ "FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
"width", "100%",
"height", "100%",
"align", "middle",
@@ -95,30 +82,27 @@
"width", "100%",
"height", "100%",
"align", "middle",
- "valign", "middle",
"id", "StartGame",
"quality", "high",
"bgcolor", "#869ca7",
"name", "StartGame",
"allowScriptAccess","sameDomain",
"type", "application/x-shockwave-flash",
- "pluginspage", "http://www.adobe.com/go/getflashplayer",
- "FlashVars", "ip=test"+clientIP+""
+ "pluginspage", "http://www.adobe.com/go/getflashplayer"
);
-} else { // flash is too old or we can't detect the plugin
- var alternateContent = 'Alternate HTML content should be placed here. '
- + 'This content requires the Adobe Flash Player. '
- + '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
- document.write(alternateContent); // insert non-flash content
+ } else { // flash is too old or we can't detect the plugin
+ var alternateContent = 'Alternate HTML content should be placed here. '
+ + 'This content requires the Adobe Flash Player. '
+ + '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+ document.write(alternateContent); // insert non-flash content
}
// -->
</script>
<noscript>
- <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+ <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
id="StartGame" width="100%" height="100%"
codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
<param name="movie" value="StartGame.swf" />
- <PARAM NAME=FlashVars VALUE="ip=test${clientIP}">
<param name="quality" value="high" />
<param name="bgcolor" value="#869ca7" />
<param name="allowScriptAccess" value="sameDomain" />
Modified: mentalmodels/trunk/src/main/webapp/StartGame.swf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
