From 72729d551032834844c065ee5a1178fb69d7ce0b Mon Sep 17 00:00:00 2001 From: Leon Miller-Out Date: Fri, 27 Sep 2013 10:15:19 -0400 Subject: [PATCH 1/2] Whitespace --- lib/gollum/public/gollum/javascript/gollum.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gollum/public/gollum/javascript/gollum.js b/lib/gollum/public/gollum/javascript/gollum.js index 5e5bf857..1c2f7cfa 100755 --- a/lib/gollum/public/gollum/javascript/gollum.js +++ b/lib/gollum/public/gollum/javascript/gollum.js @@ -171,7 +171,7 @@ $(document).ready(function() { var path = pagePath(); var oldName = pageName(); - var context_blurb = + var context_blurb = "Renamed page will be under " + "" + htmlEscape('/' + path) + "" + " unless an absolute path is given." @@ -225,7 +225,7 @@ $(document).ready(function() { // For consistency remove the trailing / path = path.replace(/\/$/,'') } - var context_blurb = + var context_blurb = "Page will be created under " + "" + htmlEscape('/' + path) + "" + " unless an absolute path is given." From 4d8677965cb529b92f550b22ea24a6c89342229b Mon Sep 17 00:00:00 2001 From: Leon Miller-Out Date: Fri, 27 Sep 2013 10:15:33 -0400 Subject: [PATCH 2/2] Add instructions for how to access file post-upload --- lib/gollum/public/gollum/javascript/gollum.dialog.js | 4 ++++ lib/gollum/public/gollum/javascript/gollum.js | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/gollum/public/gollum/javascript/gollum.dialog.js b/lib/gollum/public/gollum/javascript/gollum.dialog.js index 47c7d4ca..3131828f 100755 --- a/lib/gollum/public/gollum/javascript/gollum.dialog.js +++ b/lib/gollum/public/gollum/javascript/gollum.dialog.js @@ -102,6 +102,10 @@ html += ''; html += ''; + if( fieldAttributes.context ){ + html += '' + fieldAttributes.context + ''; + } + return html; }, diff --git a/lib/gollum/public/gollum/javascript/gollum.js b/lib/gollum/public/gollum/javascript/gollum.js index 1c2f7cfa..7b3fc87c 100755 --- a/lib/gollum/public/gollum/javascript/gollum.js +++ b/lib/gollum/public/gollum/javascript/gollum.js @@ -154,7 +154,8 @@ $(document).ready(function() { title: 'Upload File', fields: [ { - type: 'file' + type: 'file', + context: 'Your uploaded file will be accessible at /uploads/[filename]' } ], OK: function( res ) {