summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-web/grails-app/conf/Config.groovy1
-rw-r--r--idrop-web/grails-app/views/browse/_browseTabContent.gsp17
-rw-r--r--idrop-web/grails-app/views/common/_topbar.gsp3
-rw-r--r--idrop-web/grails-app/views/home/index.gsp2
-rw-r--r--idrop-web/grails-app/views/layouts/main.gsp185
-rw-r--r--idrop-web/grails-app/views/profile/_profileTabContent.gsp2
-rw-r--r--idrop-web/web-app/js/mydrop/profile.js2
7 files changed, 104 insertions, 108 deletions
diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy
index 0d66346..5f306a6 100644
--- a/idrop-web/grails-app/conf/Config.groovy
+++ b/idrop-web/grails-app/conf/Config.groovy
@@ -34,6 +34,7 @@ environments {
idrop.config.preset.resource="lifelibResc1"
*/
+
/*
* 3) iDROP web includes the idrop-lite Java applet, which is launched from the iDROP web interface. The interface needs to know where to find this jar file.
* The Jar file should be placed on a web server in an accessible directory, and configured below
diff --git a/idrop-web/grails-app/views/browse/_browseTabContent.gsp b/idrop-web/grails-app/views/browse/_browseTabContent.gsp
index 7d4e62d..37669f3 100644
--- a/idrop-web/grails-app/views/browse/_browseTabContent.gsp
+++ b/idrop-web/grails-app/views/browse/_browseTabContent.gsp
@@ -1,24 +1,23 @@
- <div id="browseToolbar" style="display:block; width:100%;">
+ <div id="browseToolbar" style="display:block; width:100%;position:relative;">
<div id="infoDivPathArea"
- style="overflow: hidden; display:block; margin: 3px; font-size: 120%;">
+ style="overflow: hidden; display:block; margin: 3px; font-size: 120%;position:relative;">
<!-- area for the path crumb-trails -->
</div>
</div> <!-- browseToolbar -->
- <div id="browseMenuDiv">
- <g:render template="/common/topToolbar" />
+ <div id="browseMenuDiv" style="display:block; width:100%;position:relative;">
+ <g:render template="/common/topToolbar" />
</div>
- <div id="browser" class="wrapper" style="height:85%;width:100%;">
- <div id="dataTreeView"
- style="width: 100%; height: 700px; overflow: hidden;">
+ <div id="browser" class="wrapper" style="height:85%;width:100%;clear:both;">
+ <div id="dataTreeView" style="width: 100%; height: 700px; overflow: hidden;">
<div id="dataTreeDivWrapper" class="ui-layout-west" style="width: 25%; height: 100%; position:relative;">
<div id="dataTreeToolbar" style="width:100%; height:3%;display:block;" class="fg-toolbar">
<div id="dataTreeMenu" class="fg-buttonset fg-buttonset-multi"
- style="float: left, clear : both; display:block; overflow:hidden;">
+ style="float: left; clear : both; display:block; overflow:hidden;">
<button type="button" id="refreshTreeButton"
class="ui-state-default ui-corner-left" value="refreshTreeButton"
onclick="refreshTree()")>
@@ -38,7 +37,7 @@
</div> <!-- dataTreeToolbar -->
- <div id="dataTreeDiv" class="clearfix" style="height:95%; width:100%; overflow:auto;"></div>
+ <div id="dataTreeDiv" class="clearfix" style="height:95%; width:100%; overflow:auto;"><!-- no empty div --></div>
</div> <!-- dataTreeDivWrapper -->
<div id="infoDivOuter" style="display: block; width: 75%; height: 100%; position: relative; overflow: auto;"
diff --git a/idrop-web/grails-app/views/common/_topbar.gsp b/idrop-web/grails-app/views/common/_topbar.gsp
index 0818efa..ce1c402 100644
--- a/idrop-web/grails-app/views/common/_topbar.gsp
+++ b/idrop-web/grails-app/views/common/_topbar.gsp
@@ -1,6 +1,3 @@
-<!-- <div id="bannercontainer"> -->
- <!-- image banner -->
-<!-- </div> -->
<g:ifAuthenticated>
<div id="headerSearchBox" class="box">
diff --git a/idrop-web/grails-app/views/home/index.gsp b/idrop-web/grails-app/views/home/index.gsp
index 2b1326f..0af5f0c 100644
--- a/idrop-web/grails-app/views/home/index.gsp
+++ b/idrop-web/grails-app/views/home/index.gsp
@@ -37,7 +37,7 @@
</div> <!-- search tab -->
<g:if test="${grailsApplication.config.idrop.config.use.userprofile==true}">
- <div id="profileTab" style="height:100%;overflow;hidden;">
+ <div id="profileTab" style="height:100%;overflow:hidden;">
<g:render template="/profile/profileTabContent" />
</div><!-- profile tab -->
</g:if>
diff --git a/idrop-web/grails-app/views/layouts/main.gsp b/idrop-web/grails-app/views/layouts/main.gsp
index 21892ca..2da8db6 100644
--- a/idrop-web/grails-app/views/layouts/main.gsp
+++ b/idrop-web/grails-app/views/layouts/main.gsp
@@ -1,112 +1,109 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 //EN">
<html>
-<head>
-<title><g:layoutTitle default="iDrop-web - iRODS Cloud Browser" /></title>
-<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:'jqcloud.css')}" />
-<link rel="stylesheet" href="${resource(dir:'css',file:'layout-default-latest.css')}" />
-<link rel="stylesheet" href="${resource(dir:'css',file:'jquery.fileupload-ui.css')}" />
-<link rel="stylesheet" href="${resource(dir:'css',file:'superfish.css')}" />
-<link rel="stylesheet" href="${resource(dir:'css',file:'jquery.gritter.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')}" />
+ <head>
+ <title><g:layoutTitle default="iDrop-web - iRODS Cloud Browser" /></title>
+ <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:'jqcloud.css')}" />
+ <link rel="stylesheet" href="${resource(dir:'css',file:'layout-default-latest.css')}" />
+ <link rel="stylesheet" href="${resource(dir:'css',file:'jquery.fileupload-ui.css')}" />
+ <link rel="stylesheet" href="${resource(dir:'css',file:'superfish.css')}" />
+ <link rel="stylesheet" href="${resource(dir:'css',file:'jquery.gritter.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')}" />
-<link rel="shortcut icon"
- href="${resource(dir:'images',file:'favicon.ico')}" type="image/x-icon" />
-<g:layoutHead />
-<g:javascript library="jquery-1.7.2.min" />
-<g:javascript library="jquery-ui-1.8.7.custom.min" />
- <g:javascript library="jquery.hotkeys" />
- <g:javascript library="jquery.jstree" />
-<g:javascript library="jquery.jeditable.mini" />
-<g:javascript library="jquery.dataTables.min" />
-<g:javascript library="mydrop/ticket" />
-<g:javascript library="jquery.i18n.properties-min-1.0.9" />
-<g:javascript library="jqcloud-0.1.6" />
-<g:javascript library="jquery.fileupload-ui" />
-<g:javascript library="jquery.fileupload" />
-<g:javascript library="jquery.media" />
-<g:javascript library="mydrop/lingo_common" />
-<g:javascript library="mydrop/main" />
-<g:javascript library="jquery-ui-13" />
-<g:javascript library="jquery.blockUI" />
-<g:javascript library="jquery.ba-bbq.min" />
-<g:javascript library="jquery.layout-latest.min" />
-<g:javascript library="jquery-ui-13" />
-<g:javascript library="jquery.tools.min" />
-<g:javascript library="mydrop/shopping_cart" />
-<g:javascript library="mydrop/user" />
-<g:javascript library="galleria-1.2.6" />
-<g:javascript library="jquery.gritter.min" />
-<g:javascript library="jquery.opacityrollover" />
-<g:javascript library="superfish" />
-<!-- preserve the application context as a js variable for use in AJAX callbacks -->
-<script type="text/javascript">
- context = "${request.contextPath}";
- scheme = "${request.scheme}";
- host = "${request.localName}";
- port = "${request.localPort}";
+ <link rel="shortcut icon"
+ href="${resource(dir:'images',file:'favicon.ico')}" type="image/x-icon" />
+ <g:layoutHead />
+ <g:javascript library="jquery-1.7.2.min" />
+ <g:javascript library="jquery-ui-1.8.7.custom.min" />
+ <g:javascript library="jquery.hotkeys" />
+ <g:javascript library="jquery.jstree" />
+ <g:javascript library="jquery.jeditable.mini" />
+ <g:javascript library="jquery.dataTables.min" />
+ <g:javascript library="mydrop/ticket" />
+ <g:javascript library="jquery.i18n.properties-min-1.0.9" />
+ <g:javascript library="jqcloud-0.1.6" />
+ <g:javascript library="jquery.fileupload-ui" />
+ <g:javascript library="jquery.fileupload" />
+ <g:javascript library="jquery.media" />
+ <g:javascript library="mydrop/lingo_common" />
+ <g:javascript library="mydrop/main" />
+ <g:javascript library="jquery-ui-13" />
+ <g:javascript library="jquery.blockUI" />
+ <g:javascript library="jquery.ba-bbq.min" />
+ <g:javascript library="jquery.layout-latest.min" />
+ <g:javascript library="jquery-ui-13" />
+ <g:javascript library="jquery.tools.min" />
+ <g:javascript library="mydrop/shopping_cart" />
+ <g:javascript library="mydrop/user" />
+ <g:javascript library="galleria-1.2.6" />
+ <g:javascript library="jquery.gritter.min" />
+ <g:javascript library="jquery.opacityrollover" />
+ <g:javascript library="superfish" />
+ <!-- preserve the application context as a js variable for use in AJAX callbacks -->
+ <script type="text/javascript">
+ context = "${request.contextPath}";
+ scheme = "${request.scheme}";
+ host = "${request.localName}";
+ port = "${request.localPort}";
- $(function(){
- // Keep a mapping of url-to-container for caching purposes.
- var cache = {
- // If url is '' (no fragment), display this div's content.
- '': $('.bbq-default')
- };
+ $(function(){
+ // Keep a mapping of url-to-container for caching purposes.
+ var cache = {
+ // If url is '' (no fragment), display this div's content.
+ '': $('.bbq-default')
+ };
- // Bind an event to window.onhashchange that, when the history state changes,
- // gets the url from the hash and displays either our cached content or fetches
- // new content to be displayed.
- $(window).bind( 'hashchange', function(e) {
+ // Bind an event to window.onhashchange that, when the history state changes,
+ // gets the url from the hash and displays either our cached content or fetches
+ // new content to be displayed.
+ $(window).bind( 'hashchange', function(e) {
- processStateChange( $.bbq.getState());
+ processStateChange( $.bbq.getState());
- });
+ });
- jQuery.i18n.properties({
- name:'messages',
- path:'js/bundles/',
- mode:'both'
- });
+ jQuery.i18n.properties({
+ name:'messages',
+ path:'js/bundles/',
+ mode:'both'
+ });
- // Since the event is only triggered when the hash changes, we need to trigger
- // the event now, to handle the hash the page may have loaded with.
- // $(window).trigger( 'hashchange' );
- });
+ });
-</script>
+ </script>
</head>
<body style="height:100%;overflow:visible;">
-<div id="hd"><!-- PUT MASTHEAD CODE HERE -->
-<g:render template="/common/topbar"/>
-<g:render template="/common/messages"/>
-</div>
-<div id="bd" style="height:100%;">
-<div id="defaultDialogDiv"><!-- default for general jquery dialogs --></div>
-<div id="yui-main" style="height:100%;">
-<div class="yui-b" style="height:100%;">
-<div id="mainDiv" class="yui-ge" style="height:100%;">
-<div id="mainDivCol1" class="yui-u first" style="height:100%;"><!-- PUT MAIN COLUMN 1 CODE HERE -->
- <g:layoutBody />
-</div>
-<div id="secondaryDiv" class="yui-u" style="height:100%;"><!-- PUT MAIN COLUMN 2 CODE HERE -->
-<g:ifAuthenticated>
-<g:render template="/common/secondarymain"/>
-</g:ifAuthenticated>
+ <div id="hd"><!-- PUT MASTHEAD CODE HERE -->
+ <g:render template="/common/topbar"/>
+ <g:render template="/common/messages"/>
+ </div>
+ <div id="bd" style="height:100%;">
+ <div id="defaultDialogDiv"><!-- default for general jquery dialogs --></div>
+ <div id="yui-main" style="height:100%;">
+ <div class="yui-b" style="height:100%;">
+ <div id="mainDiv" class="yui-ge" style="height:100%;">
+ <div id="mainDivCol1" class="yui-u first" style="height:100%;"><!-- PUT MAIN COLUMN 1 CODE HERE -->
+ <g:layoutBody />
+ </div>
+ <div id="secondaryDiv" class="yui-u" style="height:100%;"><!-- PUT MAIN COLUMN 2 CODE HERE -->
+ <g:ifAuthenticated>
+ <g:render template="/common/secondarymain"/>
+ </g:ifAuthenticated>
-</div>
-</div>
-</div>
-</div>
+ </div>
+ </div>
+ </div>
+ </div>
-</div>
-<div id="ft"><!-- PUT FOOTER CODE HERE -->
-<g:render template="/common/footer" />
-</div>
+ </div>
+ <div id="ft"><!-- PUT FOOTER CODE HERE -->
+ <g:render template="/common/footer" />
+ </div>
</body>
</html> \ No newline at end of file
diff --git a/idrop-web/grails-app/views/profile/_profileTabContent.gsp b/idrop-web/grails-app/views/profile/_profileTabContent.gsp
index f45af20..32d6fab 100644
--- a/idrop-web/grails-app/views/profile/_profileTabContent.gsp
+++ b/idrop-web/grails-app/views/profile/_profileTabContent.gsp
@@ -5,7 +5,7 @@
</div> <!-- profileToolbar -->
<div id="profileDialogArea"><!-- div for optional profile dialogs -->
</div>
- <div id="profileDataArea">
+ <div id="profileDataArea" style="clear:both;">
<!-- area for profile data -->
</div>
</div>
diff --git a/idrop-web/web-app/js/mydrop/profile.js b/idrop-web/web-app/js/mydrop/profile.js
index 2378a40..6d57517 100644
--- a/idrop-web/web-app/js/mydrop/profile.js
+++ b/idrop-web/web-app/js/mydrop/profile.js
@@ -53,6 +53,7 @@ function loadProfileData() {
function showChangePasswordDialog() {
var targetDiv = "#profileDialogArea";
$("#profileDataArea").hide("slow");
+ $("#profileToolbar").hide("slow");
lcSendValueAndCallbackHtmlAfterErrorCheckPreserveMessage(
"/profile/showPasswordChangeDialog",
targetDiv, targetDiv, null);
@@ -63,6 +64,7 @@ function showChangePasswordDialog() {
*/
function closePasswordDialog() {
$("#profileDialogArea").html("");
+ $("#profileToolbar").show("slow");
$("#profileDataArea").show("slow");
}