summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2013-02-23 13:53:45 (GMT)
committer mconway <michael.c.conway@gmail.com>2013-02-23 13:53:45 (GMT)
commit8687916e4cf188bca01d4691703098df847e666b (patch)
tree6ca373e126ee38e5ede54fa2b52a59dbdb02a431
parentbf159ca0bd0689123bb0fd0e403c1c558e3b788e (diff)
downloadQCG-Data-8687916e4cf188bca01d4691703098df847e666b.zip
QCG-Data-8687916e4cf188bca01d4691703098df847e666b.tar.gz
QCG-Data-8687916e4cf188bca01d4691703098df847e666b.tar.bz2
[#1238] public link dialog shows up in wrong place
-rwxr-xr-xidrop-web/grails-app/views/browse/publicLinkDialog.gsp5
-rwxr-xr-xidrop-web/grails-app/views/common/_topToolbar.gsp31
-rw-r--r--idrop-web/release_notes.txt4
-rwxr-xr-xidrop-web/web-app/js/mydrop/search.js2
4 files changed, 9 insertions, 33 deletions
diff --git a/idrop-web/grails-app/views/browse/publicLinkDialog.gsp b/idrop-web/grails-app/views/browse/publicLinkDialog.gsp
index 50d3efd..07d604d 100755
--- a/idrop-web/grails-app/views/browse/publicLinkDialog.gsp
+++ b/idrop-web/grails-app/views/browse/publicLinkDialog.gsp
@@ -8,7 +8,10 @@
</div>
<fieldset>
- <g:textArea name="url" rows="4" columns="200" value="${accessUrlString}"/>
+
+ <span id="url"><a target="_blank" href="${accessUrlString}">${accessUrlString}</a></span>
+
+
<br />
<div id="publicLinkDialogMenu"
class="pull-right">
diff --git a/idrop-web/grails-app/views/common/_topToolbar.gsp b/idrop-web/grails-app/views/common/_topToolbar.gsp
index 251c8e6..5c23047 100755
--- a/idrop-web/grails-app/views/common/_topToolbar.gsp
+++ b/idrop-web/grails-app/views/common/_topToolbar.gsp
@@ -120,36 +120,5 @@
var path = $("#infoAbsPath").val();
downloadViaToolbar(path);
}
-
- /*
- * Cause a dialog to appear that has a link for a public path for the current path
- */
- function makePublicLinkAtPath() {
- $("#browseDialogArea").html();
- var path = selectedPath;
- if (selectedPath == null) {
- return false;
- }
-
- // show the public link dialog
- var url = "/browse/preparePublicLinkDialog";
- var params = {
- absPath : path
- }
-
- lcSendValueWithParamsAndPlugHtmlInDiv(url, params, "", function(data) {
- fillInPublicLinkDialog(data);
- });
-
- }
-
- /*
- *Given the contents of the 'create public link' dialog,
- */
- function fillInPublicLinkDialog(data) {
- $("#browseDialogArea").html(data);
- $("#browseDialogArea").show("slow");
- //$("#browseDialogArea").dialog({width:500, modal:true});
- }
</script> \ No newline at end of file
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index 7e673bc..288f3ac 100644
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -42,6 +42,10 @@ Note that the following bug and feature requests are logged in GForge with relat
*[#1220] shares in home page on servers w/o specific query still show errors
**Added new SpecificQueryException in jargon and tolerate this error in the show shares functions on the home page with a user friendly message
+*[#1238] public link dialog shows up in wrong place
+
+
+
==Features==
*[#984] iDrop web '2.0' redesign effort
diff --git a/idrop-web/web-app/js/mydrop/search.js b/idrop-web/web-app/js/mydrop/search.js
index c0b0aae..8b40d69 100755
--- a/idrop-web/web-app/js/mydrop/search.js
+++ b/idrop-web/web-app/js/mydrop/search.js
@@ -76,7 +76,7 @@ function buildSearchLayout(detailsId) {
function askForSearchDetailsPulldown(absPath, detailsId) {
- var url = "/browse/fileInfo";
+ var url = "/browse/miniInfo";
var params = {
absPath:absPath
}