summaryrefslogtreecommitdiffstats
path: root/idrop-web
diff options
context:
space:
mode:
authorMike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-02-15 12:12:17 (GMT)
committer Mike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-02-15 12:12:17 (GMT)
commit45ce77e0fa65c6b5c99c47e10a6b78c532910089 (patch)
treef268cef71508de90d8141c705ad6331b51924700 /idrop-web
parent8d525b9203e41c0dcc9be1c5b9129c4312c26bc4 (diff)
downloadQCG-Data-45ce77e0fa65c6b5c99c47e10a6b78c532910089.zip
QCG-Data-45ce77e0fa65c6b5c99c47e10a6b78c532910089.tar.gz
QCG-Data-45ce77e0fa65c6b5c99c47e10a6b78c532910089.tar.bz2
working on browser view, css updates, cleanups
Diffstat (limited to 'idrop-web')
-rw-r--r--idrop-web/grails-app/conf/spring/resources.groovy5
-rw-r--r--idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy23
-rw-r--r--idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy18
-rw-r--r--idrop-web/grails-app/views/browse/index.gsp8
-rw-r--r--idrop-web/test/unit/org/irods/mydrop/controller/BrowseControllerTests.groovy23
-rw-r--r--idrop-web/test/unit/org/irods/mydrop/controller/LoginControllerTests.groovy29
-rw-r--r--idrop-web/web-app/css/main.css63
7 files changed, 67 insertions, 102 deletions
diff --git a/idrop-web/grails-app/conf/spring/resources.groovy b/idrop-web/grails-app/conf/spring/resources.groovy
index 5f35c93..baa2acc 100644
--- a/idrop-web/grails-app/conf/spring/resources.groovy
+++ b/idrop-web/grails-app/conf/spring/resources.groovy
@@ -1,9 +1,6 @@
// Place your Spring DSL code here
beans = {
-
- irodsAuthenticationHelperService(mydrop.IRODSAuthenticationHelperService) {
- irodsAccessObjectFactory = ref("irodsAccessObjectFactory")
- }
+
browserController(org.irods.mydrop.controller.BrowseController) {
irodsAccessObjectFactory = ref("irodsAccessObjectFactory")
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
index 95344e4..452632f 100644
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
@@ -88,25 +88,12 @@ class BrowseController {
}
render jsonBuff as JSON
-
- /*
- render(contentType:"text/json") {
- children = array {
- for (entry in collectionAndDataObjectList) {
- data = entry.nodeValueForDisplay
- attr = {id=entry.formattedAbsolutePath}
- state="closed"
- children=[]
- if (entry.getObjectType == CollectionAndDataObjectListingEntry.ObjectType.COLLECTION) {
- icon="folder"
- } else {
- icon="/"
- }
- }
- }
- }
- */
+ }
+
+ def fileInfo = {
}
+
+
}
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
deleted file mode 100644
index ba34f24..0000000
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.irods.mydrop.controller
-
-import org.codehaus.groovy.grails.validation.Validateable;
-
-class LoginController {
-
-
- def login = {
- render(view:"login")
- }
-
- def index ={
- redirect(action: "login")
- }
-
- def logout = {}
-
-}
diff --git a/idrop-web/grails-app/views/browse/index.gsp b/idrop-web/grails-app/views/browse/index.gsp
index 08de27d..b49b8d3 100644
--- a/idrop-web/grails-app/views/browse/index.gsp
+++ b/idrop-web/grails-app/views/browse/index.gsp
@@ -7,11 +7,11 @@ $(function() {
});
</script>
-<div id="browser" style="height:800px; display:inline-block;">
+<div id="browser" class="wrapper">
<div id="dataTreeView"
- style="float: left; height:800px; width=600px; display:inline-block"><!-- no empty divs -->
-<div id="dataTreeDiv" class="scroll">
+ style="float: left; position: relative; width: auto;"><!-- no empty divs -->
+<div id="dataTreeDiv" class="colLeft"></div>
+<div id="infoDiv" class="colRight roundedContainer">info here</div>
</div>
-</div>
</div> \ No newline at end of file
diff --git a/idrop-web/test/unit/org/irods/mydrop/controller/BrowseControllerTests.groovy b/idrop-web/test/unit/org/irods/mydrop/controller/BrowseControllerTests.groovy
index 2daaa52..4cfe745 100644
--- a/idrop-web/test/unit/org/irods/mydrop/controller/BrowseControllerTests.groovy
+++ b/idrop-web/test/unit/org/irods/mydrop/controller/BrowseControllerTests.groovy
@@ -48,12 +48,7 @@ class BrowseControllerTests extends ControllerUnitTestCase {
def controllerResponse = controller.response.contentAsString
def jsonResult = JSON.parse(controllerResponse)
assertNotNull("missing json result", jsonResult)
- /*def mav = controller.modelAndView
- def name = mav.viewName
- assertNotNull("null mav", mav)
- assertEquals("view name should be loadTree", "loadTree", name)
- def parent = mav.model.linkedHashMap.parent
- assertEquals("parent dir not found", "/", parent)*/
+
}
@@ -65,12 +60,14 @@ class BrowseControllerTests extends ControllerUnitTestCase {
def controllerResponse = controller.response.contentAsString
def jsonResult = JSON.parse(controllerResponse)
assertNotNull("missing json result", jsonResult)
- /*def mav = controller.modelAndView
- def name = mav.viewName
- assertNotNull("null mav", mav)
- assertEquals("view name should be loadTree", "loadTree", name)
- def parent = mav.model.linkedHashMap.parent
- assertEquals("parent dir not found", "/", parent)*/
-
+
+ }
+
+ void testFileInfo() {
+ assertTrue(true)
}
+
+
+
+
}
diff --git a/idrop-web/test/unit/org/irods/mydrop/controller/LoginControllerTests.groovy b/idrop-web/test/unit/org/irods/mydrop/controller/LoginControllerTests.groovy
deleted file mode 100644
index 359b289..0000000
--- a/idrop-web/test/unit/org/irods/mydrop/controller/LoginControllerTests.groovy
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.irods.mydrop.controller
-
-
-import org.irods.jargon.core.pub.IRODSFileSystem;
-import org.irods.mydrop.controller.LoginController;
-import mydrop.*;
-import grails.test.*
-
-class LoginControllerTests extends ControllerUnitTestCase {
-
- protected void setUp() {
- super.setUp()
-
- }
-
- protected void tearDown() {
- super.tearDown()
- irodsFileSystem.closeAndEatExceptions()
- }
-
- void testLogin() {
- def loginController = new LoginController();
- loginController.login()
- def mav = loginController.modelAndView
- def name = mav.viewName
- assertEquals("should redirect to login view", "login", name)
- }
-
-}
diff --git a/idrop-web/web-app/css/main.css b/idrop-web/web-app/css/main.css
index 4ad56a9..915c7d6 100644
--- a/idrop-web/web-app/css/main.css
+++ b/idrop-web/web-app/css/main.css
@@ -59,12 +59,52 @@ div.box label span {
}
div.scroll {
-height: 800px;
-width: 300px;
-overflow: auto;
-padding: 8px;
+ overflow: auto;
+ padding: 8px;
}
+.wrapper {
+ text-align: left;
+ margin: 0px auto;
+ padding: 0px;
+ border: 0;
+ width: 800px;
+ display: inline-block;
+}
+
+.colRight {
+ position: relative;
+ float: right;
+ width: 250px;
+ display: block;
+ overflow: auto;
+}
+
+.colLeft {
+ position: relative;
+ float: left;
+ width: 500px;
+ display: block;
+ overflow: auto;
+}
+
+.roundedContainer {
+ -moz-background-clip: border;
+ -moz-background-inline-policy: continuous;
+ -moz-background-origin: padding;
+ -moz-border-radius-bottomleft: 8pt;
+ -moz-border-radius-bottomright: 8pt;
+ -moz-border-radius-topleft: 8pt;
+ -moz-border-radius-topright: 8pt;
+ background: #FFFFFF none repeat scroll 0 0;
+ border: 3px solid #000000;
+ cursor: default;
+ padding: 3px;
+ margin: 3px;
+ display: block;
+}
+
+
.body {
float: left;
margin: 0 15px 10px 15px;
@@ -263,10 +303,9 @@ th.desc a {
.objectContainerDetails {
float: right;
- text-align: left;
+ text-align: left;
}
-
.objectHeader {
color: #210021;
font-weight: normal;
@@ -274,7 +313,6 @@ th.desc a {
margin: .8em 0 .3em 0;
}
-
.objectDescription {
color: #210021;
font-weight: normal;
@@ -284,13 +322,6 @@ th.desc a {
.objectContainerActions {
display: block;
- float: left;
+ float: left;
padding: 10px;
-}
-
-
-
-
-
-
-
+} \ No newline at end of file