changeset 56:ffe70c0f1948

modified public/viewer/index.html
author one
date Thu, 04 Oct 2012 18:27:33 +0900
parents 3295c9fe2b3a
children ed77c5258568
files logs/application.log public/viewer/index.html target/scala-2.9.1/cache/compile/compile
diffstat 3 files changed, 15 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/logs/application.log	Thu Oct 04 18:22:10 2012 +0900
+++ b/logs/application.log	Thu Oct 04 18:27:33 2012 +0900
@@ -40,3 +40,9 @@
 2012-10-04 17:56:30,585 - [INFO] - from play in play-akka.actor.default-dispatcher-1 
 Application started (Dev)
 
+2012-10-04 18:12:18,235 - [INFO] - from application in play-akka.actor.default-dispatcher-1 
+Application shutdown...
+
+2012-10-04 18:12:18,250 - [INFO] - from play in play-akka.actor.default-dispatcher-1 
+Application started (Dev)
+
--- a/public/viewer/index.html	Thu Oct 04 18:22:10 2012 +0900
+++ b/public/viewer/index.html	Thu Oct 04 18:27:33 2012 +0900
@@ -8,10 +8,15 @@
 var viewer_url="viewer.html";
 $(function(){
 	popupInit();
-	var u=$('#loginUserName');
-	u.val(localStorage.userName||'');
-	u.focus();
 	$('body')[0].onresize=function(){placementUpdate()};
+	if(localStorage.userName){
+		login(localStorage.userName);
+	}else{
+		var u=$('#loginUserName');
+		$("#loginPopup").css("display","block");
+		u.val(localStorage.userName||'');
+		u.focus();
+	}
 });
 
 var loadedClaimIDs={};
@@ -167,7 +172,7 @@
 a.claim:hover{box-shadow:0 0 30px white;}
 
 </style>
-<div id="loginPopup" style='position:fixed;left:0;top:0;width:100%;height:100%;z-index:10;'>
+<div id="loginPopup" style='position:fixed;left:0;top:0;width:100%;height:100%;z-index:10;display:none;'>
 <div style='position:absolute;left:0;top:0;width:100%;height:100%;background:black;opacity:0.5'></div>
 <div style='position:absolute;left:50%;top:50%;'>
 <div style='position:absolute;left:-160px;top:-80px;width:320px;height:120px;background:white'>
Binary file target/scala-2.9.1/cache/compile/compile has changed