summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-web/grails-app/conf/Config.groovy8
-rw-r--r--idrop-web/grails-app/controllers/org/irods/mydrop/controller/FileController.groovy8
-rw-r--r--idrop-web/grails-app/views/browse/galleryView.gsp2
-rw-r--r--idrop-web/grails-app/views/home/index.gsp8
-rw-r--r--idrop-web/web-app/css/main.css4
-rw-r--r--idrop-web/web-app/js/themes/classic/galleria.classic.css12
6 files changed, 25 insertions, 17 deletions
diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy
index f516a49..b6b9876 100644
--- a/idrop-web/grails-app/conf/Config.groovy
+++ b/idrop-web/grails-app/conf/Config.groovy
@@ -91,8 +91,8 @@ grails.validateable.packages = ['org.irods']
// set per-environment serverURL stem for creating absolute links
environments {
- production { grails.serverURL = "http://lifetime-library.ils.unc.edu/${appName}" }
- /*production { grails.serverURL = "http://iren-web.renci.org:8080/${appName}" }*/
+ /*production { grails.serverURL = "http://lifetime-library.ils.unc.edu/${appName}" }*/
+ production { grails.serverURL = "http://iren-web.renci.org:8080/${appName}" }
development { grails.serverURL = "http://localhost:8080/${appName}" }
test { grails.serverURL = "http://localhost:8080/${appName}" }
}
@@ -125,9 +125,9 @@ log4j = {
warn 'org.irods.mydrop'
info 'org.irods.jargon'
- debug 'org.irods.jargon.spring.security'
+ info 'org.irods.jargon.spring.security'
warn 'org.springframework'
- info 'grails.app'
+ warn 'grails.app'
info 'org.mortbay.log',
'grails.app.controller',
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/FileController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/FileController.groovy
index cd77106..dae667d 100644
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/FileController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/FileController.groovy
@@ -229,14 +229,16 @@ class FileController {
filesToDelete.each{
log.info "filesToDelete: ${it}"
IRODSFile toDelete = irodsFileFactory.instanceIRODSFile(it)
- toDelete.delete()
+ toDelete.deleteWithForceOption()
+ log.info("...delete successful")
}
} else {
log.debug "not array"
- log.info "deleting: ${filesToDelete}"
+ log.info "deleting: ${filesToDelete}..."
IRODSFile toDelete = irodsFileFactory.instanceIRODSFile(filesToDelete)
- toDelete.delete()
+ toDelete.deleteWithForceOption()
+ log.info("...delete successful")
}
render "OK"
diff --git a/idrop-web/grails-app/views/browse/galleryView.gsp b/idrop-web/grails-app/views/browse/galleryView.gsp
index 4615aad..8ffd167 100644
--- a/idrop-web/grails-app/views/browse/galleryView.gsp
+++ b/idrop-web/grails-app/views/browse/galleryView.gsp
@@ -22,7 +22,7 @@
Galleria.loadTheme(context + '/js/themes/classic/galleria.classic.min.js');
$("#gallery").galleria({
width: 800,
- height: 500,
+ height: 750,
dataConfig: function(img) {
return {
description: $(img).next('div').html()
diff --git a/idrop-web/grails-app/views/home/index.gsp b/idrop-web/grails-app/views/home/index.gsp
index 2a622a0..cbcaf89 100644
--- a/idrop-web/grails-app/views/home/index.gsp
+++ b/idrop-web/grails-app/views/home/index.gsp
@@ -18,7 +18,10 @@
<div id="browseTab">
+
+
<div id="browser" class="wrapper">
+
<div id="browseToolbar">
<g:render template="/common/topToolbar" />
<span id="infoDivPathArea"
@@ -45,9 +48,12 @@
</div>
</div>
</div>
+ </div>
+
-
<div id="searchTab">
+
+
<div id="searchDivOuter"
style="display: block; width: 95%; height: 90%; position: relative; overflow: hidden;"
class="ui-layout-center">
diff --git a/idrop-web/web-app/css/main.css b/idrop-web/web-app/css/main.css
index 3e107ee..7152cb1 100644
--- a/idrop-web/web-app/css/main.css
+++ b/idrop-web/web-app/css/main.css
@@ -143,8 +143,8 @@ div#tabs { /*width: 100%;
padding: 0;
margin-left: auto;
margin-right: auto;
- /*background: #fff url(../images/iDropLogo.png) left center no-repeat;*/
- background: #fff url(../images/Lifetime-Library.png) left center no-repeat;
+ background: #fff url(../images/iDropLogo.png) left center no-repeat;
+ /*background: #fff url(../images/Lifetime-Library.png) left center no-repeat;*/
display: inline-block;
position: relative;
}
diff --git a/idrop-web/web-app/js/themes/classic/galleria.classic.css b/idrop-web/web-app/js/themes/classic/galleria.classic.css
index dcc13a2..e490a0f 100644
--- a/idrop-web/web-app/js/themes/classic/galleria.classic.css
+++ b/idrop-web/web-app/js/themes/classic/galleria.classic.css
@@ -15,7 +15,7 @@
-o-user-select: none;
}
.galleria-stage {
- height:450px; <-- set this to any height and i should work :)
+ height:600px; <-- set this to any height and i should work :)
position: absolute;
top: 10px;
bottom: 60px;
@@ -24,7 +24,7 @@
overflow:hidden;
}
.galleria-thumbnails-container {
- height: 50px;
+ height: 100px;
bottom: 0;
position: absolute;
left: 10px;
@@ -36,8 +36,8 @@
margin-right: 30px;
}
.galleria-thumbnails .galleria-image {
- height: 40px;
- width: 60px;
+ height: 100px;
+ width: 120px;
background: #000;
margin: 0 5px 0 0;
border: 1px solid #000;
@@ -50,7 +50,7 @@
left: 10px;
text-align: right;
color: #fff;
- font: normal 11px/1 arial,sans-serif;
+ font: normal 14px/1 arial,sans-serif;
z-index: 1;
}
.galleria-loader {
@@ -84,7 +84,7 @@
margin-bottom: 7px;
}
.galleria-info-description {
- font: italic 12px/1.4 georgia,serif;
+ font: 14px/1.4 georgia,serif;
margin: 0;
color: #bbb;
}