summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2013-03-04 20:58:55 (GMT)
committer mconway <michael.c.conway@gmail.com>2013-03-04 20:58:55 (GMT)
commitf95d51a6fc07ac7838185dfdc9a71c128a78c719 (patch)
tree443c4c786cca5cf59ff7f8648b14d212941eb4c0
parent7f06aebb316276f361fb96f61584f6d49cf95e00 (diff)
parent415e780e48eab6ad5fd43beaa846c1169cf52e81 (diff)
downloadQCG-Data-f95d51a6fc07ac7838185dfdc9a71c128a78c719.zip
QCG-Data-f95d51a6fc07ac7838185dfdc9a71c128a78c719.tar.gz
QCG-Data-f95d51a6fc07ac7838185dfdc9a71c128a78c719.tar.bz2
Merge branch 'development'
-rwxr-xr-xidrop-web/grails-app/views/login/login.gsp227
1 files changed, 130 insertions, 97 deletions
diff --git a/idrop-web/grails-app/views/login/login.gsp b/idrop-web/grails-app/views/login/login.gsp
index bacffe7..76af435 100755
--- a/idrop-web/grails-app/views/login/login.gsp
+++ b/idrop-web/grails-app/views/login/login.gsp
@@ -1,131 +1,164 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
<head>
<title>iDrop-web - iRODS Personal Cloud"</title>
-<g:javascript library="jquery-1.7.1.min" />
-<g:javascript library="jquery-ui-1.8.7.custom.min" />
-<link rel="stylesheet" href="${resource(dir:'css',file:'main.css')}" />
-<link rel="stylesheet" href="${resource(dir:'css',file:'base.css')}" />
-<link rel="stylesheet" href="${resource(dir:'css',file:'style.css')}" />
-<link rel="stylesheet"
- href="${resource(dir:'css',file:'reset-fonts-grids.css')}" />
-<link rel="stylesheet" href="${resource(dir:'css',file:'start/jquery-ui-1.8.18.custom.css')}" />
-
+<meta name="layout" content="basic" />
</head>
-<body style="height:100%;">
-<div id="bannercontainer">
- <!-- image banner -->
-</div>
-
- <div id="normalLoginWrapper">
- <!--begin-normalLogin-->
- <div id="normalLoginForm" class="roundedContainer" style="width:auto;height:auto;margin-top:100px;clear:both;background:grey">
-
- <g:form class="normalLogin" id="normalLogin" method="post" controller="login" action="authenticate">
-
-
- <g:hiddenField
- name="usePresets" id="usePresets" value="${loginCommand.usePresets}"/>
- <g:hasErrors bean="${loginCommand}">
- <div class="errors">
- <ul>
- <g:eachError var="err" bean="${loginCommand}">
- <li><g:message error="${err}" /></li>
- </g:eachError>
- </ul>
- </div>
+
+<div class="row-fluid">
+ <div class="span5 offset4">
+ <div id="normalLoginForm" class="well">
+
+ <g:form id="normalLogin" method="post" controller="login"
+ action="authenticate">
+
+
+ <g:hiddenField name="usePresets" id="usePresets"
+ value="${loginCommand.usePresets}" />
+ <g:hasErrors bean="${loginCommand}">
+ <div class="alert alert-error">
+ <ul>
+ <g:eachError var="err" bean="${loginCommand}">
+ <li><g:message error="${err}" /></li>
+ </g:eachError>
+ </ul>
+ </div>
</g:hasErrors>
-
- <div id="container" style="height:100%;width:100%;">
-
+
+ <div id="container" style="height: auto; width: auto;">
+
<g:if test="${loginCommand.usePresets}">
-
- <g:hiddenField
- name="host" id="host" value="${loginCommand.host}"/>
- <g:hiddenField
- name="port" id="port" value="${loginCommand.port}"/>
- <g:hiddenField
- name="zone" id="zone" value="${loginCommand.zone}"/>
- <g:hiddenField
- name="defaultStorageResource" id="resource" value="${loginCommand.defaultStorageResource}"/>
- <g:hiddenField
- name="authMethod" id="authMethod" value="${loginCommand.authMethod}"/>
- </g:if>
- <g:else>
+
+ <g:hiddenField name="host" id="host" value="${loginCommand.host}" />
+ <g:hiddenField name="port" id="port" value="${loginCommand.port}" />
+ <g:hiddenField name="zone" id="zone" value="${loginCommand.zone}" />
+ <g:hiddenField name="defaultStorageResource" id="resource"
+ value="${loginCommand.defaultStorageResource}" />
+ <g:hiddenField name="authMethod" id="authMethod"
+ value="${loginCommand.authMethod}" />
+ </g:if>
+ <g:else>
<div>
- <div style="width:30%;"><label><g:message code="text.host" />:</label></div>
- <div><input type="text" class="input-text" name="host" id="host" value="${loginCommand.host}"/></div>
+ <div style="width: 30%;">
+ <label><g:message code="text.host" />:</label>
+ </div>
+ <div>
+ <input type="text" class="input-text" name="host" id="host"
+ value="${loginCommand.host}" />
+ </div>
</div>
<div>
- <div ><label><g:message code="text.port" />:</label></div>
- <div><input type="text" class="input-text" name="port" id="port" value="${loginCommand.port}"/></div>
+ <div>
+ <label><g:message code="text.port" />:</label>
+ </div>
+ <div>
+ <input type="text" class="input-text" name="port" id="port"
+ value="${loginCommand.port}" />
+ </div>
</div>
<div>
- <div ><label><g:message code="text.zone" />:</label></div>
- <div><input type="text" class="input-text" name="zone" id="zone" value="${loginCommand.zone}"/></div>
+ <div>
+ <label><g:message code="text.zone" />:</label>
+ </div>
+ <div>
+ <input type="text" class="input-text" name="zone" id="zone"
+ value="${loginCommand.zone}" />
+ </div>
</div>
<div>
- <div ><label><g:message code="text.auth.method" />:</label></div>
- <div><g:select name="authMethod" from="${['Standard', 'PAM']}" value="${loginCommand.authMethod}"/></div>
+ <div>
+ <label><g:message code="text.auth.method" />:</label>
+ </div>
+ <div>
+ <g:select name="authMethod" from="${['Standard', 'PAM']}"
+ value="${loginCommand.authMethod}" />
+ </div>
</div>
- </g:else>
-
- <div>
- <div ><label><g:message code="text.guest.login" />:</label></div>
- <div><g:checkBox name="useGuestLogin" id="useGuestLogin" value="${loginCommand.useGuestLogin}" onclick="toggleGuestLogin()"/></div>
- </div>
-
- <div class="userLoginData">
- <div ><label><g:message code="text.user" />:</label></div>
- <div><input type="text" class="input-text" name="user" id="user" value="${loginCommand.user}"/></div>
- </div>
- <div class="userLoginData">
- <div><label><g:message code="text.password" />:</label></div>
- <div><input type="password" class="input-text" name="password" id="password" value="${loginCommand.password}"/></div>
- </div>
-
- </span>
- <div>
- <div></div>
- <div><button id="login" name="login" style="margin-left:150px;margin-top:20px;margin-bottom:20px;" ><g:message code="text.login"/></button></div>
- </div>
- <g:if test="${!loginCommand.usePresets}">
- <div>
- <div><label><g:message code="text.resource" />:</label></div>
- <div><input type="text" class="input-text" name="resource" id="resource" value="${loginCommand.defaultStorageResource}"/><stong><g:message code="text.optional" /></strong></div>
+ </g:else>
+
+ <div>
+ <div>
+ <label><g:message code="text.guest.login" />:</label>
+ </div>
+ <div>
+ <g:checkBox name="useGuestLogin" id="useGuestLogin"
+ value="${loginCommand.useGuestLogin}"
+ onclick="toggleGuestLogin()" />
+ </div>
+ </div>
+
+ <div class="userLoginData">
+ <div>
+ <label><g:message code="text.user" />:</label>
+ </div>
+ <div>
+ <input type="text" class="input-text" name="user" id="user"
+ value="${loginCommand.user}" />
+ </div>
+ </div>
+ <div class="userLoginData">
+ <div>
+ <label><g:message code="text.password" />:</label>
+ </div>
+ <div>
+ <input type="password" class="input-text" name="password"
+ id="password" value="${loginCommand.password}" />
+ </div>
+ </div>
+
+ </span>
+ <div>
+ <div></div>
+ <div>
+ <button id="login" name="login"
+ style="margin-left: 150px; margin-top: 20px; margin-bottom: 20px;">
+ <g:message code="text.login" />
+ </button>
+ </div>
+ </div>
+ <g:if test="${!loginCommand.usePresets}">
+ <div>
+ <div>
+ <label><g:message code="text.resource" />:</label>
+ </div>
+ <div>
+ <input type="text" class="input-text" name="resource"
+ id="resource" value="${loginCommand.defaultStorageResource}" />
+ <stong>
+ <g:message code="text.optional" />
+ </strong>
+ </div>
+ </div>
+ </g:if>
</div>
- </g:if>
- </div> <!-- container div -->
-
- </g:form>
-
- <!--end-normalLogin-->
- </div>
+ <!-- container div -->
+
+ </g:form>
+
+ <!--end-normalLogin-->
</div>
+
</div>
-
+
+</div>
+</div>
</div>
-</body>
</html>
<script>
-
$(function() {
toggleGuestLogin();
});
-
- function toggleGuestLogin() {
+ function toggleGuestLogin() {
var checkVal = $("#useGuestLogin").attr("checked");
if (checkVal) {
$(".userLoginData").hide("slow");
-
+
} else {
$(".userLoginData").show("slow");
}
}
-
</script>