summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael_conway@unc.edu>2013-06-07 15:22:34 (GMT)
committer mconway <michael_conway@unc.edu>2013-06-07 15:22:34 (GMT)
commit12e0d822bada07e3249651d7cbc8d21990dba439 (patch)
tree4cd7817df5031fd3f337dd9fa1d4bb6a89bf18fe
parentb5e226777c12ca519c93a84cfb76d1ab101e5abc (diff)
downloadQCG-Data-12e0d822bada07e3249651d7cbc8d21990dba439.zip
QCG-Data-12e0d822bada07e3249651d7cbc8d21990dba439.tar.gz
QCG-Data-12e0d822bada07e3249651d7cbc8d21990dba439.tar.bz2
[#1475] login form discombobulated on ie later versions
-rwxr-xr-xidrop-web/grails-app/views/browse/_browseTabContent.gsp6
-rwxr-xr-xidrop-web/grails-app/views/login/login.gsp230
2 files changed, 120 insertions, 116 deletions
diff --git a/idrop-web/grails-app/views/browse/_browseTabContent.gsp b/idrop-web/grails-app/views/browse/_browseTabContent.gsp
index 2d27b70..0a31ba0 100755
--- a/idrop-web/grails-app/views/browse/_browseTabContent.gsp
+++ b/idrop-web/grails-app/views/browse/_browseTabContent.gsp
@@ -26,17 +26,17 @@
<button type="button" id="refreshTreeButton"
value="refreshTreeButton"
onclick="refreshTree()")>
- <img class="icon-refresh"/>
+ <i class="icon-refresh"></i>
</button>
<button type="button" id="homeTreeButton"
onclick="setTreeToUserHome()")>
- <img class="icon-home"/>
+ <i class="icon-home"></i>
</button>
<button type="button" id="rootTreeButton"
value="rootTreeButton"
onclick="setTreeToRoot()")>
- <img class="icon-arrow-up"/>
+ <i class="icon-arrow-up"></i>
</button>
</div> <!-- dataTreeMenu -->
diff --git a/idrop-web/grails-app/views/login/login.gsp b/idrop-web/grails-app/views/login/login.gsp
index 86317a1..ecc9059 100755
--- a/idrop-web/grails-app/views/login/login.gsp
+++ b/idrop-web/grails-app/views/login/login.gsp
@@ -4,146 +4,147 @@
<title>iDrop-web - iRODS Personal Cloud"</title>
<meta name="layout" content="basic" />
<style type="text/css">
- /* Override some defaults */
- html, body {
- background-color: #eee;
- }
- body {
- padding-top: 40px;
- }
- .container {
- width: 600px;
- }
-
- /* The white background content wrapper */
- .container > .content {
- background-color: #fff;
- padding: 20px;
- margin: 0 -20px;
- -webkit-border-radius: 10px 10px 10px 10px;
- -moz-border-radius: 10px 10px 10px 10px;
- border-radius: 10px 10px 10px 10px;
- -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
- -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
- box-shadow: 0 1px 2px rgba(0,0,0,.15);
- }
-
- .login-form {
- margin-left: 65px;
- }
-
- legend {
- margin-right: -50px;
- font-weight: bold;
- color: #404040;
- }
-
- </style>
+/* Override some defaults */
+html,body {
+ background-color: #eee;
+}
+
+body {
+ padding-top: 40px;
+}
+
+.container {
+ width: 600px;
+}
+
+/* The white background content wrapper */
+.container>.content {
+ background-color: #fff;
+ padding: 20px;
+ margin: 0 -20px;
+ -webkit-border-radius: 10px 10px 10px 10px;
+ -moz-border-radius: 10px 10px 10px 10px;
+ border-radius: 10px 10px 10px 10px;
+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .15);
+ -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, .15);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, .15);
+}
+
+.login-form {
+ margin-left: 65px;
+}
+
+legend {
+ margin-right: -50px;
+ font-weight: bold;
+ color: #404040;
+}
+</style>
</head>
<body>
-<div class="container">
-<div class="row-fluid content">
- <div class="span12">
- <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 class="container">
+ <div class="row-fluid content">
+ <div class="span12">
+ <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>
- </g:hasErrors>
- </div>
- <div class="span12">
+ <div class="span12">
- <g:form id="normalLogin" method="post" controller="login"
- action="authenticate" class="loginForm">
- <g:hiddenField name="usePresets" id="usePresets"
- value="${loginCommand.usePresets}" />
- <fieldset>
- <legend>
- <g:message code="message.login" />
- </legend>
+ <g:form id="normalLogin" method="post" controller="login"
+ action="authenticate" class="loginForm">
+ <g:hiddenField name="usePresets" id="usePresets"
+ value="${loginCommand.usePresets}" />
+ <fieldset>
+ <legend>
+ <g:message code="message.login" />
+ </legend>
- <g:if test="${loginCommand.usePresets}">
+ <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>
- <label><g:message code="text.host" />:</label>
+ <label><g:message code="text.host" />:</label>
- <input type="text" class="input-text" name="host" id="host"
- value="${loginCommand.host}" />
+ <input type="text" class="input-text" name="host" id="host"
+ value="${loginCommand.host}" />
- <label><g:message code="text.port" />:</label>
+ <label><g:message code="text.port" />:</label>
- <input type="text" class="input-text" name="port" id="port"
- value="${loginCommand.port}" />
+ <input type="text" class="input-text" name="port" id="port"
+ value="${loginCommand.port}" />
- <label><g:message code="text.zone" />:</label>
+ <label><g:message code="text.zone" />:</label>
- <input type="text" class="input-text" name="zone" id="zone"
- value="${loginCommand.zone}" />
+ <input type="text" class="input-text" name="zone" id="zone"
+ value="${loginCommand.zone}" />
- <label><g:message code="text.auth.method" />:</label>
+ <label><g:message code="text.auth.method" />:</label>
- <g:select name="authMethod" from="${['Standard', 'PAM']}"
- value="${loginCommand.authMethod}" />
- </g:else>
+ <g:select name="authMethod" from="${['Standard', 'PAM']}"
+ value="${loginCommand.authMethod}" />
+ </g:else>
- <label><g:message code="text.guest.login" />:</label>
+ <label><g:message code="text.guest.login" />:</label>
- <g:checkBox name="useGuestLogin" id="useGuestLogin"
- value="${loginCommand.useGuestLogin}" onclick="toggleGuestLogin()" />
+ <g:checkBox name="useGuestLogin" id="useGuestLogin"
+ value="${loginCommand.useGuestLogin}"
+ onclick="toggleGuestLogin()" />
- <label><g:message code="text.user" />:</label> <input type="text"
- class="input-text" name="user" id="user"
- value="${loginCommand.user}" /> <label><g:message
- code="text.password" />:</label> <input type="password"
- class="input-text" name="password" id="password"
- value="${loginCommand.password}" />
+ <label><g:message code="text.user" />:</label> <input type="text"
+ class="input-text" name="user" id="user"
+ value="${loginCommand.user}" /> <label><g:message
+ code="text.password" />:</label> <input type="password"
+ class="input-text" name="password" id="password"
+ value="${loginCommand.password}" />
- <button id="login" name="login"
- style="margin-left: 150px; margin-top: 20px; margin-bottom: 20px;">
- <g:message code="text.login" />
- </button>
+ <button id="login" name="login"
+ style="margin-left: 150px; margin-top: 20px; margin-bottom: 20px;" type="submit">
+ <g:message code="text.login" />
+ </button>
- <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>
- </fieldset>
- </g:form>
+ <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></strong>
+ </stong>
+ </div>
+ </div>
+ </g:if>
+ </fieldset>
+ </g:form>
- <!--end-normalLogin-->
- </div>
+ <!--end-normalLogin-->
+ </div>
-</div>
+ </div>
-</div>
-</body>
-</html>
-<script>
+ </div>
+ <script type="text/javascript">
$(function() {
toggleGuestLogin();
@@ -159,6 +160,9 @@
}
}
</script>
+</body>
+</html>
+