diff options
author | mconway <michael_conway@unc.edu> | 2013-05-24 21:02:59 (GMT) |
---|---|---|
committer | mconway <michael_conway@unc.edu> | 2013-05-24 21:02:59 (GMT) |
commit | 240fc89b54fe23524c3837e68a468bbd5d50f743 (patch) | |
tree | 9fbe86701d475cf5915b68108f57dbf2e2bd1930 | |
parent | b288ef6ada1101dd1d9d89d8de6c3a9cb8d7efe4 (diff) | |
download | QCG-Data-240fc89b54fe23524c3837e68a468bbd5d50f743.zip QCG-Data-240fc89b54fe23524c3837e68a468bbd5d50f743.tar.gz QCG-Data-240fc89b54fe23524c3837e68a468bbd5d50f743.tar.bz2 |
[#1439] iDrop 2.0.1 release small cleanups and fixes
-rwxr-xr-x | idrop-web/grails-app/conf/Config.groovy | 7 | ||||
-rwxr-xr-x | idrop-web/grails-app/views/common/_topToolbar.gsp | 17 | ||||
-rwxr-xr-x | idrop-web/idrop-web-config2.groovy | 6 | ||||
-rw-r--r-- | idrop-web/release_notes.txt | 1 |
4 files changed, 22 insertions, 9 deletions
diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy index 2c55e2d..2541d6b 100755 --- a/idrop-web/grails-app/conf/Config.groovy +++ b/idrop-web/grails-app/conf/Config.groovy @@ -18,8 +18,7 @@ environments { production { grails.serverURL = "http://iren-web.renci.org:8080/${appName}" } production { grails.serverURL = "http://srbbrick15.ucsd.edu:1525//${appName}" } production { grails.serverURL = "http://www.irods.org" } */2 - production { - grails.serverURL = "http://iren-web.renci.org:8080/${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}" } } @@ -76,6 +75,10 @@ idrop.config.use.userprofile=true // do I support sharing? Requires target server to have specific query support and sharing queries loaded from jargon-user-tagging idrop.config.use.sharing=true +// do I want to show the gallery view? +idrop.config.use.gallery.view=false +// do I want to show the browse view? +idrop.config.use.browse.view=true /* * Some properties may be set in an external configuration file, as configured below */ diff --git a/idrop-web/grails-app/views/common/_topToolbar.gsp b/idrop-web/grails-app/views/common/_topToolbar.gsp index 5c23047..f2ef150 100755 --- a/idrop-web/grails-app/views/common/_topToolbar.gsp +++ b/idrop-web/grails-app/views/common/_topToolbar.gsp @@ -12,14 +12,17 @@ </div> <div id="menuView" class="btn-group"> - - <button id="menuBrowseView" - onclick="browseView()"><img class="icon-list"/><g:message - code="text.browse" /></button> + <g:if test="${grailsApplication.config.idrop.config.use.browse.view==true}"> + <button id="menuBrowseView" + onclick="browseView()"><img class="icon-list"/><g:message + code="text.browse" /></button> + </g:if> <button id="menuInfoView" onclick="infoView()"><img class="icon-info-sign"/> <g:message code="text.info" /></button> - <button id="menuGalleryView" - onclick="galleryView()"><img class="icon-picture"/><g:message - code="text.gallery" /></button> + <g:if test="${grailsApplication.config.idrop.config.use.gallery.view==true}"> + <button id="menuGalleryView" + onclick="galleryView()"><img class="icon-picture"/><g:message + code="text.gallery" /></button> + </g:if> </div> </div> diff --git a/idrop-web/idrop-web-config2.groovy b/idrop-web/idrop-web-config2.groovy index 9d877f1..531dbda 100755 --- a/idrop-web/idrop-web-config2.groovy +++ b/idrop-web/idrop-web-config2.groovy @@ -69,3 +69,9 @@ idrop.config.use.userprofile=true // do I support sharing? Requires target server to have specific query support and sharing queries loaded from jargon-user-tagging idrop.config.use.sharing=true + +// do I want to show the gallery view? +idrop.config.use.gallery.view=false + +// do I want to show the browse view? +idrop.config.use.browse.view=false diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt index 396ceb5..99f9ab7 100644 --- a/idrop-web/release_notes.txt +++ b/idrop-web/release_notes.txt @@ -48,6 +48,7 @@ Note that the following bug and feature requests are logged in GForge with relat *[#1439] iDrop 2.0.1 release small cleanups and fixes
**Nicer display when no files/folders to display in home page
+**Gallery and browse view now configurable option in config.groovy
==Features==
|