summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael_conway@unc.edu>2013-06-07 14:53:40 (GMT)
committer mconway <michael_conway@unc.edu>2013-06-07 14:53:40 (GMT)
commitb5e226777c12ca519c93a84cfb76d1ab101e5abc (patch)
treeed20790a29afd4a34428cb0c14417105923fe95d
parentaa321688526671deab31ca2a28f20fdf0f1c1e93 (diff)
downloadQCG-Data-b5e226777c12ca519c93a84cfb76d1ab101e5abc.zip
QCG-Data-b5e226777c12ca519c93a84cfb76d1ab101e5abc.tar.gz
QCG-Data-b5e226777c12ca519c93a84cfb76d1ab101e5abc.tar.bz2
[#1475] login form discombobulated on ie later versions
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java2
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
-rwxr-xr-xidrop-web/grails-app/i18n/messages.properties1
-rwxr-xr-xidrop-web/grails-app/views/login/login.gsp237
-rw-r--r--idrop-web/release_notes.txt3
5 files changed, 123 insertions, 122 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
index 9b2c0ae..e21fb60 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
@@ -30,10 +30,8 @@ import javax.swing.DefaultListModel;
import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
import javax.swing.ListSelectionModel;
-import javax.swing.SwingConstants;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import javax.swing.plaf.basic.BasicArrowButton;
import javax.swing.tree.TreePath;
import org.irods.jargon.core.connection.IRODSAccount;
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
index a78f594..c2d1dc7 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
@@ -1,5 +1,5 @@
package org.irods.jargon.idrop.desktop.systraygui.utils;
public final class Version {
public static String VERSION="2.0.1-SNAPSHOT";
- public static String BUILD_TIME="20130605-1541";
+ public static String BUILD_TIME="20130605-1641";
}
diff --git a/idrop-web/grails-app/i18n/messages.properties b/idrop-web/grails-app/i18n/messages.properties
index 34d49ef..6639196 100755
--- a/idrop-web/grails-app/i18n/messages.properties
+++ b/idrop-web/grails-app/i18n/messages.properties
@@ -215,6 +215,7 @@ error.some.error.occurred=An error occurred processing your request, please info
message.update.successful=Update successful
message.no.resource=A default resource needs to be selected from the combo box in the upper right-hand corner. Select a resource and try your request again
message.error.in.upload=An error occurred in uploading this file. If the problem persists, contact the service administrator
+message.login=Please enter your credentials to log into iRODS
message.password.updated=The password was successfully updated
message.resource.updated=Default storage resource updated successfully
message.update.successful=Update successful
diff --git a/idrop-web/grails-app/views/login/login.gsp b/idrop-web/grails-app/views/login/login.gsp
index 76af435..86317a1 100755
--- a/idrop-web/grails-app/views/login/login.gsp
+++ b/idrop-web/grails-app/views/login/login.gsp
@@ -3,146 +3,145 @@
<head>
<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>
</head>
-<div class="row-fluid">
- <div class="span5 offset4">
- <div id="normalLoginForm" class="well">
+<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>
+ </g:hasErrors>
+ </div>
+ <div class="span12">
- <g:form id="normalLogin" method="post" controller="login"
- action="authenticate">
+ <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: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: auto; width: auto;">
+ <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>
- <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>
- <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>
- </g:else>
+ <label><g:message code="text.host" />:</label>
- <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>
+ <input type="text" class="input-text" name="host" id="host"
+ value="${loginCommand.host}" />
- <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>
+ <label><g:message code="text.port" />:</label>
+
+ <input type="text" class="input-text" name="port" id="port"
+ value="${loginCommand.port}" />
+
+ <label><g:message code="text.zone" />:</label>
+
+ <input type="text" class="input-text" name="zone" id="zone"
+ value="${loginCommand.zone}" />
+
+ <label><g:message code="text.auth.method" />:</label>
+
+ <g:select name="authMethod" from="${['Standard', 'PAM']}"
+ value="${loginCommand.authMethod}" />
+ </g:else>
+
+
+ <label><g:message code="text.guest.login" />:</label>
- </span>
+ <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}" />
+
+ <button id="login" name="login"
+ style="margin-left: 150px; margin-top: 20px; margin-bottom: 20px;">
+ <g:message code="text.login" />
+ </button>
+
+ <g:if test="${!loginCommand.usePresets}">
<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>
+ <label><g:message code="text.resource" />:</label>
</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>
+ <input type="text" class="input-text" name="resource"
+ id="resource" value="${loginCommand.defaultStorageResource}" />
+ <stong> <g:message code="text.optional" /> </strong>
</div>
- </g:if>
- </div>
- <!-- container div -->
-
- </g:form>
-
- <!--end-normalLogin-->
- </div>
+ </div>
+ </g:if>
+ </fieldset>
+ </g:form>
+ <!--end-normalLogin-->
</div>
</div>
+
</div>
-</div>
+</body>
</html>
<script>
$(function() {
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index 0958cc6..13279dc 100644
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -61,3 +61,6 @@ Note that the following bug and feature requests are logged in GForge with relat
*[#1345] upgrade grails to 2.2.1
**Upgrade to grails 2.2.1 and related cleanups to make it easier to work with
**Move plug-in defs to BuildConfig.groovy
+
+*[#1475] login form discombobulated on ie later versions
+**Fix layout markup for login form for better cross-browser compatability