Skip to content
Snippets Groups Projects
Commit 44271dcd authored by juanf's avatar juanf
Browse files

SSDM-2034 : Add explanation of content of ELN publication server on the server

SVN: 34244
parent 9cb33e2a
No related branches found
No related tags found
No related merge requests found
...@@ -205,8 +205,9 @@ ...@@ -205,8 +205,9 @@
$('#login-form').submit(function() { $('#login-form').submit(function() {
Util.blockUI(); Util.blockUI();
mainController.serverFacade.login( $.trim($('#username').val()), $.trim($('#password').val()), mainController.serverFacade.login(
function(data) { mainController.enterApp(data) }) $.trim($('#username').val()), $.trim($('#password').val()),
function(data) { mainController.enterApp(data) });
}); });
mainController.serverFacade.ifRestoredSessionActive(function(data) { mainController.enterApp(data) }); mainController.serverFacade.ifRestoredSessionActive(function(data) { mainController.enterApp(data) });
...@@ -220,6 +221,15 @@ ...@@ -220,6 +221,15 @@
return true; return true;
} }
}); });
//Automatic login if special parameters are given
var queryString = Util.queryString();
var user = queryString.user;
var pass = queryString.pass;
if(user && pass) {
Util.blockUI();
mainController.serverFacade.login(user, pass, function(data) { mainController.enterApp(data) });
}
}); });
</script> </script>
</head> </head>
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<div class="col-xs-12"> <div class="col-xs-12">
<h1>ELN-LIMS Plugin for openBIS</h1> <h1>ELN-LIMS Plugin for openBIS</h1>
<p>An easy to use, intuitive interface for day to day laboratory operations build on top of modern web technologies.</p> <p>An easy to use, intuitive interface for day to day laboratory operations build on top of modern web technologies.</p>
<p><a class="btn btn-default" href="./index.html" role="button">Log in</a></p> <p><a class="btn btn-default" href="./index.html?user=admin&pass=something" role="button">Log in with demo user</a></p>
</div> </div>
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment